X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_keyhunt.qc;h=04576486b71bacd743304e7a5de42b709d3b95d7;hb=fbd313c7ceb26a09310d8062926f4ac2468623a8;hp=5f3bd4b39597fff8371f165f8cfa2edecc77d92d;hpb=b834eab77489d98d5d722d67c8a96cf6c3549436;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 5f3bd4b39..04576486b 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc @@ -49,7 +49,6 @@ bool kh_no_radar_circles; // bits 5- 9: team of key 2, or 0 for no such key, or 30 for dropped, or 31 for self // bits 10-14: team of key 3, or 0 for no such key, or 30 for dropped, or 31 for self // bits 15-19: team of key 4, or 0 for no such key, or 30 for dropped, or 31 for self -.int kh_state = _STAT(KH_KEYS); .float siren_time; // time delay the siren //.float stuff_time; // time delay to stuffcmd a cvar @@ -85,18 +84,18 @@ int kh_key_dropped, kh_key_carried; int kh_Key_AllOwnedByWhichTeam(); -const float ST_KH_CAPS = 1; +const int ST_KH_CAPS = 1; void kh_ScoreRules(int teams) { - ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); - ScoreInfo_SetLabel_TeamScore( ST_KH_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); - ScoreInfo_SetLabel_PlayerScore(SP_KH_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); - ScoreInfo_SetLabel_PlayerScore(SP_KH_PUSHES, "pushes", 0); - ScoreInfo_SetLabel_PlayerScore(SP_KH_DESTROYS, "destroyed", SFL_LOWER_IS_BETTER); - ScoreInfo_SetLabel_PlayerScore(SP_KH_PICKUPS, "pickups", 0); - ScoreInfo_SetLabel_PlayerScore(SP_KH_KCKILLS, "kckills", 0); - ScoreInfo_SetLabel_PlayerScore(SP_KH_LOSSES, "losses", SFL_LOWER_IS_BETTER); - ScoreRules_basics_end(); + GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, { + field_team(ST_KH_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); + field(SP_KH_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); + field(SP_KH_PUSHES, "pushes", 0); + field(SP_KH_DESTROYS, "destroyed", SFL_LOWER_IS_BETTER); + field(SP_KH_PICKUPS, "pickups", 0); + field(SP_KH_KCKILLS, "kckills", 0); + field(SP_KH_LOSSES, "losses", SFL_LOWER_IS_BETTER); + }); } bool kh_KeyCarrier_waypointsprite_visible_for_player(entity this, entity player, entity view) // runs all the time @@ -130,15 +129,15 @@ void kh_update_state() f = key.team; else f = 30; - s |= pow(32, key.count) * f; + s |= (32 ** key.count) * f; } - FOREACH_CLIENT(true, LAMBDA(it.kh_state = s)); + FOREACH_CLIENT(true, { STAT(KH_KEYS, it) = s; }); FOR_EACH_KH_KEY(key) { if(key.owner) - key.owner.kh_state |= pow(32, key.count) * 31; + STAT(KH_KEYS, key.owner) |= (32 ** key.count) * 31; } //print(ftos((nextent(NULL)).kh_state), "\n"); } @@ -248,7 +247,8 @@ void kh_Key_Attach(entity key) // runs when a player picks up a key and several key.angles_y -= key.owner.angles.y; #endif key.flags = 0; - IL_REMOVE(g_items, key); + if(IL_CONTAINS(g_items, key)) + IL_REMOVE(g_items, key); key.solid = SOLID_NOT; set_movetype(key, MOVETYPE_NONE); key.team = key.owner.team; @@ -256,6 +256,7 @@ void kh_Key_Attach(entity key) // runs when a player picks up a key and several key.damageforcescale = 0; key.takedamage = DAMAGE_NO; key.modelindex = kh_key_carried; + navigation_dynamicgoal_unset(key); } void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs several times times when all the keys are captured @@ -287,7 +288,8 @@ void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs key.angles_y += key.owner.angles.y; #endif key.flags = FL_ITEM; - IL_PUSH(g_items, key); + if(!IL_CONTAINS(g_items, key)) + IL_PUSH(g_items, key); key.solid = SOLID_TRIGGER; set_movetype(key, MOVETYPE_TOSS); key.pain_finished = time + autocvar_g_balance_keyhunt_delay_return; @@ -295,6 +297,7 @@ void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs key.takedamage = DAMAGE_YES; // let key.team stay key.modelindex = kh_key_dropped; + navigation_dynamicgoal_set(key); key.kh_previous_owner = key.owner; key.kh_previous_owner_playerid = key.owner.playerid; } @@ -390,9 +393,9 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic { if (!k.owner) continue; entity first = WP_Null; - FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model1, LAMBDA(first = it; break)); + FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model1, { first = it; break; }); entity third = WP_Null; - FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model3, LAMBDA(third = it; break)); + FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model3, { third = it; break; }); WaypointSprite_UpdateSprites(k.owner.waypointsprite_attachedforcarrier, first, WP_KeyCarrierFinish, third); } } @@ -405,16 +408,16 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic { if (!k.owner) continue; entity first = WP_Null; - FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model1, LAMBDA(first = it; break)); + FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model1, { first = it; break; }); entity third = WP_Null; - FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model3, LAMBDA(third = it; break)); + FOREACH(Waypoints, it.netname == k.owner.waypointsprite_attachedforcarrier.model3, { third = it; break; }); WaypointSprite_UpdateSprites(k.owner.waypointsprite_attachedforcarrier, first, WP_KeyCarrierFriend, third); } } } } -void kh_Key_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) +void kh_Key_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { if(this.owner) return; @@ -437,7 +440,7 @@ void kh_Key_Collect(entity key, entity player) //a player picks up a dropped ke if(key.kh_dropperteam != player.team) { kh_Scores_Event(player, key, "collect", autocvar_g_balance_keyhunt_score_collect, 0); - PlayerScore_Add(player, SP_KH_PICKUPS, 1); + GameRules_scoring_add(player, KH_PICKUPS, 1); } key.kh_dropperteam = 0; int realteam = kh_Team_ByID(key.count); @@ -530,7 +533,7 @@ void kh_WinnerTeam(int winner_team) // runs when a team wins { float f = DistributeEvenly_Get(1); kh_Scores_Event(key.owner, key, "capture", f, 0); - PlayerTeamScore_Add(key.owner, SP_KH_CAPS, ST_KH_CAPS, 1); + GameRules_scoring_add_team(key.owner, KH_CAPS, 1); nades_GiveBonus(key.owner, autocvar_g_nades_bonus_score_high); } @@ -589,7 +592,7 @@ void kh_LoserTeam(int loser_team, entity lostkey) // runs when a player pushes kh_Scores_Event(lostkey.kh_previous_owner, NULL, "pushed", 0, -autocvar_g_balance_keyhunt_score_push); // don't actually GIVE him the -nn points, just log kh_Scores_Event(attacker, NULL, "push", autocvar_g_balance_keyhunt_score_push, 0); - PlayerScore_Add(attacker, SP_KH_PUSHES, 1); + GameRules_scoring_add(attacker, KH_PUSHES, 1); //centerprint(attacker, "Your push is the best!"); // does this really need to exist? } else @@ -597,7 +600,7 @@ void kh_LoserTeam(int loser_team, entity lostkey) // runs when a player pushes int players = 0; float of = autocvar_g_balance_keyhunt_score_destroyed_ownfactor; - FOREACH_CLIENT(IS_PLAYER(it) && it.team != loser_team, LAMBDA(++players)); + FOREACH_CLIENT(IS_PLAYER(it) && it.team != loser_team, { ++players; }); entity key; int keys = 0; @@ -610,7 +613,7 @@ void kh_LoserTeam(int loser_team, entity lostkey) // runs when a player pushes // don't actually GIVE him the -nn points, just log if(lostkey.kh_previous_owner.playerid == lostkey.kh_previous_owner_playerid) - PlayerScore_Add(lostkey.kh_previous_owner, SP_KH_DESTROYS, 1); + GameRules_scoring_add(lostkey.kh_previous_owner, KH_DESTROYS, 1); DistributeEvenly_Init(autocvar_g_balance_keyhunt_score_destroyed, keys * of + players); @@ -632,16 +635,16 @@ void kh_LoserTeam(int loser_team, entity lostkey) // runs when a player pushes continue; players = 0; - FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, LAMBDA(++players)); + FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, { ++players; }); DistributeEvenly_Init(fragsleft, j); fragsleft = DistributeEvenly_Get(j - 1); DistributeEvenly_Init(DistributeEvenly_Get(1), players); - FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, { f = DistributeEvenly_Get(1); kh_Scores_Event(it, NULL, "destroyed", f, 0); - )); + }); --j; } @@ -699,7 +702,7 @@ LABEL(not_winning) if(kh_interferemsg_time && time > kh_interferemsg_time) { kh_interferemsg_time = 0; - FOREACH_CLIENT(IS_PLAYER(it), LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it), { if(it.team == kh_interferemsg_team) if(it.kh_next) Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_MEET); @@ -707,7 +710,7 @@ LABEL(not_winning) Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_HELP); else Send_Notification(NOTIF_ONE, it, MSG_CENTER, APP_TEAM_NUM(kh_interferemsg_team, CENTER_KEYHUNT_INTERFERE)); - )); + }); } this.nextthink = time + 0.05; @@ -742,6 +745,7 @@ void kh_Key_Spawn(entity initial_owner, float _angle, float i) // runs every ti setsize(key, KH_KEY_MIN, KH_KEY_MAX); key.colormod = Team_ColorRGB(initial_owner.team) * KH_KEY_BRIGHTNESS; key.reset = key_reset; + navigation_dynamicgoal_init(key, false); switch(initial_owner.team) { @@ -804,7 +808,7 @@ void kh_Key_DropOne(entity key) key.enemy = player; kh_Scores_Event(player, key, "dropkey", 0, 0); - PlayerScore_Add(player, SP_KH_LOSSES, 1); + GameRules_scoring_add(player, KH_LOSSES, 1); int realteam = kh_Team_ByID(key.count); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(realteam, INFO_KEYHUNT_DROP), player.netname); @@ -831,7 +835,7 @@ void kh_Key_DropAll(entity player, float suicide) // runs whenever a player dies while((key = player.kh_next)) { kh_Scores_Event(player, key, "losekey", 0, 0); - PlayerScore_Add(player, SP_KH_LOSSES, 1); + GameRules_scoring_add(player, KH_LOSSES, 1); int realteam = kh_Team_ByID(key.count); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(realteam, INFO_KEYHUNT_LOST), player.netname); kh_Key_AssignTo(key, NULL); @@ -853,12 +857,12 @@ int kh_GetMissingTeams() { int teem = kh_Team_ByID(i); int players = 0; - FOREACH_CLIENT(IS_PLAYER(it), LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it), { if(!IS_DEAD(it) && !PHYS_INPUT_BUTTON_CHAT(it) && it.team == teem) ++players; - )); + }); if (!players) - missing_teams |= pow(2, i); + missing_teams |= (2 ** i); } return missing_teams; } @@ -934,14 +938,14 @@ void kh_StartRound() // runs at the start of each round int teem = kh_Team_ByID(i); int players = 0; entity my_player = NULL; - FOREACH_CLIENT(IS_PLAYER(it), LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it), { 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 / NumTeams(kh_teams), i); } @@ -967,7 +971,7 @@ float kh_HandleFrags(entity attacker, entity targ, float f) // adds to the play else { kh_Scores_Event(attacker, targ.kh_next, "carrierfrag", autocvar_g_balance_keyhunt_score_carrierfrag-1, 0); - PlayerScore_Add(attacker, SP_KH_KCKILLS, 1); + GameRules_scoring_add(attacker, KH_KCKILLS, 1); // the frag gets added later } } @@ -981,15 +985,7 @@ void kh_Initialize() // sets up th KH environment kh_teams = autocvar_g_keyhunt_teams_override; if(kh_teams < 2) kh_teams = cvar("g_keyhunt_teams"); // read the cvar directly as it gets written earlier in the same frame - kh_teams = bound(2, kh_teams, 4); - - int teams = 0; - if(kh_teams >= 1) teams |= BIT(0); - if(kh_teams >= 2) teams |= BIT(1); - if(kh_teams >= 3) teams |= BIT(2); - if(kh_teams >= 4) teams |= BIT(3); - - kh_teams = teams; // now set it? + kh_teams = BITS(bound(2, kh_teams, 4)); // make a KH entity for controlling the game kh_controller = spawn(); @@ -1074,9 +1070,8 @@ void havocbot_role_kh_carrier(entity this) return; } - if (this.bot_strategytime < time) + if (navigation_goalrating_timeout(this)) { - this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; navigation_goalrating_start(this); if(kh_Key_AllOwnedByWhichTeam() == this.team) @@ -1085,6 +1080,8 @@ void havocbot_role_kh_carrier(entity this) havocbot_goalrating_kh(this, 4, 4, 1); // play defensively navigation_goalrating_end(this); + + navigation_goalrating_timeout_set(this); } } @@ -1111,10 +1108,9 @@ void havocbot_role_kh_defense(entity this) return; } - if (this.bot_strategytime < time) + if (navigation_goalrating_timeout(this)) { float key_owner_team; - this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; navigation_goalrating_start(this); key_owner_team = kh_Key_AllOwnedByWhichTeam(); @@ -1126,6 +1122,8 @@ void havocbot_role_kh_defense(entity this) havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY navigation_goalrating_end(this); + + navigation_goalrating_timeout_set(this); } } @@ -1152,11 +1150,10 @@ void havocbot_role_kh_offense(entity this) return; } - if (this.bot_strategytime < time) + if (navigation_goalrating_timeout(this)) { float key_owner_team; - this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; navigation_goalrating_start(this); key_owner_team = kh_Key_AllOwnedByWhichTeam(); @@ -1168,6 +1165,8 @@ void havocbot_role_kh_offense(entity this) havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK! EMERGENCY! navigation_goalrating_end(this); + + navigation_goalrating_timeout_set(this); } } @@ -1202,9 +1201,8 @@ void havocbot_role_kh_freelancer(entity this) return; } - if (this.bot_strategytime < time) + if (navigation_goalrating_timeout(this)) { - this.bot_strategytime = time + autocvar_bot_ai_strategyinterval; navigation_goalrating_start(this); int key_owner_team = kh_Key_AllOwnedByWhichTeam(); @@ -1216,6 +1214,8 @@ void havocbot_role_kh_freelancer(entity this) havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY navigation_goalrating_end(this); + + navigation_goalrating_timeout_set(this); } } @@ -1272,7 +1272,7 @@ MUTATOR_HOOKFUNCTION(kh, SpectateCopy) entity spectatee = M_ARGV(0, entity); entity client = M_ARGV(1, entity); - client.kh_state = spectatee.kh_state; + STAT(KH_KEYS, client) = STAT(KH_KEYS, spectatee); } MUTATOR_HOOKFUNCTION(kh, PlayerUseKey)