X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_keyhunt.qc;h=04576486b71bacd743304e7a5de42b709d3b95d7;hb=b093c2ea2c367cb9bb4ce2c0468346080938270c;hp=d32df0f59058cde75fa8e55f132914ecb210b539;hpb=ae277921268b84c7b7ee5ab901ce7f0088c07605;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 d32df0f59..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 @@ -133,12 +132,12 @@ void kh_update_state() s |= (32 ** key.count) * f; } - FOREACH_CLIENT(true, { it.kh_state = s; }); + FOREACH_CLIENT(true, { STAT(KH_KEYS, it) = s; }); FOR_EACH_KH_KEY(key) { if(key.owner) - key.owner.kh_state |= (32 ** key.count) * 31; + STAT(KH_KEYS, key.owner) |= (32 ** key.count) * 31; } //print(ftos((nextent(NULL)).kh_state), "\n"); } @@ -418,7 +417,7 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic } } -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; @@ -441,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); @@ -534,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); } @@ -593,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 @@ -614,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); @@ -809,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); @@ -836,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); @@ -972,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 } } @@ -986,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(); @@ -1079,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) @@ -1090,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); } } @@ -1116,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(); @@ -1131,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); } } @@ -1157,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(); @@ -1173,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); } } @@ -1207,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(); @@ -1221,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); } } @@ -1277,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)