From d93bd1c90ca42bf97e782decb4b8995f257c75de Mon Sep 17 00:00:00 2001 From: Jamesssssssssssssss <87044058+Jamesssssssssssssss@users.noreply.github.com> Date: Sat, 10 Jan 2026 15:18:58 +0000 Subject: [PATCH] rename challenger to solopvp_player (#462) * rename challenger to solopvp_player * ... actually rename solopvp_player to challenger --- CTA/CustomTeamAssigner/Utils.cs | 2 +- CustomRoles.cs | 2 +- Resources/Lang/cs_CZ.json | 4 ++-- Resources/Lang/de_DE.json | 4 ++-- Resources/Lang/es_ES.json | 4 ++-- Resources/Lang/fa_IR.json | 4 ++-- Resources/Lang/fr_FR.json | 4 ++-- Resources/Lang/hu_HU.json | 4 ++-- Resources/Lang/id_ID.json | 4 ++-- Resources/Lang/ja_JP.json | 4 ++-- Resources/Lang/ko_KR.json | 4 ++-- Resources/Lang/pl_PL.json | 4 ++-- Resources/Lang/pt_BR.json | 4 ++-- Resources/Lang/ro_RO.json | 4 ++-- Resources/Lang/ru_RU.json | 4 ++-- Resources/Lang/vi_VN.json | 4 ++-- Resources/Lang/zh_CN.json | 4 ++-- Resources/Lang/zh_TW.json | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CTA/CustomTeamAssigner/Utils.cs b/CTA/CustomTeamAssigner/Utils.cs index ceb469878..a426b812f 100644 --- a/CTA/CustomTeamAssigner/Utils.cs +++ b/CTA/CustomTeamAssigner/Utils.cs @@ -74,7 +74,7 @@ namespace CustomTeamAssigner return list; } - public static IEnumerable GetAllValidRoles() => Enum.GetValues().Where(x => !Teams.Any(t => t.TeamMembers.Contains(x)) && !x.ToString().Contains("EHR") && x < CustomRoles.NotAssigned && x is not (CustomRoles.SoloPVP_Player or CustomRoles.Killer or CustomRoles.Tasker or CustomRoles.Potato or CustomRoles.Runner or CustomRoles.CTFPlayer or CustomRoles.NDPlayer or CustomRoles.Hider or CustomRoles.Seeker or CustomRoles.Fox or CustomRoles.Troll or CustomRoles.Jet or CustomRoles.Detector or CustomRoles.Jumper or CustomRoles.Venter or CustomRoles.Locator or CustomRoles.Agent or CustomRoles.Dasher or CustomRoles.GM or CustomRoles.Convict or CustomRoles.Impostor or CustomRoles.Shapeshifter or CustomRoles.Crewmate or CustomRoles.Engineer or CustomRoles.Scientist or CustomRoles.GuardianAngel or CustomRoles.Phantom or CustomRoles.Tracker or CustomRoles.Noisemaker)); + public static IEnumerable GetAllValidRoles() => Enum.GetValues().Where(x => !Teams.Any(t => t.TeamMembers.Contains(x)) && !x.ToString().Contains("EHR") && x < CustomRoles.NotAssigned && x is not (CustomRoles.Challenger or CustomRoles.Killer or CustomRoles.Tasker or CustomRoles.Potato or CustomRoles.Runner or CustomRoles.CTFPlayer or CustomRoles.NDPlayer or CustomRoles.Hider or CustomRoles.Seeker or CustomRoles.Fox or CustomRoles.Troll or CustomRoles.Jet or CustomRoles.Detector or CustomRoles.Jumper or CustomRoles.Venter or CustomRoles.Locator or CustomRoles.Agent or CustomRoles.Dasher or CustomRoles.GM or CustomRoles.Convict or CustomRoles.Impostor or CustomRoles.Shapeshifter or CustomRoles.Crewmate or CustomRoles.Engineer or CustomRoles.Scientist or CustomRoles.GuardianAngel or CustomRoles.Phantom or CustomRoles.Tracker or CustomRoles.Noisemaker)); public static string GetActualRoleName(CustomRoles role) { diff --git a/CustomRoles.cs b/CustomRoles.cs index 58f486f6e..e6a4597ad 100644 --- a/CustomRoles.cs +++ b/CustomRoles.cs @@ -428,7 +428,7 @@ public enum CustomRoles VoodooMaster, Wyrd, - // Solo Kombat + // Solo PVP Challenger, // FFA diff --git a/Resources/Lang/cs_CZ.json b/Resources/Lang/cs_CZ.json index cfe927c11..74e49f3e2 100644 --- a/Resources/Lang/cs_CZ.json +++ b/Resources/Lang/cs_CZ.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/de_DE.json b/Resources/Lang/de_DE.json index 9dc56135a..842e53026 100644 --- a/Resources/Lang/de_DE.json +++ b/Resources/Lang/de_DE.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Spielemodus: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/es_ES.json b/Resources/Lang/es_ES.json index 32e9e963c..ebbc82e0d 100644 --- a/Resources/Lang/es_ES.json +++ b/Resources/Lang/es_ES.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemoto: SOLO PVP ", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/fa_IR.json b/Resources/Lang/fa_IR.json index 1dfc82ebc..0c798ec23 100644 --- a/Resources/Lang/fa_IR.json +++ b/Resources/Lang/fa_IR.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/fr_FR.json b/Resources/Lang/fr_FR.json index 14bc0bbff..cd2df68cf 100644 --- a/Resources/Lang/fr_FR.json +++ b/Resources/Lang/fr_FR.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/hu_HU.json b/Resources/Lang/hu_HU.json index 9ddf3f1b0..3d6867c45 100644 --- a/Resources/Lang/hu_HU.json +++ b/Resources/Lang/hu_HU.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/id_ID.json b/Resources/Lang/id_ID.json index 204d6bb0b..c27fed24f 100644 --- a/Resources/Lang/id_ID.json +++ b/Resources/Lang/id_ID.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/ja_JP.json b/Resources/Lang/ja_JP.json index 0c8751071..6bb28d984 100644 --- a/Resources/Lang/ja_JP.json +++ b/Resources/Lang/ja_JP.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/ko_KR.json b/Resources/Lang/ko_KR.json index 3d28be403..94a96e23b 100644 --- a/Resources/Lang/ko_KR.json +++ b/Resources/Lang/ko_KR.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/pl_PL.json b/Resources/Lang/pl_PL.json index 0fb17b3e7..64200ee1e 100644 --- a/Resources/Lang/pl_PL.json +++ b/Resources/Lang/pl_PL.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/pt_BR.json b/Resources/Lang/pt_BR.json index 80660a035..f52ca463a 100644 --- a/Resources/Lang/pt_BR.json +++ b/Resources/Lang/pt_BR.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/ro_RO.json b/Resources/Lang/ro_RO.json index e4ba7ae92..3eba99823 100644 --- a/Resources/Lang/ro_RO.json +++ b/Resources/Lang/ro_RO.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/ru_RU.json b/Resources/Lang/ru_RU.json index f2d8fc8ee..16a2adec6 100644 --- a/Resources/Lang/ru_RU.json +++ b/Resources/Lang/ru_RU.json @@ -4922,8 +4922,8 @@ "SoloPVP": "Соло PVP", "ModeSoloPVP": "Режим: Соло PVP", "ModeDescribe.SoloPVP": "В режиме Соло PVP у всех есть определённое количество здоровья и каждый имеет кнопку убийства, чтобы атаковать. Убитый игрок временно становится призраком, затем возрождается. Выигрывает игрок с наибольшим количеством убийств. За убийство даётся бонус к здоровью/урону/регенерации.", - "SoloPVP_Player": "Соло PVP", - "SoloPVP_PlayerInfo": "Убейте их всех!", + "Challenger": "Соло PVP", + "ChallengerInfo": "Убейте их всех!", "SoloPVP_GameTime": "Длительность игры", "SoloPVP_HPMax": "Стандартное здоровье", "SoloPVP_ATK": "Стандартный урон", diff --git a/Resources/Lang/vi_VN.json b/Resources/Lang/vi_VN.json index 188049ff4..4d0907ba8 100644 --- a/Resources/Lang/vi_VN.json +++ b/Resources/Lang/vi_VN.json @@ -4922,8 +4922,8 @@ "SoloPVP": "SOLO PVP", "ModeSoloPVP": "Gamemode: Solo PVP", "ModeDescribe.SoloPVP": "In the Solo PVP game mode, everyone has HP and can use their kill button to cause damage on other players. When a player's health reaches 0, they 'die' and respawn after a few seconds. The player(s) with the highest number of kills win(s) at the end of the game.", - "SoloPVP_Player": "SOLO PVP", - "SoloPVP_PlayerInfo": "DEFEAT OPPONENTS TO WIN", + "Challenger": "SOLO PVP", + "ChallengerInfo": "DEFEAT OPPONENTS TO WIN", "SoloPVP_GameTime": "Game duration", "SoloPVP_HPMax": "Default HP", "SoloPVP_ATK": "Default Attack", diff --git a/Resources/Lang/zh_CN.json b/Resources/Lang/zh_CN.json index 857814b60..944cef17d 100644 --- a/Resources/Lang/zh_CN.json +++ b/Resources/Lang/zh_CN.json @@ -4922,8 +4922,8 @@ "SoloPVP": "角逐竞技", "ModeSoloPVP": "游戏模式：角逐竞技", "ModeDescribe.SoloPVP": "在角逐竞技游戏模式中，没有职业分配。每个人都有血量（HP），可以使用击杀按钮对其他玩家造成伤害。击杀次数最多的玩家在游戏结束时获胜。", - "SoloPVP_Player": "角逐竞技", - "SoloPVP_PlayerInfo": "角逐取胜，杀光他们！", + "Challenger": "角逐竞技", + "ChallengerInfo": "角逐取胜，杀光他们！", "SoloPVP_GameTime": "游戏持续时间", "SoloPVP_HPMax": "初始血量上限", "SoloPVP_ATK": "初始攻击力", diff --git a/Resources/Lang/zh_TW.json b/Resources/Lang/zh_TW.json index e2e924aab..75aa9ac4a 100644 --- a/Resources/Lang/zh_TW.json +++ b/Resources/Lang/zh_TW.json @@ -4922,8 +4922,8 @@ "SoloPVP": "個人競技模式", "ModeSoloPVP": "遊戲模式: 個人競技模式", "ModeDescribe.SoloPVP": "在個人競技模式中，每個人都有生命值，可以使用擊殺按鈕對其他玩家造成傷害。當玩家的生命值降至0時，他們會“死亡”，並在幾秒後重生。遊戲結束時，擊殺最多的玩家獲勝。", - "SoloPVP_Player": "個人競技模式", - "SoloPVP_PlayerInfo": "擊敗所有人!", + "Challenger": "個人競技模式", + "ChallengerInfo": "擊敗所有人!", "SoloPVP_GameTime": "遊戲時間", "SoloPVP_HPMax": "初始血量上限", "SoloPVP_ATK": "初始攻擊力",