X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_ctf.qc;h=b0c4c4c400f6bfa25734fa9f9bcf6d5f1cfadb31;hb=e5f76411bc09bfec67f21930d781cafe6f283120;hp=721407f4554350156f8def992ab5b78a9e2ccc9a;hpb=d42146f8994fe016990e664ed976d2889ec5290e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 721407f45..b0c4c4c40 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -1,16 +1,8 @@ // ================================================================ // Official capture the flag game mode coding, reworked by Samual -// Last updated: March 30th, 2012 +// Last updated: September, 2012 // ================================================================ -float ctf_ReadScore(string parameter) // make this obsolete -{ - //if(g_ctf_win_mode != 2) - return cvar(strcat("g_ctf_personal", parameter)); - //else - // return cvar(strcat("g_ctf_flag", parameter)); -} - void ctf_FakeTimeLimit(entity e, float t) { msg_entity = e; @@ -62,10 +54,10 @@ string ctf_CaptureRecord(entity flag, entity player) void ctf_FlagcarrierWaypoints(entity player) { - WaypointSprite_Spawn("flagcarrier", 0, 0, player, '0 0 64', world, player.team, player, wps_flagcarrier, FALSE, RADARICON_FLAG, '1 1 0'); + WaypointSprite_Spawn("flagcarrier", 0, 0, player, FLAG_WAYPOINT_OFFSET, world, player.team, player, wps_flagcarrier, TRUE, RADARICON_FLAG, WPCOLOR_FLAGCARRIER(player.team)); WaypointSprite_UpdateMaxHealth(player.wps_flagcarrier, '1 0 0' * healtharmor_maxdamage(start_health, start_armorvalue, autocvar_g_balance_armor_blockpercent) * 2); WaypointSprite_UpdateHealth(player.wps_flagcarrier, '1 0 0' * healtharmor_maxdamage(player.health, player.armorvalue, autocvar_g_balance_armor_blockpercent)); - WaypointSprite_UpdateTeamRadar(player.wps_flagcarrier, RADARICON_FLAGCARRIER, '1 1 0'); + WaypointSprite_UpdateTeamRadar(player.wps_flagcarrier, RADARICON_FLAGCARRIER, WPCOLOR_FLAGCARRIER(player.team)); } @@ -89,7 +81,7 @@ float ctf_CaptureShield_CheckStatus(entity p) players_total = players_worseeq = 0; FOR_EACH_PLAYER(e) { - if(e.team != p.team) + if(IsDifferentTeam(e, p)) continue; se = PlayerScore_Add(e, SP_SCORE, 0); if(se <= s) @@ -122,16 +114,16 @@ void ctf_CaptureShield_Update(entity player, float wanted_status) float ctf_CaptureShield_Customize() { - if not(other.ctf_captureshielded) { return FALSE; } - if(self.team == other.team) { return FALSE; } + if(!other.ctf_captureshielded) { return FALSE; } + if(!IsDifferentTeam(self, other)) { return FALSE; } return TRUE; } void ctf_CaptureShield_Touch() { - if not(other.ctf_captureshielded) { return; } - if(self.team == other.team) { return; } + if(!other.ctf_captureshielded) { return; } + if(!IsDifferentTeam(self, other)) { return; } vector mymid = (self.absmin + self.absmax) * 0.5; vector othermid = (other.absmin + other.absmax) * 0.5; @@ -184,12 +176,12 @@ void ctf_Handle_Drop(entity flag, entity player, float droptype) ctf_EventLog("dropped", player.team, player); // scoring - PlayerTeamScore_AddScore(player, -ctf_ReadScore("penalty_drop")); + PlayerTeamScore_AddScore(player, -autocvar_g_ctf_score_penalty_drop); PlayerScore_Add(player, SP_CTF_DROPS, 1); // waypoints if(autocvar_g_ctf_flag_dropped_waypoint) - WaypointSprite_Spawn("flagdropped", 0, 0, flag, '0 0 64', world, ((autocvar_g_ctf_flag_dropped_waypoint == 2) ? 0 : player.team), flag, wps_flagdropped, FALSE, RADARICON_FLAG, '0 0.5 0' + ((flag.team == COLOR_TEAM1) ? '0.75 0 0' : '0 0 0.75')); // (COLOR_TEAM1 + COLOR_TEAM2 - flag.team) + WaypointSprite_Spawn("flagdropped", 0, 0, flag, FLAG_WAYPOINT_OFFSET, world, ((autocvar_g_ctf_flag_dropped_waypoint == 2) ? 0 : player.team), flag, wps_flagdropped, TRUE, RADARICON_FLAG, WPCOLOR_DROPPEDFLAG(flag.team)); if(autocvar_g_ctf_flag_return_time || (autocvar_g_ctf_flag_return_damage && autocvar_g_ctf_flag_health)) { @@ -212,7 +204,6 @@ void ctf_Handle_Retrieve(entity flag, entity player) entity sender = flag.pass_sender; // transfer flag to player - flag.ctf_carrier = player; flag.owner = player; flag.owner.flagcarried = flag; @@ -222,36 +213,39 @@ void ctf_Handle_Retrieve(entity flag, entity player) flag.movetype = MOVETYPE_NONE; flag.takedamage = DAMAGE_NO; flag.solid = SOLID_NOT; - flag.ctf_carrier = player; flag.ctf_status = FLAG_CARRY; // messages and sounds - sound(player, CH_TRIGGER, "keepaway/respawn.wav", VOL_BASE, ATTN_NORM); - ctf_EventLog("recieve", flag.team, player); - FOR_EACH_PLAYER(tmp_player) + sound(player, CH_TRIGGER, flag.snd_flag_pass, VOL_BASE, ATTN_NORM); + ctf_EventLog("receive", flag.team, player); + + FOR_EACH_REALPLAYER(tmp_player) + { if(tmp_player == sender) centerprint(tmp_player, strcat("You passed the ", flag.netname, " to ", player.netname)); else if(tmp_player == player) - centerprint(tmp_player, strcat("You recieved the ", flag.netname, " from ", sender.netname)); - else if(tmp_player.team == sender.team) + centerprint(tmp_player, strcat("You received the ", flag.netname, " from ", sender.netname)); + else if(!IsDifferentTeam(tmp_player, sender)) centerprint(tmp_player, strcat(sender.netname, " passed the ", flag.netname, " to ", player.netname)); + } // create new waypoint ctf_FlagcarrierWaypoints(player); sender.throw_antispam = time + autocvar_g_ctf_pass_wait; player.throw_antispam = sender.throw_antispam; - + flag.pass_sender = world; flag.pass_target = world; } -void ctf_Handle_Throw(entity player, entity reciever, float droptype) +void ctf_Handle_Throw(entity player, entity receiver, float droptype) { entity flag = player.flagcarried; + vector targ_origin, flag_velocity; if(!flag) { return; } - if((droptype == DROP_PASS) && !reciever) { return; } + if((droptype == DROP_PASS) && !receiver) { return; } if(flag.speedrunning) { ctf_RespawnFlag(flag); return; } @@ -261,6 +255,7 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) flag.owner.flagcarried = world; flag.owner = world; flag.solid = SOLID_TRIGGER; + flag.ctf_dropper = player; flag.ctf_droptime = time; flag.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND for MOVETYPE_TOSS @@ -269,7 +264,8 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) { case DROP_PASS: { - vector targ_origin = (0.5 * (reciever.absmin + reciever.absmax)); + WarpZone_RefSys_Copy(flag, receiver); + targ_origin = WarpZone_RefSys_TransformOrigin(receiver, flag, (0.5 * (receiver.absmin + receiver.absmax))); flag.velocity = (normalize(targ_origin - player.origin) * autocvar_g_ctf_pass_velocity); break; } @@ -277,7 +273,8 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) case DROP_THROW: { makevectors((player.v_angle_y * '0 1 0') + (player.v_angle_x * '0.5 0 0')); - flag.velocity = W_CalculateProjectileVelocity(player.velocity, ('0 0 200' + (v_forward * autocvar_g_ctf_drop_velocity)), FALSE); + flag_velocity = ('0 0 200' + ((v_forward * autocvar_g_ctf_drop_velocity) * ((player.items & IT_STRENGTH) ? autocvar_g_ctf_drop_strengthmultiplier : 1))); + flag.velocity = W_CalculateProjectileVelocity(player.velocity, flag_velocity, FALSE); break; } @@ -290,7 +287,7 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) default: case DROP_NORMAL: { - flag.velocity = ('0 0 200' + ('0 100 0' * crandom()) + ('100 0 0' * crandom())); + flag.velocity = W_CalculateProjectileVelocity(player.velocity, ('0 0 200' + ('0 100 0' * crandom()) + ('100 0 0' * crandom())), FALSE); break; } } @@ -303,13 +300,13 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) flag.movetype = MOVETYPE_FLY; flag.takedamage = DAMAGE_NO; flag.pass_sender = player; - flag.pass_target = reciever; + flag.pass_target = receiver; flag.ctf_status = FLAG_PASSING; // other sound(player, CH_TRIGGER, flag.snd_flag_touch, VOL_BASE, ATTN_NORM); + WarpZone_TrailParticles(world, particleeffectnum(flag.passeffect), targ_origin, player.origin); ctf_EventLog("pass", flag.team, player); - te_lightning2(world, reciever.origin, player.origin); break; } @@ -332,8 +329,11 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) WaypointSprite_Ping(player.wps_flagcarrier); WaypointSprite_Kill(player.wps_flagcarrier); + if(player.wps_enemyflagcarrier) + WaypointSprite_Kill(player.wps_enemyflagcarrier); + // captureshield - //ctf_CaptureShield_Update(player, 0); // shield only + ctf_CaptureShield_Update(player, 0); // shield player from picking up flag } @@ -345,6 +345,7 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype) { entity enemy_flag = ((capturetype == CAPTURE_NORMAL) ? toucher.flagcarried : toucher); entity player = ((capturetype == CAPTURE_NORMAL) ? toucher : enemy_flag.ctf_dropper); + float old_time, new_time; if not(player) { return; } // without someone to give the reward to, we can't possibly cap @@ -360,9 +361,14 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype) } // scoring - PlayerTeamScore_AddScore(player, ctf_ReadScore("score_capture")); + PlayerTeamScore_AddScore(player, autocvar_g_ctf_score_capture); PlayerTeamScore_Add(player, SP_CTF_CAPS, ST_CTF_CAPS, 1); + old_time = PlayerScore_Add(player, SP_CTF_CAPTIME, 0); + new_time = TIME_ENCODE(time - enemy_flag.ctf_pickuptime); + if(!old_time || new_time < old_time) + PlayerScore_Add(player, SP_CTF_CAPTIME, new_time - old_time); + // effects if(autocvar_g_ctf_flag_capture_effects) { @@ -375,6 +381,9 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype) { WaypointSprite_Kill(player.wps_flagcarrier); if(flag.speedrunning) { ctf_FakeTimeLimit(player, -1); } + + if((enemy_flag.ctf_dropper) && (player != enemy_flag.ctf_dropper)) + { PlayerTeamScore_AddScore(enemy_flag.ctf_dropper, autocvar_g_ctf_score_capture_assist); } } // reset the flag @@ -386,23 +395,24 @@ void ctf_Handle_Return(entity flag, entity player) { // messages and sounds //centerprint(player, strcat("You returned the ", flag.netname)); - Send_KillNotification (player.netname, flag.netname, "", INFO_RETURNFLAG, MSG_INFO); + Send_KillNotification(player.netname, flag.netname, "", INFO_RETURNFLAG, MSG_INFO); sound(player, CH_TRIGGER, flag.snd_flag_returned, VOL_BASE, ATTN_NONE); ctf_EventLog("return", flag.team, player); // scoring - PlayerTeamScore_AddScore(player, ctf_ReadScore("score_return")); // reward for return + PlayerTeamScore_AddScore(player, autocvar_g_ctf_score_return); // reward for return PlayerScore_Add(player, SP_CTF_RETURNS, 1); // add to count of returns - TeamScore_AddToTeam(((flag.team == COLOR_TEAM1) ? COLOR_TEAM2 : COLOR_TEAM1), ST_SCORE, -ctf_ReadScore("penalty_returned")); // punish the team who was last carrying it - FOR_EACH_PLAYER(player) if(player == flag.ctf_dropper) // punish the player who dropped the flag + TeamScore_AddToTeam(flag.team, ST_SCORE, -autocvar_g_ctf_score_penalty_returned); // punish the team who was last carrying it + + if(flag.ctf_dropper) { - PlayerScore_Add(player, SP_SCORE, -ctf_ReadScore("penalty_returned")); - ctf_CaptureShield_Update(player, 0); // shield only + PlayerScore_Add(flag.ctf_dropper, SP_SCORE, -autocvar_g_ctf_score_penalty_returned); // punish the player who dropped the flag + ctf_CaptureShield_Update(flag.ctf_dropper, 0); // shield player from picking up flag + flag.ctf_dropper.next_take_time = time + autocvar_g_ctf_flag_collect_delay; // set next take time } // reset the flag - flag.ctf_dropper.next_take_time = time + autocvar_g_ctf_flag_collect_delay; ctf_RespawnFlag(flag); } @@ -424,7 +434,6 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) flag.takedamage = DAMAGE_NO; flag.solid = SOLID_NOT; flag.angles = '0 0 0'; - flag.ctf_carrier = player; flag.ctf_status = FLAG_CARRY; switch(pickuptype) @@ -439,14 +448,16 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) sound(player, CH_TRIGGER, flag.snd_flag_taken, VOL_BASE, ATTN_NONE); verbosename = ((autocvar_g_ctf_flag_pickup_verbosename) ? strcat(Team_ColorCode(player.team), "(^7", player.netname, Team_ColorCode(player.team), ") ") : ""); - FOR_EACH_PLAYER(tmp_player) + FOR_EACH_REALPLAYER(tmp_player) + { if(tmp_player == player) centerprint(tmp_player, strcat("You got the ", flag.netname, "!")); - else if(tmp_player.team == player.team) + else if(!IsDifferentTeam(tmp_player, player)) centerprint(tmp_player, strcat("Your ", Team_ColorCode(player.team), "team mate ", verbosename, "^7got the flag! Protect them!")); - else if(tmp_player.team == flag.team) + else if(!IsDifferentTeam(tmp_player, flag)) centerprint(tmp_player, strcat("The ", Team_ColorCode(player.team), "enemy ", verbosename, "^7got your flag! Retrieve it!")); - + } + switch(pickuptype) { case PICKUP_BASE: ctf_EventLog("steal", flag.team, player); break; @@ -460,14 +471,14 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) { case PICKUP_BASE: { - PlayerTeamScore_AddScore(player, ctf_ReadScore("score_pickup_base")); + PlayerTeamScore_AddScore(player, autocvar_g_ctf_score_pickup_base); break; } case PICKUP_DROPPED: { pickup_dropped_score = (autocvar_g_ctf_flag_return_time ? bound(0, ((flag.ctf_droptime + autocvar_g_ctf_flag_return_time) - time) / autocvar_g_ctf_flag_return_time, 1) : 1); - pickup_dropped_score = floor((ctf_ReadScore("score_pickup_dropped_late") * (1 - pickup_dropped_score) + ctf_ReadScore("score_pickup_dropped_early") * pickup_dropped_score) + 0.5); + pickup_dropped_score = floor((autocvar_g_ctf_score_pickup_dropped_late * (1 - pickup_dropped_score) + autocvar_g_ctf_score_pickup_dropped_early * pickup_dropped_score) + 0.5); print("pickup_dropped_score is ", ftos(pickup_dropped_score), "\n"); PlayerTeamScore_AddScore(player, pickup_dropped_score); break; @@ -499,33 +510,96 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) // Main Flag Functions // =================== -void ctf_CheckFlagReturn(entity flag) +void ctf_CheckFlagReturn(entity flag, float returntype) { if(flag.wps_flagdropped) { WaypointSprite_UpdateHealth(flag.wps_flagdropped, flag.health); } - if((flag.health <= 0) || (time > flag.ctf_droptime + autocvar_g_ctf_flag_return_time)) + if((flag.health <= 0) || (time >= flag.ctf_droptime + autocvar_g_ctf_flag_return_time)) { - bprint("The ", flag.netname, " has returned to base\n"); + switch(returntype) + { + case RETURN_DROPPED: bprint("The ", flag.netname, " was dropped in the base and returned itself\n"); break; + case RETURN_DAMAGE: bprint("The ", flag.netname, " was destroyed and returned to base\n"); break; + case RETURN_SPEEDRUN: bprint("The ", flag.netname, " became impatient after ", ftos_decimals(ctf_captimerecord, 2), " seconds and returned itself\n"); break; + case RETURN_NEEDKILL: bprint("The ", flag.netname, " fell somewhere it couldn't be reached and returned to base\n"); break; + + default: + case RETURN_TIMEOUT: + { bprint("The ", flag.netname, " has returned to base\n"); break; } + } sound(flag, CH_TRIGGER, flag.snd_flag_respawn, VOL_BASE, ATTN_NONE); ctf_EventLog("returned", flag.team, world); ctf_RespawnFlag(flag); } } +void ctf_CheckStalemate(void) +{ + // declarations + float stale_red_flags, stale_blue_flags; + entity tmp_entity; + + entity ctf_staleflaglist; // reset the list, we need to build the list each time this function runs + + // build list of stale flags + for(tmp_entity = ctf_worldflaglist; tmp_entity; tmp_entity = tmp_entity.ctf_worldflagnext) + { + if(autocvar_g_ctf_flagcarrier_waypointforenemy_stalemate) + if(tmp_entity.ctf_status != FLAG_BASE) + if(time >= tmp_entity.ctf_pickuptime + autocvar_g_ctf_flagcarrier_waypointforenemy_stalemate) + { + tmp_entity.ctf_staleflagnext = ctf_staleflaglist; // link flag into staleflaglist + ctf_staleflaglist = tmp_entity; + + switch(tmp_entity.team) + { + case COLOR_TEAM1: ++stale_red_flags; break; + case COLOR_TEAM2: ++stale_blue_flags; break; + } + } + } + + if(stale_red_flags && stale_blue_flags) + ctf_stalemate = TRUE; + else if(!stale_red_flags && !stale_blue_flags) + ctf_stalemate = FALSE; + + // if sufficient stalemate, then set up the waypointsprite and announce the stalemate if necessary + if(ctf_stalemate) + { + for(tmp_entity = ctf_staleflaglist; tmp_entity; tmp_entity = tmp_entity.ctf_staleflagnext) + { + if((tmp_entity.owner) && (!tmp_entity.owner.wps_enemyflagcarrier)) + WaypointSprite_Spawn("enemyflagcarrier", 0, 0, tmp_entity.owner, FLAG_WAYPOINT_OFFSET, world, tmp_entity.team, tmp_entity.owner, wps_enemyflagcarrier, TRUE, RADARICON_FLAG, WPCOLOR_ENEMYFC(tmp_entity.owner.team)); + } + + if not(wpforenemy_announced) + { + FOR_EACH_REALPLAYER(tmp_entity) + if(tmp_entity.flagcarried) + centerprint(tmp_entity, "Stalemate! Enemies can now see you on radar!"); + else + centerprint(tmp_entity, "Stalemate! Flag carriers can now be seen by enemies on radar!"); + + wpforenemy_announced = TRUE; + } + } +} + void ctf_FlagDamage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { if(ITEM_DAMAGE_NEEDKILL(deathtype)) { // automatically kill the flag and return it self.health = 0; - ctf_CheckFlagReturn(self); + ctf_CheckFlagReturn(self, RETURN_NEEDKILL); return; } - if(autocvar_g_ctf_flag_return_damage) { + // reduce health and check if it should be returned self.health = self.health - damage; - ctf_CheckFlagReturn(self); + ctf_CheckFlagReturn(self, RETURN_DAMAGE); return; } } @@ -548,6 +622,18 @@ void ctf_FlagThink() tracebox(self.origin, FLAG_MIN, FLAG_MAX, self.origin, MOVE_NOMONSTERS, self); if(!trace_startsolid) // can we resize it without getting stuck? setsize(self, FLAG_MIN, FLAG_MAX); } + + switch(self.ctf_status) // reset flag angles in case warpzones adjust it + { + case FLAG_DROPPED: + case FLAG_PASSING: + { + self.angles = '0 0 0'; + break; + } + + default: break; + } // main think method switch(self.ctf_status) @@ -566,19 +652,33 @@ void ctf_FlagThink() case FLAG_DROPPED: { + if(autocvar_g_ctf_flag_dropped_floatinwater) + { + vector midpoint = ((self.absmin + self.absmax) * 0.5); + if(pointcontents(midpoint) == CONTENT_WATER) + { + self.velocity = self.velocity * 0.5; + + if(pointcontents(midpoint + FLAG_FLOAT_OFFSET) == CONTENT_WATER) + { self.velocity_z = autocvar_g_ctf_flag_dropped_floatinwater; } + else + { self.movetype = MOVETYPE_FLY; } + } + else if(self.movetype == MOVETYPE_FLY) { self.movetype = MOVETYPE_TOSS; } + } if(autocvar_g_ctf_flag_return_dropped) { - if((vlen(self.origin - self.ctf_spawnorigin) < autocvar_g_ctf_flag_return_dropped) || (autocvar_g_ctf_flag_return_dropped == -1)) + if((vlen(self.origin - self.ctf_spawnorigin) <= autocvar_g_ctf_flag_return_dropped) || (autocvar_g_ctf_flag_return_dropped == -1)) { self.health = 0; - ctf_CheckFlagReturn(self); + ctf_CheckFlagReturn(self, RETURN_DROPPED); return; } } if(autocvar_g_ctf_flag_return_time) { self.health -= ((self.max_flag_health / autocvar_g_ctf_flag_return_time) * FLAG_THINKRATE); - ctf_CheckFlagReturn(self); + ctf_CheckFlagReturn(self, RETURN_TIMEOUT); return; } return; @@ -586,12 +686,10 @@ void ctf_FlagThink() case FLAG_CARRY: { - if((self.owner) && (self.speedrunning) && (ctf_captimerecord) && (time >= self.ctf_pickuptime + ctf_captimerecord)) + if(self.speedrunning && ctf_captimerecord && (time >= self.ctf_pickuptime + ctf_captimerecord)) { - bprint("The ", self.netname, " became impatient after ", ftos_decimals(ctf_captimerecord, 2), " seconds and returned itself\n"); - sound(self, CH_TRIGGER, self.snd_flag_respawn, VOL_BASE, ATTN_NONE); - ctf_EventLog("returned", self.team, world); - ctf_RespawnFlag(tmp_entity); + self.health = 0; + ctf_CheckFlagReturn(self, RETURN_SPEEDRUN); tmp_entity = self; self = self.owner; @@ -599,14 +697,25 @@ void ctf_FlagThink() ImpulseCommands(); self = tmp_entity; } + if(autocvar_g_ctf_flagcarrier_waypointforenemy_stalemate) + { + if(time >= wpforenemy_nextthink) + { + ctf_CheckStalemate(); + wpforenemy_nextthink = time + WPFE_THINKRATE; // waypoint for enemy think rate (to reduce unnecessary spam of this check) + } + } return; } case FLAG_PASSING: // todo make work with warpzones - { + { vector targ_origin = ((self.pass_target.absmin + self.pass_target.absmax) * 0.5); - - traceline(self.origin, targ_origin, MOVE_NOMONSTERS, self); + vector old_targ_origin = targ_origin; + targ_origin = WarpZone_RefSys_TransformOrigin(self.pass_target, self, targ_origin); + WarpZone_TraceLine(self.origin, targ_origin, MOVE_NOMONSTERS, self); + + print(strcat("self: ", vtos(self.origin), ", old: ", vtos(old_targ_origin), " (", ftos(vlen(self.origin - old_targ_origin)), "qu)"), ", transformed: ", vtos(targ_origin), " (", ftos(vlen(self.origin - targ_origin)), "qu)", ".\n"); if((self.pass_target.deadflag != DEAD_NO) || (vlen(self.origin - targ_origin) > autocvar_g_ctf_pass_radius) @@ -619,7 +728,7 @@ void ctf_FlagThink() { vector desired_direction = normalize(targ_origin - self.origin); vector current_direction = normalize(self.velocity); - + self.velocity = (normalize(current_direction + (desired_direction * autocvar_g_ctf_pass_turnrate)) * autocvar_g_ctf_pass_velocity); } return; @@ -636,43 +745,54 @@ void ctf_FlagThink() void ctf_FlagTouch() { if(gameover) { return; } - if(!self) { return; } - if(other.deadflag != DEAD_NO) { return; } + + entity toucher = other; + + // automatically kill the flag and return it if it touched lava/slime/nodrop surfaces if(ITEM_TOUCH_NEEDKILL()) { - // automatically kill the flag and return it self.health = 0; - ctf_CheckFlagReturn(self); + ctf_CheckFlagReturn(self, RETURN_NEEDKILL); return; } - if(other.classname != "player") // The flag just touched an object, most likely the world + + // special touch behaviors + if(toucher.vehicle_flags & VHF_ISVEHICLE) + { + if(autocvar_g_ctf_allow_vehicle_touch) + toucher = toucher.owner; // the player is actually the vehicle owner, not other + else + return; // do nothing + } + else if(toucher.classname != "player") // The flag just touched an object, most likely the world { if(time > self.wait) // if we haven't in a while, play a sound/effect { - pointparticles(particleeffectnum("kaball_sparks"), self.origin, '0 0 0', 1); + pointparticles(particleeffectnum(self.toucheffect), self.origin, '0 0 0', 1); sound(self, CH_TRIGGER, self.snd_flag_touch, VOL_BASE, ATTN_NORM); self.wait = time + FLAG_TOUCHRATE; } return; } + else if(toucher.deadflag != DEAD_NO) { return; } switch(self.ctf_status) { case FLAG_BASE: { - if((other.team == self.team) && (other.flagcarried) && (other.flagcarried.team != self.team)) - ctf_Handle_Capture(self, other, CAPTURE_NORMAL); // other just captured the enemies flag to his base - else if((other.team != self.team) && (!other.flagcarried) && (!other.ctf_captureshielded) && (time > other.next_take_time)) - ctf_Handle_Pickup(self, other, PICKUP_BASE); // other just stole the enemies flag + if(!IsDifferentTeam(toucher, self) && (toucher.flagcarried) && IsDifferentTeam(toucher.flagcarried, self)) + ctf_Handle_Capture(self, toucher, CAPTURE_NORMAL); // toucher just captured the enemies flag to his base + else if(IsDifferentTeam(toucher, self) && (!toucher.flagcarried) && (!toucher.ctf_captureshielded) && (time > toucher.next_take_time)) + ctf_Handle_Pickup(self, toucher, PICKUP_BASE); // toucher just stole the enemies flag break; } case FLAG_DROPPED: { - if(other.team == self.team) - ctf_Handle_Return(self, other); // other just returned his own flag - else if((!other.flagcarried) && ((other != self.ctf_dropper) || (time > self.ctf_droptime + autocvar_g_ctf_flag_collect_delay))) - ctf_Handle_Pickup(self, other, PICKUP_DROPPED); // other just picked up a dropped enemy flag + if(!IsDifferentTeam(toucher, self)) + ctf_Handle_Return(self, toucher); // toucher just returned his own flag + else if((!toucher.flagcarried) && ((toucher != self.ctf_dropper) || (time > self.ctf_droptime + autocvar_g_ctf_flag_collect_delay))) + ctf_Handle_Pickup(self, toucher, PICKUP_DROPPED); // toucher just picked up a dropped enemy flag break; } @@ -684,21 +804,15 @@ void ctf_FlagTouch() case FLAG_PASSING: { - if((other.classname == "player") && (other.deadflag == DEAD_NO) && (other != self.pass_sender)) + if((toucher.classname == "player") && (toucher.deadflag == DEAD_NO) && (toucher != self.pass_sender)) { - if(IsDifferentTeam(other, self.pass_sender)) - ctf_Handle_Return(self, other); + if(IsDifferentTeam(toucher, self.pass_sender)) + ctf_Handle_Return(self, toucher); else - ctf_Handle_Retrieve(self, other); + ctf_Handle_Retrieve(self, toucher); } break; } - - default: // this should never happen - { - dprint("Touch: Flag exists with no status?\n"); - break; - } } } @@ -707,7 +821,11 @@ void ctf_RespawnFlag(entity flag) // reset the player (if there is one) if((flag.owner) && (flag.owner.flagcarried == flag)) { + if(flag.owner.wps_enemyflagcarrier) + WaypointSprite_Kill(flag.owner.wps_enemyflagcarrier); + WaypointSprite_Kill(flag.wps_flagcarrier); + flag.owner.flagcarried = world; if(flag.speedrunning) @@ -733,10 +851,11 @@ void ctf_RespawnFlag(entity flag) flag.owner = world; flag.pass_sender = world; flag.pass_target = world; - flag.ctf_carrier = world; flag.ctf_dropper = world; flag.ctf_pickuptime = 0; flag.ctf_droptime = 0; + + wpforenemy_announced = FALSE; } void ctf_Reset() @@ -750,17 +869,14 @@ void ctf_Reset() void ctf_DelayedFlagSetup(void) // called after a flag is placed on a map by ctf_FlagSetup() { - // declarations - float teamnumber = ((self.team == COLOR_TEAM1) ? TRUE : FALSE); // if we were originally 1, this will become 0. If we were originally 0, this will become 1. - // bot waypoints waypoint_spawnforitem_force(self, self.origin); self.nearestwaypointtimeout = 0; // activate waypointing again self.bot_basewaypoint = self.nearestwaypoint; // waypointsprites - WaypointSprite_SpawnFixed(((teamnumber) ? "redbase" : "bluebase"), self.origin + '0 0 64', self, wps_flagbase, RADARICON_FLAG, colormapPaletteColor(((teamnumber) ? COLOR_TEAM1 : COLOR_TEAM2) - 1, FALSE)); - WaypointSprite_UpdateTeamRadar(self.wps_flagbase, RADARICON_FLAG, colormapPaletteColor(((teamnumber) ? COLOR_TEAM1 : COLOR_TEAM2) - 1, FALSE)); + WaypointSprite_SpawnFixed(((self.team == COLOR_TEAM1) ? "redbase" : "bluebase"), self.origin + FLAG_WAYPOINT_OFFSET, self, wps_flagbase, RADARICON_FLAG, colormapPaletteColor(self.team - 1, FALSE)); + WaypointSprite_UpdateTeamRadar(self.wps_flagbase, RADARICON_FLAG, colormapPaletteColor(self.team - 1, FALSE)); // captureshield setup ctf_CaptureShield_Spawn(self); @@ -791,6 +907,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag flag.health = flag.max_flag_health; flag.event_damage = ctf_FlagDamage; flag.pushable = TRUE; + flag.teleportable = TELEPORT_NORMAL; flag.damagedbytriggers = autocvar_g_ctf_flag_return_when_unreachable; flag.damagedbycontents = autocvar_g_ctf_flag_return_when_unreachable; flag.velocity = '0 0 0'; @@ -804,6 +921,8 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag if(!flag.model) { flag.model = ((teamnumber) ? autocvar_g_ctf_flag_red_model : autocvar_g_ctf_flag_blue_model); } if(!flag.scale) { flag.scale = FLAG_SCALE; } if(!flag.skin) { flag.skin = ((teamnumber) ? autocvar_g_ctf_flag_red_skin : autocvar_g_ctf_flag_blue_skin); } + if(!flag.toucheffect) { flag.toucheffect = ((teamnumber) ? "redflag_touch" : "blueflag_touch"); } + if(!flag.passeffect) { flag.passeffect = ((!teamnumber) ? "red_pass" : "blue_pass"); } // invert the team number of the flag to pass as enemy team color // sound if(!flag.snd_flag_taken) { flag.snd_flag_taken = ((teamnumber) ? "ctf/red_taken.wav" : "ctf/blue_taken.wav"); } @@ -811,7 +930,8 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag if(!flag.snd_flag_capture) { flag.snd_flag_capture = ((teamnumber) ? "ctf/red_capture.wav" : "ctf/blue_capture.wav"); } // blue team scores by capturing the red flag if(!flag.snd_flag_respawn) { flag.snd_flag_respawn = "ctf/flag_respawn.wav"; } // if there is ever a team-based sound for this, update the code to match. if(!flag.snd_flag_dropped) { flag.snd_flag_dropped = ((teamnumber) ? "ctf/red_dropped.wav" : "ctf/blue_dropped.wav"); } - if(!flag.snd_flag_touch) { flag.snd_flag_touch = "keepaway/touch.wav"; } // again has no team-based sound // FIXME + if(!flag.snd_flag_touch) { flag.snd_flag_touch = "ctf/touch.wav"; } // again has no team-based sound + if(!flag.snd_flag_pass) { flag.snd_flag_pass = "ctf/pass.wav"; } // same story here // precache precache_sound(flag.snd_flag_taken); @@ -820,6 +940,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag precache_sound(flag.snd_flag_respawn); precache_sound(flag.snd_flag_dropped); precache_sound(flag.snd_flag_touch); + precache_sound(flag.snd_flag_pass); precache_model(flag.model); precache_model("models/ctf/shield.md3"); precache_model("models/ctf/shockwavetransring.md3"); @@ -863,23 +984,6 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag // Hook Functions // ============== -MUTATOR_HOOKFUNCTION(ctf_RemovePlayer) -{ - if(self.flagcarried) - { ctf_Handle_Throw(self, world, DROP_NORMAL); } - - return 0; -} - -MUTATOR_HOOKFUNCTION(ctf_PortalTeleport) -{ - if(self.flagcarried) - if(!autocvar_g_ctf_portalteleport) - { ctf_Handle_Throw(self, world, DROP_NORMAL); } - - return 0; -} - MUTATOR_HOOKFUNCTION(ctf_PlayerPreThink) { entity flag; @@ -891,13 +995,23 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerPreThink) // scan through all the flags and notify the client about them for(flag = ctf_worldflaglist; flag; flag = flag.ctf_worldflagnext) { - if(flag.ctf_status == FLAG_CARRY) - if(flag.owner == self) - self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_CARRYING : IT_BLUE_FLAG_CARRYING); // carrying: self is currently carrying the flag - else - self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_TAKEN : IT_BLUE_FLAG_TAKEN); // taken: someone on self's team is carrying the flag - else if(flag.ctf_status == FLAG_DROPPED) - self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_LOST : IT_BLUE_FLAG_LOST); // lost: the flag is dropped somewhere on the map + switch(flag.ctf_status) + { + case FLAG_PASSING: + case FLAG_CARRY: + { + if((flag.owner == self) || (flag.pass_sender == self)) + self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_CARRYING : IT_BLUE_FLAG_CARRYING); // carrying: self is currently carrying the flag + else + self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_TAKEN : IT_BLUE_FLAG_TAKEN); // taken: someone on self's team is carrying the flag + break; + } + case FLAG_DROPPED: + { + self.items |= ((flag.items & IT_KEY2) ? IT_RED_FLAG_LOST : IT_BLUE_FLAG_LOST); // lost: the flag is dropped somewhere on the map + break; + } + } } // item for stopping players from capturing the flag too often @@ -906,9 +1020,9 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerPreThink) // update the health of the flag carrier waypointsprite if(self.wps_flagcarrier) - WaypointSprite_UpdateHealth(self.wps_flagcarrier, self.health); + WaypointSprite_UpdateHealth(self.wps_flagcarrier, '1 0 0' * healtharmor_maxdamage(self.health, self.armorvalue, autocvar_g_balance_armor_blockpercent)); - return 0; + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_PlayerDamage) // for changing damage and force values that are applied to players in g_damage.qc @@ -920,13 +1034,32 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerDamage) // for changing damage and force values t frag_damage *= autocvar_g_ctf_flagcarrier_selfdamagefactor; frag_force *= autocvar_g_ctf_flagcarrier_selfforcefactor; } - else // damage done everyone else + else // damage done to everyone else { frag_damage *= autocvar_g_ctf_flagcarrier_damagefactor; frag_force *= autocvar_g_ctf_flagcarrier_forcefactor; } } - return 0; + else if(frag_target.flagcarried && (frag_target.deadflag == DEAD_NO) && IsDifferentTeam(frag_target, frag_attacker)) // if the target is a flagcarrier + { + if(autocvar_g_ctf_flagcarrier_auto_helpme_when_damaged > ('1 0 0' * healtharmor_maxdamage(frag_target.health, frag_target.armorvalue, autocvar_g_balance_armor_blockpercent))) + WaypointSprite_HelpMePing(frag_target.wps_flagcarrier); // TODO: only do this if there is a significant loss of health? + } + return FALSE; +} + +MUTATOR_HOOKFUNCTION(ctf_PlayerDies) +{ + if((frag_attacker != frag_target) && (frag_attacker.classname == "player") && (frag_target.flagcarried)) + { + PlayerTeamScore_AddScore(frag_attacker, autocvar_g_ctf_score_kill); + PlayerScore_Add(frag_attacker, SP_CTF_FCKILLS, 1); + } + + if(frag_target.flagcarried) + { ctf_Handle_Throw(frag_target, world, DROP_NORMAL); } + + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_GiveFragsForKill) @@ -935,63 +1068,178 @@ MUTATOR_HOOKFUNCTION(ctf_GiveFragsForKill) return (autocvar_g_ctf_ignore_frags); // no frags counted in ctf if this is true } +MUTATOR_HOOKFUNCTION(ctf_RemovePlayer) +{ + if(self.flagcarried) + { ctf_Handle_Throw(self, world, DROP_NORMAL); } + + return FALSE; +} + +MUTATOR_HOOKFUNCTION(ctf_PortalTeleport) +{ + if(self.flagcarried) + if(!autocvar_g_ctf_portalteleport) + { ctf_Handle_Throw(self, world, DROP_NORMAL); } + + return FALSE; +} + MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) { + if(gameover) { return FALSE; } + entity player = self; - if(time > player.throw_antispam) + if((time > player.throw_antispam) && (player.deadflag == DEAD_NO) && !player.speedrunning && (!player.vehicle || autocvar_g_ctf_allow_vehicle_touch)) { // pass the flag to a team mate if(autocvar_g_ctf_pass) { entity head, closest_target; - head = findradius(player.origin, autocvar_g_ctf_pass_radius); + head = WarpZone_FindRadius(player.origin, autocvar_g_ctf_pass_radius, TRUE); while(head) // find the closest acceptable target to pass to { if(head.classname == "player" && head.deadflag == DEAD_NO) if(head != player && !IsDifferentTeam(head, player)) - if(!player.speedrunning && !head.speedrunning) + if(!head.speedrunning && (!head.vehicle || autocvar_g_ctf_allow_vehicle_touch)) { - traceline(player.origin, head.origin, MOVE_NOMONSTERS, player); - if not((trace_fraction < 1) && (trace_ent != head)) - { - if(autocvar_g_ctf_pass_request && !player.flagcarried && head.flagcarried) - { - if(clienttype(head) == CLIENTTYPE_BOT) - { - centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); - ctf_Handle_Throw(head, player, DROP_PASS); - } - else - { - centerprint(head, strcat(player.netname, " requests you to pass the ", head.flagcarried.netname)); - centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); - } - player.throw_antispam = time + autocvar_g_ctf_pass_wait; - return 0; + if(autocvar_g_ctf_pass_request && !player.flagcarried && head.flagcarried) + { + if(clienttype(head) == CLIENTTYPE_BOT) + { + centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); + ctf_Handle_Throw(head, player, DROP_PASS); + } + else + { + centerprint(head, strcat(player.netname, " requests you to pass the ", head.flagcarried.netname)); + centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); } - else if(player.flagcarried) + player.throw_antispam = time + autocvar_g_ctf_pass_wait; + return TRUE; + } + else if(player.flagcarried) + { + if(closest_target) { - if(closest_target) { if(vlen(player.origin - head.origin) < vlen(player.origin - closest_target.origin)) { closest_target = head; } } - else { closest_target = head; } + if(vlen(player.origin - WarpZone_UnTransformOrigin(head, head.origin)) < vlen(player.origin - WarpZone_UnTransformOrigin(closest_target, closest_target.origin))) + { closest_target = head; } } + else { closest_target = head; } } } head = head.chain; } - if(closest_target) { ctf_Handle_Throw(player, closest_target, DROP_PASS); return 0; } + if(closest_target) { ctf_Handle_Throw(player, closest_target, DROP_PASS); return TRUE; } } // throw the flag in front of you - if(autocvar_g_ctf_drop && player.flagcarried && !player.speedrunning) - { ctf_Handle_Throw(player, world, DROP_THROW); } + if(autocvar_g_ctf_drop && player.flagcarried) + { ctf_Handle_Throw(player, world, DROP_THROW); return TRUE; } } - return 0; + return FALSE; +} + +MUTATOR_HOOKFUNCTION(ctf_HelpMePing) +{ + if(self.wps_flagcarrier) // update the flagcarrier waypointsprite with "NEEDING HELP" notification + { + WaypointSprite_HelpMePing(self.wps_flagcarrier); + } + else // create a normal help me waypointsprite + { + WaypointSprite_Spawn("helpme", waypointsprite_deployed_lifetime, waypointsprite_limitedrange, self, FLAG_WAYPOINT_OFFSET, world, self.team, self, wps_helpme, FALSE, RADARICON_HELPME, '1 0.5 0'); + WaypointSprite_Ping(self.wps_helpme); + } + + return TRUE; +} + +MUTATOR_HOOKFUNCTION(ctf_VehicleEnter) +{ + if(vh_player.flagcarried) + { + if(!autocvar_g_ctf_flagcarrier_allow_vehicle_carry) + { + ctf_Handle_Throw(vh_player, world, DROP_NORMAL); + } + else + { + setattachment(vh_player.flagcarried, vh_vehicle, ""); + setorigin(vh_player.flagcarried, VEHICLE_FLAG_OFFSET); + vh_player.flagcarried.scale = VEHICLE_FLAG_SCALE; + //vh_player.flagcarried.angles = '0 0 0'; + } + } + + return FALSE; +} + +MUTATOR_HOOKFUNCTION(ctf_VehicleExit) +{ + if(vh_player.flagcarried) + { + setattachment(vh_player.flagcarried, vh_player, ""); + setorigin(vh_player.flagcarried, FLAG_CARRY_OFFSET); + vh_player.flagcarried.scale = FLAG_SCALE; + vh_player.flagcarried.angles = '0 0 0'; + return TRUE; + } + + return FALSE; +} + +MUTATOR_HOOKFUNCTION(ctf_AbortSpeedrun) +{ + if(self.flagcarried) + { + bprint("The ", self.flagcarried.netname, " was returned to base by its carrier\n"); + ctf_RespawnFlag(self); + return TRUE; + } + + return FALSE; +} + +MUTATOR_HOOKFUNCTION(ctf_MatchEnd) +{ + entity flag; // temporary entity for the search method + + for(flag = ctf_worldflaglist; flag; flag = flag.ctf_worldflagnext) + { + switch(flag.ctf_status) + { + case FLAG_DROPPED: + case FLAG_PASSING: + { + // lock the flag, game is over + flag.movetype = MOVETYPE_NONE; + flag.takedamage = DAMAGE_NO; + flag.solid = SOLID_NOT; + flag.nextthink = FALSE; // stop thinking + + print("stopping the ", flag.netname, " from moving.\n"); + break; + } + + default: + case FLAG_BASE: + case FLAG_CARRY: + { + // do nothing for these flags + break; + } + } + } + + return FALSE; } + // ========== // Spawnfuncs // ========== @@ -1141,13 +1389,18 @@ MUTATOR_DEFINITION(gamemode_ctf) { MUTATOR_HOOK(MakePlayerObserver, ctf_RemovePlayer, CBC_ORDER_ANY); MUTATOR_HOOK(ClientDisconnect, ctf_RemovePlayer, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerDies, ctf_RemovePlayer, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerDies, ctf_PlayerDies, CBC_ORDER_ANY); + MUTATOR_HOOK(MatchEnd, ctf_MatchEnd, CBC_ORDER_ANY); MUTATOR_HOOK(PortalTeleport, ctf_PortalTeleport, CBC_ORDER_ANY); MUTATOR_HOOK(GiveFragsForKill, ctf_GiveFragsForKill, CBC_ORDER_ANY); MUTATOR_HOOK(PlayerPreThink, ctf_PlayerPreThink, CBC_ORDER_ANY); MUTATOR_HOOK(PlayerDamage_Calculate, ctf_PlayerDamage, CBC_ORDER_ANY); MUTATOR_HOOK(PlayerUseKey, ctf_PlayerUseKey, CBC_ORDER_ANY); - + MUTATOR_HOOK(HelpMePing, ctf_HelpMePing, CBC_ORDER_ANY); + MUTATOR_HOOK(VehicleEnter, ctf_VehicleEnter, CBC_ORDER_ANY); + MUTATOR_HOOK(VehicleExit, ctf_VehicleExit, CBC_ORDER_ANY); + MUTATOR_HOOK(AbortSpeedrun, ctf_AbortSpeedrun, CBC_ORDER_ANY); + MUTATOR_ONADD { if(time > 1) // game loads at time 1