diff --git a/CustomRoles.cs b/CustomRoles.cs index 8248a8748..22a23f3ba 100644 --- a/CustomRoles.cs +++ b/CustomRoles.cs @@ -36,6 +36,7 @@ public enum CustomRoles Cantankerous, Catalyst, Centralizer, + Chainbinder, Changeling, Chronomancer, Cleaner, @@ -65,8 +66,6 @@ public enum CustomRoles Framer, Freezer, Frightener, - Chainbinder, - Jackpot, Gambler, Gangster, Generator, @@ -342,6 +341,7 @@ public enum CustomRoles Innocent, Investor, Jackal, + Jackpot, Jester, Jinx, Juggernaut, diff --git a/Modules/CustomRolesHelper.cs b/Modules/CustomRolesHelper.cs index e2fb0ba6c..340a53974 100644 --- a/Modules/CustomRolesHelper.cs +++ b/Modules/CustomRolesHelper.cs @@ -165,7 +165,6 @@ internal static class CustomRolesHelper CustomRoles.Venerer => UsePets ? CustomRoles.Impostor : CustomRoles.Shapeshifter, CustomRoles.Kidnapper => CustomRoles.Shapeshifter, CustomRoles.Frightener => CustomRoles.Shapeshifter, - CustomRoles.Jackpot => CustomRoles.Shapeshifter, CustomRoles.Chainbinder => UsePets ? CustomRoles.Impostor : CustomRoles.Shapeshifter, CustomRoles.Exorcist => CustomRoles.Impostor, CustomRoles.Obstructer => CustomRoles.Impostor, @@ -742,6 +741,7 @@ internal static class CustomRolesHelper CustomRoles.Viper or CustomRoles.ViperEHR or CustomRoles.LovingImpostor or + CustomRoles.Chainbinder or CustomRoles.Godfather or CustomRoles.Consigliere or CustomRoles.Wildling or @@ -1180,7 +1180,6 @@ internal static class CustomRolesHelper CustomRoles.Jester => RoleOptionType.Neutral_Evil, CustomRoles.Gaslighter => RoleOptionType.Neutral_Evil, CustomRoles.God => RoleOptionType.Neutral_Evil, - CustomRoles.Jackpot => RoleOptionType.Neutral_Killing, CustomRoles.Executioner => RoleOptionType.Neutral_Evil, CustomRoles.Doomsayer => RoleOptionType.Neutral_Evil, CustomRoles.Vector => RoleOptionType.Neutral_Evil, @@ -1246,6 +1245,7 @@ internal static class CustomRolesHelper CustomRoles.Capitalist => RoleOptionType.Impostor_Support, CustomRoles.Catalyst => RoleOptionType.Impostor_Support, CustomRoles.Centralizer => RoleOptionType.Impostor_Support, + CustomRoles.Chainbinder => RoleOptionType.Impostor_Support, CustomRoles.Cleaner => RoleOptionType.Impostor_Support, CustomRoles.ClockBlocker => RoleOptionType.Impostor_Support, CustomRoles.Commander => RoleOptionType.Impostor_Support, @@ -1261,7 +1261,6 @@ internal static class CustomRolesHelper CustomRoles.Godfather => RoleOptionType.Impostor_Support, CustomRoles.Hypnotist => RoleOptionType.Impostor_Support, CustomRoles.Librarian => RoleOptionType.Impostor_Support, - CustomRoles.Chainbinder => RoleOptionType.Impostor_Support, CustomRoles.Nullifier => RoleOptionType.Impostor_Support, CustomRoles.Occultist => RoleOptionType.Impostor_Support, CustomRoles.Perplexer => RoleOptionType.Impostor_Support, diff --git a/Resources/Lang/en_US.jsonc b/Resources/Lang/en_US.jsonc index bff117772..9ee2c5d0a 100644 --- a/Resources/Lang/en_US.jsonc +++ b/Resources/Lang/en_US.jsonc @@ -1722,6 +1722,19 @@ "CentralizerInfo": "Centralize Players' Locations", "CentralizerInfoLong": "(Impostors):\\nAs the Centralizer, mark a position. Then use your ability again to teleport a certain number of players to that position. You may also be included.", "Centralizer.NumPlayersTeleported": "Number of Players Teleported", + "Chainbinder": "Chainbinder", + "ChainbinderInfo": "Chain nearby players together", + "ChainbinderInfoLong": "(Impostors):\\nAs the Chainbinder, use your ability to chain two nearby players together for a short time. When they move too far apart, they are pulled back toward each other. With shapeshift basis, the selected player becomes part of the chain; with pets enabled, the two nearest valid players around you are chained instead. You can still kill normally.", + "Chainbinder.NotEnoughTargets": "Not enough valid players nearby to form a chain", + "Chainbinder.PairBound": "Chain formed: {0} and {1}", + "Chainbinder.PairEnded": "Your chain ended", + "Chainbinder.PairSuffix": "Chain: {0} <> {1}", + "ChainbinderButtonText": "Chain", + "ChainbinderCooldown": "Chain Cooldown", + "ChainbinderDuration": "Chain Duration", + "ChainbinderBindRange": "Chain Range", + "ChainbinderMaxDistance": "Max Distance Before Pull", + "ChainbinderCanBindImpostors": "Can Chain Fellow Impostors", "Changeling": "Changeling", "ChangelingInfo": "Pick Your Impostor Role!", "ChangelingInfoLong": "(Impostors):\\nAs the Changeling, you can vent/pet to cycle between the available impostor roles. You can see the currently selected role below your name. Select the role you want to play as, then shapeshift to confirm your choice. Your role will be changed to the role you selected.", @@ -1898,19 +1911,6 @@ "FrightenerInfo": "Prevent Players From Reporting", "FrightenerInfoLong": "(Impostors):\\nAs the Frightener, you can shapeshift into a player to alarm them for some time. Alarmed players can't report bodies (or even call meetings), else they die.", "Frightener.KillOnEmergencyMeetingCall": "Alarmed Players Die When Calling an Emergency Meeting", - "Chainbinder": "Chainbinder", - "ChainbinderInfo": "Chain nearby players together", - "ChainbinderInfoLong": "(Impostors):\\nAs the Chainbinder, use your ability to chain two nearby players together for a short time. When they move too far apart, they are pulled back toward each other. With shapeshift basis, the selected player becomes part of the chain; with pets enabled, the two nearest valid players around you are chained instead. You can still kill normally.", - "Chainbinder.NotEnoughTargets": "Not enough valid players nearby to form a chain", - "Chainbinder.PairBound": "Chain formed: {0} and {1}", - "Chainbinder.PairEnded": "Your chain ended", - "Chainbinder.PairSuffix": "Chain: {0} <> {1}", - "ChainbinderButtonText": "Chain", - "ChainbinderCooldown": "Chain Cooldown", - "ChainbinderDuration": "Chain Duration", - "ChainbinderBindRange": "Chain Range", - "ChainbinderMaxDistance": "Max Distance Before Pull", - "ChainbinderCanBindImpostors": "Can Chain Fellow Impostors", "Gambler": "Gambler", "GamblerInfo": "Each Kill gets you an Effect", "GamblerInfoLong": "(Impostors):\\nAs the Gambler, a random event happens after each kill you get. These effects can be anywhere between a self-report and an extra sniper shot.", @@ -9625,6 +9625,7 @@ "DeathReason.Assumed": "Assumed", "DeathReason.Asthma": "Asthma", "DeathReason.BadLuck": "Bad Luck", + "DeathReason.Bankrupt": "Bankrupted", "DeathReason.Bite": "Bitten", "DeathReason.Bombed": "Exploded", "DeathReason.Collapsed": "Collapsed", @@ -9644,7 +9645,6 @@ "DeathReason.Fall": "Fall", "DeathReason.FollowingSuicide": "Heartbroken", "DeathReason.Frightened": "Frightened", - "DeathReason.Bankrupt": "Bankrupted", "DeathReason.Gambled": "Guessed", "DeathReason.Hack": "Hacked", "DeathReason.Hex": "Hexed",