X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_ctf.qc;h=3c07f6509300e373fb573d31b24149670389be78;hb=31d652b02ae63bd32b5cdfe77b81d30db54808ed;hp=0c3ccc84145221b58185e8bde8145d54d9c670f6;hpb=648bd6e268881aaade7cbb3932eb07b0b5eb02e3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 0c3ccc8414..3c07f65093 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; @@ -68,6 +60,74 @@ void ctf_FlagcarrierWaypoints(entity player) WaypointSprite_UpdateTeamRadar(player.wps_flagcarrier, RADARICON_FLAGCARRIER, WPCOLOR_FLAGCARRIER(player.team)); } +void ctf_CalculatePassVelocity(entity flag, vector to, vector from, float turnrate) +{ + float current_distance = vlen((('1 0 0' * to_x) + ('0 1 0' * to_y)) - (('1 0 0' * from_x) + ('0 1 0' * from_y))); // for the sake of this check, exclude Z axis + float initial_height = min(autocvar_g_ctf_pass_arc_max, (flag.pass_distance * tanh(autocvar_g_ctf_pass_arc))); + float current_height = (initial_height * min(1, (current_distance / flag.pass_distance))); + print("current_height = ", ftos(current_height), ", initial_height = ", ftos(initial_height), ".\n"); + + vector targpos; + if(current_height) // make sure we can actually do this arcing path + { + vector arc_targpos = (to + ('0 0 1' * current_height)); + WarpZone_TraceLine(flag.origin, arc_targpos, MOVE_NOMONSTERS, flag); + if(trace_fraction < 1) + { + //print("normal arc line failed, trying to find new pos..."); + WarpZone_TraceLine(to, arc_targpos, MOVE_NOMONSTERS, flag); + arc_targpos = (trace_endpos + FLAG_PASS_ARC_OFFSET); + + WarpZone_TraceLine(flag.origin, arc_targpos, MOVE_NOMONSTERS, flag); + if(trace_fraction < 1) { targpos = to; /* print(" ^1FAILURE^7, reverting to original direction.\n"); */ } + else { targpos = arc_targpos; /* print(" ^3SUCCESS^7, using new arc line.\n"); */ } + } + else { targpos = arc_targpos; } + } + else { targpos = to; } + + //flag.angles = normalize(('0 1 0' * to_y) - ('0 1 0' * from_y)); + + vector desired_direction = normalize(targpos - from); + if(turnrate) + { + vector current_direction = normalize(flag.velocity); + flag.velocity = (normalize(current_direction + (desired_direction * autocvar_g_ctf_pass_turnrate)) * autocvar_g_ctf_pass_velocity); + } + else { flag.velocity = (desired_direction * autocvar_g_ctf_pass_velocity); } +} + +float ctf_CheckPassDirection(vector head_center, vector passer_center, vector passer_angle, vector nearest_to_passer) +{ + if(autocvar_g_ctf_pass_directional_max || autocvar_g_ctf_pass_directional_min) + { + // directional tracing only + float spreadlimit; + makevectors(passer_angle); + + // find the closest point on the enemy to the center of the attack + float ang; // angle between shotdir and h + float h; // hypotenuse, which is the distance between attacker to head + float a; // adjacent side, which is the distance between attacker and the point on w_shotdir that is closest to head.origin + + h = vlen(head_center - passer_center); + ang = acos(dotproduct(normalize(head_center - passer_center), v_forward)); + a = h * cos(ang); + + vector nearest_on_line = (passer_center + a * v_forward); + float distance_from_line = vlen(nearest_to_passer - nearest_on_line); + + spreadlimit = (autocvar_g_ctf_pass_radius ? min(1, (vlen(passer_center - nearest_on_line) / autocvar_g_ctf_pass_radius)) : 1); + spreadlimit = (autocvar_g_ctf_pass_directional_min * (1 - spreadlimit) + autocvar_g_ctf_pass_directional_max * spreadlimit); + + if(spreadlimit && (distance_from_line <= spreadlimit) && ((vlen(normalize(head_center - passer_center) - v_forward) * RAD2DEG) <= 90)) + { return TRUE; } + else + { return FALSE; } + } + else { return TRUE; } +} + // ======================= // CaptureShield Functions @@ -173,6 +233,7 @@ void ctf_Handle_Drop(entity flag, entity player, float droptype) // main flag.movetype = MOVETYPE_TOSS; flag.takedamage = DAMAGE_YES; + flag.angles = '0 0 0'; flag.health = flag.max_flag_health; flag.ctf_droptime = time; flag.ctf_dropper = player; @@ -184,7 +245,7 @@ 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 @@ -201,6 +262,7 @@ void ctf_Handle_Drop(entity flag, entity player, float droptype) if(droptype == DROP_PASS) { + flag.pass_distance = 0; flag.pass_sender = world; flag.pass_target = world; } @@ -212,7 +274,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 +283,41 @@ 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.angles = '0 0 0'; 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); + 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)); + 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_distance = 0; 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 +327,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,60 +336,50 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) { case DROP_PASS: { - vector targ_origin = (0.5 * (reciever.absmin + reciever.absmax)); - flag.velocity = (normalize(targ_origin - player.origin) * autocvar_g_ctf_pass_velocity); - break; - } - - 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); - break; - } - - case DROP_RESET: - { - flag.velocity = '0 0 0'; // do nothing - break; - } - - default: - case DROP_NORMAL: - { - flag.velocity = W_CalculateProjectileVelocity(player.velocity, ('0 0 200' + ('0 100 0' * crandom()) + ('100 0 0' * crandom())), FALSE); - break; - } - } - - switch(droptype) - { - case DROP_PASS: - { + // warpzone support: + // for the examples, we assume player -> wz1 -> ... -> wzn -> receiver + // findradius has already put wzn ... wz1 into receiver's warpzone parameters! + WarpZone_RefSys_Copy(flag, receiver); + WarpZone_RefSys_AddInverse(flag, receiver); // wz1^-1 ... wzn^-1 receiver + targ_origin = WarpZone_RefSys_TransformOrigin(receiver, flag, (0.5 * (receiver.absmin + receiver.absmax))); // this is target origin as seen by the flag + + flag.pass_distance = vlen((('1 0 0' * targ_origin_x) + ('0 1 0' * targ_origin_y)) - (('1 0 0' * player.origin_x) + ('0 1 0' * player.origin_y))); // for the sake of this check, exclude Z axis + ctf_CalculatePassVelocity(flag, targ_origin, player.origin, FALSE); + // main 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), player.origin, targ_origin); ctf_EventLog("pass", flag.team, player); - te_lightning2(world, reciever.origin, player.origin); break; } - - case DROP_RESET: + + case DROP_THROW: + { + makevectors((player.v_angle_y * '0 1 0') + (bound(autocvar_g_ctf_throw_angle_min, player.v_angle_x, autocvar_g_ctf_throw_angle_max) * '1 0 0')); + + flag_velocity = (('0 0 1' * autocvar_g_ctf_throw_velocity_up) + ((v_forward * autocvar_g_ctf_throw_velocity_forward) * ((player.items & IT_STRENGTH) ? autocvar_g_ctf_throw_strengthmultiplier : 1))); + flag.velocity = W_CalculateProjectileVelocity(player.velocity, flag_velocity, FALSE); + ctf_Handle_Drop(flag, player, droptype); + break; + } + + case DROP_RESET: { - // do nothing + flag.velocity = '0 0 0'; // do nothing break; } default: - case DROP_THROW: case DROP_NORMAL: { + flag.velocity = W_CalculateProjectileVelocity(player.velocity, (('0 0 1' * autocvar_g_ctf_drop_velocity_up) + ((('0 1 0' * crandom()) + ('1 0 0' * crandom())) * autocvar_g_ctf_drop_velocity_side)), FALSE); ctf_Handle_Drop(flag, player, droptype); break; } @@ -333,10 +390,10 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype) WaypointSprite_Kill(player.wps_flagcarrier); if(player.wps_enemyflagcarrier) - WaypointSprite_Kill(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 } @@ -348,6 +405,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 @@ -363,21 +421,26 @@ 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) - { - pointparticles(particleeffectnum((player.team == COLOR_TEAM1) ? "red_ground_quake" : "blue_ground_quake"), flag.origin, '0 0 0', 1); - shockwave_spawn("models/ctf/shockwavetransring.md3", flag.origin - '0 0 15', -0.8, 0, 1); - } + pointparticles(particleeffectnum(flag.capeffect), flag.origin, '0 0 0', 1); + //shockwave_spawn("models/ctf/shockwavetransring.md3", flag.origin - '0 0 15', -0.8, 0, 1); // other if(capturetype == CAPTURE_NORMAL) { 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 @@ -389,24 +452,21 @@ 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, ST_SCORE, -ctf_ReadScore("penalty_returned")); // punish the team who was last carrying it + TeamScore_AddToTeam(flag.team, ST_SCORE, -autocvar_g_ctf_score_penalty_returned); // punish the team who was last carrying it if(flag.ctf_dropper) { - // punish the player who dropped the flag - PlayerScore_Add(flag.ctf_dropper, SP_SCORE, -ctf_ReadScore("penalty_returned")); - ctf_CaptureShield_Update(flag.ctf_dropper, 0); // shield only - - // set next take time - flag.ctf_dropper.next_take_time = time + autocvar_g_ctf_flag_collect_delay; + 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 @@ -431,7 +491,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) @@ -447,18 +506,13 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) verbosename = ((autocvar_g_ctf_flag_pickup_verbosename) ? strcat(Team_ColorCode(player.team), "(^7", player.netname, Team_ColorCode(player.team), ") ") : ""); FOR_EACH_REALPLAYER(tmp_player) + { if(tmp_player == player) centerprint(tmp_player, strcat("You got the ", flag.netname, "!")); 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(!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; - case PICKUP_DROPPED: ctf_EventLog("pickup", flag.team, player); break; - default: break; } // scoring @@ -467,16 +521,18 @@ 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); + ctf_EventLog("steal", flag.team, player); 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); - print("pickup_dropped_score is ", ftos(pickup_dropped_score), "\n"); + 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); + dprint("pickup_dropped_score is ", ftos(pickup_dropped_score), "\n"); PlayerTeamScore_AddScore(player, pickup_dropped_score); + ctf_EventLog("pickup", flag.team, player); break; } @@ -492,8 +548,7 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) } // effects - if(autocvar_g_ctf_flag_pickup_effects) - pointparticles(particleeffectnum("smoke_ring"), 0.5 * (flag.absmin + flag.absmax), '0 0 0', 1); + pointparticles(particleeffectnum(flag.toucheffect), player.origin, '0 0 0', 1); // waypoints if(pickuptype == PICKUP_DROPPED) { WaypointSprite_Kill(flag.wps_flagdropped); } @@ -506,16 +561,82 @@ 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.ctf_status == FLAG_DROPPED) || (flag.ctf_status == FLAG_PASSING)) + { + 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)) + { + 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) { - if(flag.wps_flagdropped) { WaypointSprite_UpdateHealth(flag.wps_flagdropped, flag.health); } + // 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((flag.health <= 0) || (time >= flag.ctf_droptime + autocvar_g_ctf_flag_return_time)) + // if sufficient stalemate, then set up the waypointsprite and announce the stalemate if necessary + if(ctf_stalemate) { - bprint("The ", flag.netname, " has returned to base\n"); - sound(flag, CH_TRIGGER, flag.snd_flag_respawn, VOL_BASE, ATTN_NONE); - ctf_EventLog("returned", flag.team, world); - ctf_RespawnFlag(flag); + 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; + } } } @@ -525,15 +646,14 @@ void ctf_FlagDamage(entity inflictor, entity attacker, float damage, float death { // 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; } } @@ -556,6 +676,17 @@ 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: + { + self.angles = '0 0 0'; + break; + } + + default: break; + } // main think method switch(self.ctf_status) @@ -574,19 +705,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)) { 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; @@ -596,10 +741,8 @@ void ctf_FlagThink() { 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; @@ -607,49 +750,36 @@ void ctf_FlagThink() ImpulseCommands(); self = tmp_entity; } - - if(autocvar_g_ctf_flagcarrier_waypointforenemy_time) - if((time >= self.ctf_pickuptime + autocvar_g_ctf_flagcarrier_waypointforenemy_time) && !self.owner.wps_enemyflagcarrier) + if(autocvar_g_ctf_flagcarrier_waypointforenemy_stalemate) { - WaypointSprite_Spawn("enemyflagcarrier", 0, 0, self.owner, FLAG_WAYPOINT_OFFSET, world, self.team, self.owner, wps_enemyflagcarrier, TRUE, RADARICON_FLAG, WPCOLOR_ENEMYFC(self.owner.team)); - - if(!self.wpforenemy_announced) + if(time >= wpforenemy_nextthink) { - FOR_EACH_REALPLAYER(tmp_entity) - { - if(tmp_entity == self.owner) - centerprint(tmp_entity, strcat("Enemies can now see you on radar! (held ", self.netname, " for ", ftos(autocvar_g_ctf_flagcarrier_waypointforenemy_time), " seconds)")); - else if(IsDifferentTeam(tmp_entity, self.owner)) - centerprint(tmp_entity, strcat("You can now see the enemy flag carrier on radar! (held ", self.netname, " for ", ftos(autocvar_g_ctf_flagcarrier_waypointforenemy_time), " seconds)")); - else - centerprint(tmp_entity, strcat("Enemies can now see your flag carrier on radar! (held ", self.netname, " for ", ftos(autocvar_g_ctf_flagcarrier_waypointforenemy_time), " seconds)")); - } - - self.wpforenemy_announced = TRUE; + 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 - { + case FLAG_PASSING: + { vector targ_origin = ((self.pass_target.absmin + self.pass_target.absmax) * 0.5); + targ_origin = WarpZone_RefSys_TransformOrigin(self.pass_target, self, targ_origin); // origin of target as seen by the flag (us) + WarpZone_TraceLine(self.origin, targ_origin, MOVE_NOMONSTERS, self); - traceline(self.origin, targ_origin, MOVE_NOMONSTERS, self); - - if((self.pass_target.deadflag != DEAD_NO) + if((self.pass_target == world) + || (self.pass_target.deadflag != DEAD_NO) || (vlen(self.origin - targ_origin) > autocvar_g_ctf_pass_radius) || ((trace_fraction < 1) && (trace_ent != self.pass_target)) || (time > self.ctf_droptime + autocvar_g_ctf_pass_timelimit)) { + // give up, pass failed ctf_Handle_Drop(self, world, DROP_PASS); } - else // still a viable target, go for it + else { - 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); + // still a viable target, go for it + ctf_CalculatePassVelocity(self, targ_origin, self.origin, TRUE); } return; } @@ -665,43 +795,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(!IsDifferentTeam(other, self) && (other.flagcarried) && IsDifferentTeam(other.flagcarried, self)) - ctf_Handle_Capture(self, other, CAPTURE_NORMAL); // other just captured the enemies flag to his base - else if(IsDifferentTeam(other, self) && (!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(!IsDifferentTeam(other, self)) - 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; } @@ -713,26 +854,27 @@ 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; - } } } +.float last_respawn; void ctf_RespawnFlag(entity flag) { + // check for flag respawn being called twice in a row + if(flag.last_respawn > time - 0.5) + { backtrace("flag respawn called twice quickly! please notify Samual about this..."); } + + flag.last_respawn = time; + // reset the player (if there is one) if((flag.owner) && (flag.owner.flagcarried == flag)) { @@ -764,13 +906,14 @@ void ctf_RespawnFlag(entity flag) flag.ctf_status = FLAG_BASE; flag.owner = world; + flag.pass_distance = 0; flag.pass_sender = world; flag.pass_target = world; - flag.ctf_carrier = world; flag.ctf_dropper = world; flag.ctf_pickuptime = 0; flag.ctf_droptime = 0; - flag.wpforenemy_announced = FALSE; + + wpforenemy_announced = FALSE; } void ctf_Reset() @@ -822,6 +965,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'; @@ -835,6 +979,9 @@ 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"); } + if(!flag.capeffect) { flag.capeffect = ((teamnumber) ? "red_cap" : "blue_cap"); } // sound if(!flag.snd_flag_taken) { flag.snd_flag_taken = ((teamnumber) ? "ctf/red_taken.wav" : "ctf/blue_taken.wav"); } @@ -842,7 +989,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); @@ -851,6 +999,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"); @@ -890,6 +1039,663 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag } +// ================ +// Bot player logic +// ================ + +// NOTE: LEGACY CODE, needs to be re-written! + +void havocbot_calculate_middlepoint() +{ + entity f; + vector s = '0 0 0'; + vector fo = '0 0 0'; + float n = 0; + + f = ctf_worldflaglist; + while (f) + { + fo = f.origin; + s = s + fo; + f = f.ctf_worldflagnext; + } + if(!n) + return; + havocbot_ctf_middlepoint = s * (1.0 / n); + havocbot_ctf_middlepoint_radius = vlen(fo - havocbot_ctf_middlepoint); +} + + +entity havocbot_ctf_find_flag(entity bot) +{ + entity f; + f = ctf_worldflaglist; + while (f) + { + if (bot.team == f.team) + return f; + f = f.ctf_worldflagnext; + } + return world; +} + +entity havocbot_ctf_find_enemy_flag(entity bot) +{ + entity f; + f = ctf_worldflaglist; + while (f) + { + if (bot.team != f.team) + return f; + f = f.ctf_worldflagnext; + } + return world; +} + +float havocbot_ctf_teamcount(entity bot, vector org, float tc_radius) +{ + if not(teamplay) + return 0; + + float c = 0; + entity head; + + FOR_EACH_PLAYER(head) + { + if(head.team!=bot.team || head.deadflag != DEAD_NO || head == bot) + continue; + + if(vlen(head.origin - org) < tc_radius) + ++c; + } + + return c; +} + +void havocbot_goalrating_ctf_ourflag(float ratingscale) +{ + entity head; + head = ctf_worldflaglist; + while (head) + { + if (self.team == head.team) + break; + head = head.ctf_worldflagnext; + } + if (head) + navigation_routerating(head, ratingscale, 10000); +} + +void havocbot_goalrating_ctf_ourbase(float ratingscale) +{ + entity head; + head = ctf_worldflaglist; + while (head) + { + if (self.team == head.team) + break; + head = head.ctf_worldflagnext; + } + if not(head) + return; + + navigation_routerating(head.bot_basewaypoint, ratingscale, 10000); +} + +void havocbot_goalrating_ctf_enemyflag(float ratingscale) +{ + entity head; + head = ctf_worldflaglist; + while (head) + { + if (self.team != head.team) + break; + head = head.ctf_worldflagnext; + } + if (head) + navigation_routerating(head, ratingscale, 10000); +} + +void havocbot_goalrating_ctf_enemybase(float ratingscale) +{ + if not(bot_waypoints_for_items) + { + havocbot_goalrating_ctf_enemyflag(ratingscale); + return; + } + + entity head; + + head = havocbot_ctf_find_enemy_flag(self); + + if not(head) + return; + + navigation_routerating(head.bot_basewaypoint, ratingscale, 10000); +} + +void havocbot_goalrating_ctf_ourstolenflag(float ratingscale) +{ + entity mf; + + mf = havocbot_ctf_find_flag(self); + + if(mf.ctf_status == FLAG_BASE) + return; + + if(mf.tag_entity) + navigation_routerating(mf.tag_entity, ratingscale, 10000); +} + +void havocbot_goalrating_ctf_droppedflags(float ratingscale, vector org, float df_radius) +{ + entity head; + head = ctf_worldflaglist; + while (head) + { + // flag is out in the field + if(head.ctf_status != FLAG_BASE) + if(head.tag_entity==world) // dropped + { + if(df_radius) + { + if(vlen(org-head.origin) 0) + navigation_routerating(head, t * ratingscale, 500); + } + head = head.chain; + } +} + +void havocbot_ctf_reset_role(entity bot) +{ + float cdefense, cmiddle, coffense; + entity mf, ef, head; + float c; + + if(bot.deadflag != DEAD_NO) + return; + + if(vlen(havocbot_ctf_middlepoint)==0) + havocbot_calculate_middlepoint(); + + // Check ctf flags + if (bot.flagcarried) + { + havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_CARRIER); + return; + } + + mf = havocbot_ctf_find_flag(bot); + ef = havocbot_ctf_find_enemy_flag(bot); + + // Retrieve stolen flag + if(mf.ctf_status!=FLAG_BASE) + { + havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_RETRIEVER); + return; + } + + // If enemy flag is taken go to the middle to intercept pursuers + if(ef.ctf_status!=FLAG_BASE) + { + havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_MIDDLE); + return; + } + + // if there is only me on the team switch to offense + c = 0; + FOR_EACH_PLAYER(head) + if(head.team==bot.team) + ++c; + + if(c==1) + { + havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_OFFENSE); + return; + } + + // Evaluate best position to take + // Count mates on middle position + cmiddle = havocbot_ctf_teamcount(bot, havocbot_ctf_middlepoint, havocbot_ctf_middlepoint_radius * 0.5); + + // Count mates on defense position + cdefense = havocbot_ctf_teamcount(bot, mf.dropped_origin, havocbot_ctf_middlepoint_radius * 0.5); + + // Count mates on offense position + coffense = havocbot_ctf_teamcount(bot, ef.dropped_origin, havocbot_ctf_middlepoint_radius); + + if(cdefense<=coffense) + havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_DEFENSE); + else if(coffense<=cmiddle) + havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_OFFENSE); + else + havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_MIDDLE); +} + +void havocbot_role_ctf_carrier() +{ + if(self.deadflag != DEAD_NO) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.flagcarried == world) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.bot_strategytime < time) + { + self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + + navigation_goalrating_start(); + havocbot_goalrating_ctf_ourbase(50000); + + if(self.health<100) + havocbot_goalrating_ctf_carrieritems(1000, self.origin, 1000); + + navigation_goalrating_end(); + + if (self.navigation_hasgoals) + self.havocbot_cantfindflag = time + 10; + else if (time > self.havocbot_cantfindflag) + { + // Can't navigate to my own base, suicide! + // TODO: drop it and wander around + Damage(self, self, self, 100000, DEATH_KILL, self.origin, '0 0 0'); + return; + } + } +} + +void havocbot_role_ctf_escort() +{ + entity mf, ef; + + if(self.deadflag != DEAD_NO) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.flagcarried) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_CARRIER); + return; + } + + // If enemy flag is back on the base switch to previous role + ef = havocbot_ctf_find_enemy_flag(self); + if(ef.ctf_status==FLAG_BASE) + { + self.havocbot_role = self.havocbot_previous_role; + self.havocbot_role_timeout = 0; + return; + } + + // If the flag carrier reached the base switch to defense + mf = havocbot_ctf_find_flag(self); + if(mf.ctf_status!=FLAG_BASE) + if(vlen(ef.origin - mf.dropped_origin) < 300) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_DEFENSE); + return; + } + + // Set the role timeout if necessary + if (!self.havocbot_role_timeout) + { + self.havocbot_role_timeout = time + random() * 30 + 60; + } + + // If nothing happened just switch to previous role + if (time > self.havocbot_role_timeout) + { + self.havocbot_role = self.havocbot_previous_role; + self.havocbot_role_timeout = 0; + return; + } + + // Chase the flag carrier + if (self.bot_strategytime < time) + { + self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(); + havocbot_goalrating_ctf_enemyflag(30000); + havocbot_goalrating_ctf_ourstolenflag(40000); + havocbot_goalrating_items(10000, self.origin, 10000); + navigation_goalrating_end(); + } +} + +void havocbot_role_ctf_offense() +{ + entity mf, ef; + vector pos; + + if(self.deadflag != DEAD_NO) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.flagcarried) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_CARRIER); + return; + } + + // Check flags + mf = havocbot_ctf_find_flag(self); + ef = havocbot_ctf_find_enemy_flag(self); + + // Own flag stolen + if(mf.ctf_status!=FLAG_BASE) + { + if(mf.tag_entity) + pos = mf.tag_entity.origin; + else + pos = mf.origin; + + // Try to get it if closer than the enemy base + if(vlen(self.origin-ef.dropped_origin)>vlen(self.origin-pos)) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_RETRIEVER); + return; + } + } + + // Escort flag carrier + if(ef.ctf_status!=FLAG_BASE) + { + if(ef.tag_entity) + pos = ef.tag_entity.origin; + else + pos = ef.origin; + + if(vlen(pos-mf.dropped_origin)>700) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_ESCORT); + return; + } + } + + // About to fail, switch to middlefield + if(self.health<50) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_MIDDLE); + return; + } + + // Set the role timeout if necessary + if (!self.havocbot_role_timeout) + self.havocbot_role_timeout = time + 120; + + if (time > self.havocbot_role_timeout) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.bot_strategytime < time) + { + self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(); + havocbot_goalrating_ctf_ourstolenflag(50000); + havocbot_goalrating_ctf_enemybase(20000); + havocbot_goalrating_items(5000, self.origin, 1000); + havocbot_goalrating_items(1000, self.origin, 10000); + navigation_goalrating_end(); + } +} + +// Retriever (temporary role): +void havocbot_role_ctf_retriever() +{ + entity mf; + + if(self.deadflag != DEAD_NO) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.flagcarried) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_CARRIER); + return; + } + + // If flag is back on the base switch to previous role + mf = havocbot_ctf_find_flag(self); + if(mf.ctf_status==FLAG_BASE) + { + havocbot_ctf_reset_role(self); + return; + } + + if (!self.havocbot_role_timeout) + self.havocbot_role_timeout = time + 20; + + if (time > self.havocbot_role_timeout) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.bot_strategytime < time) + { + float rt_radius; + rt_radius = 10000; + + self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(); + havocbot_goalrating_ctf_ourstolenflag(50000); + havocbot_goalrating_ctf_droppedflags(40000, self.origin, rt_radius); + havocbot_goalrating_ctf_enemybase(30000); + havocbot_goalrating_items(500, self.origin, rt_radius); + navigation_goalrating_end(); + } +} + +void havocbot_role_ctf_middle() +{ + entity mf; + + if(self.deadflag != DEAD_NO) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.flagcarried) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_CARRIER); + return; + } + + mf = havocbot_ctf_find_flag(self); + if(mf.ctf_status!=FLAG_BASE) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_RETRIEVER); + return; + } + + if (!self.havocbot_role_timeout) + self.havocbot_role_timeout = time + 10; + + if (time > self.havocbot_role_timeout) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.bot_strategytime < time) + { + vector org; + + org = havocbot_ctf_middlepoint; + org_z = self.origin_z; + + self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(); + havocbot_goalrating_ctf_ourstolenflag(50000); + havocbot_goalrating_ctf_droppedflags(30000, self.origin, 10000); + havocbot_goalrating_enemyplayers(10000, org, havocbot_ctf_middlepoint_radius * 0.5); + havocbot_goalrating_items(5000, org, havocbot_ctf_middlepoint_radius * 0.5); + havocbot_goalrating_items(2500, self.origin, 10000); + havocbot_goalrating_ctf_enemybase(2500); + navigation_goalrating_end(); + } +} + +void havocbot_role_ctf_defense() +{ + entity mf; + + if(self.deadflag != DEAD_NO) + { + havocbot_ctf_reset_role(self); + return; + } + + if (self.flagcarried) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_CARRIER); + return; + } + + // If own flag was captured + mf = havocbot_ctf_find_flag(self); + if(mf.ctf_status!=FLAG_BASE) + { + havocbot_role_ctf_setrole(self, HAVOCBOT_CTF_ROLE_RETRIEVER); + return; + } + + if (!self.havocbot_role_timeout) + self.havocbot_role_timeout = time + 30; + + if (time > self.havocbot_role_timeout) + { + havocbot_ctf_reset_role(self); + return; + } + if (self.bot_strategytime < time) + { + float mp_radius; + vector org; + + org = mf.dropped_origin; + mp_radius = havocbot_ctf_middlepoint_radius; + + self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(); + + // if enemies are closer to our base, go there + entity head, closestplayer = world; + float distance, bestdistance = 10000; + FOR_EACH_PLAYER(head) + { + if(head.deadflag!=DEAD_NO) + continue; + + distance = vlen(org - head.origin); + if(distance1000) + if(checkpvs(self.origin,closestplayer)||random()<0.5) + havocbot_goalrating_ctf_ourbase(30000); + + havocbot_goalrating_ctf_ourstolenflag(20000); + havocbot_goalrating_ctf_droppedflags(20000, org, mp_radius); + havocbot_goalrating_enemyplayers(15000, org, mp_radius); + havocbot_goalrating_items(10000, org, mp_radius); + havocbot_goalrating_items(5000, self.origin, 10000); + navigation_goalrating_end(); + } +} + +void havocbot_role_ctf_setrole(entity bot, float role) +{ + dprint(strcat(bot.netname," switched to ")); + switch(role) + { + case HAVOCBOT_CTF_ROLE_CARRIER: + dprint("carrier"); + bot.havocbot_role = havocbot_role_ctf_carrier; + bot.havocbot_role_timeout = 0; + bot.havocbot_cantfindflag = time + 10; + bot.bot_strategytime = 0; + break; + case HAVOCBOT_CTF_ROLE_DEFENSE: + dprint("defense"); + bot.havocbot_role = havocbot_role_ctf_defense; + bot.havocbot_role_timeout = 0; + break; + case HAVOCBOT_CTF_ROLE_MIDDLE: + dprint("middle"); + bot.havocbot_role = havocbot_role_ctf_middle; + bot.havocbot_role_timeout = 0; + break; + case HAVOCBOT_CTF_ROLE_OFFENSE: + dprint("offense"); + bot.havocbot_role = havocbot_role_ctf_offense; + bot.havocbot_role_timeout = 0; + break; + case HAVOCBOT_CTF_ROLE_RETRIEVER: + dprint("retriever"); + bot.havocbot_previous_role = bot.havocbot_role; + bot.havocbot_role = havocbot_role_ctf_retriever; + bot.havocbot_role_timeout = time + 10; + bot.bot_strategytime = 0; + break; + case HAVOCBOT_CTF_ROLE_ESCORT: + dprint("escort"); + bot.havocbot_previous_role = bot.havocbot_role; + bot.havocbot_role = havocbot_role_ctf_escort; + bot.havocbot_role_timeout = time + 30; + bot.bot_strategytime = 0; + break; + } + dprint("\n"); +} + + // ============== // Hook Functions // ============== @@ -905,13 +1711,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 @@ -920,9 +1736,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 @@ -934,27 +1750,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); + } + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_PlayerDies) { if((frag_attacker != frag_target) && (frag_attacker.classname == "player") && (frag_target.flagcarried)) { - PlayerTeamScore_AddScore(frag_attacker, ctf_ReadScore("score_kill")); + 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 0; + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_GiveFragsForKill) @@ -965,10 +1786,19 @@ MUTATOR_HOOKFUNCTION(ctf_GiveFragsForKill) MUTATOR_HOOKFUNCTION(ctf_RemovePlayer) { + entity flag; // temporary entity for the search method + if(self.flagcarried) { ctf_Handle_Throw(self, world, DROP_NORMAL); } + + for(flag = ctf_worldflaglist; flag; flag = flag.ctf_worldflagnext) + { + if(flag.pass_sender == self) { flag.pass_sender = world; } + if(flag.pass_target == self) { flag.pass_target = world; } + if(flag.ctf_dropper == self) { flag.ctf_dropper = world; } + } - return 0; + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_PortalTeleport) @@ -977,20 +1807,22 @@ MUTATOR_HOOKFUNCTION(ctf_PortalTeleport) if(!autocvar_g_ctf_portalteleport) { ctf_Handle_Throw(self, world, DROP_NORMAL); } - return 0; + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) { + if(MUTATOR_RETURNVALUE || 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 && !player.speedrunning && !player.vehicle) + 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 { @@ -998,8 +1830,11 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) if(head != player && !IsDifferentTeam(head, player)) if(!head.speedrunning && !head.vehicle) { - traceline(player.origin, head.origin, MOVE_NOMONSTERS, player); - if not((trace_fraction < 1) && (trace_ent != head)) + // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc) + vector head_center = WarpZone_UnTransformOrigin(head, PLAYER_CENTER(head)); + vector passer_center = PLAYER_CENTER(player); + + if(ctf_CheckPassDirection(head_center, passer_center, player.v_angle, head.WarpZone_findradius_nearest)) { if(autocvar_g_ctf_pass_request && !player.flagcarried && head.flagcarried) { @@ -1014,11 +1849,16 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) centerprint(player, strcat("Requesting ", head.netname, " to pass you the ", head.flagcarried.netname)); } player.throw_antispam = time + autocvar_g_ctf_pass_wait; - return 0; + return TRUE; } else if(player.flagcarried) { - if(closest_target) { if(vlen(player.origin - head.origin) < vlen(player.origin - closest_target.origin)) { closest_target = head; } } + if(closest_target) + { + vector closest_target_center = WarpZone_UnTransformOrigin(closest_target, PLAYER_CENTER(closest_target)); + if(vlen(passer_center - head_center) < vlen(passer_center - closest_target_center)) + { closest_target = head; } + } else { closest_target = head; } } } @@ -1026,15 +1866,15 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) 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_throw && player.flagcarried) + { ctf_Handle_Throw(player, world, DROP_THROW); return TRUE; } } - return 0; + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_HelpMePing) @@ -1049,38 +1889,94 @@ MUTATOR_HOOKFUNCTION(ctf_HelpMePing) WaypointSprite_Ping(self.wps_helpme); } - return 1; + return TRUE; } MUTATOR_HOOKFUNCTION(ctf_VehicleEnter) { - if(other.flagcarried) + if(vh_player.flagcarried) { - if(!autocvar_g_ctf_flagcarrier_allow_vehicle_carry) + if(!autocvar_g_ctf_allow_vehicle_carry) { - ctf_Handle_Throw(self, world, DROP_NORMAL); + ctf_Handle_Throw(vh_player, world, DROP_NORMAL); } else { - setattachment(other.flagcarried, self, ""); - setorigin(other, VEHICLE_FLAG_OFFSET); - other.flagcarried.scale = VEHICLE_FLAG_SCALE; + 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 TRUE; } - return 0; + return FALSE; } MUTATOR_HOOKFUNCTION(ctf_VehicleExit) { - if(self.owner.flagcarried) + if(vh_player.flagcarried) { - setattachment(self.owner.flagcarried, self.owner, ""); - setorigin(self.owner.flagcarried, FLAG_CARRY_OFFSET); - self.owner.flagcarried.scale = FLAG_SCALE; + 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 0; + 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; +} + +MUTATOR_HOOKFUNCTION(ctf_BotRoles) +{ + havocbot_ctf_reset_role(self); + return TRUE; } @@ -1184,11 +2080,33 @@ void spawnfunc_ctf_team() self.team = self.cnt + 1; } +// compatibility for quake maps +void spawnfunc_team_CTF_redflag() { spawnfunc_item_flag_team1(); } +void spawnfunc_team_CTF_blueflag() { spawnfunc_item_flag_team2(); } +void spawnfunc_team_CTF_redplayer() { spawnfunc_info_player_team1(); } +void spawnfunc_team_CTF_blueplayer() { spawnfunc_info_player_team2(); } +void spawnfunc_team_CTF_redspawn() { spawnfunc_info_player_team1(); } +void spawnfunc_team_CTF_bluespawn() { spawnfunc_info_player_team2(); } + // ============== // Initialization // ============== +// scoreboard setup +void ctf_ScoreRules() +{ + ScoreRules_basics(2, SFL_SORT_PRIO_PRIMARY, 0, TRUE); + ScoreInfo_SetLabel_TeamScore (ST_CTF_CAPS, "caps", SFL_SORT_PRIO_PRIMARY); + ScoreInfo_SetLabel_PlayerScore(SP_CTF_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); + ScoreInfo_SetLabel_PlayerScore(SP_CTF_CAPTIME, "captime", SFL_LOWER_IS_BETTER | SFL_TIME); + ScoreInfo_SetLabel_PlayerScore(SP_CTF_PICKUPS, "pickups", 0); + ScoreInfo_SetLabel_PlayerScore(SP_CTF_FCKILLS, "fckills", 0); + ScoreInfo_SetLabel_PlayerScore(SP_CTF_RETURNS, "returns", 0); + ScoreInfo_SetLabel_PlayerScore(SP_CTF_DROPS, "drops", SFL_LOWER_IS_BETTER); + ScoreRules_basics_end(); +} + // code from here on is just to support maps that don't have flag and team entities void ctf_SpawnTeam (string teamname, float teamcolor) { @@ -1214,7 +2132,7 @@ void ctf_DelayedInit() // Do this check with a delay so we can wait for teams to ctf_SpawnTeam("Blue", COLOR_TEAM2 - 1); } - ScoreRules_ctf(); + ctf_ScoreRules(); } void ctf_Initialize() @@ -1234,6 +2152,7 @@ MUTATOR_DEFINITION(gamemode_ctf) MUTATOR_HOOK(MakePlayerObserver, ctf_RemovePlayer, CBC_ORDER_ANY); MUTATOR_HOOK(ClientDisconnect, 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); @@ -1242,6 +2161,8 @@ MUTATOR_DEFINITION(gamemode_ctf) 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_HOOK(HavocBot_ChooseRule, ctf_BotRoles, CBC_ORDER_ANY); MUTATOR_ONADD {