X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_keepaway.qc;h=0da0e30251d97e396ee3b1b7ad22487f6723701c;hb=5eea97bc262bfaf271817ca034439ad551f691d4;hp=66ac8a80e38619e61012ce18b3185cda04556926;hpb=d271f27a5ac351a3a7b39636932f6d661492be1d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc index 66ac8a80e3..0da0e30251 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc @@ -26,7 +26,7 @@ REGISTER_MUTATOR(ka, false) return -1; } - return 0; + return false; } @@ -64,10 +64,10 @@ 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 +bool ka_ballcarrier_waypointsprite_visible_for_player(entity this, entity player, entity view) // runs on waypoints which are attached to ballcarriers, updates once per frame { - if(e.ballcarried) - if(IS_SPEC(other)) + if(view.ballcarried) + if(IS_SPEC(player)) return false; // we don't want spectators of the ballcarrier to see the attached waypoint on the top of their screen // TODO: Make the ballcarrier lack a waypointsprite whenever they have the invisibility powerup @@ -81,7 +81,8 @@ void ka_EventLog(string mode, entity actor) // use an alias for easy changing an GameLogEcho(strcat(":ka:", mode, ((actor != world) ? (strcat(":", ftos(actor.playerid))) : ""))); } -void ka_TouchEvent(); +void ka_TouchEvent(entity this); +void ka_RespawnBall(entity this); void ka_RespawnBall(entity this) // runs whenever the ball needs to be relocated { if(gameover) { return; } @@ -89,7 +90,7 @@ void ka_RespawnBall(entity this) // runs whenever the ball needs to be relocated if(!MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, 10, 1024, 256)) { - entity spot = SelectSpawnPoint(true); + entity spot = SelectSpawnPoint(this, true); setorigin(self, spot.origin); self.angles = spot.angles; } @@ -99,7 +100,7 @@ void ka_RespawnBall(entity this) // runs whenever the ball needs to be relocated self.velocity = '0 0 200'; self.angles = '0 0 0'; self.effects = autocvar_g_keepawayball_effects; - self.touch = ka_TouchEvent; + settouch(self, ka_TouchEvent); setthink(self, ka_RespawnBall); self.nextthink = time + autocvar_g_keepawayball_respawntime; @@ -112,8 +113,8 @@ void ka_RespawnBall(entity this) // runs whenever the ball needs to be relocated 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(); +void ka_TimeScoring(entity this) +{ if(self.owner.ballcarried) { // add points for holding the ball after a certain amount of time if(autocvar_g_keepaway_score_timepoints) @@ -124,8 +125,8 @@ void ka_TimeScoring() } } -void ka_TouchEvent() // runs any time that the ball comes in contact with something -{SELFPARAM(); +void ka_TouchEvent(entity this) // runs any time that the ball comes in contact with something +{ if(gameover) { return; } if(!self) { return; } if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) @@ -153,8 +154,8 @@ void ka_TouchEvent() // runs any time that the ball comes in contact with someth self.velocity = '0 0 0'; self.movetype = MOVETYPE_NONE; self.effects |= EF_NODRAW; - self.touch = func_null; - self.think = ka_TimeScoring; + settouch(self, func_null); + setthink(self, ka_TimeScoring); self.nextthink = time + autocvar_g_keepaway_score_timeinterval; self.takedamage = DAMAGE_NO; @@ -192,7 +193,7 @@ void ka_DropEvent(entity plyr) // runs any time that a player is supposed to los setattachment(ball, world, ""); ball.movetype = MOVETYPE_BOUNCE; ball.wait = time + 1; - ball.touch = ka_TouchEvent; + settouch(ball, ka_TouchEvent); setthink(ball, ka_RespawnBall); ball.nextthink = time + autocvar_g_keepawayball_respawntime; ball.takedamage = DAMAGE_YES; @@ -231,7 +232,7 @@ void ka_Reset(entity this) if(time < game_starttime) { setthink(this, ka_RespawnBall); - this.touch = func_null; + settouch(this, func_null); this.nextthink = game_starttime; } else @@ -315,6 +316,9 @@ void havocbot_role_ka_collector(entity this) MUTATOR_HOOKFUNCTION(ka, PlayerDies) { + entity frag_attacker = M_ARGV(1, entity); + entity frag_target = M_ARGV(2, entity); + if((frag_attacker != frag_target) && (IS_PLAYER(frag_attacker))) { if(frag_target.ballcarried) { // add to amount of times killing carrier @@ -331,13 +335,13 @@ MUTATOR_HOOKFUNCTION(ka, PlayerDies) } if(frag_target.ballcarried) { ka_DropEvent(frag_target); } // a player with the ball has died, drop it - return 0; + return false; } 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. + M_ARGV(2, float) = 0; // no frags counted in keepaway + return true; // you deceptive little bugger ;3 This needs to be true in order for this function to even count. } MUTATOR_HOOKFUNCTION(ka, PlayerPreThink) @@ -349,7 +353,7 @@ MUTATOR_HOOKFUNCTION(ka, PlayerPreThink) if(self.ballcarried) self.items |= IT_KEY1; - return 0; + return false; } MUTATOR_HOOKFUNCTION(ka, PlayerUseKey) @@ -360,11 +364,16 @@ MUTATOR_HOOKFUNCTION(ka, PlayerUseKey) ka_DropEvent(self); return 1; } - return 0; + return false; } MUTATOR_HOOKFUNCTION(ka, PlayerDamage_Calculate) // for changing damage and force values that are applied to players in g_damage.qc { + entity frag_attacker = M_ARGV(1, entity); + entity frag_target = M_ARGV(2, entity); + float frag_damage = M_ARGV(4, float); + vector frag_force = M_ARGV(6, vector); + if(frag_attacker.ballcarried) // if the attacker is a ballcarrier { if(frag_target == frag_attacker) // damage done to yourself @@ -391,19 +400,23 @@ MUTATOR_HOOKFUNCTION(ka, PlayerDamage_Calculate) // for changing damage and forc frag_force *= autocvar_g_keepaway_noncarrier_force; } } - return 0; + + M_ARGV(4, float) = frag_damage; + M_ARGV(6, vector) = frag_force; + + return false; } MUTATOR_HOOKFUNCTION(ka, ClientDisconnect) {SELFPARAM(); if(self.ballcarried) { ka_DropEvent(self); } // a player with the ball has left the match, drop it - return 0; + return false; } MUTATOR_HOOKFUNCTION(ka, MakePlayerObserver) {SELFPARAM(); if(self.ballcarried) { ka_DropEvent(self); } // a player with the ball has left the match, drop it - return 0; + return false; } MUTATOR_HOOKFUNCTION(ka, PlayerPowerups) @@ -416,7 +429,7 @@ MUTATOR_HOOKFUNCTION(ka, PlayerPowerups) if(self.ballcarried) self.effects |= autocvar_g_keepaway_ballcarrier_effects; - return 0; + return false; } .float stat_sv_airspeedlimit_nonqw; @@ -451,6 +464,8 @@ MUTATOR_HOOKFUNCTION(ka, HavocBot_ChooseRole) MUTATOR_HOOKFUNCTION(ka, DropSpecialItems) { + entity frag_target = M_ARGV(0, entity); + if(frag_target.ballcarried) ka_DropEvent(frag_target); @@ -476,8 +491,9 @@ void ka_SpawnBall() // loads various values for the ball, runs only once at star e.glow_color = autocvar_g_keepawayball_trail_color; e.glow_trail = true; e.flags = FL_ITEM; + e.pushable = true; e.reset = ka_Reset; - e.touch = ka_TouchEvent; + settouch(e, ka_TouchEvent); e.owner = world; ka_ball = e;