// ================================================================
// 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;
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
entity sender = flag.pass_sender;
// transfer flag to player
- flag.ctf_carrier = player;
flag.owner = player;
flag.owner.flagcarried = flag;
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); // FIXCTF
- 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));
}
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; }
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
{
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;
}
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;
}
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;
}
{
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
}
// 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)
{
{
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
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)
{
- PlayerScore_Add(flag.ctf_dropper, SP_SCORE, -ctf_ReadScore("penalty_returned")); // punish the player who dropped the flag
+ 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
}
flag.takedamage = DAMAGE_NO;
flag.solid = SOLID_NOT;
flag.angles = '0 0 0';
- flag.ctf_carrier = player;
flag.ctf_status = FLAG_CARRY;
switch(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;
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
}
}
}
+
+ 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(stale_red_flags && stale_blue_flags)
+ if(ctf_stalemate)
{
for(tmp_entity = ctf_staleflaglist; tmp_entity; tmp_entity = tmp_entity.ctf_staleflagnext)
{
- if not(tmp_entity.owner.wps_enemyflagcarrier)
+ 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));
}
case FLAG_DROPPED:
{
- if(autocvar_g_ctf_flag_dropped_floatinwater && (self.flags & FL_INWATER))
- self.velocity_z = autocvar_g_ctf_flag_dropped_floatinwater;
-
+ 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))
}
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)
{
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;
{
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;
}
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;
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"); }
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);
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");
{
switch(flag.ctf_status)
{
+ case FLAG_PASSING:
case FLAG_CARRY:
{
- if(flag.owner == self)
+ 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
// 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;
}
}
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 > frag_target.health)
+ 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 0;
{
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);
}
{
entity player = self;
- if((time > player.throw_antispam) && !player.speedrunning && (!player.vehicle || autocvar_g_ctf_allow_vehicle_touch))
+ 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 != player && !IsDifferentTeam(head, player))
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 if(player.flagcarried)
+ 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;
+ }
+ 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;
MUTATOR_HOOKFUNCTION(ctf_VehicleEnter)
{
- if(other.flagcarried)
+ if(vh_player.flagcarried)
{
if(!autocvar_g_ctf_flagcarrier_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;
- //other.flagcarried.angles = '0 0 0';
+ 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';
}
}
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;
- self.owner.flagcarried.angles = '0 0 0';
+ 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 0;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff