X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_keyhunt.qc;h=30653641f49ec17ecf4aff870b3ed07b92162221;hb=75f32635eb47f324db31c8f257c935018dedbc23;hp=8d4240e29aa3478b35dbfdfc6b0e0e95179dc1d6;hpb=e9f30b97435c6afe3d6911f21e1f4fd1b97e93da;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc index 8d4240e29..30653641f 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc @@ -1,3 +1,4 @@ +#include "gamemode_keyhunt.qh" #ifndef GAMEMODE_KEYHUNT_H #define GAMEMODE_KEYHUNT_H @@ -15,7 +16,7 @@ REGISTER_MUTATOR(kh, false) kh_Initialize(); ActivateTeamplay(); - SetLimits(autocvar_g_keyhunt_point_limit, autocvar_g_keyhunt_point_leadlimit, -1, -1); + SetLimits(autocvar_g_keyhunt_point_limit, autocvar_g_keyhunt_point_leadlimit, autocvar_timelimit_override, -1); if (autocvar_g_keyhunt_team_spawns) have_team_spawns = -1; // request team spawns } @@ -45,7 +46,7 @@ float kh_tracking_enabled; .entity kh_next; float kh_Key_AllOwnedByWhichTeam(); -typedef void() kh_Think_t; +USING(kh_Think_t, void()); void kh_StartRound(); void kh_Controller_SetThink(float t, kh_Think_t func); @@ -156,29 +157,28 @@ void kh_ScoreRules(float teams) ScoreRules_basics_end(); } -float kh_KeyCarrier_waypointsprite_visible_for_player(entity e) // runs all the time -{SELFPARAM(); - if(!IS_PLAYER(e) || self.team != e.team) +bool kh_KeyCarrier_waypointsprite_visible_for_player(entity this, entity player, entity view) // runs all the time +{ + if(!IS_PLAYER(view) || DIFF_TEAM(this, view)) if(!kh_tracking_enabled) return false; return true; } -float kh_Key_waypointsprite_visible_for_player(entity e) // ?? -{SELFPARAM(); +bool kh_Key_waypointsprite_visible_for_player(entity this, entity player, entity view) +{ if(!kh_tracking_enabled) return false; - if(!self.owner) + if(!this.owner) return true; - if(!self.owner.owner) + if(!this.owner.owner) return true; return false; // draw only when key is not owned } void kh_update_state() { - entity player; entity key; float s; float f; @@ -193,10 +193,7 @@ void kh_update_state() s |= pow(32, key.count) * f; } - FOR_EACH_CLIENT(player) - { - player.kh_state = s; - } + FOREACH_CLIENT(true, LAMBDA(it.kh_state = s)); FOR_EACH_KH_KEY(key) { @@ -218,12 +215,12 @@ void kh_Controller_SetThink(float t, kh_Think_t func) // runs occasionaly kh_controller.nextthink = time; // force } void kh_WaitForPlayers(); -void kh_Controller_Think() // called a lot -{SELFPARAM(); +void kh_Controller_Think(entity this) // called a lot +{ if(intermission_running) return; if(self.cnt > 0) - { if(self.think != kh_WaitForPlayers) { self.cnt -= 1; } } + { if(getthink(self) != kh_WaitForPlayers) { self.cnt -= 1; } } else if(self.cnt == 0) { self.cnt -= 1; @@ -340,7 +337,7 @@ void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs } // in any case: setattachment(key, world, ""); - setorigin(key, key.owner.origin + '0 0 1' * (PL_MIN.z - KH_KEY_MIN_z)); + setorigin(key, key.owner.origin + '0 0 1' * (STAT(PL_MIN, NULL).z - KH_KEY_MIN_z)); key.angles = key.owner.angles; #else setorigin(key, key.owner.origin + key.origin.z * '0 0 1'); @@ -475,9 +472,9 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic } } -void kh_Key_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) -{SELFPARAM(); - if(self.owner) +void kh_Key_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) +{ + if(this.owner) return; if(ITEM_DAMAGE_NEEDKILL(deathtype)) { @@ -488,9 +485,9 @@ void kh_Key_Damage(entity inflictor, entity attacker, float damage, int deathtyp } if(vlen(force) <= 0) return; - if(time > self.pushltime) + if(time > this.pushltime) if(IS_PLAYER(attacker)) - self.team = attacker.team; + this.team = attacker.team; } void kh_Key_Collect(entity key, entity player) //a player picks up a dropped key @@ -503,13 +500,13 @@ void kh_Key_Collect(entity key, entity player) //a player picks up a dropped ke PlayerScore_Add(player, SP_KH_PICKUPS, 1); } key.kh_dropperteam = 0; - Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(key, INFO_KEYHUNT_PICKUP_), player.netname); + Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT(key, INFO_KEYHUNT_PICKUP), player.netname); kh_Key_AssignTo(key, player); // this also updates .kh_state } -void kh_Key_Touch() // runs many, many times when a key has been dropped and can be picked up -{SELFPARAM(); +void kh_Key_Touch(entity this) // runs many, many times when a key has been dropped and can be picked up +{ if(intermission_running) return; @@ -526,7 +523,7 @@ void kh_Key_Touch() // runs many, many times when a key has been dropped and ca if (!IS_PLAYER(other)) return; - if(other.deadflag != DEAD_NO) + if(IS_DEAD(other)) return; if(other == self.enemy) if(time < self.kh_droptime + autocvar_g_balance_keyhunt_delay_collect) @@ -612,7 +609,7 @@ void kh_WinnerTeam(float teem) // runs when a team wins // Samual: Teem?.... TE first = false; } - Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(teem, INFO_KEYHUNT_CAPTURE_), keyowner); + Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(teem, INFO_KEYHUNT_CAPTURE), keyowner); first = true; midpoint = '0 0 0'; @@ -646,7 +643,7 @@ void kh_WinnerTeam(float teem) // runs when a team wins // Samual: Teem?.... TE void kh_LoserTeam(float teem, entity lostkey) // runs when a player pushes a flag carrier off the map { - entity player, key, attacker; + entity key, attacker; float players; float keys; float f; @@ -673,9 +670,7 @@ void kh_LoserTeam(float teem, entity lostkey) // runs when a player pushes a fl float of, fragsleft, i, j, thisteam; of = autocvar_g_balance_keyhunt_score_destroyed_ownfactor; - FOR_EACH_PLAYER(player) - if(player.team != teem) - ++players; + FOREACH_CLIENT(IS_PLAYER(it) && it.team != teem, LAMBDA(++players)); FOR_EACH_KH_KEY(key) if(key.owner && key.team != teem) @@ -708,26 +703,22 @@ void kh_LoserTeam(float teem, entity lostkey) // runs when a player pushes a fl continue; players = 0; - FOR_EACH_PLAYER(player) - if(player.team == thisteam) - ++players; + FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, LAMBDA(++players)); DistributeEvenly_Init(fragsleft, j); fragsleft = DistributeEvenly_Get(j - 1); DistributeEvenly_Init(DistributeEvenly_Get(1), players); - FOR_EACH_PLAYER(player) - if(player.team == thisteam) - { - f = DistributeEvenly_Get(1); - kh_Scores_Event(player, world, "destroyed", f, 0); - } + FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, LAMBDA( + f = DistributeEvenly_Get(1); + kh_Scores_Event(it, world, "destroyed", f, 0); + )); --j; } } - Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(lostkey, INFO_KEYHUNT_LOST_), lostkey.kh_previous_owner.netname); + Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT(lostkey, INFO_KEYHUNT_LOST), lostkey.kh_previous_owner.netname); play2all(SND(KH_DESTROY)); te_tarexplosion(lostkey.origin); @@ -735,11 +726,8 @@ void kh_LoserTeam(float teem, entity lostkey) // runs when a player pushes a fl kh_FinishRound(); } -void kh_Key_Think() // runs all the time -{SELFPARAM(); - entity head; - //entity player; // needed by FOR_EACH_PLAYER - +void kh_Key_Think(entity this) // runs all the time +{ if(intermission_running) return; @@ -772,31 +760,30 @@ void kh_Key_Think() // runs all the time if(vlen(key.owner.origin - p) > autocvar_g_balance_keyhunt_maxdist) goto not_winning; kh_WinnerTeam(self.team); -:not_winning +LABEL(not_winning) } if(kh_interferemsg_time && time > kh_interferemsg_time) { kh_interferemsg_time = 0; - FOR_EACH_PLAYER(head) - { - if(head.team == kh_interferemsg_team) - if(head.kh_next) - Send_Notification(NOTIF_ONE, head, MSG_CENTER, CENTER_KEYHUNT_MEET); + FOREACH_CLIENT(IS_PLAYER(it), LAMBDA( + if(it.team == kh_interferemsg_team) + if(it.kh_next) + Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_MEET); else - Send_Notification(NOTIF_ONE, head, MSG_CENTER, CENTER_KEYHUNT_HELP); + Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_HELP); else - Send_Notification(NOTIF_ONE, head, MSG_CENTER, APP_TEAM_NUM_4(kh_interferemsg_team, CENTER_KEYHUNT_INTERFERE_)); - } + Send_Notification(NOTIF_ONE, it, MSG_CENTER, APP_TEAM_NUM(kh_interferemsg_team, CENTER_KEYHUNT_INTERFERE)); + )); } self.nextthink = time + 0.05; } -void key_reset() -{SELFPARAM(); - kh_Key_AssignTo(self, world); - kh_Key_Remove(self); +void key_reset(entity this) +{ + kh_Key_AssignTo(this, world); + kh_Key_Remove(this); } const string STR_ITEM_KH_KEY = "item_kh_key"; @@ -805,8 +792,8 @@ void kh_Key_Spawn(entity initial_owner, float _angle, float i) // runs every ti entity key = spawn(); key.count = i; key.classname = STR_ITEM_KH_KEY; - key.touch = kh_Key_Touch; - key.think = kh_Key_Think; + settouch(key, kh_Key_Touch); + setthink(key, kh_Key_Think); key.nextthink = time; key.items = IT_KEY1 | IT_KEY2; key.cnt = _angle; @@ -844,7 +831,7 @@ void kh_Key_Spawn(entity initial_owner, float _angle, float i) // runs every ti key.kh_worldkeynext = kh_worldkeylist; kh_worldkeylist = key; - Send_Notification(NOTIF_ONE, initial_owner, MSG_CENTER, APP_TEAM_NUM_4(initial_owner.team, CENTER_KEYHUNT_START_)); + Send_Notification(NOTIF_ONE, initial_owner, MSG_CENTER, APP_TEAM_NUM(initial_owner.team, CENTER_KEYHUNT_START)); WaypointSprite_Spawn(WP_KeyDropped, 0, 0, key, '0 0 1' * KH_KEY_WP_ZSHIFT, world, key.team, key, waypointsprite_attachedforcarrier, false, RADARICON_FLAG); key.waypointsprite_attachedforcarrier.waypointsprite_visible_for_player = kh_Key_waypointsprite_visible_for_player; @@ -887,11 +874,11 @@ void kh_Key_DropOne(entity key) kh_Scores_Event(player, key, "dropkey", 0, 0); PlayerScore_Add(player, SP_KH_LOSSES, 1); - Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(key, INFO_KEYHUNT_DROP_), player.netname); + Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT(key, INFO_KEYHUNT_DROP), player.netname); kh_Key_AssignTo(key, world); makevectors(player.v_angle); - key.velocity = W_CalculateProjectileVelocity(player.velocity, autocvar_g_balance_keyhunt_throwvelocity * v_forward, false); + key.velocity = W_CalculateProjectileVelocity(player, player.velocity, autocvar_g_balance_keyhunt_throwvelocity * v_forward, false); key.pusher = world; key.pushltime = time + autocvar_g_balance_keyhunt_protecttime; key.kh_dropperteam = key.team; @@ -913,10 +900,10 @@ void kh_Key_DropAll(entity player, float suicide) // runs whenever a player dies { kh_Scores_Event(player, key, "losekey", 0, 0); PlayerScore_Add(player, SP_KH_LOSSES, 1); - Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(key, INFO_KEYHUNT_LOST_), player.netname); + Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT(key, INFO_KEYHUNT_LOST), player.netname); kh_Key_AssignTo(key, world); makevectors('-1 0 0' * (45 + 45 * random()) + '0 360 0' * random()); - key.velocity = W_CalculateProjectileVelocity(player.velocity, autocvar_g_balance_keyhunt_dropvelocity * v_forward, false); + key.velocity = W_CalculateProjectileVelocity(player, player.velocity, autocvar_g_balance_keyhunt_dropvelocity * v_forward, false); key.pusher = mypusher; key.pushltime = time + autocvar_g_balance_keyhunt_protecttime; if(suicide) @@ -932,12 +919,10 @@ float kh_CheckPlayers(float num) { float t_team = kh_Team_ByID(num); float players = 0; - entity tmp_player; - FOR_EACH_PLAYER(tmp_player) - if(tmp_player.deadflag == DEAD_NO) - if(!tmp_player.BUTTON_CHAT) - if(tmp_player.team == t_team) - ++players; + FOREACH_CLIENT(IS_PLAYER(it), LAMBDA( + if(!IS_DEAD(it) && !PHYS_INPUT_BUTTON_CHAT(it) && it.team == t_team) + ++players; + )); if (!players) { return t_team; } } @@ -959,7 +944,7 @@ void kh_WaitForPlayers() // delay start of the round until enough players are p if(KH_READY_TEAMS_OK()) { if(prev_missing_teams_mask > 0) - Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_MISSING_TEAMS); + Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_MISSING_TEAMS); prev_missing_teams_mask = -1; Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_KEYHUNT_ROUNDSTART, autocvar_g_balance_keyhunt_delay_round); kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round, kh_StartRound); @@ -969,14 +954,14 @@ void kh_WaitForPlayers() // delay start of the round until enough players are p if(player_count == 0) { if(prev_missing_teams_mask > 0) - Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_MISSING_TEAMS); + Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_MISSING_TEAMS); prev_missing_teams_mask = -1; } else { - float missing_teams_mask = (!!p1) + (!!p2) * 2; - if(kh_teams >= 3) missing_teams_mask += (!!p3) * 4; - if(kh_teams >= 4) missing_teams_mask += (!!p4) * 8; + float missing_teams_mask = boolean(p1) + boolean(p2) * 2; + if(kh_teams >= 3) missing_teams_mask += boolean(p3) * 4; + if(kh_teams >= 4) missing_teams_mask += boolean(p4) * 8; if(prev_missing_teams_mask != missing_teams_mask) { Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_MISSING_TEAMS, missing_teams_mask); @@ -989,8 +974,8 @@ void kh_WaitForPlayers() // delay start of the round until enough players are p void kh_EnableTrackingDevice() // runs after each round { - Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT); - Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT_OTHER); + Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_KEYHUNT); + Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_KEYHUNT_OTHER); kh_tracking_enabled = true; } @@ -998,7 +983,6 @@ void kh_EnableTrackingDevice() // runs after each round void kh_StartRound() // runs at the start of each round { float i, players, teem; - entity player; if(time < game_starttime) { @@ -1013,23 +997,22 @@ void kh_StartRound() // runs at the start of each round return; } - Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT); - Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT_OTHER); + Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_KEYHUNT); + Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_KEYHUNT_OTHER); for(i = 0; i < kh_teams; ++i) { teem = kh_Team_ByID(i); players = 0; entity my_player = world; - FOR_EACH_PLAYER(player) - if(player.deadflag == DEAD_NO) - if(!player.BUTTON_CHAT) - if(player.team == teem) - { - ++players; - if(random() * players <= 1) - my_player = player; - } + FOREACH_CLIENT(IS_PLAYER(it), LAMBDA( + if(!IS_DEAD(it) && !PHYS_INPUT_BUTTON_CHAT(it) && it.team == teem) + { + ++players; + if(random() * players <= 1) + my_player = it; + } + )); kh_Key_Spawn(my_player, 360 * i / kh_teams, i); } @@ -1075,7 +1058,7 @@ void kh_Initialize() // sets up th KH environment // make a KH entity for controlling the game kh_controller = spawn(); - kh_controller.think = kh_Controller_Think; + setthink(kh_controller, kh_Controller_Think); kh_Controller_SetThink(0, kh_WaitForPlayers); setmodel(kh_controller, MDL_KH_KEY); @@ -1108,198 +1091,198 @@ void kh_finalize() // legacy bot role -void() havocbot_role_kh_carrier; -void() havocbot_role_kh_defense; -void() havocbot_role_kh_offense; -void() havocbot_role_kh_freelancer; +void(entity this) havocbot_role_kh_carrier; +void(entity this) havocbot_role_kh_defense; +void(entity this) havocbot_role_kh_offense; +void(entity this) havocbot_role_kh_freelancer; -void havocbot_goalrating_kh(float ratingscale_team, float ratingscale_dropped, float ratingscale_enemy) -{SELFPARAM(); +void havocbot_goalrating_kh(entity this, float ratingscale_team, float ratingscale_dropped, float ratingscale_enemy) +{ entity head; for (head = kh_worldkeylist; head; head = head.kh_worldkeynext) { - if(head.owner == self) + if(head.owner == this) continue; if(!kh_tracking_enabled) { // if it's carried by our team we know about it // otherwise we have to see it to know about it - if(!head.owner || head.team != self.team) + if(!head.owner || head.team != this.team) { - traceline(self.origin + self.view_ofs, head.origin, MOVE_NOMONSTERS, self); + traceline(this.origin + this.view_ofs, head.origin, MOVE_NOMONSTERS, this); if (trace_fraction < 1 && trace_ent != head) continue; // skip what I can't see } } if(!head.owner) - navigation_routerating(head, ratingscale_dropped * BOT_PICKUP_RATING_HIGH, 100000); - else if(head.team == self.team) - navigation_routerating(head.owner, ratingscale_team * BOT_PICKUP_RATING_HIGH, 100000); + navigation_routerating(this, head, ratingscale_dropped * BOT_PICKUP_RATING_HIGH, 100000); + else if(head.team == this.team) + navigation_routerating(this, head.owner, ratingscale_team * BOT_PICKUP_RATING_HIGH, 100000); else - navigation_routerating(head.owner, ratingscale_enemy * BOT_PICKUP_RATING_HIGH, 100000); + navigation_routerating(this, head.owner, ratingscale_enemy * BOT_PICKUP_RATING_HIGH, 100000); } - havocbot_goalrating_items(1, self.origin, 10000); + havocbot_goalrating_items(this, 1, this.origin, 10000); } -void havocbot_role_kh_carrier() -{SELFPARAM(); - if(self.deadflag != DEAD_NO) +void havocbot_role_kh_carrier(entity this) +{ + if(IS_DEAD(this)) return; - if (!(self.kh_next)) + if (!(this.kh_next)) { LOG_TRACE("changing role to freelancer\n"); - self.havocbot_role = havocbot_role_kh_freelancer; - self.havocbot_role_timeout = 0; + this.havocbot_role = havocbot_role_kh_freelancer; + this.havocbot_role_timeout = 0; return; } - if (self.bot_strategytime < time) + if (this.bot_strategytime < time) { - self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; - navigation_goalrating_start(); + this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(this); - if(kh_Key_AllOwnedByWhichTeam() == self.team) - havocbot_goalrating_kh(10, 0.1, 0.1); // bring home + if(kh_Key_AllOwnedByWhichTeam() == this.team) + havocbot_goalrating_kh(this, 10, 0.1, 0.1); // bring home else - havocbot_goalrating_kh(4, 4, 1); // play defensively + havocbot_goalrating_kh(this, 4, 4, 1); // play defensively - navigation_goalrating_end(); + navigation_goalrating_end(this); } } -void havocbot_role_kh_defense() -{SELFPARAM(); - if(self.deadflag != DEAD_NO) +void havocbot_role_kh_defense(entity this) +{ + if(IS_DEAD(this)) return; - if (self.kh_next) + if (this.kh_next) { LOG_TRACE("changing role to carrier\n"); - self.havocbot_role = havocbot_role_kh_carrier; - self.havocbot_role_timeout = 0; + this.havocbot_role = havocbot_role_kh_carrier; + this.havocbot_role_timeout = 0; return; } - if (!self.havocbot_role_timeout) - self.havocbot_role_timeout = time + random() * 10 + 20; - if (time > self.havocbot_role_timeout) + if (!this.havocbot_role_timeout) + this.havocbot_role_timeout = time + random() * 10 + 20; + if (time > this.havocbot_role_timeout) { LOG_TRACE("changing role to freelancer\n"); - self.havocbot_role = havocbot_role_kh_freelancer; - self.havocbot_role_timeout = 0; + this.havocbot_role = havocbot_role_kh_freelancer; + this.havocbot_role_timeout = 0; return; } - if (self.bot_strategytime < time) + if (this.bot_strategytime < time) { float key_owner_team; - self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; - navigation_goalrating_start(); + this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(this); key_owner_team = kh_Key_AllOwnedByWhichTeam(); - if(key_owner_team == self.team) - havocbot_goalrating_kh(10, 0.1, 0.1); // defend key carriers + if(key_owner_team == this.team) + havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend key carriers else if(key_owner_team == -1) - havocbot_goalrating_kh(4, 1, 0.1); // play defensively + havocbot_goalrating_kh(this, 4, 1, 0.1); // play defensively else - havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK ANYWAY + havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY - navigation_goalrating_end(); + navigation_goalrating_end(this); } } -void havocbot_role_kh_offense() -{SELFPARAM(); - if(self.deadflag != DEAD_NO) +void havocbot_role_kh_offense(entity this) +{ + if(IS_DEAD(this)) return; - if (self.kh_next) + if (this.kh_next) { LOG_TRACE("changing role to carrier\n"); - self.havocbot_role = havocbot_role_kh_carrier; - self.havocbot_role_timeout = 0; + this.havocbot_role = havocbot_role_kh_carrier; + this.havocbot_role_timeout = 0; return; } - if (!self.havocbot_role_timeout) - self.havocbot_role_timeout = time + random() * 10 + 20; - if (time > self.havocbot_role_timeout) + if (!this.havocbot_role_timeout) + this.havocbot_role_timeout = time + random() * 10 + 20; + if (time > this.havocbot_role_timeout) { LOG_TRACE("changing role to freelancer\n"); - self.havocbot_role = havocbot_role_kh_freelancer; - self.havocbot_role_timeout = 0; + this.havocbot_role = havocbot_role_kh_freelancer; + this.havocbot_role_timeout = 0; return; } - if (self.bot_strategytime < time) + if (this.bot_strategytime < time) { float key_owner_team; - self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; - navigation_goalrating_start(); + this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(this); key_owner_team = kh_Key_AllOwnedByWhichTeam(); - if(key_owner_team == self.team) - havocbot_goalrating_kh(10, 0.1, 0.1); // defend anyway + if(key_owner_team == this.team) + havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend anyway else if(key_owner_team == -1) - havocbot_goalrating_kh(0.1, 1, 4); // play offensively + havocbot_goalrating_kh(this, 0.1, 1, 4); // play offensively else - havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK! EMERGENCY! + havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK! EMERGENCY! - navigation_goalrating_end(); + navigation_goalrating_end(this); } } -void havocbot_role_kh_freelancer() -{SELFPARAM(); - if(self.deadflag != DEAD_NO) +void havocbot_role_kh_freelancer(entity this) +{ + if(IS_DEAD(this)) return; - if (self.kh_next) + if (this.kh_next) { LOG_TRACE("changing role to carrier\n"); - self.havocbot_role = havocbot_role_kh_carrier; - self.havocbot_role_timeout = 0; + this.havocbot_role = havocbot_role_kh_carrier; + this.havocbot_role_timeout = 0; return; } - if (!self.havocbot_role_timeout) - self.havocbot_role_timeout = time + random() * 10 + 10; - if (time > self.havocbot_role_timeout) + if (!this.havocbot_role_timeout) + this.havocbot_role_timeout = time + random() * 10 + 10; + if (time > this.havocbot_role_timeout) { if (random() < 0.5) { LOG_TRACE("changing role to offense\n"); - self.havocbot_role = havocbot_role_kh_offense; + this.havocbot_role = havocbot_role_kh_offense; } else { LOG_TRACE("changing role to defense\n"); - self.havocbot_role = havocbot_role_kh_defense; + this.havocbot_role = havocbot_role_kh_defense; } - self.havocbot_role_timeout = 0; + this.havocbot_role_timeout = 0; return; } - if (self.bot_strategytime < time) + if (this.bot_strategytime < time) { float key_owner_team; - self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; - navigation_goalrating_start(); + this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; + navigation_goalrating_start(this); key_owner_team = kh_Key_AllOwnedByWhichTeam(); - if(key_owner_team == self.team) - havocbot_goalrating_kh(10, 0.1, 0.1); // defend anyway + if(key_owner_team == this.team) + havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend anyway else if(key_owner_team == -1) - havocbot_goalrating_kh(1, 10, 4); // prefer dropped keys + havocbot_goalrating_kh(this, 1, 10, 4); // prefer dropped keys else - havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK ANYWAY + havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY - navigation_goalrating_end(); + navigation_goalrating_end(this); } } @@ -1307,93 +1290,101 @@ void havocbot_role_kh_freelancer() // register this as a mutator MUTATOR_HOOKFUNCTION(kh, ClientDisconnect) -{SELFPARAM(); - kh_Key_DropAll(self, true); - return 0; +{ + entity player = M_ARGV(0, entity); + + kh_Key_DropAll(player, true); } MUTATOR_HOOKFUNCTION(kh, MakePlayerObserver) -{SELFPARAM(); - kh_Key_DropAll(self, true); - return 0; +{ + entity player = M_ARGV(0, entity); + + kh_Key_DropAll(player, true); } MUTATOR_HOOKFUNCTION(kh, PlayerDies) -{SELFPARAM(); - if(self == other) - kh_Key_DropAll(self, true); - else if(IS_PLAYER(other)) - kh_Key_DropAll(self, false); +{ + entity frag_attacker = M_ARGV(1, entity); + entity frag_target = M_ARGV(2, entity); + + if(frag_target == frag_attacker) + kh_Key_DropAll(frag_target, true); + else if(IS_PLAYER(frag_attacker)) + kh_Key_DropAll(frag_target, false); else - kh_Key_DropAll(self, true); - return 0; + kh_Key_DropAll(frag_target, true); } MUTATOR_HOOKFUNCTION(kh, GiveFragsForKill, CBC_ORDER_FIRST) { - frag_score = kh_HandleFrags(frag_attacker, frag_target, frag_score); - return 0; + entity frag_attacker = M_ARGV(0, entity); + entity frag_target = M_ARGV(1, entity); + float frag_score = M_ARGV(2, float); + M_ARGV(2, float) = kh_HandleFrags(frag_attacker, frag_target, frag_score); } MUTATOR_HOOKFUNCTION(kh, MatchEnd) { kh_finalize(); - return 0; } MUTATOR_HOOKFUNCTION(kh, GetTeamCount, CBC_ORDER_EXCLUSIVE) { - ret_float = kh_teams; - return false; + M_ARGV(0, float) = kh_teams; } MUTATOR_HOOKFUNCTION(kh, SpectateCopy) -{SELFPARAM(); - self.kh_state = other.kh_state; - return 0; +{ + entity spectatee = M_ARGV(0, entity); + entity client = M_ARGV(1, entity); + + client.kh_state = spectatee.kh_state; } MUTATOR_HOOKFUNCTION(kh, PlayerUseKey) -{SELFPARAM(); +{ + entity player = M_ARGV(0, entity); + if(MUTATOR_RETURNVALUE == 0) { - entity k; - k = self.kh_next; + entity k = player.kh_next; if(k) { kh_Key_DropOne(k); - return 1; + return true; } } - return 0; } MUTATOR_HOOKFUNCTION(kh, HavocBot_ChooseRole) { - if(self.deadflag != DEAD_NO) + entity bot = M_ARGV(0, entity); + + if(IS_DEAD(bot)) return true; float r = random() * 3; if (r < 1) - self.havocbot_role = havocbot_role_kh_offense; + bot.havocbot_role = havocbot_role_kh_offense; else if (r < 2) - self.havocbot_role = havocbot_role_kh_defense; + bot.havocbot_role = havocbot_role_kh_defense; else - self.havocbot_role = havocbot_role_kh_freelancer; + bot.havocbot_role = havocbot_role_kh_freelancer; return true; } MUTATOR_HOOKFUNCTION(kh, DropSpecialItems) { + entity frag_target = M_ARGV(0, entity); + kh_Key_DropAll(frag_target, false); - return false; } MUTATOR_HOOKFUNCTION(kh, reset_map_global) { kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round + (game_starttime - time), kh_StartRound); - return false; } #endif