From 06397904cd351012ec609705353ff5fcc389c56b Mon Sep 17 00:00:00 2001 From: T0mix1608 Date: Wed, 12 Jun 2024 17:01:39 +0100 Subject: [PATCH 1/6] Update pt_BR.json - Fixed Simon translation error --- Resources/Lang/pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Lang/pt_BR.json b/Resources/Lang/pt_BR.json index 93e9c0302..070c2e79c 100644 --- a/Resources/Lang/pt_BR.json +++ b/Resources/Lang/pt_BR.json @@ -3650,7 +3650,7 @@ "Simon": "Mestre", "SimonInfo": "Dê ordens aos jogadores", "SimonInfoLong": "(Neutros):\\n★Como Mestre, você pode dar ordens aos jogadores (Mestre Mandou).\\n★Clique uma vez em alguém com o botão de matar para marcar esse jogador ou clique duas vezes para matar.\\n★Use o duto para ORDENAR todos os jogadores marcados. Os jogadores com botão de matar serão ordenados a matar, enquanto os tripulantes serão ordenados a completar uma tarefa. Se não seguirem as ordens até à próxima reunião, morrerão.\\n★Você pode sabotar/acariciar seu pet para trocar as ordens. Isso significa que ao trocar as ordens, você trocará se a pessoa TERÁ QUE CUMPRIR, ou NÃO PODERÁ CUMPRIR.", - "SimonKill": "Mestre Mandou: <#ffff00>Você NÃO deve usar o seu botão de matar antes da próxima reúnião", + "SimonKill": "Mestre Mandou: <#ffff00>Você deve usar o seu botão de matar antes da próxima reúnião", "SimonTask": "Mestre Mandou: <#ffff00>Você deve completar uma tarefa antes da próxima reunião", "SimonDontKill": "Mestre Mandou: <#ffff00>Você NÃO deve usar o seu botão de matar antes da próxima reúnião", "SimonDontTask": "Mestre Mandou: <#ffff00>Você NÃO deve completar nenhuma tarefa antes da próxima reunião", From 03ed079833f832eb315e906538763a97d0e9900c Mon Sep 17 00:00:00 2001 From: HyperAtill <150699834+HyperAtill@users.noreply.github.com> Date: Thu, 13 Jun 2024 22:46:00 +0300 Subject: [PATCH 2/6] Fix Junk String, Remove some unused strings +more I fixed 'SidekickSettings' junk string. Also I removed all Pirate strings and Konan strings (who is Konan lol) and some unused Jackal strings. And some Maverick strings... And the final change - I made 'Guesser doesn't die on misguess' setting yellow, instead of white (#f3e304) --- Resources/Lang/en_US.json | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json index 6c85d1b03..58b8759a1 100644 --- a/Resources/Lang/en_US.json +++ b/Resources/Lang/en_US.json @@ -20,8 +20,6 @@ "TeamNeutral": "Neutral", "TeamCrewmate": "Crewmate", "TeamMadmate": "Madmate", - "TeamLovingCrewmate": "Lover", - "TeamLovingImpostor": "Loving Impostor", "Neutral": "Neutral", "YouAreCrewmate": "TEAM: CREWMATES", "YouAreImpostor": ".", @@ -231,7 +229,6 @@ "Pelican": "Pelican", "Revolutionist": "Revolutionist", "FFF": "Hater", - "Konan": "Konan", "Gamer": "Demon", "DarkHide": "Stalker", "Workaholic": "Workaholic", @@ -253,7 +250,6 @@ "Virus": "Virus", "Pursuer": "Pursuer", "Phantom": "Specter", - "Pirate": "Pirate", "Jinx": "Jinx", "Maverick": "Maverick", "CursedSoul": "Cursed Soul", @@ -523,7 +519,6 @@ "PelicanInfo": "Eat all players", "RevolutionistInfo": "Recruit players to win with you", "FFFInfo": "Kill Lovers and Neptunes", - "KonanInfo": "Still on a date with Xiaoling...", "GamerInfo": "Consume blood volumes", "DarkHideInfo": "Your kills cause power outages", "WorkaholicInfo": "Finish all tasks to solo win!", @@ -545,7 +540,6 @@ "VirusInfo": "Kill and infect everyone", "PursuerInfo": "Protect yourself and live to the end!", "PhantomInfo": "Get killed and finish your tasks to win!", - "PirateInfo": "Select target to duel during the Meeting!", "JinxInfo": "Reflect attacks onto your attackers", "MaverickInfo": "Survive until the end to win", "CursedSoulInfo": "Snatch souls and steal the win", @@ -777,7 +771,6 @@ "VirusInfoLong": "(Neutrals):\\nThe virus' goal is to eliminate other players. When a crewmate is killed, their corpse is infected, and the reporting crewmate joins the virus team or dies if the virus isn't voted out. The Virus team wins if they outnumber the Crewmate team.", "PursuerInfoLong": "(Neutrals):\\nAs the Pursuer, you can use your ability on someone to make them shoot a blank when they try to kill (= reset their kill cooldown).\\n\\nTo win, just survive to the end of the game.", "PhantomInfoLong": "(Neutrals):\\nAs the Specter, your job is to get killed and finish your tasks.\\nYou can do your tasks while alive.\\nYou cannot win if you're alive.\\nIf you get killed, you win with the winning team if your tasks are completed.", - "PirateInfoLong": "(Neutrals):\\nAs the Pirate, use your kill button to select a target every round. You will duel with your target when in a meeting. If both the Pirate and the target choose the same number Pirate wins.\\nAdditionally, if Pirate wins the duel, or Target doesn't duel Target will suicide.\\n\\nDueling command:- /duel X (where X can be 0, 1 or 2)\\n\\nYou win after winning a certain number of duels set by the host.", "JinxInfoLong": "(Neutrals):\\nAs the Jinx, whenever you are attacked, you jinx them, resulting in them dying to a jinx.\\nThis has limited uses.\\n\\nKill off everyone to win.", "MaverickInfoLong": "(Neutrals):\\nAs the Maverick, you can kill much like a Serial Killer.\\n\\nHowever, you win with the winning team rather than alone.\\nIf you die, you lose.", "CursedSoulInfoLong": "(Neutrals):\\nAs the Cursed Soul, you snatch the victory if you survive to the end of the game.\\n\\nYou can snatch the win from a Jester or Executioner.\\n\\nAdditionally, you can snatch the souls of other players.\\nSoulless players win with you and count as dead.", @@ -880,7 +873,7 @@ "AdditionalEmergencyCooldownTime": "Additional Cooldown", "LadderDeath": "Fall From Ladders", "LadderDeathChance": "Fall To Death Chance", - "GuesserDoesntDieOnMisguess": "Guesser Doesn't Die on Misguess", + "GuesserDoesntDieOnMisguess": "Guesser Doesn't Die on Misguess", "DisableTasks": "Disable Tasks", "DisableSwipeCardTask": "Disable Swipe Card Task", "DisableSubmitScanTask": "Disable Submit Scan Task", @@ -1131,8 +1124,6 @@ "ShowNKRemainOnEject": "Show remaining Neutral Killers on ejects", "ConfirmEgoistOnEject": "Confirm Egoists on ejection", "ConfirmLoversOnEject": "Confirm Lovers on ejection", - "ConfirmSidekickOnEject": "Confirm Sidekicks on ejection", - "ConfirmRogueOnEject": "Confirm Mavericks on ejection", "HideBittenRolesOnEject": "Hide roles of bitten players on ejection", "ShowTeamNextToRoleNameOnEject": "Show what team the ejected player's role is on", "Addon": "Add-on", @@ -1157,7 +1148,6 @@ "MenuTitle.GuesserModeRoles": "★ Roles and Add-ons for Guesser Mode ★", "MenuTitle.CTA": "★ Custom Team Assignment ★", "ShieldPersonDiedFirst": "Shield the person who got killed first in the last game", - "JackalWinWithSidekick": "Jackal can win with Sidekick's team", "SidekickKnowOtherSidekick": "Sidekicks know each other", "SidekickKnowOtherSidekickRole": "Sidekicks know the roles of other Sidekicks", "SidekickCanKillSidekick": "Sidekicks can kill other Sidekicks", @@ -1199,11 +1189,6 @@ "OutOfAbilityUsesDoMoreTasks": "Out of ability uses! Do tasks to get more!", "AbilityUseLimit": "Initial Ability Use Limit", "SniperCanKill": "Sniper can kill with bullets remaining", - "CrewmatesCanBeSidekick": "Crewmates can be Sidekick", - "NeutralsCanBeSidekick": "Neutrals can be Sidekick", - "ImpostorsCanBeSidekick": "Impostors can be Sidekick", - "JackalCanKillSidekick": "Jackal can kill Sidekick", - "SidekickCanKillJackal": "Sidekick can kill Jackal", "EvenAfterWinning": "Even After Satisfying Win Condition", "ImpostorVision": "Has Impostor Vision", "CanUseSabotage": "Can Sabotage", @@ -1500,11 +1485,9 @@ "SidekickCountMode.None": "Nothing", "SidekickCountMode.Jackal": "Jackal", "SidekickCountMode.Original": "Original Team", - "SidekickAssignMode": "Sidekick Assign Mode", - "SidekickAssignMode.SidekickAndRecruit": "Sidekick+Recruit", - "SidekickAssignMode.Sidekick": "Sidekick Only", - "SidekickAssignMode.Recruit": "Recruit Only", "ContagiousCountMode": "Contagious players count as", + "JackalCanKillSidekick": "Jackal can kill Sidekick", + "SidekickCanKillJackal": "Sidekick can kill Jackal", "ContagiousCountMode.None": "Nothing", "ContagiousCountMode.Virus": "Virus", "ContagiousCountMode.Original": "Original Team", @@ -1637,8 +1620,7 @@ "ResetKillCooldownWhenPlayerGetKilled": "Reset kill cooldown if someone gets killed by another player", "ResetKillCooldownOn": "Kill Cooldown On Reset", "JackalCanRecruitSidekick": "Can recruit Sidekick", - "JackalSidekickRecruitLimit": "Maximum Number Of Recruits", - "SidekickCanWinWithOriginalTeam": "Sidekicks can win with original team", + "SidekickSettings": "Show Sidekick Settings", "ImpCanBeInLove": "Impostors can be in love", "CrewCanBeInLove": "Crewmates can be in love", "NeutralCanBeInLove": "Neutrals can be in love", @@ -4135,16 +4117,7 @@ "ImpCanBeRole": "Impostors can become {role}", "CrewCanBeRole": "Crewmates can become {role}", "NeutralCanBeRole": "Neutrals can become {role}", - "PirateTryHideMsg": "Hide Pirate's commands", "SuccessfulDuelsToWin": "Number of successful duels needed to win", - "PirateMeetingMsg": "Duel with your target.\\n\\n Duel command :-\\n⦿ /duel 0 (to select rock)\\n⦿ /duel 1 (to select Paper)\\n⦿ /duel 2 (to select Scissors)\\n\\nYou win if you choose same option as the target", - "PirateTargetMeetingMsg": "Pirate chose you as their target!! Duel with Pirate to save your life.\\n\\n Duel command :-\\n⦿ /duel 0 (to select rock)\\n⦿ /duel 1 (to select Paper)\\n⦿ /duel 2 (to select Scissors)\\n\\nIf Pirate chooses same option as you or you don't duel you DIE.", - "PirateTitle": "【 ★ Message from Pirate ★ 】", - "PirateTargetAlreadyChosen": "You have already chosen a target in this round", - "PirateDead": "You are dead, you cannot duel anymore", - "DuelAlreadyDone": "You have already chosen an option for the duel.", - "DuelDone": "You chose【{0}】for the duel.", - "DuelHelp": "Duel command :-\\n⦿ /duel 0 (to select Rock)\\n⦿ /duel 1 (to select Paper)\\n⦿ /duel 2 (to select Scissors)", "PlagueBearerCD": "Plague cooldown", "PestilenceCD": "Pestilence Kill cooldown", "PlagueBearerAlreadyPlagued": "Player has already been plagued", From 4a4ff08fbeb262684cee59ffe2d8b7b389c0d903 Mon Sep 17 00:00:00 2001 From: HyperAtill <150699834+HyperAtill@users.noreply.github.com> Date: Thu, 13 Jun 2024 22:49:00 +0300 Subject: [PATCH 3/6] Ofc I did something wrong... Thanks GitHub for showing what was changed... --- Resources/Lang/en_US.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json index 58b8759a1..2e7bf6562 100644 --- a/Resources/Lang/en_US.json +++ b/Resources/Lang/en_US.json @@ -1197,6 +1197,8 @@ "CrewpostorKnowsAllies": "Knows Impostors", "AlliesKnowCrewpostor": "Known to Impostors", "HasSidekick": "Has Sidekick", + "JackalCanKillSidekick": "Jackal can kill Sidekick", + "SidekickCanKillJackal": "Sidekick can kill Jackal", "NonNeutralKillingRolesMinPlayer": "Minimum amount of Non-Killing Neutrals", "NonNeutralKillingRolesMaxPlayer": "Maximum amount of Non-Killing Neutrals", "NeutralKillingRolesMinPlayer": "Minimum amount of Neutral Killers", @@ -1485,9 +1487,9 @@ "SidekickCountMode.None": "Nothing", "SidekickCountMode.Jackal": "Jackal", "SidekickCountMode.Original": "Original Team", - "ContagiousCountMode": "Contagious players count as", "JackalCanKillSidekick": "Jackal can kill Sidekick", "SidekickCanKillJackal": "Sidekick can kill Jackal", + "ContagiousCountMode": "Contagious players count as", "ContagiousCountMode.None": "Nothing", "ContagiousCountMode.Virus": "Virus", "ContagiousCountMode.Original": "Original Team", From 8ca7875e6d41e0c86ea6f2273d96497b159ba7ee Mon Sep 17 00:00:00 2001 From: T0mix1608 Date: Sun, 16 Jun 2024 14:51:28 +0100 Subject: [PATCH 4/6] Update DevManager.cs Updated my tag. - PTBR Translator / Role Idea Creator --- Modules/DevManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/DevManager.cs b/Modules/DevManager.cs index 651dd0b1f..ab6479bb9 100644 --- a/Modules/DevManager.cs +++ b/Modules/DevManager.cs @@ -61,7 +61,7 @@ public static class DevManager DevUserList.Add(new(code: "goneria#8334", color: "#FFFF00", tag: "The Dev on Phone", isUp: true, isDev: true, deBug: true, colorCmd: true, upName: "[Developer] The 200IQ guy")); // Me on phone DevUserList.Add(new(code: "neatnet#5851", color: "#FFFF00", tag: "[Developer] The 200IQ guy", isUp: true, isDev: true, deBug: true, colorCmd: true, upName: "[Developer] The 200IQ guy")); DevUserList.Add(new(code: "contenthue#0404", color: "#FFFF00", tag: "[Developer] The 200IQ guy", isUp: true, isDev: true, deBug: true, colorCmd: true, upName: "[Developer] The 200IQ guy")); - DevUserList.Add(new(code: "theseform#5686", color: "null", tag: "PTBR-Translator/Editor (YT)", isUp: true, isDev: false, deBug: false, colorCmd: false, upName: "Role idea creator")); + DevUserList.Add(new(code: "theseform#5686", color: "null", tag: "PTBR-Translator/Role Idea Creator", isUp: true, isDev: false, deBug: false, colorCmd: false, upName: "Role idea creator")); DevUserList.Add(new(code: "heavyclod#2286", color: "#FFFF00", tag: "小叨.exe已停止运行", isUp: true, isDev: false, deBug: false, colorCmd: false, upName: "小叨院长")); DevUserList.Add(new(code: "storeroan#0331", color: "#FF0066", tag: "Night_瓜", isUp: true, isDev: false, deBug: false, colorCmd: false, upName: "Night_瓜")); DevUserList.Add(new(code: "teamelder#5856", color: "#1379bf", tag: "屑Slok（没信誉的鸽子）", isUp: true, isDev: false, colorCmd: false, deBug: false, upName: "Slok7565")); From 6fdc443b9aa5448eb25713d4e712c9d0481d9e30 Mon Sep 17 00:00:00 2001 From: HyperAtill <150699834+HyperAtill@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:11:01 +0300 Subject: [PATCH 5/6] Fix Chronomancer setting format is 'Seconds' (while should be 'Percent') I hope I did everything right and didn't break everything? I just did .SetValueFormat(OptionFormat.Seconds); => .SetValueFormat(OptionFormat.Percent); --- Roles/Impostor/Chronomancer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Roles/Impostor/Chronomancer.cs b/Roles/Impostor/Chronomancer.cs index 8298d16f7..559374777 100644 --- a/Roles/Impostor/Chronomancer.cs +++ b/Roles/Impostor/Chronomancer.cs @@ -28,7 +28,7 @@ namespace EHR.Roles.Impostor .SetValueFormat(OptionFormat.Seconds); ChargeInterval = new IntegerOptionItem(Id + 12, "ChargeInterval", new(1, 20, 1), 5, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Chronomancer]) - .SetValueFormat(OptionFormat.Seconds); + .SetValueFormat(OptionFormat.Percent); ChargeLossInterval = new IntegerOptionItem(Id + 13, "ChargeLossInterval", new(1, 50, 1), 25, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Chronomancer]) .SetValueFormat(OptionFormat.Percent); @@ -150,4 +150,4 @@ namespace EHR.Roles.Impostor OnReportDeadBody(); } } -} \ No newline at end of file +} From 579e3540db258495e6c8889d2b4020a517d66c96 Mon Sep 17 00:00:00 2001 From: HyperAtill <150699834+HyperAtill@users.noreply.github.com> Date: Mon, 17 Jun 2024 19:06:07 +0300 Subject: [PATCH 6/6] Fix junk strings (Add new strings) Abyssbrigner was missing 2 strings --- Resources/Lang/en_US.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json index 2e7bf6562..c6a2cff66 100644 --- a/Resources/Lang/en_US.json +++ b/Resources/Lang/en_US.json @@ -3897,6 +3897,8 @@ "AbyssbringerInfoLong": "(Impostors):\\nAs the Abyssbringer, you can place black holes. Black holes will suck in players and kill them when colliding with them.", "BlackHolePlaceCooldown": "Black Hole Place Cooldown", "BlackHoleDespawnMode": "Black Hole Despawn Mode", + "BlackHoleDespawnTime": "Time After Black Hole Despawns", + "After1PlayerEaten": "After 1 Player Was Eaten", "BlackHoleMovesTowardsNearestPlayer": "Black Hole Moves Towards Nearest Player", "BlackHoleMoveSpeed": "Black Hole Moving Speed", "Sleep": "Sleep",