X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Flms%2Fsv_lms.qc;h=dd2c93e5037af969fd62155846a8a94b1ebac134;hb=61ec7040b5c809cc0ff62e92f21d5cbb8183bfb9;hp=1b7b527d8633dbde2a25f65004b245426b6042e6;hpb=6ae488fa94396ad9ffa0dc3dbfbedb54c8b7983a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc index 1b7b527d8..dd2c93e50 100644 --- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc +++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc @@ -36,9 +36,12 @@ void ClearWinners(); // limit. int WinningCondition_LMS() { + if (warmup_stage || time <= game_starttime) + return WINNING_NO; + entity first_player = NULL; int totalplayers = 0; - FOREACH_CLIENT(IS_PLAYER(it) && it.frags != FRAGS_PLAYER_OUT_OF_GAME, { + FOREACH_CLIENT(IS_PLAYER(it) && it.frags == FRAGS_PLAYER, { if (!totalplayers) first_player = it; ++totalplayers; @@ -77,10 +80,7 @@ int WinningCondition_LMS() // a winner! // and assign him his first place GameRules_scoring_add(first_player, LMS_RANK, 1); - if(warmup_stage) - return WINNING_NO; - else - return WINNING_YES; + return WINNING_YES; } } } @@ -118,14 +118,31 @@ int WinningCondition_LMS() MUTATOR_HOOKFUNCTION(lms, reset_map_global) { lms_lowest_lives = 999; + lms_quitters = 0; } MUTATOR_HOOKFUNCTION(lms, reset_map_players) { FOREACH_CLIENT(true, { + if (it.frags == FRAGS_PLAYER_OUT_OF_GAME) + { + // players who forfeited (rank >= 256) become spectators + if (it.lms_spectate_warning == 2) + it.frags = FRAGS_SPECTATOR; + else + it.frags = FRAGS_PLAYER; + } + + CS(it).killcount = 0; + it.lmsplayer = 0; + it.lms_spectate_warning = 0; + GameRules_scoring_add(it, LMS_RANK, -GameRules_scoring_add(it, LMS_RANK, 0)); + GameRules_scoring_add(it, LMS_LIVES, -GameRules_scoring_add(it, LMS_LIVES, 0)); + + if (it.frags != FRAGS_PLAYER) + continue; + TRANSMUTE(Player, it); - it.frags = FRAGS_PLAYER; - GameRules_scoring_add(it, LMS_LIVES, LMS_NewPlayerLives()); PutClientInServer(it); }); } @@ -138,58 +155,107 @@ MUTATOR_HOOKFUNCTION(lms, ReadLevelCvars) sv_ready_restart_after_countdown = 0; } +// returns true if player is added to the game +bool lms_AddPlayer(entity player) +{ + if (!player.lmsplayer) + { + int lives = GameRules_scoring_add(player, LMS_LIVES, LMS_NewPlayerLives()); + if(lives <= 0) + return false; + player.lmsplayer = 1; + } + if (warmup_stage || time <= game_starttime) + { + if(player.lms_spectate_warning) + { + player.lms_spectate_warning = 0; + GameRules_scoring_add(player, LMS_RANK, -GameRules_scoring_add(player, LMS_RANK, 0)); + int lives = GameRules_scoring_add(player, LMS_LIVES, 0); + if(lives <= 0) + GameRules_scoring_add(player, LMS_LIVES, LMS_NewPlayerLives()); + } + } + else + { + if(GameRules_scoring_add(player, LMS_LIVES, 0) <= 0) + { + Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_LMS_NOLIVES); + return false; + } + } + return true; +} + MUTATOR_HOOKFUNCTION(lms, PutClientInServer) { entity player = M_ARGV(0, entity); - - if(player.frags == FRAGS_SPECTATOR) - TRANSMUTE(Observer, player); - else + if (!warmup_stage && (IS_BOT_CLIENT(player) || CS(player).jointime != time)) { - float tl = GameRules_scoring_add(player, LMS_LIVES, 0); - if(tl < lms_lowest_lives) - lms_lowest_lives = tl; - if(tl <= 0) + if (GameRules_scoring_add(player, LMS_RANK, 0) || !lms_AddPlayer(player)) TRANSMUTE(Observer, player); - if(warmup_stage) - GameRules_scoring_add(player, LMS_RANK, -GameRules_scoring_add(player, LMS_RANK, 0)); } } +MUTATOR_HOOKFUNCTION(lms, PlayerSpawn) +{ + entity player = M_ARGV(0, entity); + + if (warmup_stage || time < game_starttime) + return true; + + int pl_lives = GameRules_scoring_add(player, LMS_LIVES, 0); + float min_health = start_health; + float min_armorvalue = start_armorvalue; + FOREACH_CLIENT(it != player && IS_PLAYER(it) && !IS_DEAD(it) && GameRules_scoring_add(it, LMS_LIVES, 0) == pl_lives, { + if (GetResource(it, RES_HEALTH) < min_health) + min_health = GetResource(it, RES_HEALTH); + if (GetResource(it, RES_ARMOR) < min_armorvalue) + min_armorvalue = GetResource(it, RES_ARMOR); + }); + if (min_health != start_health) + SetResource(player, RES_HEALTH, max(1, min_health)); + if (min_armorvalue != start_armorvalue) + SetResource(player, RES_ARMOR, min_armorvalue); +} + MUTATOR_HOOKFUNCTION(lms, ForbidSpawn) { entity player = M_ARGV(0, entity); - if(warmup_stage) + if (warmup_stage || lms_AddPlayer(player)) return false; - if(player.frags == FRAGS_SPECTATOR || GameRules_scoring_add(player, LMS_LIVES, 0) <= 0) - { - Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_LMS_NOLIVES); - return true; - } - return false; + + return true; } MUTATOR_HOOKFUNCTION(lms, PlayerDies) { entity frag_target = M_ARGV(2, entity); + float tl = GameRules_scoring_add(frag_target, LMS_LIVES, 0); + if (tl <= 0) + { + frag_target.respawn_flags = RESPAWN_SILENT; + // prevent unwanted sudden rejoin as spectator and movement of spectator camera + frag_target.respawn_time = time + 2; + } frag_target.respawn_flags |= RESPAWN_FORCE; } void lms_RemovePlayer(entity player) { - static int quitters = 0; + if (warmup_stage || time < game_starttime) + return; + float player_rank = GameRules_scoring_add(player, LMS_RANK, 0); if (!player_rank) { if (player.lms_spectate_warning < 2) { - if(IS_BOT_CLIENT(player)) - bot_clear(player); player.frags = FRAGS_PLAYER_OUT_OF_GAME; int pl_cnt = 0; - FOREACH_CLIENT(IS_PLAYER(it) && it.frags != FRAGS_PLAYER_OUT_OF_GAME, { + FOREACH_CLIENT(IS_PLAYER(it) && it.frags == FRAGS_PLAYER, { pl_cnt++; }); GameRules_scoring_add(player, LMS_RANK, pl_cnt + 1); @@ -197,6 +263,7 @@ void lms_RemovePlayer(entity player) else { FOREACH_CLIENT(true, { + // update rank of other players that were eliminated if (it.frags == FRAGS_PLAYER_OUT_OF_GAME) { float it_rank = GameRules_scoring_add(it, LMS_RANK, 0); @@ -210,11 +277,11 @@ void lms_RemovePlayer(entity player) lms_lowest_lives = tl; } }); - GameRules_scoring_add(player, LMS_RANK, 665 - quitters); // different from 666 + GameRules_scoring_add(player, LMS_RANK, 665 - lms_quitters); // different from 666 if(!warmup_stage) { GameRules_scoring_add(player, LMS_LIVES, -GameRules_scoring_add(player, LMS_LIVES, 0)); - ++quitters; + ++lms_quitters; } player.frags = FRAGS_PLAYER_OUT_OF_GAME; TRANSMUTE(Observer, player); @@ -238,6 +305,7 @@ MUTATOR_HOOKFUNCTION(lms, ClientDisconnect) player.lms_spectate_warning = 3; lms_RemovePlayer(player); + player.lmsplayer = 0; } MUTATOR_HOOKFUNCTION(lms, MakePlayerObserver) @@ -247,27 +315,24 @@ MUTATOR_HOOKFUNCTION(lms, MakePlayerObserver) if (!IS_PLAYER(player)) return true; - lms_RemovePlayer(player); - return true; // prevent team reset -} - -MUTATOR_HOOKFUNCTION(lms, ClientConnect) -{ - entity player = M_ARGV(0, entity); - - if(GameRules_scoring_add(player, LMS_LIVES, LMS_NewPlayerLives()) <= 0) + if (warmup_stage || time <= game_starttime) { - GameRules_scoring_add(player, LMS_RANK, 666); // mark as forced spectator for the hud code + GameRules_scoring_add(player, LMS_LIVES, -GameRules_scoring_add(player, LMS_LIVES, 0)); player.frags = FRAGS_SPECTATOR; + TRANSMUTE(Observer, player); + player.lmsplayer = 0; } + else if (!GameRules_scoring_add(player, LMS_RANK, 0)) + lms_RemovePlayer(player); + return true; // prevent team reset } -// FIXME LMS doesn't allow clients to spectate due to its particular implementation -MUTATOR_HOOKFUNCTION(lms, AutoJoinOnConnection) +MUTATOR_HOOKFUNCTION(lms, ClientConnect) { - if(autocvar_g_campaign) - return false; - return true; + entity player = M_ARGV(0, entity); + TRANSMUTE(Observer, player); + player.frags = FRAGS_SPECTATOR; + player.lms_spectate_warning = 0; } MUTATOR_HOOKFUNCTION(lms, PlayerPreThink) @@ -295,7 +360,7 @@ MUTATOR_HOOKFUNCTION(lms, GiveFragsForKill) { entity frag_target = M_ARGV(1, entity); - if (!warmup_stage) + if (!warmup_stage && time > game_starttime) { // remove a life int tl = GameRules_scoring_add(frag_target, LMS_LIVES, -1); @@ -304,11 +369,9 @@ MUTATOR_HOOKFUNCTION(lms, GiveFragsForKill) if(tl <= 0) { int pl_cnt = 0; - FOREACH_CLIENT(IS_PLAYER(it) && it.frags != FRAGS_PLAYER_OUT_OF_GAME, { + FOREACH_CLIENT(IS_PLAYER(it) && it.frags == FRAGS_PLAYER, { pl_cnt++; }); - if(IS_BOT_CLIENT(frag_target)) - bot_clear(frag_target); frag_target.frags = FRAGS_PLAYER_OUT_OF_GAME; GameRules_scoring_add(frag_target, LMS_RANK, pl_cnt); } @@ -355,6 +418,7 @@ void lms_extralife(entity this) MUTATOR_HOOKFUNCTION(lms, OnEntityPreSpawn) { + if (MUTATOR_RETURNVALUE) return false; if (!autocvar_g_powerups) return false; if (!autocvar_g_lms_extra_lives) return false; @@ -376,6 +440,8 @@ MUTATOR_HOOKFUNCTION(lms, OnEntityPreSpawn) MUTATOR_HOOKFUNCTION(lms, ItemTouch) { + if(MUTATOR_RETURNVALUE) return false; + entity item = M_ARGV(0, entity); entity toucher = M_ARGV(1, entity); @@ -392,7 +458,8 @@ MUTATOR_HOOKFUNCTION(lms, ItemTouch) MUTATOR_HOOKFUNCTION(lms, Bot_FixCount, CBC_ORDER_EXCLUSIVE) { FOREACH_CLIENT(IS_REAL_CLIENT(it), { - ++M_ARGV(0, int); // activerealplayers + if (it.lmsplayer && it.lms_spectate_warning < 2) + ++M_ARGV(0, int); // activerealplayers ++M_ARGV(1, int); // realplayers }); @@ -403,7 +470,7 @@ MUTATOR_HOOKFUNCTION(lms, ClientCommand_Spectate) { entity player = M_ARGV(0, entity); - if(warmup_stage || player.lms_spectate_warning) + if(warmup_stage || time < game_starttime || player.lms_spectate_warning) { // for the forfeit message... player.lms_spectate_warning = 2; @@ -434,7 +501,9 @@ MUTATOR_HOOKFUNCTION(lms, SetWeaponArena) MUTATOR_HOOKFUNCTION(lms, GetPlayerStatus) { - return true; + entity player = M_ARGV(0, entity); + + return boolean(player.lmsplayer); } MUTATOR_HOOKFUNCTION(lms, AddPlayerScore)