]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/mutators/gamemode_ctf.qc
Add a debug check for an issue I noticed earlier, need it resolved
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_ctf.qc
index 15e62c5b7e9f51a845859ecbd8d361ffa424116b..f5ecce93647a14e13083bdc5357cc339f2c289f6 100644 (file)
@@ -1,6 +1,6 @@
 // ================================================================
 //  Official capture the flag game mode coding, reworked by Samual
-//  Last updated: March 30th, 2012
+//  Last updated: September, 2012
 // ================================================================
 
 void ctf_FakeTimeLimit(entity e, float t)
@@ -213,19 +213,18 @@ 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, flag.snd_flag_pass, VOL_BASE, ATTN_NORM);
-       ctf_EventLog("recieve", flag.team, player);
+       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));
        }
@@ -235,18 +234,18 @@ void ctf_Handle_Retrieve(entity flag, entity 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;
+       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; }
        
@@ -256,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
@@ -264,8 +264,8 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype)
        {
                case DROP_PASS:
                {
-                       WarpZone_RefSys_MakeSameRefSys(flag, player);
-                       targ_origin = WarpZone_RefSys_TransformOrigin(reciever, flag, (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;
                }
@@ -273,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;
                }
                
@@ -299,7 +300,7 @@ 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
@@ -369,18 +370,17 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype)
                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) { PlayerTeamScore_AddScore(enemy_flag.ctf_dropper, autocvar_g_ctf_score_capture_assist); }
+               
+               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
@@ -431,7 +431,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)
@@ -477,7 +476,7 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype)
                {
                        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((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");
+                       dprint("pickup_dropped_score is ", ftos(pickup_dropped_score), "\n");
                        PlayerTeamScore_AddScore(player, pickup_dropped_score);
                        break;
                }
@@ -494,8 +493,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); }
@@ -814,8 +812,15 @@ void ctf_FlagTouch()
        }
 }
 
+.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!"); }
+
+       flag.last_respawn = time;
+       
        // reset the player (if there is one)
        if((flag.owner) && (flag.owner.flagcarried == flag))
        {
@@ -849,7 +854,6 @@ 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;
@@ -921,7 +925,8 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
        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
+       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"); }
@@ -1021,7 +1026,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerPreThink)
        if(self.wps_flagcarrier) 
                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
@@ -1042,9 +1047,9 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerDamage) // for changing damage and force values t
        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?
+                       WaypointSprite_HelpMePing(frag_target.wps_flagcarrier);
        }
-       return 0;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_PlayerDies)
@@ -1058,7 +1063,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerDies)
        if(frag_target.flagcarried)
                { ctf_Handle_Throw(frag_target, world, DROP_NORMAL); }
                
-       return 0;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_GiveFragsForKill)
@@ -1072,7 +1077,7 @@ MUTATOR_HOOKFUNCTION(ctf_RemovePlayer)
        if(self.flagcarried)
                { ctf_Handle_Throw(self, world, DROP_NORMAL); }
                
-       return 0;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_PortalTeleport)
@@ -1081,11 +1086,13 @@ 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(gameover) { return FALSE; }
+       
        entity player = self;
 
        if((time > player.throw_antispam) && (player.deadflag == DEAD_NO) && !player.speedrunning && (!player.vehicle || autocvar_g_ctf_allow_vehicle_touch))
@@ -1115,7 +1122,7 @@ 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)
                                        {
@@ -1130,15 +1137,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)
-                       { ctf_Handle_Throw(player, world, DROP_THROW); }
+                       { ctf_Handle_Throw(player, world, DROP_THROW); return TRUE; }
        }
                
-       return 0;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_HelpMePing)
@@ -1153,7 +1160,7 @@ MUTATOR_HOOKFUNCTION(ctf_HelpMePing)
                WaypointSprite_Ping(self.wps_helpme);
        }
 
-       return 1;
+       return TRUE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_VehicleEnter)
@@ -1171,9 +1178,10 @@ MUTATOR_HOOKFUNCTION(ctf_VehicleEnter)
                        vh_player.flagcarried.scale = VEHICLE_FLAG_SCALE;
                        //vh_player.flagcarried.angles = '0 0 0';       
                }
+               return TRUE;
        }
                
-       return 0;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_VehicleExit)
@@ -1183,10 +1191,11 @@ MUTATOR_HOOKFUNCTION(ctf_VehicleExit)
                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'; 
+               vh_player.flagcarried.angles = '0 0 0';
+               return TRUE;
        }
 
-       return 0;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_AbortSpeedrun)
@@ -1195,9 +1204,10 @@ MUTATOR_HOOKFUNCTION(ctf_AbortSpeedrun)
        {
                bprint("The ", self.flagcarried.netname, " was returned to base by its carrier\n");
                ctf_RespawnFlag(self);
+               return TRUE;
        }
        
-       return 0;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ctf_MatchEnd)
@@ -1215,7 +1225,7 @@ MUTATOR_HOOKFUNCTION(ctf_MatchEnd)
                                flag.movetype = MOVETYPE_NONE;
                                flag.takedamage = DAMAGE_NO;
                                flag.solid = SOLID_NOT;
-                               flag.nextthink = 0; // stop thinking
+                               flag.nextthink = FALSE; // stop thinking
                                
                                print("stopping the ", flag.netname, " from moving.\n");
                                break;
@@ -1231,7 +1241,7 @@ MUTATOR_HOOKFUNCTION(ctf_MatchEnd)
                }
        }
        
-       return 0;
+       return FALSE;
 }
 
 
@@ -1340,6 +1350,20 @@ void spawnfunc_ctf_team()
 // 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)
 {
@@ -1365,7 +1389,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()