X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_keepaway.qc;h=f96aada3ee09ac8506edb8661d116229ca8be63f;hb=9dd7ac97faf9fc1548cc3d416cedaeef803e7528;hp=ed69612d15c42e6f0e5abe4cf0e02c4ed811f30b;hpb=02e0727816326407cc681dd2d12c67d157e618cf;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc index ed69612d1..f96aada3e 100644 --- a/qcsrc/server/mutators/gamemode_keepaway.qc +++ b/qcsrc/server/mutators/gamemode_keepaway.qc @@ -1,12 +1,26 @@ #include "gamemode_keepaway.qh" -#include "../_all.qh" #include "gamemode.qh" -// =========================================================== -// Keepaway game mode coding, written by Samual and Diabolik -// Last updated: September, 2012 -// =========================================================== +int autocvar_g_keepaway_ballcarrier_effects; +float autocvar_g_keepaway_ballcarrier_damage; +float autocvar_g_keepaway_ballcarrier_force; +float autocvar_g_keepaway_ballcarrier_highspeed; +float autocvar_g_keepaway_ballcarrier_selfdamage; +float autocvar_g_keepaway_ballcarrier_selfforce; +float autocvar_g_keepaway_noncarrier_damage; +float autocvar_g_keepaway_noncarrier_force; +float autocvar_g_keepaway_noncarrier_selfdamage; +float autocvar_g_keepaway_noncarrier_selfforce; +bool autocvar_g_keepaway_noncarrier_warn; +int autocvar_g_keepaway_score_bckill; +int autocvar_g_keepaway_score_killac; +int autocvar_g_keepaway_score_timepoints; +float autocvar_g_keepaway_score_timeinterval; +float autocvar_g_keepawayball_damageforcescale; +int autocvar_g_keepawayball_effects; +float autocvar_g_keepawayball_respawntime; +int autocvar_g_keepawayball_trail_color; float ka_ballcarrier_waypointsprite_visible_for_player(entity e) // runs on waypoints which are attached to ballcarriers, updates once per frame { @@ -27,7 +41,7 @@ void ka_EventLog(string mode, entity actor) // use an alias for easy changing an void ka_TouchEvent(); void ka_RespawnBall() // runs whenever the ball needs to be relocated -{ +{SELFPARAM(); if(gameover) { return; } vector oldballorigin = self.origin; @@ -47,17 +61,17 @@ void ka_RespawnBall() // runs whenever the ball needs to be relocated self.think = ka_RespawnBall; self.nextthink = time + autocvar_g_keepawayball_respawntime; - pointparticles(particleeffectnum("electro_combo"), oldballorigin, '0 0 0', 1); - pointparticles(particleeffectnum("electro_combo"), self.origin, '0 0 0', 1); + Send_Effect(EFFECT_ELECTRO_COMBO, oldballorigin, '0 0 0', 1); + Send_Effect(EFFECT_ELECTRO_COMBO, self.origin, '0 0 0', 1); - WaypointSprite_Spawn("ka-ball", 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER, '0 1 1'); + WaypointSprite_Spawn(WP_KaBall, 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER); WaypointSprite_Ping(self.waypointsprite_attachedforcarrier); - sound(self, CH_TRIGGER, "keepaway/respawn.wav", VOL_BASE, ATTEN_NONE); // ATTEN_NONE (it's a sound intended to be heard anywhere) + sound(self, CH_TRIGGER, SND_KA_RESPAWN, VOL_BASE, ATTEN_NONE); // ATTEN_NONE (it's a sound intended to be heard anywhere) } void ka_TimeScoring() -{ +{SELFPARAM(); if(self.owner.ballcarried) { // add points for holding the ball after a certain amount of time if(autocvar_g_keepaway_score_timepoints) @@ -69,7 +83,7 @@ void ka_TimeScoring() } void ka_TouchEvent() // runs any time that the ball comes in contact with something -{ +{SELFPARAM(); if(gameover) { return; } if(!self) { return; } if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) @@ -81,8 +95,8 @@ void ka_TouchEvent() // runs any time that the ball comes in contact with someth if(other.frozen) { return; } if (!IS_PLAYER(other)) { // The ball just touched an object, most likely the world - pointparticles(particleeffectnum("kaball_sparks"), self.origin, '0 0 0', 1); - sound(self, CH_TRIGGER, "keepaway/touch.wav", VOL_BASE, ATTEN_NORM); + Send_Effect(EFFECT_BALL_SPARKS, self.origin, '0 0 0', 1); + sound(self, CH_TRIGGER, SND_KA_TOUCH, VOL_BASE, ATTEN_NORM); return; } else if(self.wait > time) { return; } @@ -112,13 +126,13 @@ void ka_TouchEvent() // runs any time that the ball comes in contact with someth Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_KEEPAWAY_PICKUP, other.netname); Send_Notification(NOTIF_ALL_EXCEPT, other, MSG_CENTER, CENTER_KEEPAWAY_PICKUP, other.netname); Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_KEEPAWAY_PICKUP_SELF); - sound(self.owner, CH_TRIGGER, "keepaway/pickedup.wav", VOL_BASE, ATTEN_NONE); // ATTEN_NONE (it's a sound intended to be heard anywhere) + sound(self.owner, CH_TRIGGER, SND_KA_PICKEDUP, VOL_BASE, ATTEN_NONE); // ATTEN_NONE (it's a sound intended to be heard anywhere) // scoring PlayerScore_Add(other, SP_KEEPAWAY_PICKUPS, 1); // waypoints - WaypointSprite_AttachCarrier("ka-ballcarrier", other, RADARICON_FLAGCARRIER, '1 0 0'); + WaypointSprite_AttachCarrier(WP_KaBallCarrier, other, RADARICON_FLAGCARRIER); other.waypointsprite_attachedforcarrier.waypointsprite_visible_for_player = ka_ballcarrier_waypointsprite_visible_for_player; WaypointSprite_UpdateRule(other.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT); WaypointSprite_Ping(other.waypointsprite_attachedforcarrier); @@ -154,20 +168,20 @@ void ka_DropEvent(entity plyr) // runs any time that a player is supposed to los ka_EventLog("dropped", plyr); Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_KEEPAWAY_DROPPED, plyr.netname); Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_KEEPAWAY_DROPPED, plyr.netname); - sound(other, CH_TRIGGER, "keepaway/dropped.wav", VOL_BASE, ATTEN_NONE); // ATTEN_NONE (it's a sound intended to be heard anywhere) + sound(other, CH_TRIGGER, SND_KA_DROPPED, VOL_BASE, ATTEN_NONE); // ATTEN_NONE (it's a sound intended to be heard anywhere) // scoring // PlayerScore_Add(plyr, SP_KEEPAWAY_DROPS, 1); Not anymore, this is 100% the same as pickups and is useless. // waypoints - WaypointSprite_Spawn("ka-ball", 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER, '0 1 1'); + WaypointSprite_Spawn(WP_KaBall, 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, false, RADARICON_FLAGCARRIER); WaypointSprite_UpdateRule(ball.waypointsprite_attachedforcarrier, 0, SPRITERULE_DEFAULT); WaypointSprite_Ping(ball.waypointsprite_attachedforcarrier); WaypointSprite_Kill(plyr.waypointsprite_attachedforcarrier); } void ka_Reset() // used to clear the ballcarrier whenever the match switches from warmup to normal -{ +{SELFPARAM(); if((self.owner) && (IS_PLAYER(self.owner))) ka_DropEvent(self.owner); @@ -187,7 +201,7 @@ void ka_Reset() // used to clear the ballcarrier whenever the match switches fro // ================ void havocbot_goalrating_ball(float ratingscale, vector org) -{ +{SELFPARAM(); float t; entity ball_owner; ball_owner = ka_ball.owner; @@ -206,7 +220,7 @@ void havocbot_goalrating_ball(float ratingscale, vector org) } void havocbot_role_ka_carrier() -{ +{SELFPARAM(); if (self.deadflag != DEAD_NO) return; @@ -229,7 +243,7 @@ void havocbot_role_ka_carrier() } void havocbot_role_ka_collector() -{ +{SELFPARAM(); if (self.deadflag != DEAD_NO) return; @@ -256,8 +270,8 @@ void havocbot_role_ka_collector() // Hook Functions // ============== -MUTATOR_HOOKFUNCTION(ka_Scoring) -{ +MUTATOR_HOOKFUNCTION(ka, PlayerDies) +{SELFPARAM(); if((frag_attacker != frag_target) && (IS_PLAYER(frag_attacker))) { if(frag_target.ballcarried) { // add to amount of times killing carrier @@ -277,14 +291,14 @@ MUTATOR_HOOKFUNCTION(ka_Scoring) return 0; } -MUTATOR_HOOKFUNCTION(ka_GiveFragsForKill) +MUTATOR_HOOKFUNCTION(ka, GiveFragsForKill) { frag_score = 0; // no frags counted in keepaway return 1; // you deceptive little bugger ;3 This needs to be true in order for this function to even count. } -MUTATOR_HOOKFUNCTION(ka_PlayerPreThink) -{ +MUTATOR_HOOKFUNCTION(ka, PlayerPreThink) +{SELFPARAM(); // clear the item used for the ball in keepaway self.items &= ~IT_KEY1; @@ -295,8 +309,8 @@ MUTATOR_HOOKFUNCTION(ka_PlayerPreThink) return 0; } -MUTATOR_HOOKFUNCTION(ka_PlayerUseKey) -{ +MUTATOR_HOOKFUNCTION(ka, PlayerUseKey) +{SELFPARAM(); if(MUTATOR_RETURNVALUE == 0) if(self.ballcarried) { @@ -306,7 +320,7 @@ MUTATOR_HOOKFUNCTION(ka_PlayerUseKey) return 0; } -MUTATOR_HOOKFUNCTION(ka_PlayerDamage) // for changing damage and force values that are applied to players in g_damage.qc +MUTATOR_HOOKFUNCTION(ka, PlayerDamage_Calculate) // for changing damage and force values that are applied to players in g_damage.qc { if(frag_attacker.ballcarried) // if the attacker is a ballcarrier { @@ -337,14 +351,20 @@ MUTATOR_HOOKFUNCTION(ka_PlayerDamage) // for changing damage and force values th return 0; } -MUTATOR_HOOKFUNCTION(ka_RemovePlayer) -{ +MUTATOR_HOOKFUNCTION(ka, ClientDisconnect) +{SELFPARAM(); if(self.ballcarried) { ka_DropEvent(self); } // a player with the ball has left the match, drop it return 0; } -MUTATOR_HOOKFUNCTION(ka_PlayerPowerups) -{ +MUTATOR_HOOKFUNCTION(ka, MakePlayerObserver) +{SELFPARAM(); + if(self.ballcarried) { ka_DropEvent(self); } // a player with the ball has left the match, drop it + return 0; +} + +MUTATOR_HOOKFUNCTION(ka, PlayerPowerups) +{SELFPARAM(); // In the future this hook is supposed to allow me to do some extra stuff with waypointsprites and invisibility powerup // So bare with me until I can fix a certain bug with ka_ballcarrier_waypointsprite_visible_for_player() @@ -356,8 +376,29 @@ MUTATOR_HOOKFUNCTION(ka_PlayerPowerups) return 0; } -MUTATOR_HOOKFUNCTION(ka_BotRoles) -{ +.float stat_sv_airspeedlimit_nonqw; +.float stat_sv_maxspeed; + +MUTATOR_HOOKFUNCTION(ka, PlayerPhysics) +{SELFPARAM(); + if(self.ballcarried) + { + self.stat_sv_airspeedlimit_nonqw *= autocvar_g_keepaway_ballcarrier_highspeed; + self.stat_sv_maxspeed *= autocvar_g_keepaway_ballcarrier_highspeed; + } + return false; +} + +MUTATOR_HOOKFUNCTION(ka, BotShouldAttack) +{SELFPARAM(); + // if neither player has ball then don't attack unless the ball is on the ground + if(!checkentity.ballcarried && !self.ballcarried && ka_ball.owner) + return true; + return false; +} + +MUTATOR_HOOKFUNCTION(ka, HavocBot_ChooseRole) +{SELFPARAM(); if (self.ballcarried) self.havocbot_role = havocbot_role_ka_carrier; else @@ -365,6 +406,14 @@ MUTATOR_HOOKFUNCTION(ka_BotRoles) return true; } +MUTATOR_HOOKFUNCTION(ka, DropSpecialItems) +{ + if(frag_target.ballcarried) + ka_DropEvent(frag_target); + + return false; +} + // ============== // Initialization @@ -372,13 +421,11 @@ MUTATOR_HOOKFUNCTION(ka_BotRoles) void ka_SpawnBall() // loads various values for the ball, runs only once at start of match { - if(!g_keepaway) { return; } - entity e; e = spawn(); e.model = "models/orbs/orbblue.md3"; precache_model(e.model); - setmodel(e, e.model); + _setmodel(e, e.model); setsize(e, '-16 -16 -20', '16 16 20'); // 20 20 20 was too big, player is only 16 16 24... gotta cheat with the Z (20) axis so that the particle isn't cut off e.classname = "keepawayball"; e.damageforcescale = autocvar_g_keepawayball_damageforcescale; @@ -407,31 +454,13 @@ void ka_ScoreRules() void ka_Initialize() // run at the start of a match, initiates game mode { - if(!g_keepaway) - return; - - precache_sound("keepaway/pickedup.wav"); - precache_sound("keepaway/dropped.wav"); - precache_sound("keepaway/respawn.wav"); - precache_sound("keepaway/touch.wav"); - ka_ScoreRules(); ka_SpawnBall(); } -MUTATOR_DEFINITION(gamemode_keepaway) +REGISTER_MUTATOR(ka, IS_GAMETYPE(KEEPAWAY)) { - MUTATOR_HOOK(MakePlayerObserver, ka_RemovePlayer, CBC_ORDER_ANY); - MUTATOR_HOOK(ClientDisconnect, ka_RemovePlayer, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerDies, ka_Scoring, CBC_ORDER_ANY); - MUTATOR_HOOK(GiveFragsForKill, ka_GiveFragsForKill, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerPreThink, ka_PlayerPreThink, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerDamage_Calculate, ka_PlayerDamage, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerPowerups, ka_PlayerPowerups, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerUseKey, ka_PlayerUseKey, CBC_ORDER_ANY); - MUTATOR_HOOK(HavocBot_ChooseRole, ka_BotRoles, CBC_ORDER_ANY); - MUTATOR_ONADD { if(time > 1) // game loads at time 1 @@ -448,7 +477,7 @@ MUTATOR_DEFINITION(gamemode_keepaway) MUTATOR_ONREMOVE { - print("This is a game type and it cannot be removed at runtime."); + LOG_INFO("This is a game type and it cannot be removed at runtime."); return -1; }