From 732ba9ec019142a693a6735abd3d25a5d26af545 Mon Sep 17 00:00:00 2001 From: Gurge44 Date: Sun, 7 Apr 2024 15:25:44 +0200 Subject: [PATCH] Add Bargainer (not simple, to say the least), Code Cleaup, Fix FFA --- CustomRoles.cs | 1 + GameMode/CustomHideAndSeekManager.cs | 12 +- GameMode/FFAManager.cs | 40 +- GameMode/HideAndSeekRoles/Fox.cs | 4 +- GameMode/HideAndSeekRoles/Hider.cs | 6 +- GameMode/HideAndSeekRoles/Seeker.cs | 8 +- GameMode/HideAndSeekRoles/Troll.cs | 4 +- GameMode/HotPotatoManager.cs | 12 +- GameMode/MoveAndStopManager.cs | 14 +- GameMode/SoloKombatManager.cs | 26 +- Modules/AntiBlackout.cs | 6 +- Modules/BanManager.cs | 4 +- Modules/Camouflague.cs | 2 +- Modules/ClientOptionItem.cs | 4 +- Modules/Cloud.cs | 4 +- Modules/CustomRoleSelector.cs | 6 +- Modules/CustomRolesHelper.cs | 15 +- Modules/CustomRpcSender.cs | 4 +- Modules/CustomSounds.cs | 4 +- Modules/CustomTeamManager.cs | 4 +- Modules/CustomWinnerHolder.cs | 2 +- Modules/DebugModeManager.cs | 4 +- Modules/Debugger.cs | 2 +- Modules/DisableDevice.cs | 2 +- Modules/EAC.cs | 10 +- Modules/ExtendedPlayerControl.cs | 10 +- .../GameOptionsSender/GameOptionsSender.cs | 4 +- .../NormalGameOptionsSender.cs | 2 +- .../PlayerGameOptionsSender.cs | 6 +- Modules/GameState.cs | 6 +- Modules/GhostRolesManager.cs | 8 +- Modules/GuessManager.cs | 10 +- Modules/LoadingScreen.cs | 4 +- Modules/MeetingTimeManager.cs | 4 +- Modules/ModUpdater.cs | 6 +- Modules/NameColorManager.cs | 2 +- Modules/NameNotifyManager.cs | 4 +- Modules/OptionBackup/OptionBackupData.cs | 2 +- Modules/OptionBackup/OptionBackupValue.cs | 2 +- Modules/OptionHolder.cs | 574 +++++++++--------- Modules/OptionItem/BooleanOptionItem.cs | 2 +- Modules/OptionItem/FloatOptionItem.cs | 2 +- Modules/OptionItem/IntegerOptionItem.cs | 2 +- Modules/OptionItem/OptionItem.cs | 4 +- Modules/OptionItem/StringOptionItem.cs | 2 +- Modules/OptionItem/TextOptionItem.cs | 4 +- Modules/RPC.cs | 8 +- Modules/ServerAddManager.cs | 6 +- Modules/TemplateManager.cs | 6 +- Modules/Translator.cs | 4 +- Modules/Utils.cs | 22 +- Modules/Zoom.cs | 4 +- Patches/AirShipElectricalDoors.cs | 2 +- Patches/AnnouncementPatch.cs | 8 +- Patches/ChatCommandPatch.cs | 12 +- Patches/ChatControlPatch.cs | 6 +- Patches/CheckGameEndPatch.cs | 6 +- Patches/ControlPatch.cs | 6 +- Patches/CredentialsPatch.cs | 4 +- Patches/DiscordPatch.cs | 2 +- Patches/ExilePatch.cs | 2 +- Patches/GameOptionsMenuPatch.cs | 4 +- Patches/GameStartManagerPatch.cs | 6 +- Patches/HudPatch.cs | 9 +- Patches/IntroPatch.cs | 6 +- Patches/JoinGameButtonPatch.cs | 2 +- Patches/LadderPatch.cs | 4 +- Patches/LobbyListPatch.cs | 6 +- Patches/LogoAndStampPatch.cs | 4 +- Patches/MainMenuManagerPatch.cs | 4 +- Patches/MeetingHudPatch.cs | 9 +- Patches/OutroPatch.cs | 8 +- Patches/PetActionsPatch.cs | 2 +- Patches/PlayerControlPatch.cs | 12 +- Patches/PlayerJoinAndLeftPatch.cs | 6 +- Patches/RandomSpawnPatch.cs | 4 +- Patches/SabotageSystemPatch.cs | 2 +- Patches/ShipStatusPatch.cs | 4 +- Patches/TaskAdderPatch.cs | 4 +- Patches/TextBoxPatch.cs | 4 +- Patches/onGameStartedPatch.cs | 6 +- Resources/Lang/en_US.json | 27 + Roles/AddOns/Common/Antidote.cs | 10 +- Roles/AddOns/Common/Asthmatic.cs | 8 +- Roles/AddOns/Common/Autopsy.cs | 6 +- Roles/AddOns/Common/Avanger.cs | 2 +- Roles/AddOns/Common/Bait.cs | 16 +- Roles/AddOns/Common/Bewilder.cs | 8 +- Roles/AddOns/Common/Brakar.cs | 6 +- Roles/AddOns/Common/Busy.cs | 4 +- Roles/AddOns/Common/Disco.cs | 6 +- Roles/AddOns/Common/Diseased.cs | 10 +- Roles/AddOns/Common/DoubleShot.cs | 6 +- Roles/AddOns/Common/DualPersonality.cs | 6 +- Roles/AddOns/Common/Flash.cs | 2 +- Roles/AddOns/Common/Fool.cs | 6 +- Roles/AddOns/Common/Giant.cs | 2 +- Roles/AddOns/Common/Glow.cs | 6 +- Roles/AddOns/Common/Gravestone.cs | 6 +- Roles/AddOns/Common/Guesser.cs | 12 +- Roles/AddOns/Common/Lovers.cs | 16 +- Roles/AddOns/Common/Loyal.cs | 4 +- Roles/AddOns/Common/Lucky.cs | 8 +- Roles/AddOns/Common/Necroview.cs | 6 +- Roles/AddOns/Common/Nimble.cs | 4 +- Roles/AddOns/Common/Oblivious.cs | 8 +- Roles/AddOns/Common/Physicist.cs | 4 +- Roles/AddOns/Common/Rascal.cs | 2 +- Roles/AddOns/Common/Seer.cs | 6 +- Roles/AddOns/Common/Sunglasses.cs | 8 +- Roles/AddOns/Common/Torch.cs | 4 +- Roles/AddOns/Common/Trapper.cs | 8 +- Roles/AddOns/Common/Truant.cs | 2 +- Roles/AddOns/Common/Unlucky.cs | 16 +- Roles/AddOns/Common/Unreportable.cs | 6 +- Roles/AddOns/Common/Watcher.cs | 6 +- Roles/AddOns/Crewmate/Bloodlust.cs | 6 +- Roles/AddOns/Crewmate/Lazy.cs | 4 +- Roles/AddOns/Crewmate/Stressed.cs | 22 +- Roles/AddOns/Crewmate/Workhorse.cs | 12 +- Roles/AddOns/GhostRoles/Haunter.cs | 6 +- Roles/AddOns/GhostRoles/Minion.cs | 2 +- Roles/AddOns/GhostRoles/Specter.cs | 6 +- Roles/AddOns/GhostRoles/Warden.cs | 4 +- Roles/AddOns/Impostor/Circumvent.cs | 4 +- Roles/AddOns/Impostor/Damocles.cs | 12 +- Roles/AddOns/Impostor/DeadlyQuota.cs | 2 +- Roles/AddOns/Impostor/Egoist.cs | 2 +- Roles/AddOns/Impostor/LastImpostor.cs | 2 +- Roles/AddOns/Impostor/Madmate.cs | 20 +- Roles/AddOns/Impostor/Mare.cs | 8 +- Roles/AddOns/Impostor/Mimic.cs | 2 +- Roles/AddOns/Impostor/TicketsStealer.cs | 2 +- Roles/Crewmate/Addict.cs | 12 +- Roles/Crewmate/Adventurer.cs | 8 +- Roles/Crewmate/Aid.cs | 8 +- Roles/Crewmate/Alchemist.cs | 22 +- Roles/Crewmate/Analyst.cs | 16 +- Roles/Crewmate/Beacon.cs | 4 +- Roles/Crewmate/Benefactor.cs | 10 +- Roles/Crewmate/Bloodhound.cs | 18 +- Roles/Crewmate/Bodyguard.cs | 4 +- Roles/Crewmate/CameraMan.cs | 10 +- Roles/Crewmate/CandleLighter.cs | 16 +- Roles/Crewmate/Chameleon.cs | 10 +- Roles/Crewmate/Cleanser.cs | 8 +- Roles/Crewmate/Convener.cs | 6 +- Roles/Crewmate/CopyCat.cs | 8 +- Roles/Crewmate/CrewmateVanillaRoles.cs | 4 +- Roles/Crewmate/Crusader.cs | 6 +- Roles/Crewmate/CyberStar.cs | 4 +- Roles/Crewmate/Demolitionist.cs | 4 +- Roles/Crewmate/Deputy.cs | 12 +- Roles/Crewmate/Detective.cs | 2 +- Roles/Crewmate/Divinator.cs | 14 +- Roles/Crewmate/Doctor.cs | 4 +- Roles/Crewmate/DonutDelivery.cs | 8 +- Roles/Crewmate/Doormaster.cs | 10 +- Roles/Crewmate/DovesOfNeace.cs | 12 +- Roles/Crewmate/Drainer.cs | 14 +- Roles/Crewmate/Druid.cs | 18 +- Roles/Crewmate/Electric.cs | 2 +- Roles/Crewmate/Enigma.cs | 12 +- Roles/Crewmate/Escort.cs | 8 +- Roles/Crewmate/Express.cs | 4 +- Roles/Crewmate/Farseer.cs | 12 +- Roles/Crewmate/Gaulois.cs | 10 +- Roles/Crewmate/Grenadier.cs | 22 +- Roles/Crewmate/Jailer.cs | 6 +- Roles/Crewmate/Judge.cs | 32 +- Roles/Crewmate/Lighter.cs | 18 +- Roles/Crewmate/Luckey.cs | 2 +- Roles/Crewmate/Marshall.cs | 2 +- Roles/Crewmate/Mayor.cs | 16 +- Roles/Crewmate/Medic.cs | 26 +- Roles/Crewmate/Mediumshiper.cs | 8 +- Roles/Crewmate/Merchant.cs | 36 +- Roles/Crewmate/Monarch.cs | 8 +- Roles/Crewmate/Monitor.cs | 4 +- Roles/Crewmate/Mortician.cs | 6 +- Roles/Crewmate/NiceEraser.cs | 4 +- Roles/Crewmate/NiceGuesser.cs | 8 +- Roles/Crewmate/NiceHacker.cs | 22 +- Roles/Crewmate/NiceSwapper.cs | 20 +- Roles/Crewmate/Oracle.cs | 10 +- Roles/Crewmate/Paranoia.cs | 8 +- Roles/Crewmate/ParityCop.cs | 24 +- Roles/Crewmate/Perceiver.cs | 12 +- Roles/Crewmate/Psychic.cs | 16 +- Roles/Crewmate/Rabbit.cs | 8 +- Roles/Crewmate/Randomizer.cs | 16 +- Roles/Crewmate/Ricochet.cs | 8 +- Roles/Crewmate/SabotageMaster.cs | 22 +- Roles/Crewmate/SecurityGuard.cs | 14 +- Roles/Crewmate/Sentinel.cs | 10 +- Roles/Crewmate/Sentry.cs | 16 +- Roles/Crewmate/Sheriff.cs | 42 +- Roles/Crewmate/Snitch.cs | 10 +- Roles/Crewmate/Speedrunner.cs | 8 +- Roles/Crewmate/Spiritualist.cs | 4 +- Roles/Crewmate/Spy.cs | 10 +- Roles/Crewmate/SuperStar.cs | 2 +- Roles/Crewmate/SwordsMan.cs | 6 +- Roles/Crewmate/Tether.cs | 12 +- Roles/Crewmate/TimeManager.cs | 6 +- Roles/Crewmate/TimeMaster.cs | 14 +- Roles/Crewmate/Tornado.cs | 12 +- Roles/Crewmate/Tracefinder.cs | 12 +- Roles/Crewmate/Tracker.cs | 18 +- Roles/Crewmate/Transporter.cs | 8 +- Roles/Crewmate/Ventguard.cs | 12 +- Roles/Crewmate/Veteran.cs | 16 +- Roles/Crewmate/Witness.cs | 8 +- Roles/Impostor/AntiAdminer.cs | 16 +- Roles/Impostor/Assassin.cs | 10 +- Roles/Impostor/BallLightning.cs | 10 +- Roles/Impostor/Blackmailer.cs | 4 +- Roles/Impostor/Bomber.cs | 18 +- Roles/Impostor/BoobyTrap.cs | 4 +- Roles/Impostor/BountyHunter.cs | 12 +- Roles/Impostor/Camouflager.cs | 10 +- Roles/Impostor/Cantankerous.cs | 6 +- Roles/Impostor/Capitalism.cs | 4 +- Roles/Impostor/Changeling.cs | 10 +- Roles/Impostor/Chronomancer.cs | 10 +- Roles/Impostor/Cleaner.cs | 8 +- Roles/Impostor/Commander.cs | 8 +- Roles/Impostor/Consort.cs | 8 +- Roles/Impostor/Councillor.cs | 22 +- Roles/Impostor/Crewpostor.cs | 16 +- Roles/Impostor/CursedWolf.cs | 4 +- Roles/Impostor/Dazzler.cs | 14 +- Roles/Impostor/Deathpact.cs | 20 +- Roles/Impostor/Devourer.cs | 14 +- Roles/Impostor/Disperser.cs | 8 +- Roles/Impostor/Duellist.cs | 6 +- Roles/Impostor/Eraser.cs | 12 +- Roles/Impostor/Escapee.cs | 2 +- Roles/Impostor/EvilDiviner.cs | 8 +- Roles/Impostor/EvilGuesser.cs | 10 +- Roles/Impostor/EvilTracker.cs | 14 +- Roles/Impostor/FireWorks.cs | 12 +- Roles/Impostor/Freezer.cs | 4 +- Roles/Impostor/Gambler.cs | 44 +- Roles/Impostor/Gangster.cs | 16 +- Roles/Impostor/Generator.cs | 14 +- Roles/Impostor/Greedier.cs | 12 +- Roles/Impostor/Hacker.cs | 10 +- Roles/Impostor/Hangman.cs | 14 +- Roles/Impostor/Hitman.cs | 10 +- Roles/Impostor/ImperiusCurse.cs | 4 +- Roles/Impostor/ImpostorVanillaRoles.cs | 4 +- Roles/Impostor/Inhibitor.cs | 4 +- Roles/Impostor/Kamikaze.cs | 6 +- Roles/Impostor/Kidnapper.cs | 2 +- Roles/Impostor/Librarian.cs | 16 +- Roles/Impostor/Lurker.cs | 4 +- Roles/Impostor/Mafia.cs | 16 +- Roles/Impostor/Mafioso.cs | 16 +- Roles/Impostor/Mastermind.cs | 12 +- Roles/Impostor/Miner.cs | 2 +- Roles/Impostor/Minimalism.cs | 4 +- Roles/Impostor/Morphling.cs | 8 +- Roles/Impostor/Nullifier.cs | 10 +- Roles/Impostor/OverKiller.cs | 6 +- Roles/Impostor/Parasite.cs | 2 +- Roles/Impostor/Penguin.cs | 8 +- Roles/Impostor/Puppeteer.cs | 32 +- Roles/Impostor/QuickShooter.cs | 12 +- Roles/Impostor/RiftMaker.cs | 8 +- Roles/Impostor/Saboteur.cs | 4 +- Roles/Impostor/Sans.cs | 14 +- Roles/Impostor/Sapper.cs | 12 +- Roles/Impostor/Scavenger.cs | 4 +- Roles/Impostor/SerialKiller.cs | 6 +- Roles/Impostor/Silencer.cs | 8 +- Roles/Impostor/Sniper.cs | 16 +- Roles/Impostor/Stealth.cs | 10 +- Roles/Impostor/Swapster.cs | 6 +- Roles/Impostor/Swiftclaw.cs | 6 +- Roles/Impostor/Swooper.cs | 18 +- Roles/Impostor/TimeThief.cs | 8 +- Roles/Impostor/Twister.cs | 10 +- Roles/Impostor/Underdog.cs | 6 +- Roles/Impostor/Undertaker.cs | 6 +- Roles/Impostor/Vampire.cs | 6 +- Roles/Impostor/Vindicator.cs | 4 +- Roles/Impostor/Visionary.cs | 10 +- Roles/Impostor/Warlock.cs | 23 +- Roles/Impostor/Wildling.cs | 16 +- Roles/Impostor/Witch.cs | 6 +- Roles/Impostor/YinYanger.cs | 8 +- Roles/Impostor/Zombie.cs | 8 +- Roles/Neutral/Agitater.cs | 18 +- Roles/Neutral/Amnesiac.cs | 12 +- Roles/Neutral/Arsonist.cs | 18 +- Roles/Neutral/Bandit.cs | 18 +- Roles/Neutral/Bargainer.cs | 390 ++++++++++++ Roles/Neutral/BloodKnight.cs | 8 +- Roles/Neutral/Bubble.cs | 20 +- Roles/Neutral/Cherokious.cs | 2 +- Roles/Neutral/Collector.cs | 8 +- Roles/Neutral/DarkHide.cs | 14 +- Roles/Neutral/Doomsayer.cs | 12 +- Roles/Neutral/Doppelganger.cs | 14 +- Roles/Neutral/Eclipse.cs | 12 +- Roles/Neutral/Enderman.cs | 6 +- Roles/Neutral/Executioner.cs | 18 +- Roles/Neutral/FFF.cs | 24 +- Roles/Neutral/Gamer.cs | 18 +- Roles/Neutral/Glitch.cs | 22 +- Roles/Neutral/God.cs | 4 +- Roles/Neutral/HeadHunter.cs | 22 +- Roles/Neutral/HexMaster.cs | 2 +- Roles/Neutral/Hookshot.cs | 6 +- Roles/Neutral/Imitator.cs | 10 +- Roles/Neutral/Impartial.cs | 16 +- Roles/Neutral/Innocent.cs | 2 +- Roles/Neutral/Jackal.cs | 38 +- Roles/Neutral/Jester.cs | 8 +- Roles/Neutral/Jinx.cs | 14 +- Roles/Neutral/Juggernaut.cs | 10 +- Roles/Neutral/Lawyer.cs | 20 +- Roles/Neutral/Magician.cs | 34 +- Roles/Neutral/Mario.cs | 12 +- Roles/Neutral/Maverick.cs | 8 +- Roles/Neutral/Medusa.cs | 8 +- Roles/Neutral/Mycologist.cs | 18 +- Roles/Neutral/NSerialKiller.cs | 6 +- Roles/Neutral/Necromancer.cs | 12 +- Roles/Neutral/Opportunist.cs | 2 +- Roles/Neutral/Pelican.cs | 10 +- Roles/Neutral/Phantom.cs | 6 +- Roles/Neutral/Pickpocket.cs | 10 +- Roles/Neutral/PlagueBearer.cs | 12 +- Roles/Neutral/PlagueDoctor.cs | 22 +- Roles/Neutral/Poisoner.cs | 6 +- Roles/Neutral/Postman.cs | 12 +- Roles/Neutral/Predator.cs | 16 +- Roles/Neutral/Provocateur.cs | 4 +- Roles/Neutral/Pursuer.cs | 8 +- Roles/Neutral/Pyromaniac.cs | 12 +- Roles/Neutral/Reckless.cs | 10 +- Roles/Neutral/Revolutionist.cs | 22 +- Roles/Neutral/Ritualist.cs | 8 +- Roles/Neutral/Romantic.cs | 22 +- Roles/Neutral/SchrodingersCat.cs | 2 +- Roles/Neutral/Sidekick.cs | 2 +- Roles/Neutral/SoulHunter.cs | 18 +- Roles/Neutral/Spiritcaller.cs | 22 +- Roles/Neutral/Sprayer.cs | 22 +- Roles/Neutral/Succubus.cs | 20 +- Roles/Neutral/Terrorist.cs | 4 +- Roles/Neutral/Tiger.cs | 10 +- Roles/Neutral/Totocalcio.cs | 16 +- Roles/Neutral/Traitor.cs | 10 +- Roles/Neutral/Vengeance.cs | 10 +- Roles/Neutral/Virus.cs | 24 +- Roles/Neutral/Vulture.cs | 12 +- Roles/Neutral/WeaponMaster.cs | 12 +- Roles/Neutral/Werewolf.cs | 12 +- Roles/Neutral/Workaholic.cs | 16 +- Roles/Neutral/Wraith.cs | 6 +- Roles/RoleBase.cs | 6 +- main.cs | 16 +- 365 files changed, 2457 insertions(+), 2025 deletions(-) create mode 100644 Roles/Neutral/Bargainer.cs diff --git a/CustomRoles.cs b/CustomRoles.cs index 3bb18f8e0..21ae4524d 100644 --- a/CustomRoles.cs +++ b/CustomRoles.cs @@ -220,6 +220,7 @@ public enum CustomRoles Amnesiac, Arsonist, Bandit, + Bargainer, BloodKnight, Bubble, Cherokious, diff --git a/GameMode/CustomHideAndSeekManager.cs b/GameMode/CustomHideAndSeekManager.cs index 4b5f168ea..5ac2269fc 100644 --- a/GameMode/CustomHideAndSeekManager.cs +++ b/GameMode/CustomHideAndSeekManager.cs @@ -1,11 +1,11 @@ -using AmongUs.GameOptions; -using EHR.GameMode.HideAndSeekRoles; -using EHR.Modules; -using HarmonyLib; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using AmongUs.GameOptions; +using EHR.GameMode.HideAndSeekRoles; +using EHR.Modules; +using HarmonyLib; using UnityEngine; namespace EHR @@ -22,7 +22,7 @@ namespace EHR const int id = 69_211_001; Color color = new(52, 94, 235, byte.MaxValue); - MaxGameLength = IntegerOptionItem.Create(id, "FFA_GameTime", new(0, 1200, 10), 600, TabGroup.GameSettings, false) + MaxGameLength = IntegerOptionItem.Create(id, "FFA_GameTime", new(0, 1200, 10), 600, TabGroup.GameSettings) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Seconds) .SetColor(color); diff --git a/GameMode/FFAManager.cs b/GameMode/FFAManager.cs index e4e70826e..f2f1cceac 100644 --- a/GameMode/FFAManager.cs +++ b/GameMode/FFAManager.cs @@ -1,9 +1,9 @@ -using EHR.Modules; -using HarmonyLib; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using HarmonyLib; +using Hazel; using UnityEngine; using static EHR.Translator; @@ -55,56 +55,56 @@ internal static class FFAManager public static void SetupCustomOption() { - FFAGameTime = IntegerOptionItem.Create(67_223_001, "FFA_GameTime", new(30, 600, 10), 300, TabGroup.GameSettings, false) + FFAGameTime = IntegerOptionItem.Create(67_223_001, "FFA_GameTime", new(30, 600, 10), 300, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds) .SetHeader(true); - FFAKcd = FloatOptionItem.Create(67_223_002, "FFA_KCD", new(1f, 60f, 1f), 10f, TabGroup.GameSettings, false) + FFAKcd = FloatOptionItem.Create(67_223_002, "FFA_KCD", new(1f, 60f, 1f), 10f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - FFADisableVentingWhenTwoPlayersAlive = BooleanOptionItem.Create(67_223_003, "FFA_DisableVentingWhenTwoPlayersAlive", true, TabGroup.GameSettings, false) + FFADisableVentingWhenTwoPlayersAlive = BooleanOptionItem.Create(67_223_003, "FFA_DisableVentingWhenTwoPlayersAlive", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); - FFADisableVentingWhenKcdIsUp = BooleanOptionItem.Create(67_223_004, "FFA_DisableVentingWhenKCDIsUp", true, TabGroup.GameSettings, false) + FFADisableVentingWhenKcdIsUp = BooleanOptionItem.Create(67_223_004, "FFA_DisableVentingWhenKCDIsUp", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); - FFAEnableRandomAbilities = BooleanOptionItem.Create(67_223_005, "FFA_EnableRandomAbilities", true, TabGroup.GameSettings, false) + FFAEnableRandomAbilities = BooleanOptionItem.Create(67_223_005, "FFA_EnableRandomAbilities", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); - FFAShieldDuration = FloatOptionItem.Create(67_223_006, "FFA_ShieldDuration", new(1f, 70f, 1f), 7f, TabGroup.GameSettings, false) + FFAShieldDuration = FloatOptionItem.Create(67_223_006, "FFA_ShieldDuration", new(1f, 70f, 1f), 7f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - FFAIncreasedSpeed = FloatOptionItem.Create(67_223_007, "FFA_IncreasedSpeed", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.GameSettings, false) + FFAIncreasedSpeed = FloatOptionItem.Create(67_223_007, "FFA_IncreasedSpeed", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Multiplier); - FFADecreasedSpeed = FloatOptionItem.Create(67_223_008, "FFA_DecreasedSpeed", new(0.1f, 5f, 0.1f), 1f, TabGroup.GameSettings, false) + FFADecreasedSpeed = FloatOptionItem.Create(67_223_008, "FFA_DecreasedSpeed", new(0.1f, 5f, 0.1f), 1f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Multiplier); - FFAModifiedSpeedDuration = FloatOptionItem.Create(67_223_009, "FFA_ModifiedSpeedDuration", new(1f, 60f, 1f), 10f, TabGroup.GameSettings, false).SetGameMode(CustomGameMode.FFA).SetColor(new Color32(0, 255, 165, byte.MaxValue)) + FFAModifiedSpeedDuration = FloatOptionItem.Create(67_223_009, "FFA_ModifiedSpeedDuration", new(1f, 60f, 1f), 10f, TabGroup.GameSettings).SetGameMode(CustomGameMode.FFA).SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - FFALowerVision = FloatOptionItem.Create(67_223_010, "FFA_LowerVision", new(0f, 1f, 0.05f), 0.5f, TabGroup.GameSettings, false).SetGameMode(CustomGameMode.FFA).SetColor(new Color32(0, 255, 165, byte.MaxValue)) + FFALowerVision = FloatOptionItem.Create(67_223_010, "FFA_LowerVision", new(0f, 1f, 0.05f), 0.5f, TabGroup.GameSettings).SetGameMode(CustomGameMode.FFA).SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Multiplier); - FFAModifiedVisionDuration = FloatOptionItem.Create(67_223_011, "FFA_ModifiedVisionDuration", new(1f, 70f, 1f), 5f, TabGroup.GameSettings, false).SetGameMode(CustomGameMode.FFA).SetColor(new Color32(0, 255, 165, byte.MaxValue)) + FFAModifiedVisionDuration = FloatOptionItem.Create(67_223_011, "FFA_ModifiedVisionDuration", new(1f, 70f, 1f), 5f, TabGroup.GameSettings).SetGameMode(CustomGameMode.FFA).SetColor(new Color32(0, 255, 165, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - FFAEnableRandomTwists = BooleanOptionItem.Create(67_223_012, "FFA_EnableRandomTwists", true, TabGroup.GameSettings, false) + FFAEnableRandomTwists = BooleanOptionItem.Create(67_223_012, "FFA_EnableRandomTwists", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); - FFAShieldIsOneTimeUse = BooleanOptionItem.Create(67_223_013, "FFA_ShieldIsOneTimeUse", true, TabGroup.GameSettings, false) + FFAShieldIsOneTimeUse = BooleanOptionItem.Create(67_223_013, "FFA_ShieldIsOneTimeUse", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); - FFAChatDuringGame = BooleanOptionItem.Create(67_223_014, "FFA_ChatDuringGame", false, TabGroup.GameSettings, false) + FFAChatDuringGame = BooleanOptionItem.Create(67_223_014, "FFA_ChatDuringGame", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); - FFATeamMode = BooleanOptionItem.Create(67_223_015, "FFA_TeamMode", false, TabGroup.GameSettings, false) + FFATeamMode = BooleanOptionItem.Create(67_223_015, "FFA_TeamMode", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.FFA) .SetHeader(true) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); - FFATeamNumber = IntegerOptionItem.Create(67_223_016, "FFA_TeamNumber", new(2, 7, 1), 2, TabGroup.GameSettings, false) + FFATeamNumber = IntegerOptionItem.Create(67_223_016, "FFA_TeamNumber", new(2, 7, 1), 2, TabGroup.GameSettings) .SetParent(FFATeamMode) .SetGameMode(CustomGameMode.FFA) .SetColor(new Color32(0, 255, 165, byte.MaxValue)); diff --git a/GameMode/HideAndSeekRoles/Fox.cs b/GameMode/HideAndSeekRoles/Fox.cs index 4b2a8973a..b9a429701 100644 --- a/GameMode/HideAndSeekRoles/Fox.cs +++ b/GameMode/HideAndSeekRoles/Fox.cs @@ -13,12 +13,12 @@ namespace EHR.GameMode.HideAndSeekRoles public static void SetupCustomOption() { Options.SetupRoleOptions(69_211_301, TabGroup.NeutralRoles, CustomRoles.Fox, CustomGameMode.HideAndSeek, true); - Vision = FloatOptionItem.Create(69_211_303, "FoxVision", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles, false) + Vision = FloatOptionItem.Create(69_211_303, "FoxVision", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(0, 255, 0, byte.MaxValue)) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Fox]); - Speed = FloatOptionItem.Create(69_213_304, "FoxSpeed", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles, false) + Speed = FloatOptionItem.Create(69_213_304, "FoxSpeed", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(0, 255, 0, byte.MaxValue)) diff --git a/GameMode/HideAndSeekRoles/Hider.cs b/GameMode/HideAndSeekRoles/Hider.cs index 101d7ecf5..2e5d193c5 100644 --- a/GameMode/HideAndSeekRoles/Hider.cs +++ b/GameMode/HideAndSeekRoles/Hider.cs @@ -18,15 +18,15 @@ namespace EHR.GameMode.HideAndSeekRoles .SetHeader(true) .SetColor(new(52, 94, 235, byte.MaxValue)); - Vision = FloatOptionItem.Create(69_211_101, "HiderVision", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.CrewmateRoles, false) + Vision = FloatOptionItem.Create(69_211_101, "HiderVision", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.CrewmateRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(52, 94, 235, byte.MaxValue)); - Speed = FloatOptionItem.Create(69_211_102, "HiderSpeed", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.CrewmateRoles, false) + Speed = FloatOptionItem.Create(69_211_102, "HiderSpeed", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.CrewmateRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(52, 94, 235, byte.MaxValue)); - TimeDecreaseOnTaskComplete = IntegerOptionItem.Create(69_211_103, "TimeDecreaseOnTaskComplete", new(0, 60, 1), 5, TabGroup.CrewmateRoles, false) + TimeDecreaseOnTaskComplete = IntegerOptionItem.Create(69_211_103, "TimeDecreaseOnTaskComplete", new(0, 60, 1), 5, TabGroup.CrewmateRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Seconds) .SetColor(new(52, 94, 235, byte.MaxValue)); diff --git a/GameMode/HideAndSeekRoles/Seeker.cs b/GameMode/HideAndSeekRoles/Seeker.cs index 99cd5fb4e..e6b8cf366 100644 --- a/GameMode/HideAndSeekRoles/Seeker.cs +++ b/GameMode/HideAndSeekRoles/Seeker.cs @@ -19,19 +19,19 @@ namespace EHR.GameMode.HideAndSeekRoles .SetHeader(true) .SetColor(new(255, 25, 25, byte.MaxValue)); - Vision = FloatOptionItem.Create(69_211_201, "SeekerVision", new(0.05f, 5f, 0.05f), 0.5f, TabGroup.ImpostorRoles, false) + Vision = FloatOptionItem.Create(69_211_201, "SeekerVision", new(0.05f, 5f, 0.05f), 0.5f, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(255, 25, 25, byte.MaxValue)); - Speed = FloatOptionItem.Create(69_211_202, "SeekerSpeed", new(0.05f, 5f, 0.05f), 1.5f, TabGroup.ImpostorRoles, false) + Speed = FloatOptionItem.Create(69_211_202, "SeekerSpeed", new(0.05f, 5f, 0.05f), 1.5f, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(255, 25, 25, byte.MaxValue)); - KillCooldown = FloatOptionItem.Create(69_211_203, "KillCooldown", new(0f, 90f, 1f), 10f, TabGroup.ImpostorRoles, false) + KillCooldown = FloatOptionItem.Create(69_211_203, "KillCooldown", new(0f, 90f, 1f), 10f, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Seconds) .SetColor(new(255, 25, 25, byte.MaxValue)); - CanVent = BooleanOptionItem.Create(69_211_204, "CanVent", false, TabGroup.ImpostorRoles, false) + CanVent = BooleanOptionItem.Create(69_211_204, "CanVent", false, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetColor(new(255, 25, 25, byte.MaxValue)); } diff --git a/GameMode/HideAndSeekRoles/Troll.cs b/GameMode/HideAndSeekRoles/Troll.cs index 4d7ce1878..a18c85291 100644 --- a/GameMode/HideAndSeekRoles/Troll.cs +++ b/GameMode/HideAndSeekRoles/Troll.cs @@ -13,12 +13,12 @@ namespace EHR.GameMode.HideAndSeekRoles public static void SetupCustomOption() { Options.SetupRoleOptions(69_211_401, TabGroup.NeutralRoles, CustomRoles.Troll, CustomGameMode.HideAndSeek, true); - Vision = FloatOptionItem.Create(69_211_403, "TrollVision", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles, false) + Vision = FloatOptionItem.Create(69_211_403, "TrollVision", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(255, 0, 255, byte.MaxValue)) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Troll]); - Speed = FloatOptionItem.Create(69_211_404, "TrollSpeed", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles, false) + Speed = FloatOptionItem.Create(69_211_404, "TrollSpeed", new(0.05f, 5f, 0.05f), 1.25f, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.HideAndSeek) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new(255, 0, 255, byte.MaxValue)) diff --git a/GameMode/HotPotatoManager.cs b/GameMode/HotPotatoManager.cs index 6752f4be0..ff4daac8b 100644 --- a/GameMode/HotPotatoManager.cs +++ b/GameMode/HotPotatoManager.cs @@ -1,7 +1,7 @@ -using HarmonyLib; -using System; +using System; using System.Collections.Generic; using System.Linq; +using HarmonyLib; using UnityEngine; namespace EHR @@ -23,19 +23,19 @@ namespace EHR public static void SetupCustomOption() { - Time = IntegerOptionItem.Create(69_213_001, "HotPotato_Time", new(1, 90, 1), 20, TabGroup.GameSettings, false) + Time = IntegerOptionItem.Create(69_213_001, "HotPotato_Time", new(1, 90, 1), 20, TabGroup.GameSettings) .SetHeader(true) .SetGameMode(CustomGameMode.HotPotato) .SetValueFormat(OptionFormat.Seconds) .SetColor(new Color32(232, 205, 70, byte.MaxValue)); - HolderSpeed = FloatOptionItem.Create(69_213_002, "HotPotato_HolderSpeed", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.GameSettings, false) + HolderSpeed = FloatOptionItem.Create(69_213_002, "HotPotato_HolderSpeed", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.HotPotato) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new Color32(232, 205, 70, byte.MaxValue)); - Chat = BooleanOptionItem.Create(69_213_003, "FFA_ChatDuringGame", false, TabGroup.GameSettings, false) + Chat = BooleanOptionItem.Create(69_213_003, "FFA_ChatDuringGame", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.HotPotato) .SetColor(new Color32(232, 205, 70, byte.MaxValue)); - Range = FloatOptionItem.Create(69_213_004, "HotPotato_Range", new(0.25f, 5f, 0.25f), 1f, TabGroup.GameSettings, false) + Range = FloatOptionItem.Create(69_213_004, "HotPotato_Range", new(0.25f, 5f, 0.25f), 1f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.HotPotato) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new Color32(232, 205, 70, byte.MaxValue)); diff --git a/GameMode/MoveAndStopManager.cs b/GameMode/MoveAndStopManager.cs index 66cb3952e..b41a31200 100644 --- a/GameMode/MoveAndStopManager.cs +++ b/GameMode/MoveAndStopManager.cs @@ -1,8 +1,8 @@ -using EHR.Roles.AddOns.Common; -using HarmonyLib; -using System; +using System; using System.Collections.Generic; using System.Linq; +using EHR.Roles.AddOns.Common; +using HarmonyLib; using UnityEngine; using static EHR.Translator; @@ -64,7 +64,7 @@ public class Counter(int totalGreenTime, int totalRedTime, long startTimeStamp, { get { - string result = IsYellow || (Timer == TotalGreenTime && !IsRed && !IsYellow) || (Timer == TotalRedTime && IsRed) ? Utils.ColorString(Color.clear, "00") : Utils.ColorString(IsRed ? Color.red : Color.green, Timer < 10 ? $"0{Timer}" : Timer.ToString()); + string result = IsYellow || (Timer == TotalGreenTime && !IsRed && !IsYellow) || (Timer == TotalRedTime && IsRed) ? Utils.ColorString(Color.clear, "00") : Utils.ColorString(IsRed ? Color.red : Color.green, Timer < 10 ? $" {Timer}" : Timer.ToString()); if (Timer is <= 19 and >= 10 && !IsYellow) result = $" {result}"; if (Timer % 10 == 1 && !IsYellow) result = result.Insert(result.Length - 9, " "); @@ -217,7 +217,7 @@ internal class MoveAndStopManager private static int DefaultMaxValue => 30; private static OptionItem CreateSetting(int Id, string direction, bool red, bool min) => - IntegerOptionItem.Create(Id, CounterSettingString(direction, red, min), CounterValueRule, min ? DefaultMinValue : DefaultMaxValue, TabGroup.GameSettings, false) + IntegerOptionItem.Create(Id, CounterSettingString(direction, red, min), CounterValueRule, min ? DefaultMinValue : DefaultMaxValue, TabGroup.GameSettings) .SetGameMode(CustomGameMode.MoveAndStop) .SetColor(new Color32(0, 255, 255, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds) @@ -230,7 +230,7 @@ internal class MoveAndStopManager .AddReplacement(new("Middle", Utils.ColorString(Color.white, "Middle"))); private static OptionItem CreateExtraTimeSetting(int Id, string mapName, int defaultValue) => - IntegerOptionItem.Create(Id, $"MoveAndStop_ExtraGreenTimeOn{mapName}", ExtraTimeValue, defaultValue, TabGroup.GameSettings, false) + IntegerOptionItem.Create(Id, $"MoveAndStop_ExtraGreenTimeOn{mapName}", ExtraTimeValue, defaultValue, TabGroup.GameSettings) .SetGameMode(CustomGameMode.MoveAndStop) .SetColor(new Color32(0, 255, 255, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds) @@ -238,7 +238,7 @@ internal class MoveAndStopManager public static void SetupCustomOption() { - MoveAndStop_GameTime = IntegerOptionItem.Create(68_213_001, "FFA_GameTime", new(30, 1200, 10), 900, TabGroup.GameSettings, false) + MoveAndStop_GameTime = IntegerOptionItem.Create(68_213_001, "FFA_GameTime", new(30, 1200, 10), 900, TabGroup.GameSettings) .SetGameMode(CustomGameMode.MoveAndStop) .SetColor(new Color32(0, 255, 255, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds) diff --git a/GameMode/SoloKombatManager.cs b/GameMode/SoloKombatManager.cs index 9fc5bcca3..858a85f60 100644 --- a/GameMode/SoloKombatManager.cs +++ b/GameMode/SoloKombatManager.cs @@ -1,10 +1,10 @@ -using EHR.Modules; +using System; +using System.Collections.Generic; +using System.Linq; +using EHR.Modules; using EHR.Roles.Neutral; using HarmonyLib; using Hazel; -using System; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.RandomSpawn; @@ -43,40 +43,40 @@ internal static class SoloKombatManager public static void SetupCustomOption() { - KB_GameTime = IntegerOptionItem.Create(66_233_001, "KB_GameTime", new(30, 300, 5), 180, TabGroup.GameSettings, false) + KB_GameTime = IntegerOptionItem.Create(66_233_001, "KB_GameTime", new(30, 300, 5), 180, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds) .SetHeader(true); - KB_ATKCooldown = FloatOptionItem.Create(66_223_008, "KB_ATKCooldown", new(1f, 10f, 0.1f), 1f, TabGroup.GameSettings, false) + KB_ATKCooldown = FloatOptionItem.Create(66_223_008, "KB_ATKCooldown", new(1f, 10f, 0.1f), 1f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - KB_HPMax = FloatOptionItem.Create(66_233_002, "KB_HPMax", new(10f, 990f, 5f), 100f, TabGroup.GameSettings, false) + KB_HPMax = FloatOptionItem.Create(66_233_002, "KB_HPMax", new(10f, 990f, 5f), 100f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Health); - KB_ATK = FloatOptionItem.Create(66_233_003, "KB_ATK", new(1f, 100f, 1f), 8f, TabGroup.GameSettings, false) + KB_ATK = FloatOptionItem.Create(66_233_003, "KB_ATK", new(1f, 100f, 1f), 8f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Health); - KB_RecoverPerSecond = FloatOptionItem.Create(66_233_005, "KB_RecoverPerSecond", new(1f, 180f, 1f), 2f, TabGroup.GameSettings, false) + KB_RecoverPerSecond = FloatOptionItem.Create(66_233_005, "KB_RecoverPerSecond", new(1f, 180f, 1f), 2f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Health); - KB_RecoverAfterSecond = IntegerOptionItem.Create(66_233_004, "KB_RecoverAfterSecond", new(0, 60, 1), 8, TabGroup.GameSettings, false) + KB_RecoverAfterSecond = IntegerOptionItem.Create(66_233_004, "KB_RecoverAfterSecond", new(0, 60, 1), 8, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - KB_ResurrectionWaitingTime = IntegerOptionItem.Create(66_233_006, "KB_ResurrectionWaitingTime", new(3, 990, 1), 15, TabGroup.GameSettings, false) + KB_ResurrectionWaitingTime = IntegerOptionItem.Create(66_233_006, "KB_ResurrectionWaitingTime", new(3, 990, 1), 15, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - KB_KillBonusMultiplier = FloatOptionItem.Create(66_233_007, "KB_KillBonusMultiplier", new(0.25f, 5f, 0.25f), 1.25f, TabGroup.GameSettings, false) + KB_KillBonusMultiplier = FloatOptionItem.Create(66_233_007, "KB_KillBonusMultiplier", new(0.25f, 5f, 0.25f), 1.25f, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)) .SetValueFormat(OptionFormat.Multiplier); - KB_BootVentWhenDead = BooleanOptionItem.Create(66_233_009, "KB_BootVentWhenDead", false, TabGroup.GameSettings, false) + KB_BootVentWhenDead = BooleanOptionItem.Create(66_233_009, "KB_BootVentWhenDead", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.SoloKombat) .SetColor(new Color32(245, 82, 82, byte.MaxValue)); } diff --git a/Modules/AntiBlackout.cs b/Modules/AntiBlackout.cs index 7be72dbf4..9a658de46 100644 --- a/Modules/AntiBlackout.cs +++ b/Modules/AntiBlackout.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; namespace EHR; diff --git a/Modules/BanManager.cs b/Modules/BanManager.cs index bcb898abd..5aa405a4d 100644 --- a/Modules/BanManager.cs +++ b/Modules/BanManager.cs @@ -1,5 +1,3 @@ -using HarmonyLib; -using InnerNet; using System; using System.Collections.Generic; using System.IO; @@ -8,6 +6,8 @@ using System.Reflection; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; +using HarmonyLib; +using InnerNet; using static EHR.Translator; namespace EHR; diff --git a/Modules/Camouflague.cs b/Modules/Camouflague.cs index fbd79fb7a..aa02d05b6 100644 --- a/Modules/Camouflague.cs +++ b/Modules/Camouflague.cs @@ -1,7 +1,7 @@ +using System.Collections.Generic; using AmongUs.Data; using EHR.Roles.Impostor; using EHR.Roles.Neutral; -using System.Collections.Generic; namespace EHR; diff --git a/Modules/ClientOptionItem.cs b/Modules/ClientOptionItem.cs index 041ae292a..4405b56d6 100644 --- a/Modules/ClientOptionItem.cs +++ b/Modules/ClientOptionItem.cs @@ -1,5 +1,5 @@ -using BepInEx.Configuration; -using System; +using System; +using BepInEx.Configuration; using UnityEngine; using Object = UnityEngine.Object; diff --git a/Modules/Cloud.cs b/Modules/Cloud.cs index 8c6133a15..330a43f9e 100644 --- a/Modules/Cloud.cs +++ b/Modules/Cloud.cs @@ -1,9 +1,9 @@ -using HarmonyLib; -using System; +using System; using System.IO; using System.Net.Sockets; using System.Reflection; using System.Text; +using HarmonyLib; namespace EHR; diff --git a/Modules/CustomRoleSelector.cs b/Modules/CustomRoleSelector.cs index 24a9444e5..ce8af2053 100644 --- a/Modules/CustomRoleSelector.cs +++ b/Modules/CustomRoleSelector.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Roles.Impostor; using HarmonyLib; -using System.Collections.Generic; -using System.Linq; namespace EHR.Modules; diff --git a/Modules/CustomRolesHelper.cs b/Modules/CustomRolesHelper.cs index ab99b1de3..fe34b9dfa 100644 --- a/Modules/CustomRolesHelper.cs +++ b/Modules/CustomRolesHelper.cs @@ -1,11 +1,11 @@ -using AmongUs.GameOptions; -using EHR.Roles.Crewmate; -using EHR.Roles.Impostor; -using EHR.Roles.Neutral; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; +using AmongUs.GameOptions; +using EHR.Roles.Crewmate; +using EHR.Roles.Impostor; +using EHR.Roles.Neutral; using UnityEngine; namespace EHR; @@ -333,6 +333,7 @@ internal static class CustomRolesHelper CustomRoles.BloodKnight => RoleTypes.Impostor, CustomRoles.Poisoner => RoleTypes.Impostor, CustomRoles.NSerialKiller => RoleTypes.Impostor, + CustomRoles.Bargainer => RoleTypes.Impostor, CustomRoles.Tiger => RoleTypes.Impostor, CustomRoles.SoulHunter => RoleTypes.Impostor, CustomRoles.Enderman => RoleTypes.Impostor, @@ -433,6 +434,7 @@ internal static class CustomRolesHelper CustomRoles.Refugee or CustomRoles.Parasite or CustomRoles.NSerialKiller or + CustomRoles.Bargainer or CustomRoles.Tiger or CustomRoles.Enderman or CustomRoles.Mycologist or @@ -688,7 +690,8 @@ internal static class CustomRolesHelper CustomRoles.Swiftclaw, CustomRoles.Adventurer, CustomRoles.Sentry, - CustomRoles.Cherokious + CustomRoles.Cherokious, + CustomRoles.Bargainer ]; public static bool OnlySpawnsWithPets(this CustomRoles role) => OnlySpawnsWithPetsRoleList.Contains(role); @@ -1156,6 +1159,7 @@ internal static class CustomRolesHelper CustomRoles.PlagueBearer => CountTypes.PlagueBearer, CustomRoles.Parasite => CountTypes.Impostor, CustomRoles.NSerialKiller => CountTypes.NSerialKiller, + CustomRoles.Bargainer => CountTypes.Bargainer, CustomRoles.Tiger => CountTypes.Tiger, CustomRoles.Enderman => CountTypes.Enderman, CustomRoles.Mycologist => CountTypes.Mycologist, @@ -1305,6 +1309,7 @@ public enum CountTypes HexMaster, Wraith, NSerialKiller, + Bargainer, Tiger, Enderman, Mycologist, diff --git a/Modules/CustomRpcSender.cs b/Modules/CustomRpcSender.cs index b7ba9aa7b..d44b07691 100644 --- a/Modules/CustomRpcSender.cs +++ b/Modules/CustomRpcSender.cs @@ -1,9 +1,9 @@ +using System; +using System.Diagnostics.CodeAnalysis; using AmongUs.GameOptions; using Hazel; using Il2CppInterop.Runtime.InteropTypes.Arrays; using InnerNet; -using System; -using System.Diagnostics.CodeAnalysis; namespace EHR; diff --git a/Modules/CustomSounds.cs b/Modules/CustomSounds.cs index 5f18bc5b9..40c7f4018 100644 --- a/Modules/CustomSounds.cs +++ b/Modules/CustomSounds.cs @@ -1,8 +1,8 @@ -using Hazel; -using System; +using System; using System.IO; using System.Reflection; using System.Runtime.InteropServices; +using Hazel; namespace EHR.Modules; diff --git a/Modules/CustomTeamManager.cs b/Modules/CustomTeamManager.cs index 1bdc4da26..be6fbee42 100644 --- a/Modules/CustomTeamManager.cs +++ b/Modules/CustomTeamManager.cs @@ -1,8 +1,8 @@ -using HarmonyLib; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; +using HarmonyLib; namespace EHR.Modules { diff --git a/Modules/CustomWinnerHolder.cs b/Modules/CustomWinnerHolder.cs index 8493b2ed8..1dec88a42 100644 --- a/Modules/CustomWinnerHolder.cs +++ b/Modules/CustomWinnerHolder.cs @@ -1,5 +1,5 @@ -using Hazel; using System.Collections.Generic; +using Hazel; namespace EHR; diff --git a/Modules/DebugModeManager.cs b/Modules/DebugModeManager.cs index 1a9bfdbb6..2f2e0f220 100644 --- a/Modules/DebugModeManager.cs +++ b/Modules/DebugModeManager.cs @@ -6,11 +6,10 @@ public static class DebugModeManager { // これが有効の時、通常のゲームに支障のないデバッグ機能(詳細ログ・ゲーム外でのデバッグ表示など)が有効化される。 // また、ゲーム内オプションでデバッグモードを有効化することができる。 - public static bool AmDebugger { get; private set; } = + public static bool AmDebugger { get; private set; } #if DEBUG true; #else - false; #endif // これが有効の時、通常のゲームを破壊する可能性のある強力なデバッグ機能(テレポートなど)が有効化される。 public static bool IsDebugMode => AmDebugger && EnableDebugMode != null && EnableDebugMode.GetBool(); @@ -22,6 +21,7 @@ public static class DebugModeManager // AmDebugger = デバッグビルドである || デバッグキー認証が通った AmDebugger = AmDebugger || auth.CheckString(input); } + public static void SetupCustomOption() { EnableDebugMode = BooleanOptionItem.Create(2, "EnableDebugMode", false, TabGroup.SystemSettings, true) diff --git a/Modules/Debugger.cs b/Modules/Debugger.cs index 3302d3d0d..0a6d12275 100644 --- a/Modules/Debugger.cs +++ b/Modules/Debugger.cs @@ -1,4 +1,3 @@ -using EHR.Modules; using System; using System.Collections.Generic; using System.Diagnostics; @@ -6,6 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Net.Http; using System.Runtime.CompilerServices; +using EHR.Modules; using LogLevel = BepInEx.Logging.LogLevel; namespace EHR; diff --git a/Modules/DisableDevice.cs b/Modules/DisableDevice.cs index ecd00c9b2..75ec600a8 100644 --- a/Modules/DisableDevice.cs +++ b/Modules/DisableDevice.cs @@ -1,6 +1,6 @@ -using HarmonyLib; using System; using System.Collections.Generic; +using HarmonyLib; using UnityEngine; using Object = UnityEngine.Object; diff --git a/Modules/EAC.cs b/Modules/EAC.cs index f94d62eb6..ff6f81d26 100644 --- a/Modules/EAC.cs +++ b/Modules/EAC.cs @@ -1,11 +1,11 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; -using InnerNet; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; +using InnerNet; using static EHR.Translator; namespace EHR; diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs index 871d36c4b..18a761ef6 100644 --- a/Modules/ExtendedPlayerControl.cs +++ b/Modules/ExtendedPlayerControl.cs @@ -1,3 +1,8 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; using AmongUs.GameOptions; using EHR.Modules; using EHR.Patches; @@ -9,11 +14,6 @@ using EHR.Roles.Neutral; using HarmonyLib; using Hazel; using InnerNet; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; using UnityEngine; using static EHR.Translator; using static EHR.Utils; diff --git a/Modules/GameOptionsSender/GameOptionsSender.cs b/Modules/GameOptionsSender/GameOptionsSender.cs index df7c2d826..0f15b37fa 100644 --- a/Modules/GameOptionsSender/GameOptionsSender.cs +++ b/Modules/GameOptionsSender/GameOptionsSender.cs @@ -1,9 +1,9 @@ +using System; +using System.Collections.Generic; using AmongUs.GameOptions; using Hazel; using Il2CppInterop.Runtime.InteropTypes.Arrays; using InnerNet; -using System; -using System.Collections.Generic; using Array = Il2CppSystem.Array; using Buffer = Il2CppSystem.Buffer; diff --git a/Modules/GameOptionsSender/NormalGameOptionsSender.cs b/Modules/GameOptionsSender/NormalGameOptionsSender.cs index f4e603f98..34dac02f2 100644 --- a/Modules/GameOptionsSender/NormalGameOptionsSender.cs +++ b/Modules/GameOptionsSender/NormalGameOptionsSender.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System; +using AmongUs.GameOptions; namespace EHR.Modules; diff --git a/Modules/GameOptionsSender/PlayerGameOptionsSender.cs b/Modules/GameOptionsSender/PlayerGameOptionsSender.cs index ffa96d8ef..4cce638b4 100644 --- a/Modules/GameOptionsSender/PlayerGameOptionsSender.cs +++ b/Modules/GameOptionsSender/PlayerGameOptionsSender.cs @@ -1,4 +1,6 @@ -using AmongUs.GameOptions; +using System; +using System.Linq; +using AmongUs.GameOptions; using EHR.Roles.AddOns.GhostRoles; using EHR.Roles.Crewmate; using EHR.Roles.Impostor; @@ -6,8 +8,6 @@ using EHR.Roles.Neutral; using Hazel; using Il2CppInterop.Runtime.InteropTypes.Arrays; using InnerNet; -using System; -using System.Linq; using Mathf = UnityEngine.Mathf; namespace EHR.Modules; diff --git a/Modules/GameState.cs b/Modules/GameState.cs index 796ba2d15..76d09e2ec 100644 --- a/Modules/GameState.cs +++ b/Modules/GameState.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.AddOns.Crewmate; @@ -7,9 +10,6 @@ using EHR.Roles.Impostor; using EHR.Roles.Neutral; using HarmonyLib; using InnerNet; -using System; -using System.Collections.Generic; -using System.Linq; namespace EHR; diff --git a/Modules/GhostRolesManager.cs b/Modules/GhostRolesManager.cs index 6e6dad434..4c8940f48 100644 --- a/Modules/GhostRolesManager.cs +++ b/Modules/GhostRolesManager.cs @@ -1,10 +1,10 @@ -using AmongUs.GameOptions; -using EHR.Roles.AddOns.GhostRoles; -using HarmonyLib; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using AmongUs.GameOptions; +using EHR.Roles.AddOns.GhostRoles; +using HarmonyLib; namespace EHR.Modules { diff --git a/Modules/GuessManager.cs b/Modules/GuessManager.cs index 2b9d5e47e..6f2b89dc7 100644 --- a/Modules/GuessManager.cs +++ b/Modules/GuessManager.cs @@ -1,13 +1,13 @@ -using EHR.Modules; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.RegularExpressions; +using EHR.Modules; using EHR.Roles.AddOns.Common; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using HarmonyLib; using Hazel; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.RegularExpressions; using TMPro; using UnityEngine; using UnityEngine.Events; diff --git a/Modules/LoadingScreen.cs b/Modules/LoadingScreen.cs index 4a90b7e31..6666fcbf6 100644 --- a/Modules/LoadingScreen.cs +++ b/Modules/LoadingScreen.cs @@ -1,6 +1,6 @@ -using EHR.Patches; +using System; +using EHR.Patches; using Rewired.Utils; -using System; using UnityEngine; using Object = UnityEngine.Object; diff --git a/Modules/MeetingTimeManager.cs b/Modules/MeetingTimeManager.cs index 36eb1ee06..4976ace5f 100644 --- a/Modules/MeetingTimeManager.cs +++ b/Modules/MeetingTimeManager.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System; +using AmongUs.GameOptions; using EHR.Roles.Crewmate; using EHR.Roles.Impostor; -using System; namespace EHR.Modules; diff --git a/Modules/ModUpdater.cs b/Modules/ModUpdater.cs index 0747908f7..28483c829 100644 --- a/Modules/ModUpdater.cs +++ b/Modules/ModUpdater.cs @@ -1,11 +1,11 @@ -using HarmonyLib; -using Newtonsoft.Json.Linq; -using System; +using System; using System.IO; using System.IO.Compression; using System.Net.Http; using System.Reflection; using System.Threading.Tasks; +using HarmonyLib; +using Newtonsoft.Json.Linq; using Twitch; using UnityEngine; using static EHR.Translator; diff --git a/Modules/NameColorManager.cs b/Modules/NameColorManager.cs index dbbfa5d07..cbb52182f 100644 --- a/Modules/NameColorManager.cs +++ b/Modules/NameColorManager.cs @@ -1,3 +1,4 @@ +using System.Linq; using EHR.Modules; using EHR.Roles.AddOns.Common; using EHR.Roles.AddOns.GhostRoles; @@ -5,7 +6,6 @@ using EHR.Roles.Crewmate; using EHR.Roles.Impostor; using EHR.Roles.Neutral; using Hazel; -using System.Linq; namespace EHR; diff --git a/Modules/NameNotifyManager.cs b/Modules/NameNotifyManager.cs index 8a76f94cc..cc7381d6a 100644 --- a/Modules/NameNotifyManager.cs +++ b/Modules/NameNotifyManager.cs @@ -1,6 +1,6 @@ -using EHR.Modules; +using System.Collections.Generic; +using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; namespace EHR; diff --git a/Modules/OptionBackup/OptionBackupData.cs b/Modules/OptionBackup/OptionBackupData.cs index 5d1b61984..fd22c67e6 100644 --- a/Modules/OptionBackup/OptionBackupData.cs +++ b/Modules/OptionBackup/OptionBackupData.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; namespace EHR; diff --git a/Modules/OptionBackup/OptionBackupValue.cs b/Modules/OptionBackup/OptionBackupValue.cs index 2cae0b76c..cc408b2d1 100644 --- a/Modules/OptionBackup/OptionBackupValue.cs +++ b/Modules/OptionBackup/OptionBackupValue.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System; +using AmongUs.GameOptions; namespace EHR; diff --git a/Modules/OptionHolder.cs b/Modules/OptionHolder.cs index f8f71ea95..fa35b0490 100644 --- a/Modules/OptionHolder.cs +++ b/Modules/OptionHolder.cs @@ -1,12 +1,12 @@ -using EHR.Modules; -using EHR.Roles.AddOns; -using HarmonyLib; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using EHR.Modules; +using EHR.Roles.AddOns; +using HarmonyLib; using UnityEngine; namespace EHR; @@ -1030,7 +1030,7 @@ public static class Options .SetColor(new Color32(255, 235, 4, byte.MaxValue)) .SetHeader(true); - GameMode = StringOptionItem.Create(1, "GameMode", GameModes, 0, TabGroup.GameSettings, false) + GameMode = StringOptionItem.Create(1, "GameMode", GameModes, 0, TabGroup.GameSettings) .SetHeader(true); #region Settings @@ -1042,65 +1042,65 @@ public static class Options MainLoadingText = "Building general settings"; - ImpKnowAlliesRole = BooleanOptionItem.Create(150, "ImpKnowAlliesRole", true, TabGroup.ImpostorRoles, false) + ImpKnowAlliesRole = BooleanOptionItem.Create(150, "ImpKnowAlliesRole", true, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard) .SetHeader(true); - ImpKnowWhosMadmate = BooleanOptionItem.Create(151, "ImpKnowWhosMadmate", false, TabGroup.ImpostorRoles, false) + ImpKnowWhosMadmate = BooleanOptionItem.Create(151, "ImpKnowWhosMadmate", false, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard); - ImpCanKillMadmate = BooleanOptionItem.Create(152, "ImpCanKillMadmate", true, TabGroup.ImpostorRoles, false) + ImpCanKillMadmate = BooleanOptionItem.Create(152, "ImpCanKillMadmate", true, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard); - MadmateKnowWhosMadmate = BooleanOptionItem.Create(153, "MadmateKnowWhosMadmate", false, TabGroup.ImpostorRoles, false) + MadmateKnowWhosMadmate = BooleanOptionItem.Create(153, "MadmateKnowWhosMadmate", false, TabGroup.ImpostorRoles) .SetHeader(true) .SetGameMode(CustomGameMode.Standard); - MadmateKnowWhosImp = BooleanOptionItem.Create(154, "MadmateKnowWhosImp", true, TabGroup.ImpostorRoles, false) + MadmateKnowWhosImp = BooleanOptionItem.Create(154, "MadmateKnowWhosImp", true, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard); - MadmateCanKillImp = BooleanOptionItem.Create(155, "MadmateCanKillImp", true, TabGroup.ImpostorRoles, false) + MadmateCanKillImp = BooleanOptionItem.Create(155, "MadmateCanKillImp", true, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard); - MadmateHasImpostorVision = BooleanOptionItem.Create(156, "MadmateHasImpostorVision", true, TabGroup.ImpostorRoles, false) + MadmateHasImpostorVision = BooleanOptionItem.Create(156, "MadmateHasImpostorVision", true, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard); - DefaultShapeshiftCooldown = FloatOptionItem.Create(200, "DefaultShapeshiftCooldown", new(5f, 180f, 5f), 15f, TabGroup.ImpostorRoles, false) + DefaultShapeshiftCooldown = FloatOptionItem.Create(200, "DefaultShapeshiftCooldown", new(5f, 180f, 5f), 15f, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetValueFormat(OptionFormat.Seconds); - DeadImpCantSabotage = BooleanOptionItem.Create(201, "DeadImpCantSabotage", false, TabGroup.ImpostorRoles, false) + DeadImpCantSabotage = BooleanOptionItem.Create(201, "DeadImpCantSabotage", false, TabGroup.ImpostorRoles) .SetGameMode(CustomGameMode.Standard); - NonNeutralKillingRolesMinPlayer = IntegerOptionItem.Create(202, "NonNeutralKillingRolesMinPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles, false) + NonNeutralKillingRolesMinPlayer = IntegerOptionItem.Create(202, "NonNeutralKillingRolesMinPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetValueFormat(OptionFormat.Players); - NonNeutralKillingRolesMaxPlayer = IntegerOptionItem.Create(203, "NonNeutralKillingRolesMaxPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles, false) + NonNeutralKillingRolesMaxPlayer = IntegerOptionItem.Create(203, "NonNeutralKillingRolesMaxPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.Standard) .SetValueFormat(OptionFormat.Players); - NeutralKillingRolesMinPlayer = IntegerOptionItem.Create(204, "NeutralKillingRolesMinPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles, false) + NeutralKillingRolesMinPlayer = IntegerOptionItem.Create(204, "NeutralKillingRolesMinPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetValueFormat(OptionFormat.Players); - NeutralKillingRolesMaxPlayer = IntegerOptionItem.Create(205, "NeutralKillingRolesMaxPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles, false) + NeutralKillingRolesMaxPlayer = IntegerOptionItem.Create(205, "NeutralKillingRolesMaxPlayer", new(0, 15, 1), 0, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.Standard) .SetValueFormat(OptionFormat.Players); - NeutralRoleWinTogether = BooleanOptionItem.Create(208, "NeutralRoleWinTogether", false, TabGroup.NeutralRoles, false) + NeutralRoleWinTogether = BooleanOptionItem.Create(208, "NeutralRoleWinTogether", false, TabGroup.NeutralRoles) .SetGameMode(CustomGameMode.Standard) .SetHeader(true); - NeutralWinTogether = BooleanOptionItem.Create(209, "NeutralWinTogether", false, TabGroup.NeutralRoles, false) + NeutralWinTogether = BooleanOptionItem.Create(209, "NeutralWinTogether", false, TabGroup.NeutralRoles) .SetParent(NeutralRoleWinTogether) .SetGameMode(CustomGameMode.Standard); - NameDisplayAddons = BooleanOptionItem.Create(210, "NameDisplayAddons", true, TabGroup.Addons, false) + NameDisplayAddons = BooleanOptionItem.Create(210, "NameDisplayAddons", true, TabGroup.Addons) .SetGameMode(CustomGameMode.Standard) .SetHeader(true); - NoLimitAddonsNumMax = IntegerOptionItem.Create(211, "NoLimitAddonsNumMax", new(1, 90, 1), 1, TabGroup.Addons, false) + NoLimitAddonsNumMax = IntegerOptionItem.Create(211, "NoLimitAddonsNumMax", new(1, 90, 1), 1, TabGroup.Addons) .SetGameMode(CustomGameMode.Standard); RoleLoadingText = "Add-ons\n."; - AddBracketsToAddons = BooleanOptionItem.Create(13500, "BracketAddons", false, TabGroup.Addons, false) + AddBracketsToAddons = BooleanOptionItem.Create(13500, "BracketAddons", false, TabGroup.Addons) .SetGameMode(CustomGameMode.Standard) .SetHeader(true); @@ -1251,63 +1251,63 @@ public static class Options MainLoadingText = "Building EHR settings"; - KickLowLevelPlayer = IntegerOptionItem.Create(19300, "KickLowLevelPlayer", new(0, 100, 1), 0, TabGroup.SystemSettings, false) + KickLowLevelPlayer = IntegerOptionItem.Create(19300, "KickLowLevelPlayer", new(0, 100, 1), 0, TabGroup.SystemSettings) .SetValueFormat(OptionFormat.Level) .SetHeader(true); - KickAndroidPlayer = BooleanOptionItem.Create(19301, "KickAndroidPlayer", false, TabGroup.SystemSettings, false); + KickAndroidPlayer = BooleanOptionItem.Create(19301, "KickAndroidPlayer", false, TabGroup.SystemSettings); KickPlayerFriendCodeNotExist = BooleanOptionItem.Create(19302, "KickPlayerFriendCodeNotExist", false, TabGroup.SystemSettings, true); ApplyDenyNameList = BooleanOptionItem.Create(19303, "ApplyDenyNameList", true, TabGroup.SystemSettings, true); ApplyBanList = BooleanOptionItem.Create(19304, "ApplyBanList", true, TabGroup.SystemSettings, true); - ApplyModeratorList = BooleanOptionItem.Create(19305, "ApplyModeratorList", false, TabGroup.SystemSettings, false); + ApplyModeratorList = BooleanOptionItem.Create(19305, "ApplyModeratorList", false, TabGroup.SystemSettings); LoadingPercentage = 61; - AutoKickStart = BooleanOptionItem.Create(19310, "AutoKickStart", false, TabGroup.SystemSettings, false); - AutoKickStartTimes = IntegerOptionItem.Create(19311, "AutoKickStartTimes", new(0, 90, 1), 1, TabGroup.SystemSettings, false) + AutoKickStart = BooleanOptionItem.Create(19310, "AutoKickStart", false, TabGroup.SystemSettings); + AutoKickStartTimes = IntegerOptionItem.Create(19311, "AutoKickStartTimes", new(0, 90, 1), 1, TabGroup.SystemSettings) .SetParent(AutoKickStart) .SetValueFormat(OptionFormat.Times); - AutoKickStartAsBan = BooleanOptionItem.Create(19312, "AutoKickStartAsBan", false, TabGroup.SystemSettings, false) + AutoKickStartAsBan = BooleanOptionItem.Create(19312, "AutoKickStartAsBan", false, TabGroup.SystemSettings) .SetParent(AutoKickStart); - AutoKickStopWords = BooleanOptionItem.Create(19313, "AutoKickStopWords", false, TabGroup.SystemSettings, false); - AutoKickStopWordsTimes = IntegerOptionItem.Create(19314, "AutoKickStopWordsTimes", new(0, 90, 1), 3, TabGroup.SystemSettings, false) + AutoKickStopWords = BooleanOptionItem.Create(19313, "AutoKickStopWords", false, TabGroup.SystemSettings); + AutoKickStopWordsTimes = IntegerOptionItem.Create(19314, "AutoKickStopWordsTimes", new(0, 90, 1), 3, TabGroup.SystemSettings) .SetParent(AutoKickStopWords) .SetValueFormat(OptionFormat.Times); - AutoKickStopWordsAsBan = BooleanOptionItem.Create(19315, "AutoKickStopWordsAsBan", false, TabGroup.SystemSettings, false) + AutoKickStopWordsAsBan = BooleanOptionItem.Create(19315, "AutoKickStopWordsAsBan", false, TabGroup.SystemSettings) .SetParent(AutoKickStopWords); LoadingPercentage = 62; - AutoWarnStopWords = BooleanOptionItem.Create(19316, "AutoWarnStopWords", false, TabGroup.SystemSettings, false); - MinWaitAutoStart = FloatOptionItem.Create(44420, "MinWaitAutoStart", new(0f, 10f, 0.5f), 1.5f, TabGroup.SystemSettings, false); - MaxWaitAutoStart = FloatOptionItem.Create(44421, "MaxWaitAutoStart", new(0f, 10f, 0.5f), 1.5f, TabGroup.SystemSettings, false); - PlayerAutoStart = IntegerOptionItem.Create(44422, "PlayerAutoStart", new(1, 15, 1), 14, TabGroup.SystemSettings, false); - AutoStartTimer = IntegerOptionItem.Create(44423, "AutoStartTimer", new(10, 600, 1), 20, TabGroup.SystemSettings, false) + AutoWarnStopWords = BooleanOptionItem.Create(19316, "AutoWarnStopWords", false, TabGroup.SystemSettings); + MinWaitAutoStart = FloatOptionItem.Create(44420, "MinWaitAutoStart", new(0f, 10f, 0.5f), 1.5f, TabGroup.SystemSettings); + MaxWaitAutoStart = FloatOptionItem.Create(44421, "MaxWaitAutoStart", new(0f, 10f, 0.5f), 1.5f, TabGroup.SystemSettings); + PlayerAutoStart = IntegerOptionItem.Create(44422, "PlayerAutoStart", new(1, 15, 1), 14, TabGroup.SystemSettings); + AutoStartTimer = IntegerOptionItem.Create(44423, "AutoStartTimer", new(10, 600, 1), 20, TabGroup.SystemSettings) .SetValueFormat(OptionFormat.Seconds); - AutoPlayAgain = BooleanOptionItem.Create(44424, "AutoPlayAgain", false, TabGroup.SystemSettings, false); - AutoPlayAgainCountdown = IntegerOptionItem.Create(44425, "AutoPlayAgainCountdown", new(1, 90, 1), 10, TabGroup.SystemSettings, false) + AutoPlayAgain = BooleanOptionItem.Create(44424, "AutoPlayAgain", false, TabGroup.SystemSettings); + AutoPlayAgainCountdown = IntegerOptionItem.Create(44425, "AutoPlayAgainCountdown", new(1, 90, 1), 10, TabGroup.SystemSettings) .SetParent(AutoPlayAgain); - LowLoadMode = BooleanOptionItem.Create(19317, "LowLoadMode", true, TabGroup.SystemSettings, false) + LowLoadMode = BooleanOptionItem.Create(19317, "LowLoadMode", true, TabGroup.SystemSettings) .SetHeader(true) .SetColor(Color.green); - DeepLowLoad = BooleanOptionItem.Create(19325, "DeepLowLoad", false, TabGroup.SystemSettings, false) + DeepLowLoad = BooleanOptionItem.Create(19325, "DeepLowLoad", false, TabGroup.SystemSettings) .SetColor(Color.red); - DontUpdateDeadPlayers = BooleanOptionItem.Create(19326, "DontUpdateDeadPlayers", true, TabGroup.SystemSettings, false) + DontUpdateDeadPlayers = BooleanOptionItem.Create(19326, "DontUpdateDeadPlayers", true, TabGroup.SystemSettings) .SetColor(Color.red); - DumpLogAfterGameEnd = BooleanOptionItem.Create(19327, "DumpLogAfterGameEnd", true, TabGroup.SystemSettings, false) + DumpLogAfterGameEnd = BooleanOptionItem.Create(19327, "DumpLogAfterGameEnd", true, TabGroup.SystemSettings) .SetColor(Color.yellow); - EndWhenPlayerBug = BooleanOptionItem.Create(19318, "EndWhenPlayerBug", true, TabGroup.SystemSettings, false) + EndWhenPlayerBug = BooleanOptionItem.Create(19318, "EndWhenPlayerBug", true, TabGroup.SystemSettings) .SetHeader(true) .SetColor(Color.blue); - RemovePetsAtDeadPlayers = BooleanOptionItem.Create(60294, "RemovePetsAtDeadPlayers", false, TabGroup.SystemSettings, false) + RemovePetsAtDeadPlayers = BooleanOptionItem.Create(60294, "RemovePetsAtDeadPlayers", false, TabGroup.SystemSettings) .SetColor(Color.magenta); - CheatResponses = StringOptionItem.Create(19319, "CheatResponses", CheatResponsesName, 2, TabGroup.SystemSettings, false) + CheatResponses = StringOptionItem.Create(19319, "CheatResponses", CheatResponsesName, 2, TabGroup.SystemSettings) .SetHeader(true); DisableVoteBan = BooleanOptionItem.Create(19320, "DisableVoteBan", true, TabGroup.SystemSettings, true); @@ -1316,37 +1316,37 @@ public static class Options LoadingPercentage = 63; - AutoDisplayKillLog = BooleanOptionItem.Create(19321, "AutoDisplayKillLog", true, TabGroup.SystemSettings, false) + AutoDisplayKillLog = BooleanOptionItem.Create(19321, "AutoDisplayKillLog", true, TabGroup.SystemSettings) .SetHeader(true); - AutoDisplayLastRoles = BooleanOptionItem.Create(19322, "AutoDisplayLastRoles", true, TabGroup.SystemSettings, false); - AutoDisplayLastAddOns = BooleanOptionItem.Create(19328, "AutoDisplayLastAddOns", true, TabGroup.SystemSettings, false); - AutoDisplayLastResult = BooleanOptionItem.Create(19323, "AutoDisplayLastResult", true, TabGroup.SystemSettings, false); + AutoDisplayLastRoles = BooleanOptionItem.Create(19322, "AutoDisplayLastRoles", true, TabGroup.SystemSettings); + AutoDisplayLastAddOns = BooleanOptionItem.Create(19328, "AutoDisplayLastAddOns", true, TabGroup.SystemSettings); + AutoDisplayLastResult = BooleanOptionItem.Create(19323, "AutoDisplayLastResult", true, TabGroup.SystemSettings); SuffixMode = StringOptionItem.Create(19324, "SuffixMode", SuffixModes, 0, TabGroup.SystemSettings, true) .SetHeader(true); - HideGameSettings = BooleanOptionItem.Create(19400, "HideGameSettings", false, TabGroup.SystemSettings, false); - DIYGameSettings = BooleanOptionItem.Create(19401, "DIYGameSettings", false, TabGroup.SystemSettings, false); - PlayerCanSetColor = BooleanOptionItem.Create(19402, "PlayerCanSetColor", false, TabGroup.SystemSettings, false); - PlayerCanSetName = BooleanOptionItem.Create(19410, "PlayerCanSetName", false, TabGroup.SystemSettings, false); - PlayerCanTPInAndOut = BooleanOptionItem.Create(19411, "PlayerCanTPInAndOut", false, TabGroup.SystemSettings, false); - FormatNameMode = StringOptionItem.Create(19403, "FormatNameMode", FormatNameModes, 0, TabGroup.SystemSettings, false); - DisableEmojiName = BooleanOptionItem.Create(19404, "DisableEmojiName", true, TabGroup.SystemSettings, false); - ChangeNameToRoleInfo = BooleanOptionItem.Create(19405, "ChangeNameToRoleInfo", true, TabGroup.SystemSettings, false); - SendRoleDescriptionFirstMeeting = BooleanOptionItem.Create(19406, "SendRoleDescriptionFirstMeeting", true, TabGroup.SystemSettings, false); - NoGameEnd = BooleanOptionItem.Create(19407, "NoGameEnd", false, TabGroup.SystemSettings, false) + HideGameSettings = BooleanOptionItem.Create(19400, "HideGameSettings", false, TabGroup.SystemSettings); + DIYGameSettings = BooleanOptionItem.Create(19401, "DIYGameSettings", false, TabGroup.SystemSettings); + PlayerCanSetColor = BooleanOptionItem.Create(19402, "PlayerCanSetColor", false, TabGroup.SystemSettings); + PlayerCanSetName = BooleanOptionItem.Create(19410, "PlayerCanSetName", false, TabGroup.SystemSettings); + PlayerCanTPInAndOut = BooleanOptionItem.Create(19411, "PlayerCanTPInAndOut", false, TabGroup.SystemSettings); + FormatNameMode = StringOptionItem.Create(19403, "FormatNameMode", FormatNameModes, 0, TabGroup.SystemSettings); + DisableEmojiName = BooleanOptionItem.Create(19404, "DisableEmojiName", true, TabGroup.SystemSettings); + ChangeNameToRoleInfo = BooleanOptionItem.Create(19405, "ChangeNameToRoleInfo", true, TabGroup.SystemSettings); + SendRoleDescriptionFirstMeeting = BooleanOptionItem.Create(19406, "SendRoleDescriptionFirstMeeting", true, TabGroup.SystemSettings); + NoGameEnd = BooleanOptionItem.Create(19407, "NoGameEnd", false, TabGroup.SystemSettings) .SetColor(Color.red); - AllowConsole = BooleanOptionItem.Create(19408, "AllowConsole", false, TabGroup.SystemSettings, false) + AllowConsole = BooleanOptionItem.Create(19408, "AllowConsole", false, TabGroup.SystemSettings) .SetColor(Color.red); RoleAssigningAlgorithm = StringOptionItem.Create(19409, "RoleAssigningAlgorithm", RoleAssigningAlgorithms, 4, TabGroup.SystemSettings, true) .RegisterUpdateValueEvent((_, args) => IRandom.SetInstanceById(args.CurrentValue)); - KPDCamouflageMode = StringOptionItem.Create(19500, "KPDCamouflageMode", CamouflageMode, 0, TabGroup.SystemSettings, false) + KPDCamouflageMode = StringOptionItem.Create(19500, "KPDCamouflageMode", CamouflageMode, 0, TabGroup.SystemSettings) .SetHeader(true) .SetColor(new Color32(255, 192, 203, byte.MaxValue)); LoadingPercentage = 64; - EnableUpMode = BooleanOptionItem.Create(19600, "EnableYTPlan", false, TabGroup.SystemSettings, false) + EnableUpMode = BooleanOptionItem.Create(19600, "EnableYTPlan", false, TabGroup.SystemSettings) .SetColor(Color.cyan) .SetHeader(true); @@ -1375,28 +1375,28 @@ public static class Options .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 238, 232, byte.MaxValue)); - CEMode = StringOptionItem.Create(19800, "ConfirmEjectionsMode", ConfirmEjectionsMode, 2, TabGroup.GameSettings, false) + CEMode = StringOptionItem.Create(19800, "ConfirmEjectionsMode", ConfirmEjectionsMode, 2, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(255, 238, 232, byte.MaxValue)); - ShowImpRemainOnEject = BooleanOptionItem.Create(19810, "ShowImpRemainOnEject", true, TabGroup.GameSettings, false) + ShowImpRemainOnEject = BooleanOptionItem.Create(19810, "ShowImpRemainOnEject", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 238, 232, byte.MaxValue)); - ShowNKRemainOnEject = BooleanOptionItem.Create(19811, "ShowNKRemainOnEject", true, TabGroup.GameSettings, false) + ShowNKRemainOnEject = BooleanOptionItem.Create(19811, "ShowNKRemainOnEject", true, TabGroup.GameSettings) .SetParent(ShowImpRemainOnEject) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 238, 232, byte.MaxValue)); LoadingPercentage = 66; - ShowTeamNextToRoleNameOnEject = BooleanOptionItem.Create(19812, "ShowTeamNextToRoleNameOnEject", false, TabGroup.GameSettings, false) + ShowTeamNextToRoleNameOnEject = BooleanOptionItem.Create(19812, "ShowTeamNextToRoleNameOnEject", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 238, 232, byte.MaxValue)); - ConfirmEgoistOnEject = BooleanOptionItem.Create(19813, "ConfirmEgoistOnEject", true, TabGroup.GameSettings, false) + ConfirmEgoistOnEject = BooleanOptionItem.Create(19813, "ConfirmEgoistOnEject", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 238, 232, byte.MaxValue)) .SetHeader(true); - ConfirmLoversOnEject = BooleanOptionItem.Create(19815, "ConfirmLoversOnEject", true, TabGroup.GameSettings, false) + ConfirmLoversOnEject = BooleanOptionItem.Create(19815, "ConfirmLoversOnEject", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 238, 232, byte.MaxValue)); @@ -1409,28 +1409,28 @@ public static class Options .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Random Maps Mode - RandomMapsMode = BooleanOptionItem.Create(19900, "RandomMapsMode", false, TabGroup.GameSettings, false) + RandomMapsMode = BooleanOptionItem.Create(19900, "RandomMapsMode", false, TabGroup.GameSettings) .SetHeader(true) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); LoadingPercentage = 68; - SkeldChance = IntegerOptionItem.Create(19910, "SkeldChance", new(0, 100, 5), 0, TabGroup.GameSettings, false) + SkeldChance = IntegerOptionItem.Create(19910, "SkeldChance", new(0, 100, 5), 0, TabGroup.GameSettings) .SetParent(RandomMapsMode) .SetValueFormat(OptionFormat.Percent); - MiraChance = IntegerOptionItem.Create(19911, "MiraChance", new(0, 100, 5), 0, TabGroup.GameSettings, false) + MiraChance = IntegerOptionItem.Create(19911, "MiraChance", new(0, 100, 5), 0, TabGroup.GameSettings) .SetParent(RandomMapsMode) .SetValueFormat(OptionFormat.Percent); - PolusChance = IntegerOptionItem.Create(19912, "PolusChance", new(0, 100, 5), 0, TabGroup.GameSettings, false) + PolusChance = IntegerOptionItem.Create(19912, "PolusChance", new(0, 100, 5), 0, TabGroup.GameSettings) .SetParent(RandomMapsMode) .SetValueFormat(OptionFormat.Percent); - DleksChance = IntegerOptionItem.Create(19914, "DleksChance", new(0, 100, 5), 0, TabGroup.GameSettings, false) + DleksChance = IntegerOptionItem.Create(19914, "DleksChance", new(0, 100, 5), 0, TabGroup.GameSettings) .SetParent(RandomMapsMode) .SetValueFormat(OptionFormat.Percent); - AirshipChance = IntegerOptionItem.Create(19913, "AirshipChance", new(0, 100, 5), 0, TabGroup.GameSettings, false) + AirshipChance = IntegerOptionItem.Create(19913, "AirshipChance", new(0, 100, 5), 0, TabGroup.GameSettings) .SetParent(RandomMapsMode) .SetValueFormat(OptionFormat.Percent); - FungleChance = IntegerOptionItem.Create(19922, "FungleChance", new(0, 100, 5), 0, TabGroup.GameSettings, false) + FungleChance = IntegerOptionItem.Create(19922, "FungleChance", new(0, 100, 5), 0, TabGroup.GameSettings) .SetParent(RandomMapsMode) .SetValueFormat(OptionFormat.Percent); @@ -1438,72 +1438,72 @@ public static class Options // Random Spawn - RandomSpawn = BooleanOptionItem.Create(22000, "RandomSpawn", false, TabGroup.GameSettings, false) + RandomSpawn = BooleanOptionItem.Create(22000, "RandomSpawn", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); - AirshipAdditionalSpawn = BooleanOptionItem.Create(22010, "AirshipAdditionalSpawn", false, TabGroup.GameSettings, false) + AirshipAdditionalSpawn = BooleanOptionItem.Create(22010, "AirshipAdditionalSpawn", false, TabGroup.GameSettings) .SetParent(RandomSpawn) .SetGameMode(CustomGameMode.Standard); // Airship Variable Electrical - AirshipVariableElectrical = BooleanOptionItem.Create(22100, "AirshipVariableElectrical", false, TabGroup.GameSettings, false) + AirshipVariableElectrical = BooleanOptionItem.Create(22100, "AirshipVariableElectrical", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Disable Airship Moving Platform - DisableAirshipMovingPlatform = BooleanOptionItem.Create(22110, "DisableAirshipMovingPlatform", false, TabGroup.GameSettings, false) + DisableAirshipMovingPlatform = BooleanOptionItem.Create(22110, "DisableAirshipMovingPlatform", false, TabGroup.GameSettings) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Disable Spore Triggers on Fungle - DisableSporeTriggerOnFungle = BooleanOptionItem.Create(22130, "DisableSporeTriggerOnFungle", false, TabGroup.GameSettings, false) + DisableSporeTriggerOnFungle = BooleanOptionItem.Create(22130, "DisableSporeTriggerOnFungle", false, TabGroup.GameSettings) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Disable Zipline On Fungle - DisableZiplineOnFungle = BooleanOptionItem.Create(22305, "DisableZiplineOnFungle", false, TabGroup.GameSettings, false) + DisableZiplineOnFungle = BooleanOptionItem.Create(22305, "DisableZiplineOnFungle", false, TabGroup.GameSettings) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Disable Zipline From Top - DisableZiplineFromTop = BooleanOptionItem.Create(22308, "DisableZiplineFromTop", false, TabGroup.GameSettings, false) + DisableZiplineFromTop = BooleanOptionItem.Create(22308, "DisableZiplineFromTop", false, TabGroup.GameSettings) .SetParent(DisableZiplineOnFungle) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Disable Zipline From Under - DisableZiplineFromUnder = BooleanOptionItem.Create(22310, "DisableZiplineFromUnder", false, TabGroup.GameSettings, false) + DisableZiplineFromUnder = BooleanOptionItem.Create(22310, "DisableZiplineFromUnder", false, TabGroup.GameSettings) .SetParent(DisableZiplineOnFungle) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); - DisableZiplineForCrew = BooleanOptionItem.Create(22316, "DisableZiplineForCrew", false, TabGroup.GameSettings, false) + DisableZiplineForCrew = BooleanOptionItem.Create(22316, "DisableZiplineForCrew", false, TabGroup.GameSettings) .SetParent(DisableZiplineOnFungle) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); - DisableZiplineForImps = BooleanOptionItem.Create(22318, "DisableZiplineForImps", false, TabGroup.GameSettings, false) + DisableZiplineForImps = BooleanOptionItem.Create(22318, "DisableZiplineForImps", false, TabGroup.GameSettings) .SetParent(DisableZiplineOnFungle) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); - DisableZiplineForNeutrals = BooleanOptionItem.Create(22320, "DisableZiplineForNeutrals", false, TabGroup.GameSettings, false) + DisableZiplineForNeutrals = BooleanOptionItem.Create(22320, "DisableZiplineForNeutrals", false, TabGroup.GameSettings) .SetParent(DisableZiplineOnFungle) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); - ZiplineTravelTimeFromBottom = FloatOptionItem.Create(22312, "ZiplineTravelTimeFromBottom", new(0.5f, 10f, 0.5f), 4f, TabGroup.GameSettings, false) + ZiplineTravelTimeFromBottom = FloatOptionItem.Create(22312, "ZiplineTravelTimeFromBottom", new(0.5f, 10f, 0.5f), 4f, TabGroup.GameSettings) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); - ZiplineTravelTimeFromTop = FloatOptionItem.Create(22314, "ZiplineTravelTimeFromTop", new(0.5f, 10f, 0.5f), 2f, TabGroup.GameSettings, false) + ZiplineTravelTimeFromTop = FloatOptionItem.Create(22314, "ZiplineTravelTimeFromTop", new(0.5f, 10f, 0.5f), 2f, TabGroup.GameSettings) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Reset Doors After Meeting - ResetDoorsEveryTurns = BooleanOptionItem.Create(22120, "ResetDoorsEveryTurns", false, TabGroup.GameSettings, false) + ResetDoorsEveryTurns = BooleanOptionItem.Create(22120, "ResetDoorsEveryTurns", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Reset Doors Mode - DoorsResetMode = StringOptionItem.Create(22122, "DoorsResetMode", EnumHelper.GetAllNames(), 2, TabGroup.GameSettings, false) + DoorsResetMode = StringOptionItem.Create(22122, "DoorsResetMode", EnumHelper.GetAllNames(), 2, TabGroup.GameSettings) .SetColor(new Color32(19, 188, 233, byte.MaxValue)) .SetGameMode(CustomGameMode.Standard) .SetParent(ResetDoorsEveryTurns); // Change decontamination time on MiraHQ/Polus - ChangeDecontaminationTime = BooleanOptionItem.Create(60503, "ChangeDecontaminationTime", false, TabGroup.GameSettings, false) + ChangeDecontaminationTime = BooleanOptionItem.Create(60503, "ChangeDecontaminationTime", false, TabGroup.GameSettings) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Decontamination time on MiraHQ - DecontaminationTimeOnMiraHQ = FloatOptionItem.Create(60504, "DecontaminationTimeOnMiraHQ", new(0.5f, 10f, 0.25f), 3f, TabGroup.GameSettings, false) + DecontaminationTimeOnMiraHQ = FloatOptionItem.Create(60504, "DecontaminationTimeOnMiraHQ", new(0.5f, 10f, 0.25f), 3f, TabGroup.GameSettings) .SetParent(ChangeDecontaminationTime) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); // Decontamination time on Polus - DecontaminationTimeOnPolus = FloatOptionItem.Create(60505, "DecontaminationTimeOnPolus", new(0.5f, 10f, 0.25f), 3f, TabGroup.GameSettings, false) + DecontaminationTimeOnPolus = FloatOptionItem.Create(60505, "DecontaminationTimeOnPolus", new(0.5f, 10f, 0.25f), 3f, TabGroup.GameSettings) .SetParent(ChangeDecontaminationTime) .SetValueFormat(OptionFormat.Multiplier) .SetColor(new Color32(19, 188, 233, byte.MaxValue)); @@ -1518,15 +1518,15 @@ public static class Options .SetHeader(true); // CommsCamouflage - CommsCamouflage = BooleanOptionItem.Create(22200, "CommsCamouflage", false, TabGroup.GameSettings, false) + CommsCamouflage = BooleanOptionItem.Create(22200, "CommsCamouflage", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(243, 96, 96, byte.MaxValue)); - CommsCamouflageDisableOnFungle = BooleanOptionItem.Create(22202, "CommsCamouflageDisableOnFungle", true, TabGroup.GameSettings, false) + CommsCamouflageDisableOnFungle = BooleanOptionItem.Create(22202, "CommsCamouflageDisableOnFungle", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetParent(CommsCamouflage) .SetColor(new Color32(243, 96, 96, byte.MaxValue)); - DisableReportWhenCC = BooleanOptionItem.Create(22300, "DisableReportWhenCC", false, TabGroup.GameSettings, false) + DisableReportWhenCC = BooleanOptionItem.Create(22300, "DisableReportWhenCC", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(243, 96, 96, byte.MaxValue)); @@ -1534,53 +1534,53 @@ public static class Options // Sabotage Cooldown Control - SabotageCooldownControl = BooleanOptionItem.Create(22400, "SabotageCooldownControl", false, TabGroup.GameSettings, false) + SabotageCooldownControl = BooleanOptionItem.Create(22400, "SabotageCooldownControl", false, TabGroup.GameSettings) .SetColor(new Color32(243, 96, 96, byte.MaxValue)) .SetGameMode(CustomGameMode.Standard); - SabotageCooldown = FloatOptionItem.Create(22405, "SabotageCooldown", new(1f, 60f, 1f), 30f, TabGroup.GameSettings, false) + SabotageCooldown = FloatOptionItem.Create(22405, "SabotageCooldown", new(1f, 60f, 1f), 30f, TabGroup.GameSettings) .SetParent(SabotageCooldownControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); // Sabotage Duration Control - SabotageTimeControl = BooleanOptionItem.Create(22410, "SabotageTimeControl", false, TabGroup.GameSettings, false) + SabotageTimeControl = BooleanOptionItem.Create(22410, "SabotageTimeControl", false, TabGroup.GameSettings) .SetColor(new Color32(243, 96, 96, byte.MaxValue)) .SetGameMode(CustomGameMode.Standard); // The Skeld - SkeldReactorTimeLimit = FloatOptionItem.Create(22418, "SkeldReactorTimeLimit", new(5f, 90f, 1f), 30f, TabGroup.GameSettings, false) + SkeldReactorTimeLimit = FloatOptionItem.Create(22418, "SkeldReactorTimeLimit", new(5f, 90f, 1f), 30f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); - SkeldO2TimeLimit = FloatOptionItem.Create(22419, "SkeldO2TimeLimit", new(5f, 90f, 1f), 30f, TabGroup.GameSettings, false) + SkeldO2TimeLimit = FloatOptionItem.Create(22419, "SkeldO2TimeLimit", new(5f, 90f, 1f), 30f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); // Mira HQ - MiraReactorTimeLimit = FloatOptionItem.Create(22422, "MiraReactorTimeLimit", new(5f, 90f, 1f), 45f, TabGroup.GameSettings, false) + MiraReactorTimeLimit = FloatOptionItem.Create(22422, "MiraReactorTimeLimit", new(5f, 90f, 1f), 45f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); - MiraO2TimeLimit = FloatOptionItem.Create(22423, "MiraO2TimeLimit", new(5f, 90f, 1f), 45f, TabGroup.GameSettings, false) + MiraO2TimeLimit = FloatOptionItem.Create(22423, "MiraO2TimeLimit", new(5f, 90f, 1f), 45f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); // Polus - PolusReactorTimeLimit = FloatOptionItem.Create(22424, "PolusReactorTimeLimit", new(5f, 90f, 1f), 60f, TabGroup.GameSettings, false) + PolusReactorTimeLimit = FloatOptionItem.Create(22424, "PolusReactorTimeLimit", new(5f, 90f, 1f), 60f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); // The Airship - AirshipReactorTimeLimit = FloatOptionItem.Create(22425, "AirshipReactorTimeLimit", new(5f, 90f, 1f), 90f, TabGroup.GameSettings, false) + AirshipReactorTimeLimit = FloatOptionItem.Create(22425, "AirshipReactorTimeLimit", new(5f, 90f, 1f), 90f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); // The Fungle - FungleReactorTimeLimit = FloatOptionItem.Create(22426, "FungleReactorTimeLimit", new(5f, 90f, 1f), 60f, TabGroup.GameSettings, false) + FungleReactorTimeLimit = FloatOptionItem.Create(22426, "FungleReactorTimeLimit", new(5f, 90f, 1f), 60f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); - FungleMushroomMixupDuration = FloatOptionItem.Create(22427, "FungleMushroomMixupDuration", new(5f, 90f, 1f), 10f, TabGroup.GameSettings, false) + FungleMushroomMixupDuration = FloatOptionItem.Create(22427, "FungleMushroomMixupDuration", new(5f, 90f, 1f), 10f, TabGroup.GameSettings) .SetParent(SabotageTimeControl) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); @@ -1588,16 +1588,16 @@ public static class Options LoadingPercentage = 72; // LightsOutSpecialSettings - LightsOutSpecialSettings = BooleanOptionItem.Create(22500, "LightsOutSpecialSettings", false, TabGroup.GameSettings, false) + LightsOutSpecialSettings = BooleanOptionItem.Create(22500, "LightsOutSpecialSettings", false, TabGroup.GameSettings) .SetColor(new Color32(243, 96, 96, byte.MaxValue)) .SetGameMode(CustomGameMode.Standard); - DisableAirshipViewingDeckLightsPanel = BooleanOptionItem.Create(22510, "DisableAirshipViewingDeckLightsPanel", false, TabGroup.GameSettings, false) + DisableAirshipViewingDeckLightsPanel = BooleanOptionItem.Create(22510, "DisableAirshipViewingDeckLightsPanel", false, TabGroup.GameSettings) .SetParent(LightsOutSpecialSettings) .SetGameMode(CustomGameMode.Standard); - DisableAirshipGapRoomLightsPanel = BooleanOptionItem.Create(22511, "DisableAirshipGapRoomLightsPanel", false, TabGroup.GameSettings, false) + DisableAirshipGapRoomLightsPanel = BooleanOptionItem.Create(22511, "DisableAirshipGapRoomLightsPanel", false, TabGroup.GameSettings) .SetParent(LightsOutSpecialSettings) .SetGameMode(CustomGameMode.Standard); - DisableAirshipCargoLightsPanel = BooleanOptionItem.Create(22512, "DisableAirshipCargoLightsPanel", false, TabGroup.GameSettings, false) + DisableAirshipCargoLightsPanel = BooleanOptionItem.Create(22512, "DisableAirshipCargoLightsPanel", false, TabGroup.GameSettings) .SetParent(LightsOutSpecialSettings) .SetGameMode(CustomGameMode.Standard); @@ -1608,270 +1608,270 @@ public static class Options .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableShieldAnimations = BooleanOptionItem.Create(22601, "DisableShieldAnimations", true, TabGroup.GameSettings, false) + DisableShieldAnimations = BooleanOptionItem.Create(22601, "DisableShieldAnimations", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableKillAnimationOnGuess = BooleanOptionItem.Create(22602, "DisableKillAnimationOnGuess", true, TabGroup.GameSettings, false) + DisableKillAnimationOnGuess = BooleanOptionItem.Create(22602, "DisableKillAnimationOnGuess", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableCrackedGlass = BooleanOptionItem.Create(22603, "DisableCrackedGlass", false, TabGroup.GameSettings, false) + DisableCrackedGlass = BooleanOptionItem.Create(22603, "DisableCrackedGlass", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetHidden(true) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableShapeshiftAnimations = BooleanOptionItem.Create(22604, "DisableShapeshiftAnimations", true, TabGroup.GameSettings, false) + DisableShapeshiftAnimations = BooleanOptionItem.Create(22604, "DisableShapeshiftAnimations", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableAllShapeshiftAnimations = BooleanOptionItem.Create(22605, "DisableAllShapeshiftAnimations", false, TabGroup.GameSettings, false) + DisableAllShapeshiftAnimations = BooleanOptionItem.Create(22605, "DisableAllShapeshiftAnimations", false, TabGroup.GameSettings) .SetParent(DisableShapeshiftAnimations) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableVanillaRoles = BooleanOptionItem.Create(22600, "DisableVanillaRoles", true, TabGroup.GameSettings, false) + DisableVanillaRoles = BooleanOptionItem.Create(22600, "DisableVanillaRoles", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableTaskWin = BooleanOptionItem.Create(22650, "DisableTaskWin", false, TabGroup.GameSettings, false) + DisableTaskWin = BooleanOptionItem.Create(22650, "DisableTaskWin", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableTaskWinIfAllCrewsAreDead = BooleanOptionItem.Create(22651, "DisableTaskWinIfAllCrewsAreDead", false, TabGroup.GameSettings, false) + DisableTaskWinIfAllCrewsAreDead = BooleanOptionItem.Create(22651, "DisableTaskWinIfAllCrewsAreDead", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); LoadingPercentage = 74; - DisableMeeting = BooleanOptionItem.Create(22700, "DisableMeeting", false, TabGroup.GameSettings, false) + DisableMeeting = BooleanOptionItem.Create(22700, "DisableMeeting", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableSabotage = BooleanOptionItem.Create(22800, "DisableSabotage", false, TabGroup.GameSettings, false) + DisableSabotage = BooleanOptionItem.Create(22800, "DisableSabotage", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableCloseDoor = BooleanOptionItem.Create(22810, "DisableCloseDoor", false, TabGroup.GameSettings, false) + DisableCloseDoor = BooleanOptionItem.Create(22810, "DisableCloseDoor", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetParent(DisableSabotage) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); LoadingPercentage = 75; - DisableDevices = BooleanOptionItem.Create(22900, "DisableDevices", false, TabGroup.GameSettings, false) + DisableDevices = BooleanOptionItem.Create(22900, "DisableDevices", false, TabGroup.GameSettings) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); - DisableSkeldDevices = BooleanOptionItem.Create(22905, "DisableSkeldDevices", false, TabGroup.GameSettings, false) + DisableSkeldDevices = BooleanOptionItem.Create(22905, "DisableSkeldDevices", false, TabGroup.GameSettings) .SetParent(DisableDevices); - DisableSkeldAdmin = BooleanOptionItem.Create(22906, "DisableSkeldAdmin", false, TabGroup.GameSettings, false) + DisableSkeldAdmin = BooleanOptionItem.Create(22906, "DisableSkeldAdmin", false, TabGroup.GameSettings) .SetParent(DisableSkeldDevices); - DisableSkeldCamera = BooleanOptionItem.Create(22907, "DisableSkeldCamera", false, TabGroup.GameSettings, false) + DisableSkeldCamera = BooleanOptionItem.Create(22907, "DisableSkeldCamera", false, TabGroup.GameSettings) .SetParent(DisableSkeldDevices); LoadingPercentage = 76; - DisableMiraHQDevices = BooleanOptionItem.Create(22908, "DisableMiraHQDevices", false, TabGroup.GameSettings, false) + DisableMiraHQDevices = BooleanOptionItem.Create(22908, "DisableMiraHQDevices", false, TabGroup.GameSettings) .SetParent(DisableDevices); - DisableMiraHQAdmin = BooleanOptionItem.Create(22909, "DisableMiraHQAdmin", false, TabGroup.GameSettings, false) + DisableMiraHQAdmin = BooleanOptionItem.Create(22909, "DisableMiraHQAdmin", false, TabGroup.GameSettings) .SetParent(DisableMiraHQDevices); - DisableMiraHQDoorLog = BooleanOptionItem.Create(22910, "DisableMiraHQDoorLog", false, TabGroup.GameSettings, false) + DisableMiraHQDoorLog = BooleanOptionItem.Create(22910, "DisableMiraHQDoorLog", false, TabGroup.GameSettings) .SetParent(DisableMiraHQDevices); - DisablePolusDevices = BooleanOptionItem.Create(22911, "DisablePolusDevices", false, TabGroup.GameSettings, false) + DisablePolusDevices = BooleanOptionItem.Create(22911, "DisablePolusDevices", false, TabGroup.GameSettings) .SetParent(DisableDevices); - DisablePolusAdmin = BooleanOptionItem.Create(22912, "DisablePolusAdmin", false, TabGroup.GameSettings, false) + DisablePolusAdmin = BooleanOptionItem.Create(22912, "DisablePolusAdmin", false, TabGroup.GameSettings) .SetParent(DisablePolusDevices); - DisablePolusCamera = BooleanOptionItem.Create(22913, "DisablePolusCamera", false, TabGroup.GameSettings, false) + DisablePolusCamera = BooleanOptionItem.Create(22913, "DisablePolusCamera", false, TabGroup.GameSettings) .SetParent(DisablePolusDevices); - DisablePolusVital = BooleanOptionItem.Create(22914, "DisablePolusVital", false, TabGroup.GameSettings, false) + DisablePolusVital = BooleanOptionItem.Create(22914, "DisablePolusVital", false, TabGroup.GameSettings) .SetParent(DisablePolusDevices); - DisableAirshipDevices = BooleanOptionItem.Create(22915, "DisableAirshipDevices", false, TabGroup.GameSettings, false) + DisableAirshipDevices = BooleanOptionItem.Create(22915, "DisableAirshipDevices", false, TabGroup.GameSettings) .SetParent(DisableDevices); - DisableAirshipCockpitAdmin = BooleanOptionItem.Create(22916, "DisableAirshipCockpitAdmin", false, TabGroup.GameSettings, false) + DisableAirshipCockpitAdmin = BooleanOptionItem.Create(22916, "DisableAirshipCockpitAdmin", false, TabGroup.GameSettings) .SetParent(DisableAirshipDevices); LoadingPercentage = 77; - DisableAirshipRecordsAdmin = BooleanOptionItem.Create(22917, "DisableAirshipRecordsAdmin", false, TabGroup.GameSettings, false) + DisableAirshipRecordsAdmin = BooleanOptionItem.Create(22917, "DisableAirshipRecordsAdmin", false, TabGroup.GameSettings) .SetParent(DisableAirshipDevices); - DisableAirshipCamera = BooleanOptionItem.Create(22918, "DisableAirshipCamera", false, TabGroup.GameSettings, false) + DisableAirshipCamera = BooleanOptionItem.Create(22918, "DisableAirshipCamera", false, TabGroup.GameSettings) .SetParent(DisableAirshipDevices); - DisableAirshipVital = BooleanOptionItem.Create(22919, "DisableAirshipVital", false, TabGroup.GameSettings, false) + DisableAirshipVital = BooleanOptionItem.Create(22919, "DisableAirshipVital", false, TabGroup.GameSettings) .SetParent(DisableAirshipDevices); - DisableFungleDevices = BooleanOptionItem.Create(22925, "DisableFungleDevices", false, TabGroup.GameSettings, false) + DisableFungleDevices = BooleanOptionItem.Create(22925, "DisableFungleDevices", false, TabGroup.GameSettings) .SetParent(DisableDevices) .SetGameMode(CustomGameMode.Standard); - DisableFungleCamera = BooleanOptionItem.Create(22926, "DisableFungleCamera", false, TabGroup.GameSettings, false) + DisableFungleCamera = BooleanOptionItem.Create(22926, "DisableFungleCamera", false, TabGroup.GameSettings) .SetParent(DisableFungleDevices) .SetGameMode(CustomGameMode.Standard); - DisableFungleVital = BooleanOptionItem.Create(22927, "DisableFungleVital", false, TabGroup.GameSettings, false) + DisableFungleVital = BooleanOptionItem.Create(22927, "DisableFungleVital", false, TabGroup.GameSettings) .SetParent(DisableFungleDevices) .SetGameMode(CustomGameMode.Standard); - DisableDevicesIgnoreConditions = BooleanOptionItem.Create(22920, "IgnoreConditions", false, TabGroup.GameSettings, false) + DisableDevicesIgnoreConditions = BooleanOptionItem.Create(22920, "IgnoreConditions", false, TabGroup.GameSettings) .SetParent(DisableDevices); - DisableDevicesIgnoreImpostors = BooleanOptionItem.Create(22921, "IgnoreImpostors", false, TabGroup.GameSettings, false) + DisableDevicesIgnoreImpostors = BooleanOptionItem.Create(22921, "IgnoreImpostors", false, TabGroup.GameSettings) .SetParent(DisableDevicesIgnoreConditions); - DisableDevicesIgnoreNeutrals = BooleanOptionItem.Create(22922, "IgnoreNeutrals", false, TabGroup.GameSettings, false) + DisableDevicesIgnoreNeutrals = BooleanOptionItem.Create(22922, "IgnoreNeutrals", false, TabGroup.GameSettings) .SetParent(DisableDevicesIgnoreConditions); - DisableDevicesIgnoreCrewmates = BooleanOptionItem.Create(22923, "IgnoreCrewmates", false, TabGroup.GameSettings, false) + DisableDevicesIgnoreCrewmates = BooleanOptionItem.Create(22923, "IgnoreCrewmates", false, TabGroup.GameSettings) .SetParent(DisableDevicesIgnoreConditions); - DisableDevicesIgnoreAfterAnyoneDied = BooleanOptionItem.Create(22924, "IgnoreAfterAnyoneDied", false, TabGroup.GameSettings, false) + DisableDevicesIgnoreAfterAnyoneDied = BooleanOptionItem.Create(22924, "IgnoreAfterAnyoneDied", false, TabGroup.GameSettings) .SetParent(DisableDevicesIgnoreConditions) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 78; - UsePets = BooleanOptionItem.Create(23850, "UsePets", false, TabGroup.TaskSettings, false) + UsePets = BooleanOptionItem.Create(23850, "UsePets", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(60, 0, 255, byte.MaxValue)); - PetToAssignToEveryone = StringOptionItem.Create(23854, "PetToAssign", PetToAssign, 24, TabGroup.TaskSettings, false) + PetToAssignToEveryone = StringOptionItem.Create(23854, "PetToAssign", PetToAssign, 24, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetParent(UsePets) .SetColor(new Color32(60, 0, 255, byte.MaxValue)); - UseVoteCancelling = BooleanOptionItem.Create(23852, "UseVoteCancelling", false, TabGroup.TaskSettings, false) + UseVoteCancelling = BooleanOptionItem.Create(23852, "UseVoteCancelling", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(0, 65, 196, byte.MaxValue)); - EveryoneCanVent = BooleanOptionItem.Create(23853, "EveryoneCanVent", false, TabGroup.TaskSettings, false) + EveryoneCanVent = BooleanOptionItem.Create(23853, "EveryoneCanVent", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(Color.green); - OverrideScientistBasedRoles = BooleanOptionItem.Create(23855, "OverrideScientistBasedRoles", false, TabGroup.TaskSettings, false) + OverrideScientistBasedRoles = BooleanOptionItem.Create(23855, "OverrideScientistBasedRoles", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetParent(EveryoneCanVent); - WhackAMole = BooleanOptionItem.Create(23856, "WhackAMole", false, TabGroup.TaskSettings, false) + WhackAMole = BooleanOptionItem.Create(23856, "WhackAMole", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetParent(EveryoneCanVent); - SpawnAdditionalRefugeeOnImpsDead = BooleanOptionItem.Create(23857, "SpawnAdditionalRefugeeOnImpsDead", false, TabGroup.TaskSettings, false) + SpawnAdditionalRefugeeOnImpsDead = BooleanOptionItem.Create(23857, "SpawnAdditionalRefugeeOnImpsDead", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(Color.magenta) .SetHeader(true); - SpawnAdditionalRefugeeWhenNKAlive = BooleanOptionItem.Create(23858, "SpawnAdditionalRefugeeWhenNKAlive", false, TabGroup.TaskSettings, false) + SpawnAdditionalRefugeeWhenNKAlive = BooleanOptionItem.Create(23858, "SpawnAdditionalRefugeeWhenNKAlive", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(Color.magenta) .SetParent(SpawnAdditionalRefugeeOnImpsDead); - SpawnAdditionalRefugeeMinAlivePlayers = IntegerOptionItem.Create(23859, "SpawnAdditionalRefugeeMinAlivePlayers", new(1, 14, 1), 7, TabGroup.TaskSettings, false) + SpawnAdditionalRefugeeMinAlivePlayers = IntegerOptionItem.Create(23859, "SpawnAdditionalRefugeeMinAlivePlayers", new(1, 14, 1), 7, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(Color.magenta) .SetParent(SpawnAdditionalRefugeeOnImpsDead); - AprilFoolsMode = BooleanOptionItem.Create(23860, "AprilFoolsMode", Main.IsAprilFools, TabGroup.TaskSettings, false) + AprilFoolsMode = BooleanOptionItem.Create(23860, "AprilFoolsMode", Main.IsAprilFools, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(255, 153, 153, byte.MaxValue)); // Disable Short Tasks - DisableShortTasks = BooleanOptionItem.Create(23000, "DisableShortTasks", false, TabGroup.TaskSettings, false) + DisableShortTasks = BooleanOptionItem.Create(23000, "DisableShortTasks", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(239, 89, 175, byte.MaxValue)); - DisableCleanVent = BooleanOptionItem.Create(23001, "DisableCleanVent", false, TabGroup.TaskSettings, false) + DisableCleanVent = BooleanOptionItem.Create(23001, "DisableCleanVent", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableCalibrateDistributor = BooleanOptionItem.Create(23002, "DisableCalibrateDistributor", false, TabGroup.TaskSettings, false) + DisableCalibrateDistributor = BooleanOptionItem.Create(23002, "DisableCalibrateDistributor", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableChartCourse = BooleanOptionItem.Create(23003, "DisableChartCourse", false, TabGroup.TaskSettings, false) + DisableChartCourse = BooleanOptionItem.Create(23003, "DisableChartCourse", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 79; - DisableStabilizeSteering = BooleanOptionItem.Create(23004, "DisableStabilizeSteering", false, TabGroup.TaskSettings, false) + DisableStabilizeSteering = BooleanOptionItem.Create(23004, "DisableStabilizeSteering", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableCleanO2Filter = BooleanOptionItem.Create(23005, "DisableCleanO2Filter", false, TabGroup.TaskSettings, false) + DisableCleanO2Filter = BooleanOptionItem.Create(23005, "DisableCleanO2Filter", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableUnlockManifolds = BooleanOptionItem.Create(23006, "DisableUnlockManifolds", false, TabGroup.TaskSettings, false) + DisableUnlockManifolds = BooleanOptionItem.Create(23006, "DisableUnlockManifolds", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisablePrimeShields = BooleanOptionItem.Create(23007, "DisablePrimeShields", false, TabGroup.TaskSettings, false) + DisablePrimeShields = BooleanOptionItem.Create(23007, "DisablePrimeShields", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableMeasureWeather = BooleanOptionItem.Create(23008, "DisableMeasureWeather", false, TabGroup.TaskSettings, false) + DisableMeasureWeather = BooleanOptionItem.Create(23008, "DisableMeasureWeather", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 80; - DisableBuyBeverage = BooleanOptionItem.Create(23009, "DisableBuyBeverage", false, TabGroup.TaskSettings, false) + DisableBuyBeverage = BooleanOptionItem.Create(23009, "DisableBuyBeverage", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableAssembleArtifact = BooleanOptionItem.Create(23010, "DisableAssembleArtifact", false, TabGroup.TaskSettings, false) + DisableAssembleArtifact = BooleanOptionItem.Create(23010, "DisableAssembleArtifact", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableSortSamples = BooleanOptionItem.Create(23011, "DisableSortSamples", false, TabGroup.TaskSettings, false) + DisableSortSamples = BooleanOptionItem.Create(23011, "DisableSortSamples", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableProcessData = BooleanOptionItem.Create(23012, "DisableProcessData", false, TabGroup.TaskSettings, false) + DisableProcessData = BooleanOptionItem.Create(23012, "DisableProcessData", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableRunDiagnostics = BooleanOptionItem.Create(23013, "DisableRunDiagnostics", false, TabGroup.TaskSettings, false) + DisableRunDiagnostics = BooleanOptionItem.Create(23013, "DisableRunDiagnostics", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 81; - DisableRepairDrill = BooleanOptionItem.Create(23014, "DisableRepairDrill", false, TabGroup.TaskSettings, false) + DisableRepairDrill = BooleanOptionItem.Create(23014, "DisableRepairDrill", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableAlignTelescope = BooleanOptionItem.Create(23015, "DisableAlignTelescope", false, TabGroup.TaskSettings, false) + DisableAlignTelescope = BooleanOptionItem.Create(23015, "DisableAlignTelescope", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableRecordTemperature = BooleanOptionItem.Create(23016, "DisableRecordTemperature", false, TabGroup.TaskSettings, false) + DisableRecordTemperature = BooleanOptionItem.Create(23016, "DisableRecordTemperature", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableFillCanisters = BooleanOptionItem.Create(23017, "DisableFillCanisters", false, TabGroup.TaskSettings, false) + DisableFillCanisters = BooleanOptionItem.Create(23017, "DisableFillCanisters", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 82; - DisableMonitorTree = BooleanOptionItem.Create(23018, "DisableMonitorTree", false, TabGroup.TaskSettings, false) + DisableMonitorTree = BooleanOptionItem.Create(23018, "DisableMonitorTree", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableStoreArtifacts = BooleanOptionItem.Create(23019, "DisableStoreArtifacts", false, TabGroup.TaskSettings, false) + DisableStoreArtifacts = BooleanOptionItem.Create(23019, "DisableStoreArtifacts", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisablePutAwayPistols = BooleanOptionItem.Create(23020, "DisablePutAwayPistols", false, TabGroup.TaskSettings, false) + DisablePutAwayPistols = BooleanOptionItem.Create(23020, "DisablePutAwayPistols", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisablePutAwayRifles = BooleanOptionItem.Create(23021, "DisablePutAwayRifles", false, TabGroup.TaskSettings, false) + DisablePutAwayRifles = BooleanOptionItem.Create(23021, "DisablePutAwayRifles", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableMakeBurger = BooleanOptionItem.Create(23022, "DisableMakeBurger", false, TabGroup.TaskSettings, false) + DisableMakeBurger = BooleanOptionItem.Create(23022, "DisableMakeBurger", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 83; - DisableCleanToilet = BooleanOptionItem.Create(23023, "DisableCleanToilet", false, TabGroup.TaskSettings, false) + DisableCleanToilet = BooleanOptionItem.Create(23023, "DisableCleanToilet", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableDecontaminate = BooleanOptionItem.Create(23024, "DisableDecontaminate", false, TabGroup.TaskSettings, false) + DisableDecontaminate = BooleanOptionItem.Create(23024, "DisableDecontaminate", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableSortRecords = BooleanOptionItem.Create(23025, "DisableSortRecords", false, TabGroup.TaskSettings, false) + DisableSortRecords = BooleanOptionItem.Create(23025, "DisableSortRecords", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableFixShower = BooleanOptionItem.Create(23026, "DisableFixShower", false, TabGroup.TaskSettings, false) + DisableFixShower = BooleanOptionItem.Create(23026, "DisableFixShower", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisablePickUpTowels = BooleanOptionItem.Create(23027, "DisablePickUpTowels", false, TabGroup.TaskSettings, false) + DisablePickUpTowels = BooleanOptionItem.Create(23027, "DisablePickUpTowels", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisablePolishRuby = BooleanOptionItem.Create(23028, "DisablePolishRuby", false, TabGroup.TaskSettings, false) + DisablePolishRuby = BooleanOptionItem.Create(23028, "DisablePolishRuby", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableDressMannequin = BooleanOptionItem.Create(23029, "DisableDressMannequin", false, TabGroup.TaskSettings, false) + DisableDressMannequin = BooleanOptionItem.Create(23029, "DisableDressMannequin", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableRoastMarshmallow = BooleanOptionItem.Create(23030, "DisableRoastMarshmallow", false, TabGroup.TaskSettings, false) + DisableRoastMarshmallow = BooleanOptionItem.Create(23030, "DisableRoastMarshmallow", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableCollectSamples = BooleanOptionItem.Create(23031, "DisableCollectSamples", false, TabGroup.TaskSettings, false) + DisableCollectSamples = BooleanOptionItem.Create(23031, "DisableCollectSamples", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); - DisableReplaceParts = BooleanOptionItem.Create(23032, "DisableReplaceParts", false, TabGroup.TaskSettings, false) + DisableReplaceParts = BooleanOptionItem.Create(23032, "DisableReplaceParts", false, TabGroup.TaskSettings) .SetParent(DisableShortTasks) .SetGameMode(CustomGameMode.Standard); @@ -1879,131 +1879,131 @@ public static class Options // Disable Common Tasks - DisableCommonTasks = BooleanOptionItem.Create(23100, "DisableCommonTasks", false, TabGroup.TaskSettings, false) + DisableCommonTasks = BooleanOptionItem.Create(23100, "DisableCommonTasks", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(239, 89, 175, byte.MaxValue)); - DisableSwipeCard = BooleanOptionItem.Create(23101, "DisableSwipeCardTask", false, TabGroup.TaskSettings, false) + DisableSwipeCard = BooleanOptionItem.Create(23101, "DisableSwipeCardTask", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableFixWiring = BooleanOptionItem.Create(23102, "DisableFixWiring", false, TabGroup.TaskSettings, false) + DisableFixWiring = BooleanOptionItem.Create(23102, "DisableFixWiring", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableEnterIdCode = BooleanOptionItem.Create(23103, "DisableEnterIdCode", false, TabGroup.TaskSettings, false) + DisableEnterIdCode = BooleanOptionItem.Create(23103, "DisableEnterIdCode", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableInsertKeys = BooleanOptionItem.Create(23104, "DisableInsertKeys", false, TabGroup.TaskSettings, false) + DisableInsertKeys = BooleanOptionItem.Create(23104, "DisableInsertKeys", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableScanBoardingPass = BooleanOptionItem.Create(23105, "DisableScanBoardingPass", false, TabGroup.TaskSettings, false) + DisableScanBoardingPass = BooleanOptionItem.Create(23105, "DisableScanBoardingPass", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableCollectVegetables = BooleanOptionItem.Create(23106, "DisableCollectVegetables", false, TabGroup.TaskSettings, false) + DisableCollectVegetables = BooleanOptionItem.Create(23106, "DisableCollectVegetables", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableMineOres = BooleanOptionItem.Create(23107, "DisableMineOres", false, TabGroup.TaskSettings, false) + DisableMineOres = BooleanOptionItem.Create(23107, "DisableMineOres", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableExtractFuel = BooleanOptionItem.Create(23108, "DisableExtractFuel", false, TabGroup.TaskSettings, false) + DisableExtractFuel = BooleanOptionItem.Create(23108, "DisableExtractFuel", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableCatchFish = BooleanOptionItem.Create(23109, "DisableCatchFish", false, TabGroup.TaskSettings, false) + DisableCatchFish = BooleanOptionItem.Create(23109, "DisableCatchFish", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisablePolishGem = BooleanOptionItem.Create(23110, "DisablePolishGem", false, TabGroup.TaskSettings, false) + DisablePolishGem = BooleanOptionItem.Create(23110, "DisablePolishGem", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableHelpCritter = BooleanOptionItem.Create(23111, "DisableHelpCritter", false, TabGroup.TaskSettings, false) + DisableHelpCritter = BooleanOptionItem.Create(23111, "DisableHelpCritter", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); - DisableHoistSupplies = BooleanOptionItem.Create(23112, "DisableHoistSupplies", false, TabGroup.TaskSettings, false) + DisableHoistSupplies = BooleanOptionItem.Create(23112, "DisableHoistSupplies", false, TabGroup.TaskSettings) .SetParent(DisableCommonTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 85; // Disable Long Tasks - DisableLongTasks = BooleanOptionItem.Create(23150, "DisableLongTasks", false, TabGroup.TaskSettings, false) + DisableLongTasks = BooleanOptionItem.Create(23150, "DisableLongTasks", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(239, 89, 175, byte.MaxValue)); - DisableSubmitScan = BooleanOptionItem.Create(23151, "DisableSubmitScanTask", false, TabGroup.TaskSettings, false) + DisableSubmitScan = BooleanOptionItem.Create(23151, "DisableSubmitScanTask", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableUnlockSafe = BooleanOptionItem.Create(23152, "DisableUnlockSafeTask", false, TabGroup.TaskSettings, false) + DisableUnlockSafe = BooleanOptionItem.Create(23152, "DisableUnlockSafeTask", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableStartReactor = BooleanOptionItem.Create(23153, "DisableStartReactorTask", false, TabGroup.TaskSettings, false) + DisableStartReactor = BooleanOptionItem.Create(23153, "DisableStartReactorTask", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableResetBreaker = BooleanOptionItem.Create(23154, "DisableResetBreakerTask", false, TabGroup.TaskSettings, false) + DisableResetBreaker = BooleanOptionItem.Create(23154, "DisableResetBreakerTask", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 86; - DisableAlignEngineOutput = BooleanOptionItem.Create(23155, "DisableAlignEngineOutput", false, TabGroup.TaskSettings, false) + DisableAlignEngineOutput = BooleanOptionItem.Create(23155, "DisableAlignEngineOutput", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableInspectSample = BooleanOptionItem.Create(23156, "DisableInspectSample", false, TabGroup.TaskSettings, false) + DisableInspectSample = BooleanOptionItem.Create(23156, "DisableInspectSample", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableEmptyChute = BooleanOptionItem.Create(23157, "DisableEmptyChute", false, TabGroup.TaskSettings, false) + DisableEmptyChute = BooleanOptionItem.Create(23157, "DisableEmptyChute", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableClearAsteroids = BooleanOptionItem.Create(23158, "DisableClearAsteroids", false, TabGroup.TaskSettings, false) + DisableClearAsteroids = BooleanOptionItem.Create(23158, "DisableClearAsteroids", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableWaterPlants = BooleanOptionItem.Create(23159, "DisableWaterPlants", false, TabGroup.TaskSettings, false) + DisableWaterPlants = BooleanOptionItem.Create(23159, "DisableWaterPlants", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableOpenWaterways = BooleanOptionItem.Create(23160, "DisableOpenWaterways", false, TabGroup.TaskSettings, false) + DisableOpenWaterways = BooleanOptionItem.Create(23160, "DisableOpenWaterways", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 87; - DisableReplaceWaterJug = BooleanOptionItem.Create(23161, "DisableReplaceWaterJug", false, TabGroup.TaskSettings, false) + DisableReplaceWaterJug = BooleanOptionItem.Create(23161, "DisableReplaceWaterJug", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableRebootWifi = BooleanOptionItem.Create(23162, "DisableRebootWifi", false, TabGroup.TaskSettings, false) + DisableRebootWifi = BooleanOptionItem.Create(23162, "DisableRebootWifi", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableDevelopPhotos = BooleanOptionItem.Create(23163, "DisableDevelopPhotos", false, TabGroup.TaskSettings, false) + DisableDevelopPhotos = BooleanOptionItem.Create(23163, "DisableDevelopPhotos", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableRewindTapes = BooleanOptionItem.Create(23164, "DisableRewindTapes", false, TabGroup.TaskSettings, false) + DisableRewindTapes = BooleanOptionItem.Create(23164, "DisableRewindTapes", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableStartFans = BooleanOptionItem.Create(23165, "DisableStartFans", false, TabGroup.TaskSettings, false) + DisableStartFans = BooleanOptionItem.Create(23165, "DisableStartFans", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableFixAntenna = BooleanOptionItem.Create(23166, "DisableFixAntenna", false, TabGroup.TaskSettings, false) + DisableFixAntenna = BooleanOptionItem.Create(23166, "DisableFixAntenna", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableBuildSandcastle = BooleanOptionItem.Create(23167, "DisableBuildSandcastle", false, TabGroup.TaskSettings, false) + DisableBuildSandcastle = BooleanOptionItem.Create(23167, "DisableBuildSandcastle", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); LoadingPercentage = 88; - DisableCrankGenerator = BooleanOptionItem.Create(23168, "DisableCrankGenerator", false, TabGroup.TaskSettings, false) + DisableCrankGenerator = BooleanOptionItem.Create(23168, "DisableCrankGenerator", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableMonitorMushroom = BooleanOptionItem.Create(23169, "DisableMonitorMushroom", false, TabGroup.TaskSettings, false) + DisableMonitorMushroom = BooleanOptionItem.Create(23169, "DisableMonitorMushroom", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisablePlayVideoGame = BooleanOptionItem.Create(23170, "DisablePlayVideoGame", false, TabGroup.TaskSettings, false) + DisablePlayVideoGame = BooleanOptionItem.Create(23170, "DisablePlayVideoGame", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableFindSignal = BooleanOptionItem.Create(23171, "DisableFindSignal", false, TabGroup.TaskSettings, false) + DisableFindSignal = BooleanOptionItem.Create(23171, "DisableFindSignal", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableThrowFisbee = BooleanOptionItem.Create(23172, "DisableThrowFisbee", false, TabGroup.TaskSettings, false) + DisableThrowFisbee = BooleanOptionItem.Create(23172, "DisableThrowFisbee", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableLiftWeights = BooleanOptionItem.Create(23173, "DisableLiftWeights", false, TabGroup.TaskSettings, false) + DisableLiftWeights = BooleanOptionItem.Create(23173, "DisableLiftWeights", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); - DisableCollectShells = BooleanOptionItem.Create(23174, "DisableCollectShells", false, TabGroup.TaskSettings, false) + DisableCollectShells = BooleanOptionItem.Create(23174, "DisableCollectShells", false, TabGroup.TaskSettings) .SetParent(DisableLongTasks) .SetGameMode(CustomGameMode.Standard); @@ -2011,22 +2011,22 @@ public static class Options // Disable Divert Power, Weather Nodes etc. situational Tasks - DisableOtherTasks = BooleanOptionItem.Create(23200, "DisableOtherTasks", false, TabGroup.TaskSettings, false) + DisableOtherTasks = BooleanOptionItem.Create(23200, "DisableOtherTasks", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(239, 89, 175, byte.MaxValue)); - DisableUploadData = BooleanOptionItem.Create(23205, "DisableUploadDataTask", false, TabGroup.TaskSettings, false) + DisableUploadData = BooleanOptionItem.Create(23205, "DisableUploadDataTask", false, TabGroup.TaskSettings) .SetParent(DisableOtherTasks) .SetGameMode(CustomGameMode.Standard); - DisableEmptyGarbage = BooleanOptionItem.Create(23206, "DisableEmptyGarbage", false, TabGroup.TaskSettings, false) + DisableEmptyGarbage = BooleanOptionItem.Create(23206, "DisableEmptyGarbage", false, TabGroup.TaskSettings) .SetParent(DisableOtherTasks) .SetGameMode(CustomGameMode.Standard); - DisableFuelEngines = BooleanOptionItem.Create(23207, "DisableFuelEngines", false, TabGroup.TaskSettings, false) + DisableFuelEngines = BooleanOptionItem.Create(23207, "DisableFuelEngines", false, TabGroup.TaskSettings) .SetParent(DisableOtherTasks) .SetGameMode(CustomGameMode.Standard); - DisableDivertPower = BooleanOptionItem.Create(23208, "DisableDivertPower", false, TabGroup.TaskSettings, false) + DisableDivertPower = BooleanOptionItem.Create(23208, "DisableDivertPower", false, TabGroup.TaskSettings) .SetParent(DisableOtherTasks) .SetGameMode(CustomGameMode.Standard); - DisableActivateWeatherNodes = BooleanOptionItem.Create(23209, "DisableActivateWeatherNodes", false, TabGroup.TaskSettings, false) + DisableActivateWeatherNodes = BooleanOptionItem.Create(23209, "DisableActivateWeatherNodes", false, TabGroup.TaskSettings) .SetParent(DisableOtherTasks) .SetGameMode(CustomGameMode.Standard); @@ -2037,28 +2037,28 @@ public static class Options .SetGameMode(CustomGameMode.Standard) .SetColor(Color.yellow) .SetHeader(true); - GuesserMode = BooleanOptionItem.Create(19700, "GuesserMode", false, TabGroup.TaskSettings, false) + GuesserMode = BooleanOptionItem.Create(19700, "GuesserMode", false, TabGroup.TaskSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(Color.yellow) .SetHeader(true); - CrewmatesCanGuess = BooleanOptionItem.Create(19710, "CrewmatesCanGuess", false, TabGroup.TaskSettings, false) + CrewmatesCanGuess = BooleanOptionItem.Create(19710, "CrewmatesCanGuess", false, TabGroup.TaskSettings) .SetParent(GuesserMode); - ImpostorsCanGuess = BooleanOptionItem.Create(19711, "ImpostorsCanGuess", false, TabGroup.TaskSettings, false) + ImpostorsCanGuess = BooleanOptionItem.Create(19711, "ImpostorsCanGuess", false, TabGroup.TaskSettings) .SetParent(GuesserMode); LoadingPercentage = 91; - NeutralKillersCanGuess = BooleanOptionItem.Create(19712, "NeutralKillersCanGuess", false, TabGroup.TaskSettings, false) + NeutralKillersCanGuess = BooleanOptionItem.Create(19712, "NeutralKillersCanGuess", false, TabGroup.TaskSettings) .SetParent(GuesserMode); - PassiveNeutralsCanGuess = BooleanOptionItem.Create(19713, "PassiveNeutralsCanGuess", false, TabGroup.TaskSettings, false) + PassiveNeutralsCanGuess = BooleanOptionItem.Create(19713, "PassiveNeutralsCanGuess", false, TabGroup.TaskSettings) .SetParent(GuesserMode); - CanGuessAddons = BooleanOptionItem.Create(19714, "CanGuessAddons", true, TabGroup.TaskSettings, false) + CanGuessAddons = BooleanOptionItem.Create(19714, "CanGuessAddons", true, TabGroup.TaskSettings) .SetParent(GuesserMode); - CrewCanGuessCrew = BooleanOptionItem.Create(19715, "CrewCanGuessCrew", true, TabGroup.TaskSettings, false) + CrewCanGuessCrew = BooleanOptionItem.Create(19715, "CrewCanGuessCrew", true, TabGroup.TaskSettings) .SetParent(GuesserMode); - ImpCanGuessImp = BooleanOptionItem.Create(19716, "ImpCanGuessImp", true, TabGroup.TaskSettings, false) + ImpCanGuessImp = BooleanOptionItem.Create(19716, "ImpCanGuessImp", true, TabGroup.TaskSettings) .SetParent(GuesserMode); - HideGuesserCommands = BooleanOptionItem.Create(19717, "GuesserTryHideMsg", true, TabGroup.TaskSettings, false) + HideGuesserCommands = BooleanOptionItem.Create(19717, "GuesserTryHideMsg", true, TabGroup.TaskSettings) .SetParent(GuesserMode) .SetColor(Color.green); @@ -2070,11 +2070,11 @@ public static class Options .SetColor(Color.yellow) .SetHeader(true); SetupAdtRoleOptions(14500, CustomRoles.Onbound, canSetNum: true, tab: TabGroup.TaskSettings); - ImpCanBeOnbound = BooleanOptionItem.Create(14510, "ImpCanBeOnbound", true, TabGroup.TaskSettings, false) + ImpCanBeOnbound = BooleanOptionItem.Create(14510, "ImpCanBeOnbound", true, TabGroup.TaskSettings) .SetParent(CustomRoleSpawnChances[CustomRoles.Onbound]); - CrewCanBeOnbound = BooleanOptionItem.Create(14511, "CrewCanBeOnbound", true, TabGroup.TaskSettings, false) + CrewCanBeOnbound = BooleanOptionItem.Create(14511, "CrewCanBeOnbound", true, TabGroup.TaskSettings) .SetParent(CustomRoleSpawnChances[CustomRoles.Onbound]); - NeutralCanBeOnbound = BooleanOptionItem.Create(14512, "NeutralCanBeOnbound", true, TabGroup.TaskSettings, false) + NeutralCanBeOnbound = BooleanOptionItem.Create(14512, "NeutralCanBeOnbound", true, TabGroup.TaskSettings) .SetParent(CustomRoleSpawnChances[CustomRoles.Onbound]); @@ -2087,11 +2087,11 @@ public static class Options .SetHeader(true) .SetColor(new Color32(215, 227, 84, byte.MaxValue)); - CTAPlayersCanWinWithOriginalTeam = BooleanOptionItem.Create(23550, "CTA.PlayersCanWinWithOriginalTeam", false, TabGroup.GameSettings, false) + CTAPlayersCanWinWithOriginalTeam = BooleanOptionItem.Create(23550, "CTA.PlayersCanWinWithOriginalTeam", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(215, 227, 84, byte.MaxValue)); - CTAPlayersCanSeeEachOthersRoles = BooleanOptionItem.Create(23551, "CTA.PlayersCanSeeEachOthersRoles", true, TabGroup.GameSettings, false) + CTAPlayersCanSeeEachOthersRoles = BooleanOptionItem.Create(23551, "CTA.PlayersCanSeeEachOthersRoles", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(215, 227, 84, byte.MaxValue)); @@ -2101,64 +2101,64 @@ public static class Options .SetHeader(true) .SetColor(new Color32(147, 241, 240, byte.MaxValue)); - SyncButtonMode = BooleanOptionItem.Create(23300, "SyncButtonMode", false, TabGroup.GameSettings, false) + SyncButtonMode = BooleanOptionItem.Create(23300, "SyncButtonMode", false, TabGroup.GameSettings) .SetColor(new Color32(147, 241, 240, byte.MaxValue)) .SetHeader(true) .SetGameMode(CustomGameMode.Standard); - SyncedButtonCount = IntegerOptionItem.Create(23310, "SyncedButtonCount", new(0, 100, 1), 10, TabGroup.GameSettings, false) + SyncedButtonCount = IntegerOptionItem.Create(23310, "SyncedButtonCount", new(0, 100, 1), 10, TabGroup.GameSettings) .SetParent(SyncButtonMode) .SetValueFormat(OptionFormat.Times) .SetGameMode(CustomGameMode.Standard); - AllAliveMeeting = BooleanOptionItem.Create(23400, "AllAliveMeeting", false, TabGroup.GameSettings, false) + AllAliveMeeting = BooleanOptionItem.Create(23400, "AllAliveMeeting", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(147, 241, 240, byte.MaxValue)); - AllAliveMeetingTime = FloatOptionItem.Create(23410, "AllAliveMeetingTime", new(1f, 300f, 1f), 10f, TabGroup.GameSettings, false) + AllAliveMeetingTime = FloatOptionItem.Create(23410, "AllAliveMeetingTime", new(1f, 300f, 1f), 10f, TabGroup.GameSettings) .SetParent(AllAliveMeeting) .SetValueFormat(OptionFormat.Seconds); - EnableKillerLeftCommand = BooleanOptionItem.Create(44428, "EnableKillerLeftCommand", true, TabGroup.GameSettings, false) + EnableKillerLeftCommand = BooleanOptionItem.Create(44428, "EnableKillerLeftCommand", true, TabGroup.GameSettings) .SetColor(new Color32(147, 241, 240, byte.MaxValue)); - SeeEjectedRolesInMeeting = BooleanOptionItem.Create(44429, "SeeEjectedRolesInMeeting", true, TabGroup.GameSettings, false) + SeeEjectedRolesInMeeting = BooleanOptionItem.Create(44429, "SeeEjectedRolesInMeeting", true, TabGroup.GameSettings) .SetColor(new Color32(147, 241, 240, byte.MaxValue)); LoadingPercentage = 94; - AdditionalEmergencyCooldown = BooleanOptionItem.Create(23500, "AdditionalEmergencyCooldown", false, TabGroup.GameSettings, false) + AdditionalEmergencyCooldown = BooleanOptionItem.Create(23500, "AdditionalEmergencyCooldown", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(147, 241, 240, byte.MaxValue)); - AdditionalEmergencyCooldownThreshold = IntegerOptionItem.Create(23510, "AdditionalEmergencyCooldownThreshold", new(1, 15, 1), 1, TabGroup.GameSettings, false) + AdditionalEmergencyCooldownThreshold = IntegerOptionItem.Create(23510, "AdditionalEmergencyCooldownThreshold", new(1, 15, 1), 1, TabGroup.GameSettings) .SetParent(AdditionalEmergencyCooldown) .SetGameMode(CustomGameMode.Standard) .SetValueFormat(OptionFormat.Players); - AdditionalEmergencyCooldownTime = FloatOptionItem.Create(23511, "AdditionalEmergencyCooldownTime", new(1f, 60f, 1f), 1f, TabGroup.GameSettings, false) + AdditionalEmergencyCooldownTime = FloatOptionItem.Create(23511, "AdditionalEmergencyCooldownTime", new(1f, 60f, 1f), 1f, TabGroup.GameSettings) .SetParent(AdditionalEmergencyCooldown) .SetGameMode(CustomGameMode.Standard) .SetValueFormat(OptionFormat.Seconds); LoadingPercentage = 95; - VoteMode = BooleanOptionItem.Create(23600, "VoteMode", false, TabGroup.GameSettings, false) + VoteMode = BooleanOptionItem.Create(23600, "VoteMode", false, TabGroup.GameSettings) .SetColor(new Color32(147, 241, 240, byte.MaxValue)) .SetGameMode(CustomGameMode.Standard); - WhenSkipVote = StringOptionItem.Create(23610, "WhenSkipVote", VoteModes[..3], 0, TabGroup.GameSettings, false) + WhenSkipVote = StringOptionItem.Create(23610, "WhenSkipVote", VoteModes[..3], 0, TabGroup.GameSettings) .SetParent(VoteMode) .SetGameMode(CustomGameMode.Standard); - WhenSkipVoteIgnoreFirstMeeting = BooleanOptionItem.Create(23611, "WhenSkipVoteIgnoreFirstMeeting", false, TabGroup.GameSettings, false) + WhenSkipVoteIgnoreFirstMeeting = BooleanOptionItem.Create(23611, "WhenSkipVoteIgnoreFirstMeeting", false, TabGroup.GameSettings) .SetParent(WhenSkipVote) .SetGameMode(CustomGameMode.Standard); - WhenSkipVoteIgnoreNoDeadBody = BooleanOptionItem.Create(23612, "WhenSkipVoteIgnoreNoDeadBody", false, TabGroup.GameSettings, false) + WhenSkipVoteIgnoreNoDeadBody = BooleanOptionItem.Create(23612, "WhenSkipVoteIgnoreNoDeadBody", false, TabGroup.GameSettings) .SetParent(WhenSkipVote) .SetGameMode(CustomGameMode.Standard); - WhenSkipVoteIgnoreEmergency = BooleanOptionItem.Create(23613, "WhenSkipVoteIgnoreEmergency", false, TabGroup.GameSettings, false) + WhenSkipVoteIgnoreEmergency = BooleanOptionItem.Create(23613, "WhenSkipVoteIgnoreEmergency", false, TabGroup.GameSettings) .SetParent(WhenSkipVote) .SetGameMode(CustomGameMode.Standard); - WhenNonVote = StringOptionItem.Create(23700, "WhenNonVote", VoteModes, 0, TabGroup.GameSettings, false) + WhenNonVote = StringOptionItem.Create(23700, "WhenNonVote", VoteModes, 0, TabGroup.GameSettings) .SetParent(VoteMode) .SetGameMode(CustomGameMode.Standard); - WhenTie = StringOptionItem.Create(23750, "WhenTie", TieModes, 0, TabGroup.GameSettings, false) + WhenTie = StringOptionItem.Create(23750, "WhenTie", TieModes, 0, TabGroup.GameSettings) .SetParent(VoteMode) .SetGameMode(CustomGameMode.Standard); @@ -2170,35 +2170,35 @@ public static class Options .SetHeader(true) .SetColor(new Color32(193, 255, 209, byte.MaxValue)); - LadderDeath = BooleanOptionItem.Create(23800, "LadderDeath", false, TabGroup.GameSettings, false) + LadderDeath = BooleanOptionItem.Create(23800, "LadderDeath", false, TabGroup.GameSettings) .SetHeader(true) .SetColor(new Color32(193, 255, 209, byte.MaxValue)); - LadderDeathChance = StringOptionItem.Create(23810, "LadderDeathChance", Rates[1..], 0, TabGroup.GameSettings, false) + LadderDeathChance = StringOptionItem.Create(23810, "LadderDeathChance", Rates[1..], 0, TabGroup.GameSettings) .SetParent(LadderDeath); LoadingPercentage = 97; - FixFirstKillCooldown = BooleanOptionItem.Create(23900, "FixFirstKillCooldown", false, TabGroup.GameSettings, false) + FixFirstKillCooldown = BooleanOptionItem.Create(23900, "FixFirstKillCooldown", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(193, 255, 209, byte.MaxValue)); - StartingKillCooldown = FloatOptionItem.Create(23950, "StartingKillCooldown", new(1, 60, 1), 18, TabGroup.GameSettings, false) + StartingKillCooldown = FloatOptionItem.Create(23950, "StartingKillCooldown", new(1, 60, 1), 18, TabGroup.GameSettings) .SetColor(new Color32(193, 255, 209, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds); - ShieldPersonDiedFirst = BooleanOptionItem.Create(24000, "ShieldPersonDiedFirst", false, TabGroup.GameSettings, false) + ShieldPersonDiedFirst = BooleanOptionItem.Create(24000, "ShieldPersonDiedFirst", false, TabGroup.GameSettings) .SetColor(new Color32(193, 255, 209, byte.MaxValue)); LoadingPercentage = 98; - KillFlashDuration = FloatOptionItem.Create(24100, "KillFlashDuration", new(0.1f, 0.45f, 0.05f), 0.3f, TabGroup.GameSettings, false) + KillFlashDuration = FloatOptionItem.Create(24100, "KillFlashDuration", new(0.1f, 0.45f, 0.05f), 0.3f, TabGroup.GameSettings) .SetColor(new Color32(193, 255, 209, byte.MaxValue)) .SetValueFormat(OptionFormat.Seconds) .SetGameMode(CustomGameMode.Standard); - UniqueNeutralRevealScreen = BooleanOptionItem.Create(24450, "UniqueNeutralRevealScreen", false, TabGroup.GameSettings, false) + UniqueNeutralRevealScreen = BooleanOptionItem.Create(24450, "UniqueNeutralRevealScreen", false, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(193, 255, 209, byte.MaxValue)); @@ -2211,14 +2211,14 @@ public static class Options LoadingPercentage = 99; - GhostCanSeeOtherRoles = BooleanOptionItem.Create(24300, "GhostCanSeeOtherRoles", true, TabGroup.GameSettings, false) + GhostCanSeeOtherRoles = BooleanOptionItem.Create(24300, "GhostCanSeeOtherRoles", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetHeader(true) .SetColor(new Color32(217, 218, 255, byte.MaxValue)); - GhostCanSeeOtherVotes = BooleanOptionItem.Create(24400, "GhostCanSeeOtherVotes", true, TabGroup.GameSettings, false) + GhostCanSeeOtherVotes = BooleanOptionItem.Create(24400, "GhostCanSeeOtherVotes", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(217, 218, 255, byte.MaxValue)); - GhostCanSeeDeathReason = BooleanOptionItem.Create(24500, "GhostCanSeeDeathReason", true, TabGroup.GameSettings, false) + GhostCanSeeDeathReason = BooleanOptionItem.Create(24500, "GhostCanSeeDeathReason", true, TabGroup.GameSettings) .SetGameMode(CustomGameMode.Standard) .SetColor(new Color32(217, 218, 255, byte.MaxValue)); @@ -2233,13 +2233,13 @@ public static class Options public static void SetupRoleOptions(int id, TabGroup tab, CustomRoles role, CustomGameMode customGameMode = CustomGameMode.Standard, bool zeroOne = false) { - var spawnOption = StringOptionItem.Create(id, role.ToString(), zeroOne ? RatesZeroOne : Rates, 0, tab, false).SetColor(Utils.GetRoleColor(role)) + var spawnOption = StringOptionItem.Create(id, role.ToString(), zeroOne ? RatesZeroOne : Rates, 0, tab).SetColor(Utils.GetRoleColor(role)) .SetHeader(true) .SetGameMode(customGameMode) as StringOptionItem; CustomRoleSpawnChances.Add(role, spawnOption); - var countOption = IntegerOptionItem.Create(id + 1, "Maximum", new(1, 15, 1), 1, tab, false) + var countOption = IntegerOptionItem.Create(id + 1, "Maximum", new(1, 15, 1), 1, tab) .SetParent(spawnOption) .SetValueFormat(OptionFormat.Players) .SetGameMode(customGameMode); @@ -2249,17 +2249,17 @@ public static class Options public static void SetupAdtRoleOptions(int id, CustomRoles role, CustomGameMode customGameMode = CustomGameMode.Standard, bool canSetNum = false, TabGroup tab = TabGroup.Addons, bool canSetChance = true) { - var spawnOption = StringOptionItem.Create(id, role.ToString(), RatesZeroOne, 0, tab, false).SetColor(Utils.GetRoleColor(role)) + var spawnOption = StringOptionItem.Create(id, role.ToString(), RatesZeroOne, 0, tab).SetColor(Utils.GetRoleColor(role)) .SetHeader(true) .SetGameMode(customGameMode) as StringOptionItem; - var countOption = IntegerOptionItem.Create(id + 1, "Maximum", new(1, canSetNum ? 15 : 1, 1), 1, tab, false) + var countOption = IntegerOptionItem.Create(id + 1, "Maximum", new(1, canSetNum ? 15 : 1, 1), 1, tab) .SetParent(spawnOption) .SetValueFormat(OptionFormat.Players) .SetHidden(!canSetNum) .SetGameMode(customGameMode); - var spawnRateOption = IntegerOptionItem.Create(id + 2, "AdditionRolesSpawnRate", new(0, 100, 5), canSetChance ? 65 : 100, tab, false) + var spawnRateOption = IntegerOptionItem.Create(id + 2, "AdditionRolesSpawnRate", new(0, 100, 5), canSetChance ? 65 : 100, tab) .SetParent(spawnOption) .SetValueFormat(OptionFormat.Percent) .SetHidden(!canSetChance) @@ -2274,11 +2274,11 @@ public static class Options public static void SetupSingleRoleOptions(int id, TabGroup tab, CustomRoles role, int count = 1, CustomGameMode customGameMode = CustomGameMode.Standard, bool zeroOne = false, bool hideMaxSetting = true) { - var spawnOption = StringOptionItem.Create(id, role.ToString(), zeroOne ? RatesZeroOne : Rates, 0, tab, false).SetColor(Utils.GetRoleColor(role)) + var spawnOption = StringOptionItem.Create(id, role.ToString(), zeroOne ? RatesZeroOne : Rates, 0, tab).SetColor(Utils.GetRoleColor(role)) .SetHeader(true) .SetGameMode(customGameMode) as StringOptionItem; - var countOption = IntegerOptionItem.Create(id + 1, "Maximum", new(count, count, count), count, tab, false) + var countOption = IntegerOptionItem.Create(id + 1, "Maximum", new(count, count, count), count, tab) .SetParent(spawnOption) .SetHidden(hideMaxSetting) .SetGameMode(customGameMode); @@ -2289,17 +2289,17 @@ public static class Options } public static OptionItem CreateCDSetting(int id, TabGroup tab, CustomRoles role, bool isKCD = false) => - FloatOptionItem.Create(id, isKCD ? "KillCooldown" : "AbilityCooldown", new(0f, 180f, 2.5f), 30f, tab, false) + FloatOptionItem.Create(id, isKCD ? "KillCooldown" : "AbilityCooldown", new(0f, 180f, 2.5f), 30f, tab) .SetParent(CustomRoleSpawnChances[role]) .SetValueFormat(OptionFormat.Seconds); public static OptionItem CreatePetUseSetting(int id, CustomRoles role) => - BooleanOptionItem.Create(id, "UsePetInsteadOfKillButton", false, TabGroup.CrewmateRoles, false) + BooleanOptionItem.Create(id, "UsePetInsteadOfKillButton", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[role]) .SetColor(Color.magenta); public static OptionItem CreateVoteCancellingUseSetting(int id, CustomRoles role, TabGroup tab) => - BooleanOptionItem.Create(id, "UseVoteCancellingAfterVote", false, tab, false) + BooleanOptionItem.Create(id, "UseVoteCancellingAfterVote", false, tab) .SetParent(CustomRoleSpawnChances[role]) .SetColor(Color.yellow); @@ -2318,19 +2318,19 @@ public static class Options IdStart = idStart; Role = role; Dictionary replacementDic = new() { { "%role%", Utils.ColorString(Utils.GetRoleColor(role), Utils.GetRoleName(role)) } }; - DoOverride = BooleanOptionItem.Create(idStart++, "doOverride", false, tab, false) + DoOverride = BooleanOptionItem.Create(idStart++, "doOverride", false, tab) .SetParent(CustomRoleSpawnChances[role]) .SetValueFormat(OptionFormat.None); DoOverride.ReplacementDictionary = replacementDic; - AssignCommonTasks = BooleanOptionItem.Create(idStart++, "assignCommonTasks", true, tab, false) + AssignCommonTasks = BooleanOptionItem.Create(idStart++, "assignCommonTasks", true, tab) .SetParent(DoOverride) .SetValueFormat(OptionFormat.None); AssignCommonTasks.ReplacementDictionary = replacementDic; - NumLongTasks = IntegerOptionItem.Create(idStart++, "roleLongTasksNum", new(0, 90, 1), 3, tab, false) + NumLongTasks = IntegerOptionItem.Create(idStart++, "roleLongTasksNum", new(0, 90, 1), 3, tab) .SetParent(DoOverride) .SetValueFormat(OptionFormat.Pieces); NumLongTasks.ReplacementDictionary = replacementDic; - NumShortTasks = IntegerOptionItem.Create(idStart, "roleShortTasksNum", new(0, 90, 1), 3, tab, false) + NumShortTasks = IntegerOptionItem.Create(idStart, "roleShortTasksNum", new(0, 90, 1), 3, tab) .SetParent(DoOverride) .SetValueFormat(OptionFormat.Pieces); NumShortTasks.ReplacementDictionary = replacementDic; diff --git a/Modules/OptionItem/BooleanOptionItem.cs b/Modules/OptionItem/BooleanOptionItem.cs index b6d130ca1..000ff0225 100644 --- a/Modules/OptionItem/BooleanOptionItem.cs +++ b/Modules/OptionItem/BooleanOptionItem.cs @@ -6,7 +6,7 @@ public class BooleanOptionItem(int id, string name, bool defaultValue, TabGroup public const string TEXT_false = "ColoredOff"; public static BooleanOptionItem Create( - int id, string name, bool defaultValue, TabGroup tab, bool isSingleValue + int id, string name, bool defaultValue, TabGroup tab, bool isSingleValue = false ) { return new( diff --git a/Modules/OptionItem/FloatOptionItem.cs b/Modules/OptionItem/FloatOptionItem.cs index 0e7c7fb03..24ab41520 100644 --- a/Modules/OptionItem/FloatOptionItem.cs +++ b/Modules/OptionItem/FloatOptionItem.cs @@ -6,7 +6,7 @@ public class FloatOptionItem(int id, string name, float defaultValue, TabGroup t public FloatValueRule Rule = rule; public static FloatOptionItem Create( - int id, string name, FloatValueRule rule, float defaultValue, TabGroup tab, bool isSingleValue + int id, string name, FloatValueRule rule, float defaultValue, TabGroup tab, bool isSingleValue = false ) { return new( diff --git a/Modules/OptionItem/IntegerOptionItem.cs b/Modules/OptionItem/IntegerOptionItem.cs index 56a2c509a..edd9a387c 100644 --- a/Modules/OptionItem/IntegerOptionItem.cs +++ b/Modules/OptionItem/IntegerOptionItem.cs @@ -6,7 +6,7 @@ public class IntegerOptionItem(int id, string name, int defaultValue, TabGroup t public IntegerValueRule Rule = rule; public static IntegerOptionItem Create( - int id, string name, IntegerValueRule rule, int defaultValue, TabGroup tab, bool isSingleValue + int id, string name, IntegerValueRule rule, int defaultValue, TabGroup tab, bool isSingleValue = false ) { return new( diff --git a/Modules/OptionItem/OptionItem.cs b/Modules/OptionItem/OptionItem.cs index 3de4d32d4..fa8ccf02c 100644 --- a/Modules/OptionItem/OptionItem.cs +++ b/Modules/OptionItem/OptionItem.cs @@ -1,7 +1,7 @@ -using EHR.Modules; using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; using UnityEngine; namespace EHR; @@ -166,7 +166,7 @@ public abstract class OptionItem return disableColor ? Translator.GetString(Name, ReplacementDictionary, console) : Utils.ColorString(NameColor, Translator.GetString(Name, ReplacementDictionary)); } - public virtual bool GetBool() => CurrentValue != 0 && (Parent == null || Parent.GetBool()); + public virtual bool GetBool() => Name == "Bargainer.LensOfTruth.DurationSwitch" ? GetValue() == 3 : CurrentValue != 0 && (Parent == null || Parent.GetBool()); public virtual int GetInt() => CurrentValue; public virtual float GetFloat() => CurrentValue; diff --git a/Modules/OptionItem/StringOptionItem.cs b/Modules/OptionItem/StringOptionItem.cs index 1ef142d8e..976da1c73 100644 --- a/Modules/OptionItem/StringOptionItem.cs +++ b/Modules/OptionItem/StringOptionItem.cs @@ -5,7 +5,7 @@ public class StringOptionItem(int id, string name, int defaultValue, TabGroup ta public IntegerValueRule Rule = (0, selections.Length - 1, 1); public string[] Selections = selections; - public static StringOptionItem Create(int id, string name, string[] selections, int defaultIndex, TabGroup tab, bool isSingleValue, bool noTranslation = false) + public static StringOptionItem Create(int id, string name, string[] selections, int defaultIndex, TabGroup tab, bool isSingleValue = false, bool noTranslation = false) => new(id, name, defaultIndex, tab, isSingleValue, selections, noTranslation); // Getter diff --git a/Modules/OptionItem/TextOptionItem.cs b/Modules/OptionItem/TextOptionItem.cs index a3c7c8003..28fd9c92c 100644 --- a/Modules/OptionItem/TextOptionItem.cs +++ b/Modules/OptionItem/TextOptionItem.cs @@ -6,8 +6,8 @@ public class TextOptionItem : OptionItem public IntegerValueRule Rule; // コンストラクタ - public TextOptionItem(int id, string name, int defaultValue, TabGroup tab, bool isSingleValue) - : base(id, name, defaultValue, tab, isSingleValue) + public TextOptionItem(int id, string name, int defaultValue, TabGroup tab, bool isSingleValue = false) + : base(id, name, defaultValue, tab, isSingleValue) { IsText = true; IsHeader = true; diff --git a/Modules/RPC.cs b/Modules/RPC.cs index 93fca1db7..cb7e7db23 100644 --- a/Modules/RPC.cs +++ b/Modules/RPC.cs @@ -1,3 +1,7 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using AmongUs.GameOptions; using EHR.Roles.AddOns.Crewmate; using EHR.Roles.AddOns.Impostor; @@ -7,10 +11,6 @@ using EHR.Roles.Neutral; using HarmonyLib; using Hazel; using InnerNet; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using static EHR.Translator; namespace EHR.Modules; diff --git a/Modules/ServerAddManager.cs b/Modules/ServerAddManager.cs index 01c0f122a..f603a32f3 100644 --- a/Modules/ServerAddManager.cs +++ b/Modules/ServerAddManager.cs @@ -1,10 +1,10 @@ -using HarmonyLib; -using Il2CppInterop.Runtime.InteropTypes; -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Linq.Expressions; +using HarmonyLib; +using Il2CppInterop.Runtime.InteropTypes; namespace EHR; diff --git a/Modules/TemplateManager.cs b/Modules/TemplateManager.cs index f053090c3..d82b5237a 100644 --- a/Modules/TemplateManager.cs +++ b/Modules/TemplateManager.cs @@ -1,6 +1,3 @@ -using AmongUs.Data; -using HarmonyLib; -using InnerNet; using System; using System.Collections.Generic; using System.Globalization; @@ -9,6 +6,9 @@ using System.Linq; using System.Reflection; using System.Text; using System.Text.RegularExpressions; +using AmongUs.Data; +using HarmonyLib; +using InnerNet; using UnityEngine; using static EHR.Translator; diff --git a/Modules/Translator.cs b/Modules/Translator.cs index cafca2f65..f590b842f 100644 --- a/Modules/Translator.cs +++ b/Modules/Translator.cs @@ -1,5 +1,3 @@ -using HarmonyLib; -using Il2CppInterop.Runtime.InteropTypes.Arrays; using System; using System.Collections.Generic; using System.Globalization; @@ -9,6 +7,8 @@ using System.Reflection; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; +using HarmonyLib; +using Il2CppInterop.Runtime.InteropTypes.Arrays; using Object = Il2CppSystem.Object; namespace EHR; diff --git a/Modules/Utils.cs b/Modules/Utils.cs index 6de90b6c7..d1eeb955b 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -1,3 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; using AmongUs.Data; using AmongUs.GameOptions; using EHR.Modules; @@ -12,15 +21,6 @@ using HarmonyLib; using Hazel; using Il2CppInterop.Runtime.InteropTypes; using InnerNet; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; using UnityEngine; using static EHR.Translator; using Object = UnityEngine.Object; @@ -518,6 +518,7 @@ public static class Utils case CustomRoles.Eclipse: case CustomRoles.Pyromaniac: case CustomRoles.NSerialKiller: + case CustomRoles.Bargainer: case CustomRoles.Tiger: case CustomRoles.SoulHunter: case CustomRoles.Enderman: @@ -706,6 +707,7 @@ public static class Utils __instance.Is(CustomRoleTypes.Impostor) && PlayerControl.LocalPlayer.Is(CustomRoleTypes.Impostor) && Options.ImpKnowAlliesRole.GetBool() || __instance.Is(CustomRoleTypes.Impostor) && PlayerControl.LocalPlayer.Is(CustomRoles.Madmate) && Options.MadmateKnowWhosImp.GetBool() || CustomTeamManager.AreInSameCustomTeam(__instance.PlayerId, PlayerControl.LocalPlayer.PlayerId) && Options.CTAPlayersCanSeeEachOthersRoles.GetBool() || + Bargainer.KnowRole(PlayerControl.LocalPlayer, __instance) || Adventurer.KnowRole(PlayerControl.LocalPlayer, __instance) || Totocalcio.KnowRole(PlayerControl.LocalPlayer, __instance) || Romantic.KnowRole(PlayerControl.LocalPlayer, __instance) || @@ -1812,6 +1814,7 @@ public static class Utils SelfSuffix.Append(Commander.GetSuffixText(seer, seer)); SelfSuffix.Append(AntiAdminer.GetSuffixText(seer)); SelfSuffix.Append(Roles.Impostor.Sentry.GetSuffix(seer)); + SelfSuffix.Append(Bargainer.GetSuffix(seer)); switch (seer.GetCustomRole()) { @@ -2150,6 +2153,7 @@ public static class Utils (seer.Is(CustomRoleTypes.Crewmate) && target.Is(CustomRoles.Marshall) && target.GetTaskState().IsTaskFinished) || (Main.PlayerStates[target.PlayerId].deathReason == PlayerState.DeathReason.Vote && Options.SeeEjectedRolesInMeeting.GetBool()) || CustomTeamManager.AreInSameCustomTeam(seer.PlayerId, target.PlayerId) && Options.CTAPlayersCanSeeEachOthersRoles.GetBool() || + Bargainer.KnowRole(seer, target) || Adventurer.KnowRole(seer, target) || Totocalcio.KnowRole(seer, target) || Romantic.KnowRole(seer, target) || diff --git a/Modules/Zoom.cs b/Modules/Zoom.cs index b38dbfc32..daa7680dd 100644 --- a/Modules/Zoom.cs +++ b/Modules/Zoom.cs @@ -1,6 +1,6 @@ -using HarmonyLib; -using System; +using System; using System.Collections.Generic; +using HarmonyLib; using UnityEngine; namespace EHR; diff --git a/Patches/AirShipElectricalDoors.cs b/Patches/AirShipElectricalDoors.cs index 8da05872f..a631ffb3d 100644 --- a/Patches/AirShipElectricalDoors.cs +++ b/Patches/AirShipElectricalDoors.cs @@ -1,5 +1,5 @@ -using HarmonyLib; using System.Collections.Generic; +using HarmonyLib; namespace EHR; diff --git a/Patches/AnnouncementPatch.cs b/Patches/AnnouncementPatch.cs index 882d4e1aa..763fe6be8 100644 --- a/Patches/AnnouncementPatch.cs +++ b/Patches/AnnouncementPatch.cs @@ -1,11 +1,11 @@ -using AmongUs.Data; +using System; +using System.Collections.Generic; +using System.Linq; +using AmongUs.Data; using AmongUs.Data.Player; using Assets.InnerNet; using HarmonyLib; using Il2CppInterop.Runtime.InteropTypes.Arrays; -using System; -using System.Collections.Generic; -using System.Linq; namespace EHR; diff --git a/Patches/ChatCommandPatch.cs b/Patches/ChatCommandPatch.cs index 2cdcbcad6..8858e49ff 100644 --- a/Patches/ChatCommandPatch.cs +++ b/Patches/ChatCommandPatch.cs @@ -1,15 +1,15 @@ -using Assets.CoreScripts; -using EHR.Modules; -using EHR.Roles.Crewmate; -using EHR.Roles.Impostor; -using HarmonyLib; -using Hazel; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Text.RegularExpressions; +using Assets.CoreScripts; +using EHR.Modules; +using EHR.Roles.Crewmate; +using EHR.Roles.Impostor; +using HarmonyLib; +using Hazel; using UnityEngine; using static EHR.Translator; diff --git a/Patches/ChatControlPatch.cs b/Patches/ChatControlPatch.cs index 9c22c7843..db207ece7 100644 --- a/Patches/ChatControlPatch.cs +++ b/Patches/ChatControlPatch.cs @@ -1,10 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; using AmongUs.Data; using EHR.Roles.Impostor; using HarmonyLib; using InnerNet; -using System; -using System.Collections.Generic; -using System.Linq; using UnityEngine; namespace EHR; diff --git a/Patches/CheckGameEndPatch.cs b/Patches/CheckGameEndPatch.cs index 803bd5b87..ba5ec3062 100644 --- a/Patches/CheckGameEndPatch.cs +++ b/Patches/CheckGameEndPatch.cs @@ -1,3 +1,6 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; using AmongUs.GameOptions; using BepInEx.Unity.IL2CPP.Utils.Collections; using EHR.Modules; @@ -7,9 +10,6 @@ using EHR.Roles.Neutral; using HarmonyLib; using Hazel; using InnerNet; -using System.Collections; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.CustomWinnerHolder; using static EHR.Translator; diff --git a/Patches/ControlPatch.cs b/Patches/ControlPatch.cs index 3e5b2923f..c98fd3682 100644 --- a/Patches/ControlPatch.cs +++ b/Patches/ControlPatch.cs @@ -1,10 +1,10 @@ -using EHR.Modules; -using HarmonyLib; -using Rewired; using System; using System.Collections.Generic; using System.Linq; using System.Text; +using EHR.Modules; +using HarmonyLib; +using Rewired; using UnityEngine; using static EHR.Translator; diff --git a/Patches/CredentialsPatch.cs b/Patches/CredentialsPatch.cs index 610f5f500..046bd0813 100644 --- a/Patches/CredentialsPatch.cs +++ b/Patches/CredentialsPatch.cs @@ -1,8 +1,8 @@ -using EHR.Modules; -using HarmonyLib; using System; using System.Linq; using System.Text; +using EHR.Modules; +using HarmonyLib; using TMPro; using UnityEngine; using static EHR.Translator; diff --git a/Patches/DiscordPatch.cs b/Patches/DiscordPatch.cs index 98e6b6d58..f8e3ae81b 100644 --- a/Patches/DiscordPatch.cs +++ b/Patches/DiscordPatch.cs @@ -1,7 +1,7 @@ +using System; using AmongUs.Data; using Discord; using HarmonyLib; -using System; namespace EHR.Patches { diff --git a/Patches/ExilePatch.cs b/Patches/ExilePatch.cs index 9d05c81d1..668025504 100644 --- a/Patches/ExilePatch.cs +++ b/Patches/ExilePatch.cs @@ -1,3 +1,4 @@ +using System.Linq; using AmongUs.Data; using AmongUs.GameOptions; using EHR.Roles.AddOns.Crewmate; @@ -6,7 +7,6 @@ using EHR.Roles.Crewmate; using EHR.Roles.Impostor; using EHR.Roles.Neutral; using HarmonyLib; -using System.Linq; namespace EHR.Patches; diff --git a/Patches/GameOptionsMenuPatch.cs b/Patches/GameOptionsMenuPatch.cs index a0ecdb061..d29ca0975 100644 --- a/Patches/GameOptionsMenuPatch.cs +++ b/Patches/GameOptionsMenuPatch.cs @@ -1,9 +1,9 @@ +using System; +using System.Linq; using AmongUs.GameOptions; using HarmonyLib; using Il2CppInterop.Runtime.InteropTypes.Arrays; using Il2CppSystem.Collections.Generic; -using System; -using System.Linq; using TMPro; using UnityEngine; using static EHR.Translator; diff --git a/Patches/GameStartManagerPatch.cs b/Patches/GameStartManagerPatch.cs index f850e4ba1..1e3b77f66 100644 --- a/Patches/GameStartManagerPatch.cs +++ b/Patches/GameStartManagerPatch.cs @@ -1,11 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; using AmongUs.Data; using AmongUs.GameOptions; using EHR.Roles.Neutral; using HarmonyLib; using InnerNet; -using System; -using System.Collections.Generic; -using System.Linq; using TMPro; using UnityEngine; using static EHR.Translator; diff --git a/Patches/HudPatch.cs b/Patches/HudPatch.cs index 387701b5f..11018d208 100644 --- a/Patches/HudPatch.cs +++ b/Patches/HudPatch.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Linq; using EHR.Modules; using EHR.Roles.AddOns.Common; using EHR.Roles.Crewmate; @@ -5,9 +8,6 @@ using EHR.Roles.Impostor; using EHR.Roles.Neutral; using HarmonyLib; using Il2CppSystem.Text; -using System; -using System.Collections.Generic; -using System.Linq; using TMPro; using UnityEngine; using static EHR.Translator; @@ -31,7 +31,7 @@ class HudManagerPatch private static TextMeshPro OverriddenRolesText; - private static long LastNullError = 0; + private static long LastNullError; //public static GameObject TempLowerInfoText; public static void Postfix(HudManager __instance) @@ -386,6 +386,7 @@ class HudManagerPatch CustomRoles.WeaponMaster => WeaponMaster.GetHudAndProgressText(player.PlayerId), CustomRoles.Postman => Postman.GetHudText(player), CustomRoles.SoulHunter => SoulHunter.HUDText(player.PlayerId), + CustomRoles.Bargainer => Bargainer.GetSuffix(player), CustomRoles.Chronomancer => Chronomancer.GetHudText(player.PlayerId), CustomRoles.Mafioso => Mafioso.GetHUDText(player), CustomRoles.Druid => Druid.GetHUDText(player), diff --git a/Patches/IntroPatch.cs b/Patches/IntroPatch.cs index 828d4eb2b..67d665687 100644 --- a/Patches/IntroPatch.cs +++ b/Patches/IntroPatch.cs @@ -1,11 +1,11 @@ +using System; +using System.Linq; +using System.Threading.Tasks; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Neutral; using HarmonyLib; using Il2CppSystem.Collections.Generic; -using System; -using System.Linq; -using System.Threading.Tasks; using UnityEngine; using static EHR.Translator; diff --git a/Patches/JoinGameButtonPatch.cs b/Patches/JoinGameButtonPatch.cs index 3917e3034..625d1aecb 100644 --- a/Patches/JoinGameButtonPatch.cs +++ b/Patches/JoinGameButtonPatch.cs @@ -1,5 +1,5 @@ -using HarmonyLib; using System.Text.RegularExpressions; +using HarmonyLib; using UnityEngine; namespace EHR; diff --git a/Patches/LadderPatch.cs b/Patches/LadderPatch.cs index 98a03e243..d1ce7bd83 100644 --- a/Patches/LadderPatch.cs +++ b/Patches/LadderPatch.cs @@ -1,6 +1,6 @@ -using HarmonyLib; +using System.Collections.Generic; +using HarmonyLib; using Hazel; -using System.Collections.Generic; using UnityEngine; namespace EHR; diff --git a/Patches/LobbyListPatch.cs b/Patches/LobbyListPatch.cs index f584dd8fa..559119bd4 100644 --- a/Patches/LobbyListPatch.cs +++ b/Patches/LobbyListPatch.cs @@ -1,7 +1,7 @@ -using HarmonyLib; -using InnerNet; -using System; +using System; using System.Collections.Generic; +using HarmonyLib; +using InnerNet; using UnityEngine; namespace EHR; diff --git a/Patches/LogoAndStampPatch.cs b/Patches/LogoAndStampPatch.cs index 58cb17897..bbbeaa31f 100644 --- a/Patches/LogoAndStampPatch.cs +++ b/Patches/LogoAndStampPatch.cs @@ -1,6 +1,6 @@ -using BepInEx.Unity.IL2CPP.Utils; +using System.Collections; +using BepInEx.Unity.IL2CPP.Utils; using HarmonyLib; -using System.Collections; using TMPro; using UnityEngine; using static EHR.Translator; diff --git a/Patches/MainMenuManagerPatch.cs b/Patches/MainMenuManagerPatch.cs index c59e92523..c7a08252c 100644 --- a/Patches/MainMenuManagerPatch.cs +++ b/Patches/MainMenuManagerPatch.cs @@ -1,5 +1,5 @@ -using HarmonyLib; using System; +using HarmonyLib; using TMPro; using UnityEngine; using static EHR.Translator; @@ -102,7 +102,7 @@ public class MainMenuManagerPatch { freeplayButton.GetComponent().OnClick = new(); freeplayButton.GetComponent().OnClick.AddListener((Action)(() => Application.OpenURL("https://tohe.cc"))); - __instance.StartCoroutine(Effects.Lerp(0.01f, new Action((p) => freeplayButton.transform.GetChild(0).GetComponent().SetText(GetString("Website"))))); + __instance.StartCoroutine(Effects.Lerp(0.01f, new Action(p => freeplayButton.transform.GetChild(0).GetComponent().SetText(GetString("Website"))))); } #endif diff --git a/Patches/MeetingHudPatch.cs b/Patches/MeetingHudPatch.cs index 7b3d307a6..807b3f182 100644 --- a/Patches/MeetingHudPatch.cs +++ b/Patches/MeetingHudPatch.cs @@ -1,12 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Impostor; using EHR.Roles.Neutral; using HarmonyLib; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; using static EHR.Translator; using Object = UnityEngine.Object; @@ -797,6 +797,7 @@ class MeetingHudStartPatch (pc.Is(CustomRoles.Marshall) && PlayerControl.LocalPlayer.Is(CustomRoleTypes.Crewmate) && pc.GetTaskState().IsTaskFinished) || (Main.PlayerStates[pc.PlayerId].deathReason == PlayerState.DeathReason.Vote && Options.SeeEjectedRolesInMeeting.GetBool()) || CustomTeamManager.AreInSameCustomTeam(pc.PlayerId, PlayerControl.LocalPlayer.PlayerId) && Options.CTAPlayersCanSeeEachOthersRoles.GetBool() || + Bargainer.KnowRole(PlayerControl.LocalPlayer, pc) || Adventurer.KnowRole(PlayerControl.LocalPlayer, pc) || Totocalcio.KnowRole(PlayerControl.LocalPlayer, pc) || Romantic.KnowRole(PlayerControl.LocalPlayer, pc) || diff --git a/Patches/OutroPatch.cs b/Patches/OutroPatch.cs index ef5a0e98d..c726d5227 100644 --- a/Patches/OutroPatch.cs +++ b/Patches/OutroPatch.cs @@ -1,11 +1,11 @@ -using EHR.Modules; -using EHR.Roles.Crewmate; -using EHR.Roles.Neutral; -using HarmonyLib; using System; using System.Collections.Generic; using System.Linq; using System.Text; +using EHR.Modules; +using EHR.Roles.Crewmate; +using EHR.Roles.Neutral; +using HarmonyLib; using TMPro; using UnityEngine; using static EHR.Translator; diff --git a/Patches/PetActionsPatch.cs b/Patches/PetActionsPatch.cs index ad9b40f6b..839f7696d 100644 --- a/Patches/PetActionsPatch.cs +++ b/Patches/PetActionsPatch.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Roles.Impostor; using EHR.Roles.Neutral; using HarmonyLib; -using System.Collections.Generic; namespace EHR.Patches; diff --git a/Patches/PlayerControlPatch.cs b/Patches/PlayerControlPatch.cs index f7e7c7ae2..44241113b 100644 --- a/Patches/PlayerControlPatch.cs +++ b/Patches/PlayerControlPatch.cs @@ -1,3 +1,8 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; using AmongUs.GameOptions; using EHR.Modules; using EHR.Patches; @@ -11,11 +16,6 @@ using EHR.Roles.Neutral; using HarmonyLib; using Hazel; using InnerNet; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using TMPro; using UnityEngine; using static EHR.Translator; @@ -217,7 +217,7 @@ class CheckMurderPatch return false; case CustomGameMode.FFA: FFAManager.OnPlayerAttack(killer, target); - return true; + return false; case CustomGameMode.MoveAndStop: case CustomGameMode.HotPotato: return false; diff --git a/Patches/PlayerJoinAndLeftPatch.cs b/Patches/PlayerJoinAndLeftPatch.cs index c2d00df82..fc69aafac 100644 --- a/Patches/PlayerJoinAndLeftPatch.cs +++ b/Patches/PlayerJoinAndLeftPatch.cs @@ -1,3 +1,6 @@ +using System; +using System.Text.RegularExpressions; +using System.Threading.Tasks; using AmongUs.Data; using AmongUs.GameOptions; using EHR.Modules; @@ -5,9 +8,6 @@ using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using HarmonyLib; using InnerNet; -using System; -using System.Text.RegularExpressions; -using System.Threading.Tasks; using static EHR.Translator; namespace EHR; diff --git a/Patches/RandomSpawnPatch.cs b/Patches/RandomSpawnPatch.cs index 14562f47f..2bf400038 100644 --- a/Patches/RandomSpawnPatch.cs +++ b/Patches/RandomSpawnPatch.cs @@ -1,8 +1,8 @@ -using EHR.Roles.Impostor; -using HarmonyLib; using System; using System.Collections.Generic; using System.Linq; +using EHR.Roles.Impostor; +using HarmonyLib; using UnityEngine; namespace EHR; diff --git a/Patches/SabotageSystemPatch.cs b/Patches/SabotageSystemPatch.cs index da5da5332..f195d01b3 100644 --- a/Patches/SabotageSystemPatch.cs +++ b/Patches/SabotageSystemPatch.cs @@ -1,8 +1,8 @@ +using System.Linq; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using HarmonyLib; using Hazel; -using System.Linq; namespace EHR; diff --git a/Patches/ShipStatusPatch.cs b/Patches/ShipStatusPatch.cs index b140b6b25..33124703d 100644 --- a/Patches/ShipStatusPatch.cs +++ b/Patches/ShipStatusPatch.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System.Linq; using BepInEx; using EHR.Patches; using EHR.Roles.AddOns.Crewmate; @@ -6,8 +8,6 @@ using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using HarmonyLib; using Hazel; -using System.Collections.Generic; -using System.Linq; using UnityEngine; namespace EHR; diff --git a/Patches/TaskAdderPatch.cs b/Patches/TaskAdderPatch.cs index 74549f710..f03e50f38 100644 --- a/Patches/TaskAdderPatch.cs +++ b/Patches/TaskAdderPatch.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; -using HarmonyLib; using System; using System.Collections; using System.Linq; +using AmongUs.GameOptions; +using HarmonyLib; using UnityEngine; using Object = UnityEngine.Object; diff --git a/Patches/TextBoxPatch.cs b/Patches/TextBoxPatch.cs index 7109ef1ed..0e88092ce 100644 --- a/Patches/TextBoxPatch.cs +++ b/Patches/TextBoxPatch.cs @@ -1,5 +1,5 @@ -using HarmonyLib; -using System; +using System; +using HarmonyLib; namespace EHR.Patches; diff --git a/Patches/onGameStartedPatch.cs b/Patches/onGameStartedPatch.cs index 4e4d299fd..501b404b6 100644 --- a/Patches/onGameStartedPatch.cs +++ b/Patches/onGameStartedPatch.cs @@ -1,3 +1,6 @@ +using System; +using System.Collections.Generic; +using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.AddOns.Common; @@ -8,9 +11,6 @@ using EHR.Roles.Impostor; using EHR.Roles.Neutral; using HarmonyLib; using Hazel; -using System; -using System.Collections.Generic; -using System.Linq; using static EHR.Modules.CustomRoleSelector; using static EHR.Translator; diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json index 1c78a8ccd..a923eb75a 100644 --- a/Resources/Lang/en_US.json +++ b/Resources/Lang/en_US.json @@ -2628,6 +2628,33 @@ "Sentry.Suffix.Self": "Monitoring: <#00ffa5>{0}", "Sentry.Notify.Info": "Info about your monitored room:\\nPlayers: {0}\\nDead players: {1}\\nPlayers that used a vent: {2}\\nShapeshifters: {3}", "Sentry.Notify.Info.NoData": "<#ff0000>none", + "Bargainer": "Bargainer", + "BargainerInfo": "Gain Money & Buy Power-Ups", + "BargainerInfoLong": "(Neutrals):\\nAs the Bargainer, you can gain money by killing, sabotaging and surviving meetings. You can use this money to buy some items from the shop. All devices on this map represent a shop you can use by going near it. You can buy the following items:\\n- Energy Drink (lowers your kill cooldown for that round)\\n- Lens Of Truth (reveals a random player's role for some time)\\n- Band Aid (gives you a shield for some time)\\nWhen you step away from a shop, the selected item will be purchased if you have enough money for it. You can choose to not buy anything. While in the shop, use your pet button to cycle between the available items.", + "Bargainer.StartingMoney": "Starting Money", + "Bargainer.Kill.Enabled": "Gain Money for Killing", + "Bargainer.Kill.Amount": "Money Gained for Killing", + "Bargainer.Sabotage.Enabled": "Gain Money for Sabotaging", + "Bargainer.Sabotage.Amount": "Money Gained for Sabotaging", + "Bargainer.SurviveMeeting.Enabled": "Gain Money for Surviving Meetings", + "Bargainer.SurviveMeeting.Amount": "Money Gained for Surviving Meetings", + "Bargainer.EnergyDrink.Enabled": "Energy Drink Enabled", + "Bargainer.EnergyDrink.Cost": "Energy Drink Cost", + "Bargainer.LensOfTruth.Enabled": "Lens Of Truth Enabled", + "Bargainer.LensOfTruth.Cost": "Lens Of Truth Cost", + "Bargainer.BandAid.Enabled": "Band Aid Enabled", + "Bargainer.BandAid.Cost": "Band Aid Cost", + "Bargainer.BandAid.Duration": "Band Aid Duration", + "Bargainer.BandAid.DurationSwitch": "Band Aid Lasts For", + "Bargainer.EnergyDrink.ReducedKCD": "Energy Drink Reduced Kill Cooldown", + "Bargainer.LensOfTruth.Duration": "Lens Of Truth Duration", + "Bargainer.LensOfTruth.DurationSwitch": "Lens Of Truth Lasts For", + "Bargainer.Notify.PurchasedItem": "You have purchased a(n) {0}", + "Bargainer.None": "No Item", + "Bargainer.EnergyDrink": "Energy Drink", + "Bargainer.LensOfTruth": "Lens Of Truth", + "Bargainer.BandAid": "Band Aid", + "Bargainer.Suffix.InShop": "[<#00ffa5>Shop] Selected Item: {0}", "SchrodingersCat": "Schrödinger's Cat", "SchrodingersCatInfo": "Get Attacked to Get a Role", "SchrodingersCatInfoLong": "(Neutrals):\\nAs Schrödinger's Cat, if you get attacked, you turn into the same role as your killer.\\nIf you don't get attacked, you lose, or you can win with crewmates, depending on the settings.", diff --git a/Roles/AddOns/Common/Antidote.cs b/Roles/AddOns/Common/Antidote.cs index d7ddd7568..14800056e 100644 --- a/Roles/AddOns/Common/Antidote.cs +++ b/Roles/AddOns/Common/Antidote.cs @@ -9,16 +9,16 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(222420, CustomRoles.Antidote, canSetNum: true); - ImpCanBeAntidote = BooleanOptionItem.Create(222426, "ImpCanBeAntidote", true, TabGroup.Addons, false) + ImpCanBeAntidote = BooleanOptionItem.Create(222426, "ImpCanBeAntidote", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Antidote]); - CrewCanBeAntidote = BooleanOptionItem.Create(222427, "CrewCanBeAntidote", true, TabGroup.Addons, false) + CrewCanBeAntidote = BooleanOptionItem.Create(222427, "CrewCanBeAntidote", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Antidote]); - NeutralCanBeAntidote = BooleanOptionItem.Create(222423, "NeutralCanBeAntidote", true, TabGroup.Addons, false) + NeutralCanBeAntidote = BooleanOptionItem.Create(222423, "NeutralCanBeAntidote", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Antidote]); - AntidoteCDOpt = FloatOptionItem.Create(222424, "AntidoteCDOpt", new(0f, 180f, 1f), 5f, TabGroup.Addons, false) + AntidoteCDOpt = FloatOptionItem.Create(222424, "AntidoteCDOpt", new(0f, 180f, 1f), 5f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Antidote]) .SetValueFormat(OptionFormat.Seconds); - AntidoteCDReset = BooleanOptionItem.Create(222425, "AntidoteCDReset", true, TabGroup.Addons, false) + AntidoteCDReset = BooleanOptionItem.Create(222425, "AntidoteCDReset", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Antidote]); } } diff --git a/Roles/AddOns/Common/Asthmatic.cs b/Roles/AddOns/Common/Asthmatic.cs index 36296c267..a733524a4 100644 --- a/Roles/AddOns/Common/Asthmatic.cs +++ b/Roles/AddOns/Common/Asthmatic.cs @@ -12,16 +12,16 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15420, CustomRoles.Asthmatic, canSetNum: true); - AsthmaticMinRedTime = IntegerOptionItem.Create(15423, "AsthmaticMinRedTime", new(1, 90, 1), 5, TabGroup.Addons, false) + AsthmaticMinRedTime = IntegerOptionItem.Create(15423, "AsthmaticMinRedTime", new(1, 90, 1), 5, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Asthmatic]) .SetValueFormat(OptionFormat.Seconds); - AsthmaticMaxRedTime = IntegerOptionItem.Create(15424, "AsthmaticMaxRedTime", new(1, 90, 1), 30, TabGroup.Addons, false) + AsthmaticMaxRedTime = IntegerOptionItem.Create(15424, "AsthmaticMaxRedTime", new(1, 90, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Asthmatic]) .SetValueFormat(OptionFormat.Seconds); - AsthmaticMinGreenTime = IntegerOptionItem.Create(15425, "AsthmaticMinGreenTime", new(1, 90, 1), 5, TabGroup.Addons, false) + AsthmaticMinGreenTime = IntegerOptionItem.Create(15425, "AsthmaticMinGreenTime", new(1, 90, 1), 5, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Asthmatic]) .SetValueFormat(OptionFormat.Seconds); - AsthmaticMaxGreenTime = IntegerOptionItem.Create(15426, "AsthmaticMaxGreenTime", new(1, 90, 1), 30, TabGroup.Addons, false) + AsthmaticMaxGreenTime = IntegerOptionItem.Create(15426, "AsthmaticMaxGreenTime", new(1, 90, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Asthmatic]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Common/Autopsy.cs b/Roles/AddOns/Common/Autopsy.cs index b667a3c78..712588a52 100644 --- a/Roles/AddOns/Common/Autopsy.cs +++ b/Roles/AddOns/Common/Autopsy.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(13600, CustomRoles.Autopsy, canSetNum: true); - ImpCanBeAutopsy = BooleanOptionItem.Create(13610, "ImpCanBeAutopsy", true, TabGroup.Addons, false) + ImpCanBeAutopsy = BooleanOptionItem.Create(13610, "ImpCanBeAutopsy", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Autopsy]); - CrewCanBeAutopsy = BooleanOptionItem.Create(13611, "CrewCanBeAutopsy", true, TabGroup.Addons, false) + CrewCanBeAutopsy = BooleanOptionItem.Create(13611, "CrewCanBeAutopsy", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Autopsy]); - NeutralCanBeAutopsy = BooleanOptionItem.Create(13612, "NeutralCanBeAutopsy", true, TabGroup.Addons, false) + NeutralCanBeAutopsy = BooleanOptionItem.Create(13612, "NeutralCanBeAutopsy", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Autopsy]); } } diff --git a/Roles/AddOns/Common/Avanger.cs b/Roles/AddOns/Common/Avanger.cs index 077f7066d..f09f5eadb 100644 --- a/Roles/AddOns/Common/Avanger.cs +++ b/Roles/AddOns/Common/Avanger.cs @@ -7,7 +7,7 @@ public void SetupCustomOption() { Options.SetupAdtRoleOptions(15100, CustomRoles.Avanger, canSetNum: true); - Options.ImpCanBeAvanger = BooleanOptionItem.Create(15110, "ImpCanBeAvanger", false, TabGroup.Addons, false) + Options.ImpCanBeAvanger = BooleanOptionItem.Create(15110, "ImpCanBeAvanger", false, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Avanger]); } } diff --git a/Roles/AddOns/Common/Bait.cs b/Roles/AddOns/Common/Bait.cs index 4889c525e..796577c62 100644 --- a/Roles/AddOns/Common/Bait.cs +++ b/Roles/AddOns/Common/Bait.cs @@ -9,23 +9,23 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(13700, CustomRoles.Bait, canSetNum: true); - ImpCanBeBait = BooleanOptionItem.Create(13710, "ImpCanBeBait", true, TabGroup.Addons, false) + ImpCanBeBait = BooleanOptionItem.Create(13710, "ImpCanBeBait", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]); - CrewCanBeBait = BooleanOptionItem.Create(13711, "CrewCanBeBait", true, TabGroup.Addons, false) + CrewCanBeBait = BooleanOptionItem.Create(13711, "CrewCanBeBait", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]); - NeutralCanBeBait = BooleanOptionItem.Create(13712, "NeutralCanBeBait", true, TabGroup.Addons, false) + NeutralCanBeBait = BooleanOptionItem.Create(13712, "NeutralCanBeBait", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]); - BaitDelayMin = FloatOptionItem.Create(13713, "BaitDelayMin", new(0f, 90f, 1f), 0f, TabGroup.Addons, false) + BaitDelayMin = FloatOptionItem.Create(13713, "BaitDelayMin", new(0f, 90f, 1f), 0f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]) .SetValueFormat(OptionFormat.Seconds); - BaitDelayMax = FloatOptionItem.Create(13714, "BaitDelayMax", new(0f, 90f, 1f), 0f, TabGroup.Addons, false) + BaitDelayMax = FloatOptionItem.Create(13714, "BaitDelayMax", new(0f, 90f, 1f), 0f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]) .SetValueFormat(OptionFormat.Seconds); - BaitDelayNotify = BooleanOptionItem.Create(13715, "BaitDelayNotify", true, TabGroup.Addons, false) + BaitDelayNotify = BooleanOptionItem.Create(13715, "BaitDelayNotify", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]); - BaitNotification = BooleanOptionItem.Create(13716, "BaitNotification", false, TabGroup.Addons, false) + BaitNotification = BooleanOptionItem.Create(13716, "BaitNotification", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]); - ReportBaitAtAllCost = BooleanOptionItem.Create(13717, "ReportBaitAtAllCost", false, TabGroup.Addons, false) + ReportBaitAtAllCost = BooleanOptionItem.Create(13717, "ReportBaitAtAllCost", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bait]); } } diff --git a/Roles/AddOns/Common/Bewilder.cs b/Roles/AddOns/Common/Bewilder.cs index d257e8310..36384691c 100644 --- a/Roles/AddOns/Common/Bewilder.cs +++ b/Roles/AddOns/Common/Bewilder.cs @@ -9,14 +9,14 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15200, CustomRoles.Bewilder, canSetNum: true); - BewilderVision = FloatOptionItem.Create(15210, "BewilderVision", new(0f, 5f, 0.05f), 0.6f, TabGroup.Addons, false) + BewilderVision = FloatOptionItem.Create(15210, "BewilderVision", new(0f, 5f, 0.05f), 0.6f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bewilder]) .SetValueFormat(OptionFormat.Multiplier); - ImpCanBeBewilder = BooleanOptionItem.Create(15211, "ImpCanBeBewilder", true, TabGroup.Addons, false) + ImpCanBeBewilder = BooleanOptionItem.Create(15211, "ImpCanBeBewilder", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bewilder]); - CrewCanBeBewilder = BooleanOptionItem.Create(15212, "CrewCanBeBewilder", true, TabGroup.Addons, false) + CrewCanBeBewilder = BooleanOptionItem.Create(15212, "CrewCanBeBewilder", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bewilder]); - NeutralCanBeBewilder = BooleanOptionItem.Create(15213, "NeutralCanBeBewilder", true, TabGroup.Addons, false) + NeutralCanBeBewilder = BooleanOptionItem.Create(15213, "NeutralCanBeBewilder", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bewilder]); } } diff --git a/Roles/AddOns/Common/Brakar.cs b/Roles/AddOns/Common/Brakar.cs index e23c67e12..f79f5c82c 100644 --- a/Roles/AddOns/Common/Brakar.cs +++ b/Roles/AddOns/Common/Brakar.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14900, CustomRoles.Brakar, canSetNum: true); - ImpCanBeTiebreaker = BooleanOptionItem.Create(14910, "ImpCanBeTiebreaker", true, TabGroup.Addons, false) + ImpCanBeTiebreaker = BooleanOptionItem.Create(14910, "ImpCanBeTiebreaker", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Brakar]); - CrewCanBeTiebreaker = BooleanOptionItem.Create(14911, "CrewCanBeTiebreaker", true, TabGroup.Addons, false) + CrewCanBeTiebreaker = BooleanOptionItem.Create(14911, "CrewCanBeTiebreaker", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Brakar]); - NeutralCanBeTiebreaker = BooleanOptionItem.Create(14912, "NeutralCanBeTiebreaker", true, TabGroup.Addons, false) + NeutralCanBeTiebreaker = BooleanOptionItem.Create(14912, "NeutralCanBeTiebreaker", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Brakar]); } } diff --git a/Roles/AddOns/Common/Busy.cs b/Roles/AddOns/Common/Busy.cs index 71caf7e0c..44cbe2ebf 100644 --- a/Roles/AddOns/Common/Busy.cs +++ b/Roles/AddOns/Common/Busy.cs @@ -9,9 +9,9 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15290, CustomRoles.Busy, canSetNum: true); - BusyLongTasks = IntegerOptionItem.Create(15293, "BusyLongTasks", new(0, 90, 1), 1, TabGroup.Addons, false) + BusyLongTasks = IntegerOptionItem.Create(15293, "BusyLongTasks", new(0, 90, 1), 1, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Busy]); - BusyShortTasks = IntegerOptionItem.Create(15294, "BusyShortTasks", new(0, 90, 1), 1, TabGroup.Addons, false) + BusyShortTasks = IntegerOptionItem.Create(15294, "BusyShortTasks", new(0, 90, 1), 1, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Busy]); } } diff --git a/Roles/AddOns/Common/Disco.cs b/Roles/AddOns/Common/Disco.cs index 13a29ff0b..7a6f07de1 100644 --- a/Roles/AddOns/Common/Disco.cs +++ b/Roles/AddOns/Common/Disco.cs @@ -1,5 +1,5 @@ -using EHR.Roles.Impostor; -using System.Collections.Generic; +using System.Collections.Generic; +using EHR.Roles.Impostor; using static EHR.Options; namespace EHR.Roles.AddOns.Common @@ -11,7 +11,7 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15430, CustomRoles.Disco, canSetNum: true); - DiscoChangeInterval = IntegerOptionItem.Create(15433, "DiscoChangeInterval", new(1, 90, 1), 5, TabGroup.Addons, false) + DiscoChangeInterval = IntegerOptionItem.Create(15433, "DiscoChangeInterval", new(1, 90, 1), 5, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Disco]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Common/Diseased.cs b/Roles/AddOns/Common/Diseased.cs index 05cfc8cf3..20762a69c 100644 --- a/Roles/AddOns/Common/Diseased.cs +++ b/Roles/AddOns/Common/Diseased.cs @@ -9,16 +9,16 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(111420, CustomRoles.Diseased, canSetNum: true); - ImpCanBeDiseased = BooleanOptionItem.Create(111426, "ImpCanBeDiseased", true, TabGroup.Addons, false) + ImpCanBeDiseased = BooleanOptionItem.Create(111426, "ImpCanBeDiseased", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Diseased]); - CrewCanBeDiseased = BooleanOptionItem.Create(111427, "CrewCanBeDiseased", true, TabGroup.Addons, false) + CrewCanBeDiseased = BooleanOptionItem.Create(111427, "CrewCanBeDiseased", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Diseased]); - NeutralCanBeDiseased = BooleanOptionItem.Create(111423, "NeutralCanBeDiseased", true, TabGroup.Addons, false) + NeutralCanBeDiseased = BooleanOptionItem.Create(111423, "NeutralCanBeDiseased", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Diseased]); - DiseasedCDOpt = FloatOptionItem.Create(111424, "DiseasedCDOpt", new(0f, 180f, 1f), 25f, TabGroup.Addons, false) + DiseasedCDOpt = FloatOptionItem.Create(111424, "DiseasedCDOpt", new(0f, 180f, 1f), 25f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Diseased]) .SetValueFormat(OptionFormat.Seconds); - DiseasedCDReset = BooleanOptionItem.Create(111425, "DiseasedCDReset", true, TabGroup.Addons, false) + DiseasedCDReset = BooleanOptionItem.Create(111425, "DiseasedCDReset", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Diseased]); } } diff --git a/Roles/AddOns/Common/DoubleShot.cs b/Roles/AddOns/Common/DoubleShot.cs index 23e526d30..24f0e0cb6 100644 --- a/Roles/AddOns/Common/DoubleShot.cs +++ b/Roles/AddOns/Common/DoubleShot.cs @@ -17,11 +17,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(13900, CustomRoles.DoubleShot, canSetNum: true, tab: TabGroup.Addons); - ImpCanBeDoubleShot = BooleanOptionItem.Create(13910, "ImpCanBeDoubleShot", true, TabGroup.Addons, false) + ImpCanBeDoubleShot = BooleanOptionItem.Create(13910, "ImpCanBeDoubleShot", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.DoubleShot]); - CrewCanBeDoubleShot = BooleanOptionItem.Create(13911, "CrewCanBeDoubleShot", true, TabGroup.Addons, false) + CrewCanBeDoubleShot = BooleanOptionItem.Create(13911, "CrewCanBeDoubleShot", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.DoubleShot]); - NeutralCanBeDoubleShot = BooleanOptionItem.Create(13912, "NeutralCanBeDoubleShot", true, TabGroup.Addons, false) + NeutralCanBeDoubleShot = BooleanOptionItem.Create(13912, "NeutralCanBeDoubleShot", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.DoubleShot]); } } diff --git a/Roles/AddOns/Common/DualPersonality.cs b/Roles/AddOns/Common/DualPersonality.cs index 3503cfde1..86ac6a44d 100644 --- a/Roles/AddOns/Common/DualPersonality.cs +++ b/Roles/AddOns/Common/DualPersonality.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14700, CustomRoles.DualPersonality, canSetNum: true); - ImpCanBeDualPersonality = BooleanOptionItem.Create(14710, "ImpCanBeDualPersonality", true, TabGroup.Addons, false) + ImpCanBeDualPersonality = BooleanOptionItem.Create(14710, "ImpCanBeDualPersonality", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.DualPersonality]); - CrewCanBeDualPersonality = BooleanOptionItem.Create(14711, "CrewCanBeDualPersonality", true, TabGroup.Addons, false) + CrewCanBeDualPersonality = BooleanOptionItem.Create(14711, "CrewCanBeDualPersonality", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.DualPersonality]); - DualVotes = BooleanOptionItem.Create(14712, "DualVotes", true, TabGroup.Addons, false) + DualVotes = BooleanOptionItem.Create(14712, "DualVotes", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.DualPersonality]); } } diff --git a/Roles/AddOns/Common/Flash.cs b/Roles/AddOns/Common/Flash.cs index 11ee2bf67..2c1fc2c02 100644 --- a/Roles/AddOns/Common/Flash.cs +++ b/Roles/AddOns/Common/Flash.cs @@ -7,7 +7,7 @@ public void SetupCustomOption() { Options.SetupAdtRoleOptions(18700, CustomRoles.Flashman, canSetNum: true, tab: TabGroup.Addons); - Options.FlashmanSpeed = FloatOptionItem.Create(18703, "FlashmanSpeed", new(0.25f, 3f, 0.25f), 2.5f, TabGroup.Addons, false) + Options.FlashmanSpeed = FloatOptionItem.Create(18703, "FlashmanSpeed", new(0.25f, 3f, 0.25f), 2.5f, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Flashman]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/AddOns/Common/Fool.cs b/Roles/AddOns/Common/Fool.cs index f72b5436f..2f6303ef9 100644 --- a/Roles/AddOns/Common/Fool.cs +++ b/Roles/AddOns/Common/Fool.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(19200, CustomRoles.Fool, canSetNum: true, tab: TabGroup.Addons); - ImpCanBeFool = BooleanOptionItem.Create(19210, "ImpCanBeFool", true, TabGroup.Addons, false) + ImpCanBeFool = BooleanOptionItem.Create(19210, "ImpCanBeFool", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Fool]); - CrewCanBeFool = BooleanOptionItem.Create(19211, "CrewCanBeFool", true, TabGroup.Addons, false) + CrewCanBeFool = BooleanOptionItem.Create(19211, "CrewCanBeFool", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Fool]); - NeutralCanBeFool = BooleanOptionItem.Create(19212, "NeutralCanBeFool", true, TabGroup.Addons, false) + NeutralCanBeFool = BooleanOptionItem.Create(19212, "NeutralCanBeFool", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Fool]); } } diff --git a/Roles/AddOns/Common/Giant.cs b/Roles/AddOns/Common/Giant.cs index d3cd425d7..d1d3a6139 100644 --- a/Roles/AddOns/Common/Giant.cs +++ b/Roles/AddOns/Common/Giant.cs @@ -7,7 +7,7 @@ public void SetupCustomOption() { Options.SetupAdtRoleOptions(18750, CustomRoles.Giant, canSetNum: true, tab: TabGroup.Addons); - Options.GiantSpeed = FloatOptionItem.Create(18753, "GiantSpeed", new(0.25f, 3f, 0.25f), 0.75f, TabGroup.Addons, false) + Options.GiantSpeed = FloatOptionItem.Create(18753, "GiantSpeed", new(0.25f, 3f, 0.25f), 0.75f, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Giant]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/AddOns/Common/Glow.cs b/Roles/AddOns/Common/Glow.cs index 5b610160f..74c9db1f0 100644 --- a/Roles/AddOns/Common/Glow.cs +++ b/Roles/AddOns/Common/Glow.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14020, CustomRoles.Glow, canSetNum: true); - ImpCanBeGlow = BooleanOptionItem.Create(14030, "ImpCanBeGlow", true, TabGroup.Addons, false) + ImpCanBeGlow = BooleanOptionItem.Create(14030, "ImpCanBeGlow", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Glow]); - CrewCanBeGlow = BooleanOptionItem.Create(14031, "CrewCanBeGlow", true, TabGroup.Addons, false) + CrewCanBeGlow = BooleanOptionItem.Create(14031, "CrewCanBeGlow", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Glow]); - NeutralCanBeGlow = BooleanOptionItem.Create(14032, "NeutralCanBeGlow", true, TabGroup.Addons, false) + NeutralCanBeGlow = BooleanOptionItem.Create(14032, "NeutralCanBeGlow", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Glow]); } } diff --git a/Roles/AddOns/Common/Gravestone.cs b/Roles/AddOns/Common/Gravestone.cs index c93a0b0d3..3cc05f8d3 100644 --- a/Roles/AddOns/Common/Gravestone.cs +++ b/Roles/AddOns/Common/Gravestone.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14000, CustomRoles.Gravestone, canSetNum: true); - ImpCanBeGravestone = BooleanOptionItem.Create(14010, "ImpCanBeGravestone", true, TabGroup.Addons, false) + ImpCanBeGravestone = BooleanOptionItem.Create(14010, "ImpCanBeGravestone", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Gravestone]); - CrewCanBeGravestone = BooleanOptionItem.Create(14011, "CrewCanBeGravestone", true, TabGroup.Addons, false) + CrewCanBeGravestone = BooleanOptionItem.Create(14011, "CrewCanBeGravestone", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Gravestone]); - NeutralCanBeGravestone = BooleanOptionItem.Create(14012, "NeutralCanBeGravestone", true, TabGroup.Addons, false) + NeutralCanBeGravestone = BooleanOptionItem.Create(14012, "NeutralCanBeGravestone", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Gravestone]); } } diff --git a/Roles/AddOns/Common/Guesser.cs b/Roles/AddOns/Common/Guesser.cs index 0bf523bf0..10056446d 100644 --- a/Roles/AddOns/Common/Guesser.cs +++ b/Roles/AddOns/Common/Guesser.cs @@ -10,17 +10,17 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(19100, CustomRoles.Guesser, canSetNum: true, tab: TabGroup.Addons); - ImpCanBeGuesser = BooleanOptionItem.Create(19110, "ImpCanBeGuesser", true, TabGroup.Addons, false) + ImpCanBeGuesser = BooleanOptionItem.Create(19110, "ImpCanBeGuesser", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Guesser]); - CrewCanBeGuesser = BooleanOptionItem.Create(19111, "CrewCanBeGuesser", true, TabGroup.Addons, false) + CrewCanBeGuesser = BooleanOptionItem.Create(19111, "CrewCanBeGuesser", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Guesser]); - NeutralCanBeGuesser = BooleanOptionItem.Create(19112, "NeutralCanBeGuesser", true, TabGroup.Addons, false) + NeutralCanBeGuesser = BooleanOptionItem.Create(19112, "NeutralCanBeGuesser", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Guesser]); - GCanGuessAdt = BooleanOptionItem.Create(19115, "GCanGuessAdt", false, TabGroup.Addons, false) + GCanGuessAdt = BooleanOptionItem.Create(19115, "GCanGuessAdt", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Guesser]); - GCanGuessTaskDoneSnitch = BooleanOptionItem.Create(19116, "GCanGuessTaskDoneSnitch", true, TabGroup.Addons, false) + GCanGuessTaskDoneSnitch = BooleanOptionItem.Create(19116, "GCanGuessTaskDoneSnitch", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Guesser]); - GTryHideMsg = BooleanOptionItem.Create(19117, "GuesserTryHideMsg", true, TabGroup.Addons, false) + GTryHideMsg = BooleanOptionItem.Create(19117, "GuesserTryHideMsg", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Guesser]) .SetColor(Color.green); } diff --git a/Roles/AddOns/Common/Lovers.cs b/Roles/AddOns/Common/Lovers.cs index 768380ffa..df669f0e0 100644 --- a/Roles/AddOns/Common/Lovers.cs +++ b/Roles/AddOns/Common/Lovers.cs @@ -12,39 +12,39 @@ namespace EHR.Roles.AddOns.Common const int id = 16200; const CustomGameMode customGameMode = CustomGameMode.Standard; - var spawnOption = StringOptionItem.Create(id, role.ToString(), RatesZeroOne, 0, TabGroup.Addons, false) + var spawnOption = StringOptionItem.Create(id, role.ToString(), RatesZeroOne, 0, TabGroup.Addons) .SetColor(Utils.GetRoleColor(role)) .SetHeader(true) .SetGameMode(customGameMode) as StringOptionItem; - var rateOption = IntegerOptionItem.Create(id + 2, "LoverSpawnChances", new(0, 100, 5), 50, TabGroup.Addons, false) + var rateOption = IntegerOptionItem.Create(id + 2, "LoverSpawnChances", new(0, 100, 5), 50, TabGroup.Addons) .SetParent(spawnOption) .SetValueFormat(OptionFormat.Percent) .SetGameMode(customGameMode) as IntegerOptionItem; LoverSpawnChances = rateOption; - LoverKnowRoles = BooleanOptionItem.Create(id + 4, "LoverKnowRoles", true, TabGroup.Addons, false) + LoverKnowRoles = BooleanOptionItem.Create(id + 4, "LoverKnowRoles", true, TabGroup.Addons) .SetParent(spawnOption) .SetGameMode(customGameMode); - LoverSuicide = BooleanOptionItem.Create(id + 3, "LoverSuicide", true, TabGroup.Addons, false) + LoverSuicide = BooleanOptionItem.Create(id + 3, "LoverSuicide", true, TabGroup.Addons) .SetParent(spawnOption) .SetGameMode(customGameMode); - ImpCanBeInLove = BooleanOptionItem.Create(id + 5, "ImpCanBeInLove", true, TabGroup.Addons, false) + ImpCanBeInLove = BooleanOptionItem.Create(id + 5, "ImpCanBeInLove", true, TabGroup.Addons) .SetParent(spawnOption) .SetGameMode(customGameMode); - CrewCanBeInLove = BooleanOptionItem.Create(id + 6, "CrewCanBeInLove", true, TabGroup.Addons, false) + CrewCanBeInLove = BooleanOptionItem.Create(id + 6, "CrewCanBeInLove", true, TabGroup.Addons) .SetParent(spawnOption) .SetGameMode(customGameMode); - NeutralCanBeInLove = BooleanOptionItem.Create(id + 7, "NeutralCanBeInLove", true, TabGroup.Addons, false) + NeutralCanBeInLove = BooleanOptionItem.Create(id + 7, "NeutralCanBeInLove", true, TabGroup.Addons) .SetParent(spawnOption) .SetGameMode(customGameMode); - var countOption = IntegerOptionItem.Create(id + 1, "NumberOfLovers", new(2, 2, 1), 2, TabGroup.Addons, false) + var countOption = IntegerOptionItem.Create(id + 1, "NumberOfLovers", new(2, 2, 1), 2, TabGroup.Addons) .SetParent(spawnOption) .SetHidden(true) .SetGameMode(customGameMode); diff --git a/Roles/AddOns/Common/Loyal.cs b/Roles/AddOns/Common/Loyal.cs index 5b8304654..545222562 100644 --- a/Roles/AddOns/Common/Loyal.cs +++ b/Roles/AddOns/Common/Loyal.cs @@ -9,9 +9,9 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15500, CustomRoles.Loyal, canSetNum: true); - ImpCanBeLoyal = BooleanOptionItem.Create(15510, "ImpCanBeLoyal", true, TabGroup.Addons, false) + ImpCanBeLoyal = BooleanOptionItem.Create(15510, "ImpCanBeLoyal", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Loyal]); - CrewCanBeLoyal = BooleanOptionItem.Create(15511, "CrewCanBeLoyal", true, TabGroup.Addons, false) + CrewCanBeLoyal = BooleanOptionItem.Create(15511, "CrewCanBeLoyal", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Loyal]); } } diff --git a/Roles/AddOns/Common/Lucky.cs b/Roles/AddOns/Common/Lucky.cs index 27815cee6..e6209aec0 100644 --- a/Roles/AddOns/Common/Lucky.cs +++ b/Roles/AddOns/Common/Lucky.cs @@ -9,14 +9,14 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14300, CustomRoles.Lucky, canSetNum: true); - LuckyProbability = IntegerOptionItem.Create(14310, "LuckyProbability", new(0, 100, 5), 50, TabGroup.Addons, false) + LuckyProbability = IntegerOptionItem.Create(14310, "LuckyProbability", new(0, 100, 5), 50, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Lucky]) .SetValueFormat(OptionFormat.Percent); - ImpCanBeLucky = BooleanOptionItem.Create(14311, "ImpCanBeLucky", true, TabGroup.Addons, false) + ImpCanBeLucky = BooleanOptionItem.Create(14311, "ImpCanBeLucky", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Lucky]); - CrewCanBeLucky = BooleanOptionItem.Create(14312, "CrewCanBeLucky", true, TabGroup.Addons, false) + CrewCanBeLucky = BooleanOptionItem.Create(14312, "CrewCanBeLucky", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Lucky]); - NeutralCanBeLucky = BooleanOptionItem.Create(14313, "NeutralCanBeLucky", true, TabGroup.Addons, false) + NeutralCanBeLucky = BooleanOptionItem.Create(14313, "NeutralCanBeLucky", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Lucky]); } } diff --git a/Roles/AddOns/Common/Necroview.cs b/Roles/AddOns/Common/Necroview.cs index 256f256a1..dfc60c65e 100644 --- a/Roles/AddOns/Common/Necroview.cs +++ b/Roles/AddOns/Common/Necroview.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14400, CustomRoles.Necroview, canSetNum: true, tab: TabGroup.Addons); - ImpCanBeNecroview = BooleanOptionItem.Create(14410, "ImpCanBeNecroview", true, TabGroup.Addons, false) + ImpCanBeNecroview = BooleanOptionItem.Create(14410, "ImpCanBeNecroview", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Necroview]); - CrewCanBeNecroview = BooleanOptionItem.Create(14411, "CrewCanBeNecroview", true, TabGroup.Addons, false) + CrewCanBeNecroview = BooleanOptionItem.Create(14411, "CrewCanBeNecroview", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Necroview]); - NeutralCanBeNecroview = BooleanOptionItem.Create(14412, "NeutralCanBeNecroview", true, TabGroup.Addons, false) + NeutralCanBeNecroview = BooleanOptionItem.Create(14412, "NeutralCanBeNecroview", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Necroview]); } } diff --git a/Roles/AddOns/Common/Nimble.cs b/Roles/AddOns/Common/Nimble.cs index bd01a6709..2648ac110 100644 --- a/Roles/AddOns/Common/Nimble.cs +++ b/Roles/AddOns/Common/Nimble.cs @@ -9,10 +9,10 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15640, CustomRoles.Nimble); - NimbleCD = FloatOptionItem.Create(15645, "VentCooldown", new(0, 180, 1), 30, TabGroup.Addons, false) + NimbleCD = FloatOptionItem.Create(15645, "VentCooldown", new(0, 180, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Nimble]) .SetValueFormat(OptionFormat.Seconds); - NimbleInVentTime = FloatOptionItem.Create(15646, "MaxInVentTime", new(0, 180, 1), 15, TabGroup.Addons, false) + NimbleInVentTime = FloatOptionItem.Create(15646, "MaxInVentTime", new(0, 180, 1), 15, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Nimble]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Common/Oblivious.cs b/Roles/AddOns/Common/Oblivious.cs index 2ddb6a19c..388763d7e 100644 --- a/Roles/AddOns/Common/Oblivious.cs +++ b/Roles/AddOns/Common/Oblivious.cs @@ -9,13 +9,13 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15400, CustomRoles.Oblivious, canSetNum: true); - ImpCanBeOblivious = BooleanOptionItem.Create(15410, "ImpCanBeOblivious", true, TabGroup.Addons, false) + ImpCanBeOblivious = BooleanOptionItem.Create(15410, "ImpCanBeOblivious", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Oblivious]); - CrewCanBeOblivious = BooleanOptionItem.Create(15411, "CrewCanBeOblivious", true, TabGroup.Addons, false) + CrewCanBeOblivious = BooleanOptionItem.Create(15411, "CrewCanBeOblivious", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Oblivious]); - NeutralCanBeOblivious = BooleanOptionItem.Create(15412, "NeutralCanBeOblivious", true, TabGroup.Addons, false) + NeutralCanBeOblivious = BooleanOptionItem.Create(15412, "NeutralCanBeOblivious", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Oblivious]); - ObliviousBaitImmune = BooleanOptionItem.Create(15413, "ObliviousBaitImmune", false, TabGroup.Addons, false) + ObliviousBaitImmune = BooleanOptionItem.Create(15413, "ObliviousBaitImmune", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Oblivious]); } } diff --git a/Roles/AddOns/Common/Physicist.cs b/Roles/AddOns/Common/Physicist.cs index 93c5b2b67..32a922bf3 100644 --- a/Roles/AddOns/Common/Physicist.cs +++ b/Roles/AddOns/Common/Physicist.cs @@ -9,10 +9,10 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15650, CustomRoles.Physicist); - PhysicistCD = FloatOptionItem.Create(15655, "VitalsCooldown", new(0, 180, 1), 20, TabGroup.Addons, false) + PhysicistCD = FloatOptionItem.Create(15655, "VitalsCooldown", new(0, 180, 1), 20, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Physicist]) .SetValueFormat(OptionFormat.Seconds); - PhysicistViewDuration = FloatOptionItem.Create(15656, "VitalsDuration", new(0, 180, 1), 5, TabGroup.Addons, false) + PhysicistViewDuration = FloatOptionItem.Create(15656, "VitalsDuration", new(0, 180, 1), 5, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Physicist]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Common/Rascal.cs b/Roles/AddOns/Common/Rascal.cs index a72bfea65..2b96e19c4 100644 --- a/Roles/AddOns/Common/Rascal.cs +++ b/Roles/AddOns/Common/Rascal.cs @@ -9,7 +9,7 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15600, CustomRoles.Rascal, canSetNum: true, tab: TabGroup.Addons); - RascalAppearAsMadmate = BooleanOptionItem.Create(15610, "RascalAppearAsMadmate", true, TabGroup.Addons, false) + RascalAppearAsMadmate = BooleanOptionItem.Create(15610, "RascalAppearAsMadmate", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Rascal]); } } diff --git a/Roles/AddOns/Common/Seer.cs b/Roles/AddOns/Common/Seer.cs index 36bfec68b..1a5bafdea 100644 --- a/Roles/AddOns/Common/Seer.cs +++ b/Roles/AddOns/Common/Seer.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14800, CustomRoles.Seer, canSetNum: true); - ImpCanBeSeer = BooleanOptionItem.Create(14810, "ImpCanBeSeer", true, TabGroup.Addons, false) + ImpCanBeSeer = BooleanOptionItem.Create(14810, "ImpCanBeSeer", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Seer]); - CrewCanBeSeer = BooleanOptionItem.Create(14811, "CrewCanBeSeer", true, TabGroup.Addons, false) + CrewCanBeSeer = BooleanOptionItem.Create(14811, "CrewCanBeSeer", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Seer]); - NeutralCanBeSeer = BooleanOptionItem.Create(14812, "NeutralCanBeSeer", true, TabGroup.Addons, false) + NeutralCanBeSeer = BooleanOptionItem.Create(14812, "NeutralCanBeSeer", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Seer]); } } diff --git a/Roles/AddOns/Common/Sunglasses.cs b/Roles/AddOns/Common/Sunglasses.cs index 969faca9a..f5be158a2 100644 --- a/Roles/AddOns/Common/Sunglasses.cs +++ b/Roles/AddOns/Common/Sunglasses.cs @@ -9,14 +9,14 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15450, CustomRoles.Sunglasses, canSetNum: true); - SunglassesVision = FloatOptionItem.Create(15460, "SunglassesVision", new(0f, 5f, 0.05f), 0.75f, TabGroup.Addons, false) + SunglassesVision = FloatOptionItem.Create(15460, "SunglassesVision", new(0f, 5f, 0.05f), 0.75f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Sunglasses]) .SetValueFormat(OptionFormat.Multiplier); - ImpCanBeSunglasses = BooleanOptionItem.Create(15461, "ImpCanBeSunglasses", true, TabGroup.Addons, false) + ImpCanBeSunglasses = BooleanOptionItem.Create(15461, "ImpCanBeSunglasses", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Sunglasses]); - CrewCanBeSunglasses = BooleanOptionItem.Create(15462, "CrewCanBeSunglasses", true, TabGroup.Addons, false) + CrewCanBeSunglasses = BooleanOptionItem.Create(15462, "CrewCanBeSunglasses", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Sunglasses]); - NeutralCanBeSunglasses = BooleanOptionItem.Create(15463, "NeutralCanBeSunglasses", true, TabGroup.Addons, false) + NeutralCanBeSunglasses = BooleanOptionItem.Create(15463, "NeutralCanBeSunglasses", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Sunglasses]); } } diff --git a/Roles/AddOns/Common/Torch.cs b/Roles/AddOns/Common/Torch.cs index ff0b52cfa..0e0270dd8 100644 --- a/Roles/AddOns/Common/Torch.cs +++ b/Roles/AddOns/Common/Torch.cs @@ -9,10 +9,10 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14200, CustomRoles.Torch, canSetNum: true); - TorchVision = FloatOptionItem.Create(14210, "TorchVision", new(0.5f, 5f, 0.25f), 1.25f, TabGroup.Addons, false) + TorchVision = FloatOptionItem.Create(14210, "TorchVision", new(0.5f, 5f, 0.25f), 1.25f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Torch]) .SetValueFormat(OptionFormat.Multiplier); - TorchAffectedByLights = BooleanOptionItem.Create(14220, "TorchAffectedByLights", false, TabGroup.Addons, false) + TorchAffectedByLights = BooleanOptionItem.Create(14220, "TorchAffectedByLights", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Torch]); } } diff --git a/Roles/AddOns/Common/Trapper.cs b/Roles/AddOns/Common/Trapper.cs index b54e85ef8..82f66c0a6 100644 --- a/Roles/AddOns/Common/Trapper.cs +++ b/Roles/AddOns/Common/Trapper.cs @@ -9,13 +9,13 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(13800, CustomRoles.Trapper, canSetNum: true); - ImpCanBeTrapper = BooleanOptionItem.Create(13810, "ImpCanBeTrapper", true, TabGroup.Addons, false) + ImpCanBeTrapper = BooleanOptionItem.Create(13810, "ImpCanBeTrapper", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Trapper]); - CrewCanBeTrapper = BooleanOptionItem.Create(13811, "CrewCanBeTrapper", true, TabGroup.Addons, false) + CrewCanBeTrapper = BooleanOptionItem.Create(13811, "CrewCanBeTrapper", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Trapper]); - NeutralCanBeTrapper = BooleanOptionItem.Create(13812, "NeutralCanBeTrapper", true, TabGroup.Addons, false) + NeutralCanBeTrapper = BooleanOptionItem.Create(13812, "NeutralCanBeTrapper", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Trapper]); - TrapperBlockMoveTime = FloatOptionItem.Create(13813, "TrapperBlockMoveTime", new(0f, 180f, 1f), 5f, TabGroup.Addons, false) + TrapperBlockMoveTime = FloatOptionItem.Create(13813, "TrapperBlockMoveTime", new(0f, 180f, 1f), 5f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Trapper]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Common/Truant.cs b/Roles/AddOns/Common/Truant.cs index 6253f2026..126cbf0c4 100644 --- a/Roles/AddOns/Common/Truant.cs +++ b/Roles/AddOns/Common/Truant.cs @@ -9,7 +9,7 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15435, CustomRoles.Truant, canSetNum: true); - TruantWaitingTime = IntegerOptionItem.Create(15438, "TruantWaitingTime", new(1, 90, 1), 3, TabGroup.Addons, false) + TruantWaitingTime = IntegerOptionItem.Create(15438, "TruantWaitingTime", new(1, 90, 1), 3, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Truant]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Common/Unlucky.cs b/Roles/AddOns/Common/Unlucky.cs index b0e0ccc8e..1e1112dd0 100644 --- a/Roles/AddOns/Common/Unlucky.cs +++ b/Roles/AddOns/Common/Unlucky.cs @@ -9,26 +9,26 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(14350, CustomRoles.Unlucky, canSetNum: true); - UnluckyKillSuicideChance = IntegerOptionItem.Create(14364, "UnluckyKillSuicideChance", new(0, 100, 1), 2, TabGroup.Addons, false) + UnluckyKillSuicideChance = IntegerOptionItem.Create(14364, "UnluckyKillSuicideChance", new(0, 100, 1), 2, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]) .SetValueFormat(OptionFormat.Percent); - UnluckyTaskSuicideChance = IntegerOptionItem.Create(14365, "UnluckyTaskSuicideChance", new(0, 100, 1), 5, TabGroup.Addons, false) + UnluckyTaskSuicideChance = IntegerOptionItem.Create(14365, "UnluckyTaskSuicideChance", new(0, 100, 1), 5, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]) .SetValueFormat(OptionFormat.Percent); - UnluckyVentSuicideChance = IntegerOptionItem.Create(14366, "UnluckyVentSuicideChance", new(0, 100, 1), 3, TabGroup.Addons, false) + UnluckyVentSuicideChance = IntegerOptionItem.Create(14366, "UnluckyVentSuicideChance", new(0, 100, 1), 3, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]) .SetValueFormat(OptionFormat.Percent); - UnluckyReportSuicideChance = IntegerOptionItem.Create(14367, "UnluckyReportSuicideChance", new(0, 100, 1), 1, TabGroup.Addons, false) + UnluckyReportSuicideChance = IntegerOptionItem.Create(14367, "UnluckyReportSuicideChance", new(0, 100, 1), 1, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]) .SetValueFormat(OptionFormat.Percent); - UnluckySabotageSuicideChance = IntegerOptionItem.Create(14368, "UnluckySabotageSuicideChance", new(0, 100, 1), 4, TabGroup.Addons, false) + UnluckySabotageSuicideChance = IntegerOptionItem.Create(14368, "UnluckySabotageSuicideChance", new(0, 100, 1), 4, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]) .SetValueFormat(OptionFormat.Percent); - ImpCanBeUnlucky = BooleanOptionItem.Create(14361, "ImpCanBeUnlucky", true, TabGroup.Addons, false) + ImpCanBeUnlucky = BooleanOptionItem.Create(14361, "ImpCanBeUnlucky", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]); - CrewCanBeUnlucky = BooleanOptionItem.Create(14362, "CrewCanBeUnlucky", true, TabGroup.Addons, false) + CrewCanBeUnlucky = BooleanOptionItem.Create(14362, "CrewCanBeUnlucky", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]); - NeutralCanBeUnlucky = BooleanOptionItem.Create(14363, "NeutralCanBeUnlucky", true, TabGroup.Addons, false) + NeutralCanBeUnlucky = BooleanOptionItem.Create(14363, "NeutralCanBeUnlucky", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unlucky]); } } diff --git a/Roles/AddOns/Common/Unreportable.cs b/Roles/AddOns/Common/Unreportable.cs index e545db621..67b9b7bbd 100644 --- a/Roles/AddOns/Common/Unreportable.cs +++ b/Roles/AddOns/Common/Unreportable.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15300, CustomRoles.Unreportable, canSetNum: true); - ImpCanBeUnreportable = BooleanOptionItem.Create(15310, "ImpCanBeUnreportable", true, TabGroup.Addons, false) + ImpCanBeUnreportable = BooleanOptionItem.Create(15310, "ImpCanBeUnreportable", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unreportable]); - CrewCanBeUnreportable = BooleanOptionItem.Create(15311, "CrewCanBeUnreportable", true, TabGroup.Addons, false) + CrewCanBeUnreportable = BooleanOptionItem.Create(15311, "CrewCanBeUnreportable", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unreportable]); - NeutralCanBeUnreportable = BooleanOptionItem.Create(15312, "NeutralCanBeUnreportable", true, TabGroup.Addons, false) + NeutralCanBeUnreportable = BooleanOptionItem.Create(15312, "NeutralCanBeUnreportable", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Unreportable]); } } diff --git a/Roles/AddOns/Common/Watcher.cs b/Roles/AddOns/Common/Watcher.cs index b02970063..758e7e545 100644 --- a/Roles/AddOns/Common/Watcher.cs +++ b/Roles/AddOns/Common/Watcher.cs @@ -9,11 +9,11 @@ namespace EHR.Roles.AddOns.Common public void SetupCustomOption() { SetupAdtRoleOptions(15000, CustomRoles.Watcher, canSetNum: true); - ImpCanBeWatcher = BooleanOptionItem.Create(15010, "ImpCanBeWatcher", true, TabGroup.Addons, false) + ImpCanBeWatcher = BooleanOptionItem.Create(15010, "ImpCanBeWatcher", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Watcher]); - CrewCanBeWatcher = BooleanOptionItem.Create(15011, "CrewCanBeWatcher", true, TabGroup.Addons, false) + CrewCanBeWatcher = BooleanOptionItem.Create(15011, "CrewCanBeWatcher", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Watcher]); - NeutralCanBeWatcher = BooleanOptionItem.Create(15012, "NeutralCanBeWatcher", true, TabGroup.Addons, false) + NeutralCanBeWatcher = BooleanOptionItem.Create(15012, "NeutralCanBeWatcher", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Watcher]); } } diff --git a/Roles/AddOns/Crewmate/Bloodlust.cs b/Roles/AddOns/Crewmate/Bloodlust.cs index 5266084fb..35e40065c 100644 --- a/Roles/AddOns/Crewmate/Bloodlust.cs +++ b/Roles/AddOns/Crewmate/Bloodlust.cs @@ -14,12 +14,12 @@ namespace EHR.Roles.AddOns.Crewmate public void SetupCustomOption() { SetupAdtRoleOptions(Id, CustomRoles.Bloodlust); - KCD = FloatOptionItem.Create(Id + 3, "KillCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.Addons, false) + KCD = FloatOptionItem.Create(Id + 3, "KillCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bloodlust]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 4, "CanVent", true, TabGroup.Addons, false) + CanVent = BooleanOptionItem.Create(Id + 4, "CanVent", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bloodlust]); - HasImpVision = BooleanOptionItem.Create(Id + 5, "ImpostorVision", false, TabGroup.Addons, false) + HasImpVision = BooleanOptionItem.Create(Id + 5, "ImpostorVision", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Bloodlust]); } } diff --git a/Roles/AddOns/Crewmate/Lazy.cs b/Roles/AddOns/Crewmate/Lazy.cs index 16dd307f3..ad174c4e2 100644 --- a/Roles/AddOns/Crewmate/Lazy.cs +++ b/Roles/AddOns/Crewmate/Lazy.cs @@ -9,9 +9,9 @@ namespace EHR.Roles.AddOns.Crewmate public void SetupCustomOption() { SetupAdtRoleOptions(14100, CustomRoles.Lazy, canSetNum: true); - TasklessCrewCanBeLazy = BooleanOptionItem.Create(14110, "TasklessCrewCanBeLazy", false, TabGroup.Addons, false) + TasklessCrewCanBeLazy = BooleanOptionItem.Create(14110, "TasklessCrewCanBeLazy", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Lazy]); - TaskBasedCrewCanBeLazy = BooleanOptionItem.Create(14120, "TaskBasedCrewCanBeLazy", false, TabGroup.Addons, false) + TaskBasedCrewCanBeLazy = BooleanOptionItem.Create(14120, "TaskBasedCrewCanBeLazy", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Lazy]); } } diff --git a/Roles/AddOns/Crewmate/Stressed.cs b/Roles/AddOns/Crewmate/Stressed.cs index e8d5115ee..5aad24f04 100644 --- a/Roles/AddOns/Crewmate/Stressed.cs +++ b/Roles/AddOns/Crewmate/Stressed.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using Hazel; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using static EHR.Options; using static EHR.Translator; @@ -41,28 +41,28 @@ namespace EHR.Roles.AddOns.Crewmate public void SetupCustomOption() { SetupAdtRoleOptions(Id, CustomRoles.Stressed, canSetNum: true); - StressedExtraTimeAfterTaskComplete = IntegerOptionItem.Create(Id + 3, "StressedExtraTimeAfterTask", new(0, 60, 1), 30, TabGroup.Addons, false) + StressedExtraTimeAfterTaskComplete = IntegerOptionItem.Create(Id + 3, "StressedExtraTimeAfterTask", new(0, 60, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); - StressedExtraTimeAfterMeeting = IntegerOptionItem.Create(Id + 4, "DamoclesExtraTimeAfterMeeting", new(0, 60, 1), 15, TabGroup.Addons, false) + StressedExtraTimeAfterMeeting = IntegerOptionItem.Create(Id + 4, "DamoclesExtraTimeAfterMeeting", new(0, 60, 1), 15, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); - StressedExtraTimeAfterImpostorDeath = IntegerOptionItem.Create(Id + 5, "StressedExtraTimeAfterImpostorDeath", new(0, 60, 1), 10, TabGroup.Addons, false) + StressedExtraTimeAfterImpostorDeath = IntegerOptionItem.Create(Id + 5, "StressedExtraTimeAfterImpostorDeath", new(0, 60, 1), 10, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); - StressedExtraTimeAfterImpostorEjected = IntegerOptionItem.Create(Id + 6, "StressedExtraTimeAfterImpostorEjected", new(0, 60, 1), 25, TabGroup.Addons, false) + StressedExtraTimeAfterImpostorEjected = IntegerOptionItem.Create(Id + 6, "StressedExtraTimeAfterImpostorEjected", new(0, 60, 1), 25, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); - StressedExtraTimeAfterFixingSabotage = IntegerOptionItem.Create(Id + 7, "StressedExtraTimeAfterFixingSabotage", new(0, 60, 1), 20, TabGroup.Addons, false) + StressedExtraTimeAfterFixingSabotage = IntegerOptionItem.Create(Id + 7, "StressedExtraTimeAfterFixingSabotage", new(0, 60, 1), 20, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); - StressedExtraTimeAfterReporting = IntegerOptionItem.Create(Id + 8, "StressedExtraTimeAfterReporting", new(0, 60, 1), 10, TabGroup.Addons, false) + StressedExtraTimeAfterReporting = IntegerOptionItem.Create(Id + 8, "StressedExtraTimeAfterReporting", new(0, 60, 1), 10, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); - StressedTimePenaltyAfterCrewmateEjected = IntegerOptionItem.Create(Id + 9, "StressedTimePenaltyAfterCrewmateEjected", new(0, 60, 1), 15, TabGroup.Addons, false) + StressedTimePenaltyAfterCrewmateEjected = IntegerOptionItem.Create(Id + 9, "StressedTimePenaltyAfterCrewmateEjected", new(0, 60, 1), 15, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); - StressedStartingTime = IntegerOptionItem.Create(Id + 10, "DamoclesStartingTime", new(0, 60, 1), 30, TabGroup.Addons, false) + StressedStartingTime = IntegerOptionItem.Create(Id + 10, "DamoclesStartingTime", new(0, 60, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Stressed]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Crewmate/Workhorse.cs b/Roles/AddOns/Crewmate/Workhorse.cs index bb8fd8d16..9eca5c41a 100644 --- a/Roles/AddOns/Crewmate/Workhorse.cs +++ b/Roles/AddOns/Crewmate/Workhorse.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; using System; using System.Collections.Generic; +using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; @@ -27,15 +27,15 @@ public class Workhorse : IAddon public void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.Addons, CustomRoles.Workhorse, zeroOne: true); - SpawnChance = IntegerOptionItem.Create(Id + 13, "WorkhorseSpawnChance", new(0, 100, 1), 65, TabGroup.Addons, false) + SpawnChance = IntegerOptionItem.Create(Id + 13, "WorkhorseSpawnChance", new(0, 100, 1), 65, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]) .SetValueFormat(OptionFormat.Percent); - OptionAssignOnlyToCrewmate = BooleanOptionItem.Create(Id + 10, "AssignOnlyToCrewmate", true, TabGroup.Addons, false).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]); - OptionNumLongTasks = IntegerOptionItem.Create(Id + 11, "WorkhorseNumLongTasks", new(0, 5, 1), 1, TabGroup.Addons, false).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]) + OptionAssignOnlyToCrewmate = BooleanOptionItem.Create(Id + 10, "AssignOnlyToCrewmate", true, TabGroup.Addons).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]); + OptionNumLongTasks = IntegerOptionItem.Create(Id + 11, "WorkhorseNumLongTasks", new(0, 5, 1), 1, TabGroup.Addons).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]) .SetValueFormat(OptionFormat.Pieces); - OptionNumShortTasks = IntegerOptionItem.Create(Id + 12, "WorkhorseNumShortTasks", new(0, 5, 1), 1, TabGroup.Addons, false).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]) + OptionNumShortTasks = IntegerOptionItem.Create(Id + 12, "WorkhorseNumShortTasks", new(0, 5, 1), 1, TabGroup.Addons).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]) .SetValueFormat(OptionFormat.Pieces); - OptionSnitchCanBeWorkhorse = BooleanOptionItem.Create(Id + 14, "SnitchCanBeWorkhorse", false, TabGroup.Addons, false).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]); + OptionSnitchCanBeWorkhorse = BooleanOptionItem.Create(Id + 14, "SnitchCanBeWorkhorse", false, TabGroup.Addons).SetParent(CustomRoleSpawnChances[CustomRoles.Workhorse]); } public static void Init() { diff --git a/Roles/AddOns/GhostRoles/Haunter.cs b/Roles/AddOns/GhostRoles/Haunter.cs index cbe9bac59..8ba53dd19 100644 --- a/Roles/AddOns/GhostRoles/Haunter.cs +++ b/Roles/AddOns/GhostRoles/Haunter.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using System; +using System; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Modules; namespace EHR.Roles.AddOns.GhostRoles { diff --git a/Roles/AddOns/GhostRoles/Minion.cs b/Roles/AddOns/GhostRoles/Minion.cs index 8a3136891..46a0a1142 100644 --- a/Roles/AddOns/GhostRoles/Minion.cs +++ b/Roles/AddOns/GhostRoles/Minion.cs @@ -27,7 +27,7 @@ namespace EHR.Roles.AddOns.GhostRoles public void SetupCustomOption() { Options.SetupRoleOptions(649000, TabGroup.OtherRoles, CustomRoles.Minion); - BlindDuration = IntegerOptionItem.Create(649002, "MinionBlindDuration", new(1, 90, 1), 5, TabGroup.OtherRoles, false) + BlindDuration = IntegerOptionItem.Create(649002, "MinionBlindDuration", new(1, 90, 1), 5, TabGroup.OtherRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Minion]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/GhostRoles/Specter.cs b/Roles/AddOns/GhostRoles/Specter.cs index ad3b55c02..04526ff1c 100644 --- a/Roles/AddOns/GhostRoles/Specter.cs +++ b/Roles/AddOns/GhostRoles/Specter.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System; +using System; +using AmongUs.GameOptions; namespace EHR.Roles.AddOns.GhostRoles { @@ -39,7 +39,7 @@ namespace EHR.Roles.AddOns.GhostRoles public void SetupCustomOption() { Options.SetupRoleOptions(649100, TabGroup.OtherRoles, CustomRoles.Specter); - SnatchWin = BooleanOptionItem.Create(649102, "SnatchWin", false, TabGroup.OtherRoles, false) + SnatchWin = BooleanOptionItem.Create(649102, "SnatchWin", false, TabGroup.OtherRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Specter]); Tasks = Options.OverrideTasksData.Create(649103, TabGroup.OtherRoles, CustomRoles.Specter); } diff --git a/Roles/AddOns/GhostRoles/Warden.cs b/Roles/AddOns/GhostRoles/Warden.cs index c022d53ee..34d878948 100644 --- a/Roles/AddOns/GhostRoles/Warden.cs +++ b/Roles/AddOns/GhostRoles/Warden.cs @@ -27,10 +27,10 @@ namespace EHR.Roles.AddOns.GhostRoles public void SetupCustomOption() { Options.SetupRoleOptions(649200, TabGroup.OtherRoles, CustomRoles.Warden); - ExtraSpeedDuration = IntegerOptionItem.Create(649202, "ExpressSpeedDur", new(1, 90, 1), 5, TabGroup.OtherRoles, false) + ExtraSpeedDuration = IntegerOptionItem.Create(649202, "ExpressSpeedDur", new(1, 90, 1), 5, TabGroup.OtherRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Warden]) .SetValueFormat(OptionFormat.Seconds); - ExtraSpeed = FloatOptionItem.Create(649203, "ExpressSpeed", new(0.5f, 3f, 0.1f), 0.25f, TabGroup.OtherRoles, false) + ExtraSpeed = FloatOptionItem.Create(649203, "ExpressSpeed", new(0.5f, 3f, 0.1f), 0.25f, TabGroup.OtherRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Warden]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/AddOns/Impostor/Circumvent.cs b/Roles/AddOns/Impostor/Circumvent.cs index df12971ca..cec8852f6 100644 --- a/Roles/AddOns/Impostor/Circumvent.cs +++ b/Roles/AddOns/Impostor/Circumvent.cs @@ -23,9 +23,9 @@ namespace EHR.Roles.AddOns.Impostor { const int id = 14680; Options.SetupAdtRoleOptions(id, CustomRoles.Circumvent, canSetNum: true); - VentPreventionMode = StringOptionItem.Create(id + 3, "VentPreventionMode", VentPreventionModes, 1, TabGroup.Addons, false) + VentPreventionMode = StringOptionItem.Create(id + 3, "VentPreventionMode", VentPreventionModes, 1, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Circumvent]); - Limit = IntegerOptionItem.Create(id + 4, "VentLimit", new(1, 90, 1), 8, TabGroup.Addons, false) + Limit = IntegerOptionItem.Create(id + 4, "VentLimit", new(1, 90, 1), 8, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Circumvent]); } diff --git a/Roles/AddOns/Impostor/Damocles.cs b/Roles/AddOns/Impostor/Damocles.cs index e4b92eae0..1ec2515e7 100644 --- a/Roles/AddOns/Impostor/Damocles.cs +++ b/Roles/AddOns/Impostor/Damocles.cs @@ -1,8 +1,8 @@ -using EHR.Modules; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using static EHR.Options; using static EHR.Translator; @@ -32,13 +32,13 @@ namespace EHR.Roles.AddOns.Impostor public void SetupCustomOption() { SetupAdtRoleOptions(Id, CustomRoles.Damocles, canSetNum: true); - DamoclesExtraTimeAfterKill = IntegerOptionItem.Create(Id + 3, "DamoclesExtraTimeAfterKill", new(0, 60, 1), 30, TabGroup.Addons, false) + DamoclesExtraTimeAfterKill = IntegerOptionItem.Create(Id + 3, "DamoclesExtraTimeAfterKill", new(0, 60, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Damocles]) .SetValueFormat(OptionFormat.Seconds); - DamoclesExtraTimeAfterMeeting = IntegerOptionItem.Create(Id + 4, "DamoclesExtraTimeAfterMeeting", new(0, 60, 1), 30, TabGroup.Addons, false) + DamoclesExtraTimeAfterMeeting = IntegerOptionItem.Create(Id + 4, "DamoclesExtraTimeAfterMeeting", new(0, 60, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Damocles]) .SetValueFormat(OptionFormat.Seconds); - DamoclesStartingTime = IntegerOptionItem.Create(Id + 5, "DamoclesStartingTime", new(0, 60, 1), 30, TabGroup.Addons, false) + DamoclesStartingTime = IntegerOptionItem.Create(Id + 5, "DamoclesStartingTime", new(0, 60, 1), 30, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Damocles]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/AddOns/Impostor/DeadlyQuota.cs b/Roles/AddOns/Impostor/DeadlyQuota.cs index 78f886504..789b4725e 100644 --- a/Roles/AddOns/Impostor/DeadlyQuota.cs +++ b/Roles/AddOns/Impostor/DeadlyQuota.cs @@ -7,7 +7,7 @@ public void SetupCustomOption() { Options.SetupAdtRoleOptions(14650, CustomRoles.DeadlyQuota, canSetNum: true); - Options.DQNumOfKillsNeeded = IntegerOptionItem.Create(14660, "DQNumOfKillsNeeded", new(1, 14, 1), 3, TabGroup.Addons, false) + Options.DQNumOfKillsNeeded = IntegerOptionItem.Create(14660, "DQNumOfKillsNeeded", new(1, 14, 1), 3, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.DeadlyQuota]); } } diff --git a/Roles/AddOns/Impostor/Egoist.cs b/Roles/AddOns/Impostor/Egoist.cs index 97afa5a30..e80693292 100644 --- a/Roles/AddOns/Impostor/Egoist.cs +++ b/Roles/AddOns/Impostor/Egoist.cs @@ -7,7 +7,7 @@ public void SetupCustomOption() { Options.SetupAdtRoleOptions(18900, CustomRoles.Egoist, canSetNum: true, tab: TabGroup.Addons); - Options.ImpEgoistVisibalToAllies = BooleanOptionItem.Create(18912, "ImpEgoistVisibalToAllies", true, TabGroup.Addons, false) + Options.ImpEgoistVisibalToAllies = BooleanOptionItem.Create(18912, "ImpEgoistVisibalToAllies", true, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Egoist]); } } diff --git a/Roles/AddOns/Impostor/LastImpostor.cs b/Roles/AddOns/Impostor/LastImpostor.cs index 7ba4f3ca2..87056fd6a 100644 --- a/Roles/AddOns/Impostor/LastImpostor.cs +++ b/Roles/AddOns/Impostor/LastImpostor.cs @@ -12,7 +12,7 @@ public class LastImpostor : IAddon public void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.Addons, CustomRoles.LastImpostor); - KillCooldown = FloatOptionItem.Create(Id + 15, "SansReduceKillCooldown", new(5f, 95f, 5f), 50f, TabGroup.Addons, false) + KillCooldown = FloatOptionItem.Create(Id + 15, "SansReduceKillCooldown", new(5f, 95f, 5f), 50f, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.LastImpostor]) .SetValueFormat(OptionFormat.Percent); } diff --git a/Roles/AddOns/Impostor/Madmate.cs b/Roles/AddOns/Impostor/Madmate.cs index 2fe1c29e6..80be0fa52 100644 --- a/Roles/AddOns/Impostor/Madmate.cs +++ b/Roles/AddOns/Impostor/Madmate.cs @@ -9,26 +9,26 @@ namespace EHR.Roles.AddOns.Impostor public void SetupCustomOption() { SetupAdtRoleOptions(15800, CustomRoles.Madmate, canSetNum: true, canSetChance: false); - MadmateSpawnMode = StringOptionItem.Create(15810, "MadmateSpawnMode", MadmateSpawnModeStrings, 0, TabGroup.Addons, false) + MadmateSpawnMode = StringOptionItem.Create(15810, "MadmateSpawnMode", MadmateSpawnModeStrings, 0, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - MadmateCountMode = StringOptionItem.Create(15811, "MadmateCountMode", MadmateCountModeStrings, 0, TabGroup.Addons, false) + MadmateCountMode = StringOptionItem.Create(15811, "MadmateCountMode", MadmateCountModeStrings, 0, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - SheriffCanBeMadmate = BooleanOptionItem.Create(15812, "SheriffCanBeMadmate", false, TabGroup.Addons, false) + SheriffCanBeMadmate = BooleanOptionItem.Create(15812, "SheriffCanBeMadmate", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - MayorCanBeMadmate = BooleanOptionItem.Create(15813, "MayorCanBeMadmate", false, TabGroup.Addons, false) + MayorCanBeMadmate = BooleanOptionItem.Create(15813, "MayorCanBeMadmate", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - NGuesserCanBeMadmate = BooleanOptionItem.Create(15814, "NGuesserCanBeMadmate", false, TabGroup.Addons, false) + NGuesserCanBeMadmate = BooleanOptionItem.Create(15814, "NGuesserCanBeMadmate", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - MarshallCanBeMadmate = BooleanOptionItem.Create(15815, "MarshallCanBeMadmate", false, TabGroup.Addons, false) + MarshallCanBeMadmate = BooleanOptionItem.Create(15815, "MarshallCanBeMadmate", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - FarseerCanBeMadmate = BooleanOptionItem.Create(15816, "FarseerCanBeMadmate", false, TabGroup.Addons, false) + FarseerCanBeMadmate = BooleanOptionItem.Create(15816, "FarseerCanBeMadmate", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - SnitchCanBeMadmate = BooleanOptionItem.Create(15818, "SnitchCanBeMadmate", false, TabGroup.Addons, false) + SnitchCanBeMadmate = BooleanOptionItem.Create(15818, "SnitchCanBeMadmate", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); - MadSnitchTasks = IntegerOptionItem.Create(15819, "MadSnitchTasks", new(0, 90, 1), 3, TabGroup.Addons, false) + MadSnitchTasks = IntegerOptionItem.Create(15819, "MadSnitchTasks", new(0, 90, 1), 3, TabGroup.Addons) .SetParent(SnitchCanBeMadmate) .SetValueFormat(OptionFormat.Pieces); - JudgeCanBeMadmate = BooleanOptionItem.Create(15820, "JudgeCanBeMadmate", false, TabGroup.Addons, false) + JudgeCanBeMadmate = BooleanOptionItem.Create(15820, "JudgeCanBeMadmate", false, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Madmate]); } } diff --git a/Roles/AddOns/Impostor/Mare.cs b/Roles/AddOns/Impostor/Mare.cs index 66a4ebbe3..b37394e67 100644 --- a/Roles/AddOns/Impostor/Mare.cs +++ b/Roles/AddOns/Impostor/Mare.cs @@ -9,15 +9,15 @@ namespace EHR.Roles.AddOns.Impostor public void SetupCustomOption() { SetupAdtRoleOptions(1600, CustomRoles.Mare, canSetNum: true, tab: TabGroup.Addons); - MareKillCD = FloatOptionItem.Create(1605, "KillCooldown", new(0f, 60f, 1f), 15f, TabGroup.Addons, false) + MareKillCD = FloatOptionItem.Create(1605, "KillCooldown", new(0f, 60f, 1f), 15f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Mare]) .SetValueFormat(OptionFormat.Seconds); - MareKillCDNormally = FloatOptionItem.Create(1606, "KillCooldownNormally", new(0f, 90f, 1f), 40f, TabGroup.Addons, false) + MareKillCDNormally = FloatOptionItem.Create(1606, "KillCooldownNormally", new(0f, 90f, 1f), 40f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Mare]) .SetValueFormat(OptionFormat.Seconds); - MareHasIncreasedSpeed = BooleanOptionItem.Create(1607, "MareHasIncreasedSpeed", true, TabGroup.Addons, false) + MareHasIncreasedSpeed = BooleanOptionItem.Create(1607, "MareHasIncreasedSpeed", true, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Mare]); - MareSpeedDuringLightsOut = FloatOptionItem.Create(1608, "MareSpeedDuringLightsOut", new(0.5f, 3f, 0.05f), 1.75f, TabGroup.Addons, false) + MareSpeedDuringLightsOut = FloatOptionItem.Create(1608, "MareSpeedDuringLightsOut", new(0.5f, 3f, 0.05f), 1.75f, TabGroup.Addons) .SetParent(CustomRoleSpawnChances[CustomRoles.Mare]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/AddOns/Impostor/Mimic.cs b/Roles/AddOns/Impostor/Mimic.cs index 38c178e14..88c60be6b 100644 --- a/Roles/AddOns/Impostor/Mimic.cs +++ b/Roles/AddOns/Impostor/Mimic.cs @@ -7,7 +7,7 @@ public void SetupCustomOption() { Options.SetupAdtRoleOptions(16000, CustomRoles.Mimic, canSetNum: true, tab: TabGroup.Addons); - Options.MimicCanSeeDeadRoles = BooleanOptionItem.Create(16010, "MimicCanSeeDeadRoles", true, TabGroup.Addons, false) + Options.MimicCanSeeDeadRoles = BooleanOptionItem.Create(16010, "MimicCanSeeDeadRoles", true, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Mimic]); } } diff --git a/Roles/AddOns/Impostor/TicketsStealer.cs b/Roles/AddOns/Impostor/TicketsStealer.cs index 7d6a3ebbc..cbd1af0a7 100644 --- a/Roles/AddOns/Impostor/TicketsStealer.cs +++ b/Roles/AddOns/Impostor/TicketsStealer.cs @@ -7,7 +7,7 @@ public void SetupCustomOption() { Options.SetupAdtRoleOptions(16100, CustomRoles.TicketsStealer, canSetNum: true, tab: TabGroup.Addons); - Options.TicketsPerKill = FloatOptionItem.Create(16110, "TicketsPerKill", new(0.1f, 90f, 0.1f), 0.5f, TabGroup.Addons, false) + Options.TicketsPerKill = FloatOptionItem.Create(16110, "TicketsPerKill", new(0.1f, 90f, 0.1f), 0.5f, TabGroup.Addons) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.TicketsStealer]); } } diff --git a/Roles/Crewmate/Addict.cs b/Roles/Crewmate/Addict.cs index 6017d6479..35a0de22b 100644 --- a/Roles/Crewmate/Addict.cs +++ b/Roles/Crewmate/Addict.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; using System; using System.Collections.Generic; +using AmongUs.GameOptions; using UnityEngine; namespace EHR.Roles.Crewmate @@ -28,15 +28,15 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Addict); - VentCooldown = FloatOptionItem.Create(Id + 11, "VentCooldown", new(5f, 70f, 1f), 40f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) + VentCooldown = FloatOptionItem.Create(Id + 11, "VentCooldown", new(5f, 70f, 1f), 40f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) .SetValueFormat(OptionFormat.Seconds); - TimeLimit = FloatOptionItem.Create(Id + 12, "SerialKillerLimit", new(5f, 75f, 1f), 45f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) + TimeLimit = FloatOptionItem.Create(Id + 12, "SerialKillerLimit", new(5f, 75f, 1f), 45f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) .SetValueFormat(OptionFormat.Seconds); - ImmortalTimeAfterVent = FloatOptionItem.Create(Id + 13, "AddictInvulnerbilityTimeAfterVent", new(0f, 30f, 1f), 10f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) + ImmortalTimeAfterVent = FloatOptionItem.Create(Id + 13, "AddictInvulnerbilityTimeAfterVent", new(0f, 30f, 1f), 10f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) .SetValueFormat(OptionFormat.Seconds); - SpeedWhileImmortal = FloatOptionItem.Create(Id + 14, "AddictSpeedWhileInvulnerble", new(0.25f, 5f, 0.25f), 1.75f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) + SpeedWhileImmortal = FloatOptionItem.Create(Id + 14, "AddictSpeedWhileInvulnerble", new(0.25f, 5f, 0.25f), 1.75f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) .SetValueFormat(OptionFormat.Multiplier); - FreezeTimeAfterImmortal = FloatOptionItem.Create(Id + 15, "AddictFreezeTimeAfterInvulnerbility", new(0f, 10f, 1f), 3f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) + FreezeTimeAfterImmortal = FloatOptionItem.Create(Id + 15, "AddictFreezeTimeAfterInvulnerbility", new(0f, 10f, 1f), 3f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Addict]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/Adventurer.cs b/Roles/Crewmate/Adventurer.cs index 53dce8158..81aaf953f 100644 --- a/Roles/Crewmate/Adventurer.cs +++ b/Roles/Crewmate/Adventurer.cs @@ -1,6 +1,6 @@ -using EHR.Patches; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Patches; using UnityEngine; namespace EHR.Roles.Crewmate @@ -59,13 +59,13 @@ namespace EHR.Roles.Crewmate private static List EnabledWeapons = []; - static OptionItem CreateWeaponEnabledSetting(int id, Weapon weapon) => BooleanOptionItem.Create(id, $"AdventurerWeaponEnabled.{weapon}", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Adventurer]); + static OptionItem CreateWeaponEnabledSetting(int id, Weapon weapon) => BooleanOptionItem.Create(id, $"AdventurerWeaponEnabled.{weapon}", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Adventurer]); public static void SetupCustomOption() { Options.SetupRoleOptions(11330, TabGroup.CrewmateRoles, CustomRoles.Adventurer); - IncreasedVisionDuration = IntegerOptionItem.Create(11332, "AdventurerIncreasedVisionDuration", new(1, 60, 1), 30, TabGroup.CrewmateRoles, false) + IncreasedVisionDuration = IntegerOptionItem.Create(11332, "AdventurerIncreasedVisionDuration", new(1, 60, 1), 30, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Adventurer]) .SetValueFormat(OptionFormat.Seconds); diff --git a/Roles/Crewmate/Aid.cs b/Roles/Crewmate/Aid.cs index 84a26b3e8..782f2578a 100644 --- a/Roles/Crewmate/Aid.cs +++ b/Roles/Crewmate/Aid.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; namespace EHR.Roles.Crewmate { @@ -17,13 +17,13 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Aid); - AidCD = FloatOptionItem.Create(Id + 10, "AidCD", new(0f, 60f, 1f), 15f, TabGroup.CrewmateRoles, false) + AidCD = FloatOptionItem.Create(Id + 10, "AidCD", new(0f, 60f, 1f), 15f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Aid]) .SetValueFormat(OptionFormat.Seconds); - AidDur = FloatOptionItem.Create(Id + 11, "AidDur", new(0f, 60f, 1f), 10f, TabGroup.CrewmateRoles, false) + AidDur = FloatOptionItem.Create(Id + 11, "AidDur", new(0f, 60f, 1f), 10f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Aid]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(1, 20, 1), 5, TabGroup.CrewmateRoles, false) + UseLimitOpt = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(1, 20, 1), 5, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Aid]) .SetValueFormat(OptionFormat.Times); UsePet = Options.CreatePetUseSetting(Id + 13, CustomRoles.Aid); diff --git a/Roles/Crewmate/Alchemist.cs b/Roles/Crewmate/Alchemist.cs index c085ad26b..c2f2e84d2 100644 --- a/Roles/Crewmate/Alchemist.cs +++ b/Roles/Crewmate/Alchemist.cs @@ -1,10 +1,10 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Neutral; using Hazel; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace EHR.Roles.Crewmate { @@ -37,21 +37,21 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Alchemist); - VentCooldown = FloatOptionItem.Create(Id + 11, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + VentCooldown = FloatOptionItem.Create(Id + 11, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Seconds); - ShieldDuration = FloatOptionItem.Create(Id + 12, "AlchemistShieldDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + ShieldDuration = FloatOptionItem.Create(Id + 12, "AlchemistShieldDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Seconds); - InvisDuration = FloatOptionItem.Create(Id + 13, "AlchemistInvisDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + InvisDuration = FloatOptionItem.Create(Id + 13, "AlchemistInvisDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Seconds); - Speed = FloatOptionItem.Create(Id + 14, "AlchemistSpeed", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + Speed = FloatOptionItem.Create(Id + 14, "AlchemistSpeed", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Multiplier); - SpeedDuration = FloatOptionItem.Create(Id + 15, "AlchemistSpeedDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + SpeedDuration = FloatOptionItem.Create(Id + 15, "AlchemistSpeedDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Seconds); - Vision = FloatOptionItem.Create(Id + 16, "AlchemistVision", new(0f, 1f, 0.05f), 0.85f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + Vision = FloatOptionItem.Create(Id + 16, "AlchemistVision", new(0f, 1f, 0.05f), 0.85f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Multiplier); - VisionOnLightsOut = FloatOptionItem.Create(Id + 17, "AlchemistVisionOnLightsOut", new(0f, 1f, 0.05f), 0.4f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + VisionOnLightsOut = FloatOptionItem.Create(Id + 17, "AlchemistVisionOnLightsOut", new(0f, 1f, 0.05f), 0.4f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Multiplier); - VisionDuration = FloatOptionItem.Create(Id + 18, "AlchemistVisionDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) + VisionDuration = FloatOptionItem.Create(Id + 18, "AlchemistVisionDur", new(5f, 70f, 1f), 20f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Alchemist]) .SetValueFormat(OptionFormat.Seconds); OverrideTasksData.Create(Id + 20, TabGroup.CrewmateRoles, CustomRoles.Alchemist); } diff --git a/Roles/Crewmate/Analyst.cs b/Roles/Crewmate/Analyst.cs index 53a634ff0..7290420dc 100644 --- a/Roles/Crewmate/Analyst.cs +++ b/Roles/Crewmate/Analyst.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -28,22 +28,22 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Analyst); - UseLimitOpt = IntegerOptionItem.Create(Id + 10, "AbilityUseLimit", new(0, 30, 1), 3, TabGroup.CrewmateRoles, false) + UseLimitOpt = IntegerOptionItem.Create(Id + 10, "AbilityUseLimit", new(0, 30, 1), 3, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Analyst]) .SetValueFormat(OptionFormat.Times); - CD = FloatOptionItem.Create(Id + 11, "AnalyzeCD", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles, false) + CD = FloatOptionItem.Create(Id + 11, "AnalyzeCD", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Analyst]) .SetValueFormat(OptionFormat.Seconds); CD.ReplacementDictionary = ReplacementDict; - Duration = IntegerOptionItem.Create(Id + 12, "AnalyzeDur", new(1, 30, 1), 5, TabGroup.CrewmateRoles, false) + Duration = IntegerOptionItem.Create(Id + 12, "AnalyzeDur", new(1, 30, 1), 5, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Analyst]) .SetValueFormat(OptionFormat.Seconds); Duration.ReplacementDictionary = ReplacementDict; - SeeKillCount = BooleanOptionItem.Create(Id + 13, "AnalyzerSeeKillCount", true, TabGroup.CrewmateRoles, false) + SeeKillCount = BooleanOptionItem.Create(Id + 13, "AnalyzerSeeKillCount", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Analyst]); - SeeVentCount = BooleanOptionItem.Create(Id + 14, "AnalyzerSeeVentCount", true, TabGroup.CrewmateRoles, false) + SeeVentCount = BooleanOptionItem.Create(Id + 14, "AnalyzerSeeVentCount", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Analyst]); - SeeRoleBasis = BooleanOptionItem.Create(Id + 15, "AnalyzerSeeRoleBasis", true, TabGroup.CrewmateRoles, false) + SeeRoleBasis = BooleanOptionItem.Create(Id + 15, "AnalyzerSeeRoleBasis", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Analyst]); UsePet = CreatePetUseSetting(Id + 16, CustomRoles.Analyst); } diff --git a/Roles/Crewmate/Beacon.cs b/Roles/Crewmate/Beacon.cs index c3a23a01d..fd3f422ac 100644 --- a/Roles/Crewmate/Beacon.cs +++ b/Roles/Crewmate/Beacon.cs @@ -18,10 +18,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Beacon); - VisionIncrease = FloatOptionItem.Create(Id + 2, "BeaconVisionIncrease", new(0.05f, 1.5f, 0.05f), 0.5f, TabGroup.CrewmateRoles, false) + VisionIncrease = FloatOptionItem.Create(Id + 2, "BeaconVisionIncrease", new(0.05f, 1.5f, 0.05f), 0.5f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Beacon]) .SetValueFormat(OptionFormat.Multiplier); - Radius = FloatOptionItem.Create(Id + 3, "PerceiverRadius", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles, false) + Radius = FloatOptionItem.Create(Id + 3, "PerceiverRadius", new(0.1f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Beacon]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/Crewmate/Benefactor.cs b/Roles/Crewmate/Benefactor.cs index dc0d2d14b..a0321f296 100644 --- a/Roles/Crewmate/Benefactor.cs +++ b/Roles/Crewmate/Benefactor.cs @@ -1,8 +1,8 @@ -using EHR.Modules; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using static EHR.Translator; namespace EHR.Roles.Crewmate @@ -23,10 +23,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Benefactor); - TaskMarkPerRoundOpt = IntegerOptionItem.Create(Id + 10, "TaskMarkPerRound", new(1, 14, 1), 3, TabGroup.CrewmateRoles, false) + TaskMarkPerRoundOpt = IntegerOptionItem.Create(Id + 10, "TaskMarkPerRound", new(1, 14, 1), 3, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Benefactor]) .SetValueFormat(OptionFormat.Votes); - ShieldDuration = IntegerOptionItem.Create(Id + 11, "AidDur", new(1, 30, 1), 10, TabGroup.CrewmateRoles, false) + ShieldDuration = IntegerOptionItem.Create(Id + 11, "AidDur", new(1, 30, 1), 10, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Benefactor]) .SetValueFormat(OptionFormat.Seconds); Options.OverrideTasksData.Create(Id + 12, TabGroup.CrewmateRoles, CustomRoles.Benefactor); diff --git a/Roles/Crewmate/Bloodhound.cs b/Roles/Crewmate/Bloodhound.cs index e601ada50..835709883 100644 --- a/Roles/Crewmate/Bloodhound.cs +++ b/Roles/Crewmate/Bloodhound.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using Hazel; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using UnityEngine; namespace EHR.Roles.Crewmate @@ -27,15 +27,15 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Bloodhound); - ArrowsPointingToDeadBody = BooleanOptionItem.Create(Id + 10, "BloodhoundArrowsPointingToDeadBody", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]); - LeaveDeadBodyUnreportable = BooleanOptionItem.Create(Id + 11, "BloodhoundLeaveDeadBodyUnreportable", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]); - NotifyKiller = BooleanOptionItem.Create(Id + 14, "BloodhoundNotifyKiller", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]); - UseLimitOpt = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]) + ArrowsPointingToDeadBody = BooleanOptionItem.Create(Id + 10, "BloodhoundArrowsPointingToDeadBody", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]); + LeaveDeadBodyUnreportable = BooleanOptionItem.Create(Id + 11, "BloodhoundLeaveDeadBodyUnreportable", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]); + NotifyKiller = BooleanOptionItem.Create(Id + 14, "BloodhoundNotifyKiller", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]); + UseLimitOpt = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]) .SetValueFormat(OptionFormat.Times); - BloodhoundAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 13, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + BloodhoundAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 13, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 15, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 15, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bloodhound]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Bodyguard.cs b/Roles/Crewmate/Bodyguard.cs index 3a67d6d72..532a62092 100644 --- a/Roles/Crewmate/Bodyguard.cs +++ b/Roles/Crewmate/Bodyguard.cs @@ -21,10 +21,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(8400, TabGroup.CrewmateRoles, CustomRoles.Bodyguard); - BodyguardProtectRadius = FloatOptionItem.Create(8410, "BodyguardProtectRadius", new(0.5f, 5f, 0.5f), 1.5f, TabGroup.CrewmateRoles, false) + BodyguardProtectRadius = FloatOptionItem.Create(8410, "BodyguardProtectRadius", new(0.5f, 5f, 0.5f), 1.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bodyguard]) .SetValueFormat(OptionFormat.Multiplier); - BodyguardKillsKiller = BooleanOptionItem.Create(8411, "BodyguardKillsKiller", false, TabGroup.CrewmateRoles, false) + BodyguardKillsKiller = BooleanOptionItem.Create(8411, "BodyguardKillsKiller", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bodyguard]); } diff --git a/Roles/Crewmate/CameraMan.cs b/Roles/Crewmate/CameraMan.cs index a8254823b..fcc35e535 100644 --- a/Roles/Crewmate/CameraMan.cs +++ b/Roles/Crewmate/CameraMan.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; using System; using System.Collections.Generic; +using AmongUs.GameOptions; using UnityEngine; namespace EHR.Roles.Crewmate @@ -20,14 +20,14 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.CameraMan); - VentCooldown = FloatOptionItem.Create(Id + 10, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.CameraMan]) + VentCooldown = FloatOptionItem.Create(Id + 10, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.CameraMan]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.CameraMan]) + UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.CameraMan]) .SetValueFormat(OptionFormat.Times); - CameraManAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + CameraManAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.CameraMan]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.CameraMan]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/CandleLighter.cs b/Roles/Crewmate/CandleLighter.cs index 902867bf3..f30f1fc56 100644 --- a/Roles/Crewmate/CandleLighter.cs +++ b/Roles/Crewmate/CandleLighter.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System; +using System; using System.Collections.Generic; +using AmongUs.GameOptions; using UnityEngine; namespace EHR.Roles.Crewmate @@ -26,21 +26,21 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Ignitor); - OptionTaskStartVision = FloatOptionItem.Create(Id + 2, "CandleLighterStartVision", new(0.5f, 5f, 0.1f), 0.8f, TabGroup.CrewmateRoles, false) + OptionTaskStartVision = FloatOptionItem.Create(Id + 2, "CandleLighterStartVision", new(0.5f, 5f, 0.1f), 0.8f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ignitor]) .SetValueFormat(OptionFormat.Multiplier); - OptionCountStartTime = IntegerOptionItem.Create(Id + 3, "CandleLighterCountStartTime", new(0, 50, 5), 0, TabGroup.CrewmateRoles, false) + OptionCountStartTime = IntegerOptionItem.Create(Id + 3, "CandleLighterCountStartTime", new(0, 50, 5), 0, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ignitor]) .SetValueFormat(OptionFormat.Seconds); - OptionTaskEndVisionTime = IntegerOptionItem.Create(Id + 4, "CandleLighterEndVisionTime", new(20, 200, 10), 50, TabGroup.CrewmateRoles, false) + OptionTaskEndVisionTime = IntegerOptionItem.Create(Id + 4, "CandleLighterEndVisionTime", new(20, 200, 10), 50, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ignitor]) .SetValueFormat(OptionFormat.Seconds); - OptionTaskEndVision = FloatOptionItem.Create(Id + 5, "CandleLighterEndVision", new(0f, 0.5f, 0.05f), 0.1f, TabGroup.CrewmateRoles, false) + OptionTaskEndVision = FloatOptionItem.Create(Id + 5, "CandleLighterEndVision", new(0f, 0.5f, 0.05f), 0.1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ignitor]) .SetValueFormat(OptionFormat.Multiplier); - OptionTaskTimeMoveMeeting = BooleanOptionItem.Create(Id + 6, "CandleLighterTimeMoveMeeting", false, TabGroup.CrewmateRoles, false) + OptionTaskTimeMoveMeeting = BooleanOptionItem.Create(Id + 6, "CandleLighterTimeMoveMeeting", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ignitor]); - OptionTasksFinishedVision = FloatOptionItem.Create(Id + 7, "CandleLighterTasksFinishedVision", new(0.5f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles, false) + OptionTasksFinishedVision = FloatOptionItem.Create(Id + 7, "CandleLighterTasksFinishedVision", new(0.5f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ignitor]) .SetValueFormat(OptionFormat.Multiplier); OverrideTasksData.Create(Id + 8, TabGroup.CrewmateRoles, CustomRoles.Ignitor); diff --git a/Roles/Crewmate/Chameleon.cs b/Roles/Crewmate/Chameleon.cs index b3b595621..8b4354f9a 100644 --- a/Roles/Crewmate/Chameleon.cs +++ b/Roles/Crewmate/Chameleon.cs @@ -15,16 +15,16 @@ public class Chameleon : ISettingHolder public void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Chameleon); - ChameleonCooldown = FloatOptionItem.Create(Id + 2, "ChameleonCooldown", new(1f, 60f, 1f), 20f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) + ChameleonCooldown = FloatOptionItem.Create(Id + 2, "ChameleonCooldown", new(1f, 60f, 1f), 20f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) .SetValueFormat(OptionFormat.Seconds); - ChameleonDuration = FloatOptionItem.Create(Id + 3, "ChameleonDuration", new(1f, 30f, 1f), 10f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) + ChameleonDuration = FloatOptionItem.Create(Id + 3, "ChameleonDuration", new(1f, 30f, 1f), 10f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 4, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) + UseLimitOpt = IntegerOptionItem.Create(Id + 4, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) .SetValueFormat(OptionFormat.Times); - ChameleonAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 5, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles, false) + ChameleonAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 5, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 6, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 6, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Chameleon]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Cleanser.cs b/Roles/Crewmate/Cleanser.cs index 8a0c5bdaf..fd61621dc 100644 --- a/Roles/Crewmate/Cleanser.cs +++ b/Roles/Crewmate/Cleanser.cs @@ -1,6 +1,6 @@ -using EHR.Modules; +using System.Collections.Generic; +using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -25,9 +25,9 @@ public class Cleanser : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Cleanser); - CleanserUsesOpt = IntegerOptionItem.Create(Id + 10, "MaxCleanserUses", new(1, 14, 1), 3, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Cleanser]) + CleanserUsesOpt = IntegerOptionItem.Create(Id + 10, "MaxCleanserUses", new(1, 14, 1), 3, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Cleanser]) .SetValueFormat(OptionFormat.Times); - CleansedCanGetAddon = BooleanOptionItem.Create(Id + 11, "CleansedCanGetAddon", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Cleanser]); + CleansedCanGetAddon = BooleanOptionItem.Create(Id + 11, "CleansedCanGetAddon", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Cleanser]); CancelVote = CreateVoteCancellingUseSetting(Id + 12, CustomRoles.Cleanser, TabGroup.CrewmateRoles); } diff --git a/Roles/Crewmate/Convener.cs b/Roles/Crewmate/Convener.cs index de25c0d12..1f3d498ff 100644 --- a/Roles/Crewmate/Convener.cs +++ b/Roles/Crewmate/Convener.cs @@ -14,13 +14,13 @@ namespace EHR.Roles.Crewmate { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Convener); CD = Options.CreateCDSetting(Id + 2, TabGroup.CrewmateRoles, CustomRoles.Convener); - Limit = IntegerOptionItem.Create(Id + 3, "AbilityUseLimit", new(0, 20, 1), 0, TabGroup.CrewmateRoles, false) + Limit = IntegerOptionItem.Create(Id + 3, "AbilityUseLimit", new(0, 20, 1), 0, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Convener]) .SetValueFormat(OptionFormat.Times); - ConvenerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 4, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles, false) + ConvenerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 4, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Convener]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 5, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 5, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Convener]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/CopyCat.cs b/Roles/Crewmate/CopyCat.cs index 0dbf86225..0abacf813 100644 --- a/Roles/Crewmate/CopyCat.cs +++ b/Roles/Crewmate/CopyCat.cs @@ -22,11 +22,11 @@ public class CopyCat : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.CopyCat); - KillCooldown = FloatOptionItem.Create(Id + 10, "CopyCatCopyCooldown", new(0f, 60f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.CopyCat]) + KillCooldown = FloatOptionItem.Create(Id + 10, "CopyCatCopyCooldown", new(0f, 60f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.CopyCat]) .SetValueFormat(OptionFormat.Seconds); - CanKill = BooleanOptionItem.Create(Id + 11, "CopyCatCanKill", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.CopyCat]); - CopyCrewVar = BooleanOptionItem.Create(Id + 13, "CopyCrewVar", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.CopyCat]); - MiscopyLimitOpt = IntegerOptionItem.Create(Id + 12, "CopyCatMiscopyLimit", new(0, 14, 1), 2, TabGroup.CrewmateRoles, false).SetParent(CanKill) + CanKill = BooleanOptionItem.Create(Id + 11, "CopyCatCanKill", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.CopyCat]); + CopyCrewVar = BooleanOptionItem.Create(Id + 13, "CopyCrewVar", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.CopyCat]); + MiscopyLimitOpt = IntegerOptionItem.Create(Id + 12, "CopyCatMiscopyLimit", new(0, 14, 1), 2, TabGroup.CrewmateRoles).SetParent(CanKill) .SetValueFormat(OptionFormat.Times); UsePet = CreatePetUseSetting(Id + 14, CustomRoles.CopyCat); } diff --git a/Roles/Crewmate/CrewmateVanillaRoles.cs b/Roles/Crewmate/CrewmateVanillaRoles.cs index b79e43c90..69833b9a4 100644 --- a/Roles/Crewmate/CrewmateVanillaRoles.cs +++ b/Roles/Crewmate/CrewmateVanillaRoles.cs @@ -11,10 +11,10 @@ namespace EHR.Roles.Crewmate SetupRoleOptions(5050, Tab, CustomRoles.CrewmateEHR); SetupRoleOptions(5000, Tab, CustomRoles.EngineerEHR); SetupRoleOptions(5100, Tab, CustomRoles.ScientistEHR); - ScientistCD = FloatOptionItem.Create(5110, "VitalsCooldown", new(1f, 250f, 1f), 3f, Tab, false) + ScientistCD = FloatOptionItem.Create(5110, "VitalsCooldown", new(1f, 250f, 1f), 3f, Tab) .SetParent(CustomRoleSpawnChances[CustomRoles.ScientistEHR]) .SetValueFormat(OptionFormat.Seconds); - ScientistDur = FloatOptionItem.Create(5111, "VitalsDuration", new(1f, 250f, 1f), 15f, Tab, false) + ScientistDur = FloatOptionItem.Create(5111, "VitalsDuration", new(1f, 250f, 1f), 15f, Tab) .SetParent(CustomRoleSpawnChances[CustomRoles.ScientistEHR]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/Crusader.cs b/Roles/Crewmate/Crusader.cs index 1ba5a7d85..d1e6b5654 100644 --- a/Roles/Crewmate/Crusader.cs +++ b/Roles/Crewmate/Crusader.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; namespace EHR.Roles.Crewmate; @@ -19,9 +19,9 @@ public class Crusader : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Crusader); - SkillCooldown = FloatOptionItem.Create(Id + 10, "CrusaderSkillCooldown", new(2.5f, 60f, 2.5f), 20f, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Crusader]) + SkillCooldown = FloatOptionItem.Create(Id + 10, "CrusaderSkillCooldown", new(2.5f, 60f, 2.5f), 20f, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Crusader]) .SetValueFormat(OptionFormat.Seconds); - SkillLimitOpt = IntegerOptionItem.Create(Id + 11, "CrusaderSkillLimit", new(1, 10, 1), 2, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Crusader]) + SkillLimitOpt = IntegerOptionItem.Create(Id + 11, "CrusaderSkillLimit", new(1, 10, 1), 2, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Crusader]) .SetValueFormat(OptionFormat.Times); UsePet = Options.CreatePetUseSetting(Id + 12, CustomRoles.Crusader); } diff --git a/Roles/Crewmate/CyberStar.cs b/Roles/Crewmate/CyberStar.cs index 0c72dcf80..b6961fb8c 100644 --- a/Roles/Crewmate/CyberStar.cs +++ b/Roles/Crewmate/CyberStar.cs @@ -7,9 +7,9 @@ namespace EHR.Roles.Crewmate public void SetupCustomOption() { SetupRoleOptions(5300, TabGroup.CrewmateRoles, CustomRoles.CyberStar); - ImpKnowCyberStarDead = BooleanOptionItem.Create(5400, "ImpKnowCyberStarDead", false, TabGroup.CrewmateRoles, false) + ImpKnowCyberStarDead = BooleanOptionItem.Create(5400, "ImpKnowCyberStarDead", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.CyberStar]); - NeutralKnowCyberStarDead = BooleanOptionItem.Create(5500, "NeutralKnowCyberStarDead", false, TabGroup.CrewmateRoles, false) + NeutralKnowCyberStarDead = BooleanOptionItem.Create(5500, "NeutralKnowCyberStarDead", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.CyberStar]); } } diff --git a/Roles/Crewmate/Demolitionist.cs b/Roles/Crewmate/Demolitionist.cs index 1f54b3511..e7c866433 100644 --- a/Roles/Crewmate/Demolitionist.cs +++ b/Roles/Crewmate/Demolitionist.cs @@ -8,10 +8,10 @@ namespace EHR.Roles.Crewmate public void SetupCustomOption() { SetupRoleOptions(5550, TabGroup.CrewmateRoles, CustomRoles.Demolitionist); - DemolitionistVentTime = FloatOptionItem.Create(5552, "DemolitionistVentTime", new(0f, 90f, 1f), 5f, TabGroup.CrewmateRoles, false) + DemolitionistVentTime = FloatOptionItem.Create(5552, "DemolitionistVentTime", new(0f, 90f, 1f), 5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Demolitionist]) .SetValueFormat(OptionFormat.Seconds); - DemolitionistKillerDiesOnMeetingCall = BooleanOptionItem.Create(5553, "DemolitionistKillerDiesOnMeetingCall", false, TabGroup.CrewmateRoles, false) + DemolitionistKillerDiesOnMeetingCall = BooleanOptionItem.Create(5553, "DemolitionistKillerDiesOnMeetingCall", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Demolitionist]); } diff --git a/Roles/Crewmate/Deputy.cs b/Roles/Crewmate/Deputy.cs index b61d613c6..a11bdf00b 100644 --- a/Roles/Crewmate/Deputy.cs +++ b/Roles/Crewmate/Deputy.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -19,13 +19,13 @@ public class Deputy : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Deputy); - HandcuffCooldown = FloatOptionItem.Create(Id + 10, "DeputyHandcuffCooldown", new(0f, 60f, 2.5f), 17.5f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) + HandcuffCooldown = FloatOptionItem.Create(Id + 10, "DeputyHandcuffCooldown", new(0f, 60f, 2.5f), 17.5f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) .SetValueFormat(OptionFormat.Seconds); - DeputyHandcuffCDForTarget = FloatOptionItem.Create(Id + 14, "DeputyHandcuffCDForTarget", new(0f, 180f, 2.5f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) + DeputyHandcuffCDForTarget = FloatOptionItem.Create(Id + 14, "DeputyHandcuffCDForTarget", new(0f, 180f, 2.5f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) .SetValueFormat(OptionFormat.Seconds); - HandcuffMax = IntegerOptionItem.Create(Id + 12, "DeputyHandcuffMax", new(1, 20, 1), 4, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) + HandcuffMax = IntegerOptionItem.Create(Id + 12, "DeputyHandcuffMax", new(1, 20, 1), 4, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) .SetValueFormat(OptionFormat.Times); - DeputyHandcuffDelay = IntegerOptionItem.Create(Id + 11, "DeputyHandcuffDelay", new(0, 20, 1), 5, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) + DeputyHandcuffDelay = IntegerOptionItem.Create(Id + 11, "DeputyHandcuffDelay", new(0, 20, 1), 5, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deputy]) .SetValueFormat(OptionFormat.Seconds); UsePet = CreatePetUseSetting(Id + 13, CustomRoles.Deputy); } diff --git a/Roles/Crewmate/Detective.cs b/Roles/Crewmate/Detective.cs index 208c6e78e..cd8e26a56 100644 --- a/Roles/Crewmate/Detective.cs +++ b/Roles/Crewmate/Detective.cs @@ -9,7 +9,7 @@ namespace EHR.Roles.Crewmate public void SetupCustomOption() { Options.SetupRoleOptions(6600, TabGroup.CrewmateRoles, CustomRoles.Detective); - Options.DetectiveCanknowKiller = BooleanOptionItem.Create(6610, "DetectiveCanknowKiller", true, TabGroup.CrewmateRoles, false) + Options.DetectiveCanknowKiller = BooleanOptionItem.Create(6610, "DetectiveCanknowKiller", true, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Detective]); } diff --git a/Roles/Crewmate/Divinator.cs b/Roles/Crewmate/Divinator.cs index ddaa6a6ee..3be5122c2 100644 --- a/Roles/Crewmate/Divinator.cs +++ b/Roles/Crewmate/Divinator.cs @@ -1,6 +1,6 @@ -using EHR.Modules; using System.Collections.Generic; using System.Linq; +using EHR.Modules; using static EHR.Options; using static EHR.Translator; @@ -27,14 +27,14 @@ public class Divinator : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Divinator); - CheckLimitOpt = IntegerOptionItem.Create(Id + 10, "DivinatorSkillLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]) + CheckLimitOpt = IntegerOptionItem.Create(Id + 10, "DivinatorSkillLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]) .SetValueFormat(OptionFormat.Times); - AccurateCheckMode = BooleanOptionItem.Create(Id + 12, "AccurateCheckMode", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]); - ShowSpecificRole = BooleanOptionItem.Create(Id + 13, "ShowSpecificRole", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]); - HideVote = BooleanOptionItem.Create(Id + 14, "DivinatorHideVote", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]); - AbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 15, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]) + AccurateCheckMode = BooleanOptionItem.Create(Id + 12, "AccurateCheckMode", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]); + ShowSpecificRole = BooleanOptionItem.Create(Id + 13, "ShowSpecificRole", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]); + HideVote = BooleanOptionItem.Create(Id + 14, "DivinatorHideVote", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]); + AbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 15, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 16, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 16, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Divinator]) .SetValueFormat(OptionFormat.Times); CancelVote = CreateVoteCancellingUseSetting(Id + 11, CustomRoles.Divinator, TabGroup.CrewmateRoles); diff --git a/Roles/Crewmate/Doctor.cs b/Roles/Crewmate/Doctor.cs index b3d5e62eb..b1c86d653 100644 --- a/Roles/Crewmate/Doctor.cs +++ b/Roles/Crewmate/Doctor.cs @@ -10,10 +10,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(5600, TabGroup.CrewmateRoles, CustomRoles.Doctor); - Options.DoctorTaskCompletedBatteryCharge = FloatOptionItem.Create(5610, "DoctorTaskCompletedBatteryCharge", new(0f, 250f, 1f), 50f, TabGroup.CrewmateRoles, false) + Options.DoctorTaskCompletedBatteryCharge = FloatOptionItem.Create(5610, "DoctorTaskCompletedBatteryCharge", new(0f, 250f, 1f), 50f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Doctor]) .SetValueFormat(OptionFormat.Seconds); - Options.DoctorVisibleToEveryone = BooleanOptionItem.Create(5611, "DoctorVisibleToEveryone", false, TabGroup.CrewmateRoles, false) + Options.DoctorVisibleToEveryone = BooleanOptionItem.Create(5611, "DoctorVisibleToEveryone", false, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Doctor]); } diff --git a/Roles/Crewmate/DonutDelivery.cs b/Roles/Crewmate/DonutDelivery.cs index e8e9c8f6d..3e4015c91 100644 --- a/Roles/Crewmate/DonutDelivery.cs +++ b/Roles/Crewmate/DonutDelivery.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -17,10 +17,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.DonutDelivery); - CD = FloatOptionItem.Create(Id + 10, "DonutDeliverCD", new(2.5f, 60f, 2.5f), 30f, TabGroup.CrewmateRoles, false) + CD = FloatOptionItem.Create(Id + 10, "DonutDeliverCD", new(2.5f, 60f, 2.5f), 30f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.DonutDelivery]) .SetValueFormat(OptionFormat.Seconds); - UseLimit = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(1, 20, 1), 5, TabGroup.CrewmateRoles, false) + UseLimit = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(1, 20, 1), 5, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.DonutDelivery]) .SetValueFormat(OptionFormat.Times); UsePet = CreatePetUseSetting(Id + 13, CustomRoles.DonutDelivery); diff --git a/Roles/Crewmate/Doormaster.cs b/Roles/Crewmate/Doormaster.cs index 01dc803ca..dea500656 100644 --- a/Roles/Crewmate/Doormaster.cs +++ b/Roles/Crewmate/Doormaster.cs @@ -1,6 +1,6 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; -using System.Collections.Generic; namespace EHR.Roles.Crewmate { @@ -19,14 +19,14 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Doormaster); - VentCooldown = FloatOptionItem.Create(Id + 10, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Doormaster]) + VentCooldown = FloatOptionItem.Create(Id + 10, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Doormaster]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Doormaster]) + UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Doormaster]) .SetValueFormat(OptionFormat.Times); - DoormasterAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + DoormasterAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Doormaster]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Doormaster]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/DovesOfNeace.cs b/Roles/Crewmate/DovesOfNeace.cs index 4bb8ea31d..e760020dd 100644 --- a/Roles/Crewmate/DovesOfNeace.cs +++ b/Roles/Crewmate/DovesOfNeace.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Impostor; using HarmonyLib; -using System.Linq; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -15,16 +15,16 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(7700, TabGroup.CrewmateRoles, CustomRoles.DovesOfNeace); - DovesOfNeaceCooldown = FloatOptionItem.Create(7710, "DovesOfNeaceCooldown", new(0f, 180f, 1f), 7f, TabGroup.CrewmateRoles, false) + DovesOfNeaceCooldown = FloatOptionItem.Create(7710, "DovesOfNeaceCooldown", new(0f, 180f, 1f), 7f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.DovesOfNeace]) .SetValueFormat(OptionFormat.Seconds); - DovesOfNeaceMaxOfUseage = IntegerOptionItem.Create(7711, "DovesOfNeaceMaxOfUseage", new(0, 180, 1), 0, TabGroup.CrewmateRoles, false) + DovesOfNeaceMaxOfUseage = IntegerOptionItem.Create(7711, "DovesOfNeaceMaxOfUseage", new(0, 180, 1), 0, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.DovesOfNeace]) .SetValueFormat(OptionFormat.Times); - DovesOfNeaceAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(7712, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + DovesOfNeaceAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(7712, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.DovesOfNeace]) .SetValueFormat(OptionFormat.Times); - DovesOfNeaceAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(7713, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + DovesOfNeaceAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(7713, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.DovesOfNeace]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Drainer.cs b/Roles/Crewmate/Drainer.cs index b9242f609..93a76e40d 100644 --- a/Roles/Crewmate/Drainer.cs +++ b/Roles/Crewmate/Drainer.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using HarmonyLib; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using HarmonyLib; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -21,16 +21,16 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Drainer); - VentCD = IntegerOptionItem.Create(Id + 10, "VentCooldown", new(1, 60, 1), 30, TabGroup.CrewmateRoles, false) + VentCD = IntegerOptionItem.Create(Id + 10, "VentCooldown", new(1, 60, 1), 30, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Drainer]) .SetValueFormat(OptionFormat.Seconds); - UseLimit = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 1, TabGroup.CrewmateRoles, false) + UseLimit = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 1, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Drainer]) .SetValueFormat(OptionFormat.Times); - DrainerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles, false) + DrainerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Drainer]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Drainer]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Druid.cs b/Roles/Crewmate/Druid.cs index 94b477613..b55e0e954 100644 --- a/Roles/Crewmate/Druid.cs +++ b/Roles/Crewmate/Druid.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Text; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -29,19 +29,19 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Druid); - VentCooldown = IntegerOptionItem.Create(Id + 10, "VentCooldown", new(0, 60, 1), 15, TabGroup.CrewmateRoles, false) + VentCooldown = IntegerOptionItem.Create(Id + 10, "VentCooldown", new(0, 60, 1), 15, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Druid]) .SetValueFormat(OptionFormat.Seconds); - TriggerPlaceDelay = IntegerOptionItem.Create(Id + 11, "DruidTriggerPlaceDelayOpt", new(1, 20, 1), 7, TabGroup.CrewmateRoles, false) + TriggerPlaceDelay = IntegerOptionItem.Create(Id + 11, "DruidTriggerPlaceDelayOpt", new(1, 20, 1), 7, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Druid]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(0, 20, 1), 3, TabGroup.CrewmateRoles, false) + UseLimitOpt = IntegerOptionItem.Create(Id + 12, "AbilityUseLimit", new(0, 20, 1), 3, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Druid]) .SetValueFormat(OptionFormat.Times); - DruidAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 13, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + DruidAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 13, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Druid]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 14, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 14, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Druid]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Electric.cs b/Roles/Crewmate/Electric.cs index 03089b5b8..a011ea318 100644 --- a/Roles/Crewmate/Electric.cs +++ b/Roles/Crewmate/Electric.cs @@ -23,7 +23,7 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Electric); - FreezeDuration = FloatOptionItem.Create(Id + 2, "GamblerFreezeDur", new(0.5f, 90f, 0.5f), 3f, TabGroup.CrewmateRoles, false) + FreezeDuration = FloatOptionItem.Create(Id + 2, "GamblerFreezeDur", new(0.5f, 90f, 0.5f), 3f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Electric]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/Enigma.cs b/Roles/Crewmate/Enigma.cs index 612d967b8..b8580cc11 100644 --- a/Roles/Crewmate/Enigma.cs +++ b/Roles/Crewmate/Enigma.cs @@ -52,17 +52,17 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Enigma); - EnigmaClueStage1Tasks = FloatOptionItem.Create(Id + 11, "EnigmaClueStage1Tasks", new(0f, 10f, 1f), 1f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) + EnigmaClueStage1Tasks = FloatOptionItem.Create(Id + 11, "EnigmaClueStage1Tasks", new(0f, 10f, 1f), 1f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) .SetValueFormat(OptionFormat.Times); - EnigmaClueStage2Tasks = FloatOptionItem.Create(Id + 12, "EnigmaClueStage2Tasks", new(0f, 10f, 1f), 3f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) + EnigmaClueStage2Tasks = FloatOptionItem.Create(Id + 12, "EnigmaClueStage2Tasks", new(0f, 10f, 1f), 3f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) .SetValueFormat(OptionFormat.Times); - EnigmaClueStage3Tasks = FloatOptionItem.Create(Id + 13, "EnigmaClueStage3Tasks", new(0f, 10f, 1f), 7f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) + EnigmaClueStage3Tasks = FloatOptionItem.Create(Id + 13, "EnigmaClueStage3Tasks", new(0f, 10f, 1f), 7f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) .SetValueFormat(OptionFormat.Times); - EnigmaClueStage2Probability = IntegerOptionItem.Create(Id + 14, "EnigmaClueStage2Probability", new(0, 100, 5), 75, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) + EnigmaClueStage2Probability = IntegerOptionItem.Create(Id + 14, "EnigmaClueStage2Probability", new(0, 100, 5), 75, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) .SetValueFormat(OptionFormat.Percent); - EnigmaClueStage3Probability = IntegerOptionItem.Create(Id + 15, "EnigmaClueStage3Probability", new(0, 100, 5), 60, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) + EnigmaClueStage3Probability = IntegerOptionItem.Create(Id + 15, "EnigmaClueStage3Probability", new(0, 100, 5), 60, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]) .SetValueFormat(OptionFormat.Percent); - EnigmaGetCluesWithoutReporting = BooleanOptionItem.Create(Id + 16, "EnigmaClueGetCluesWithoutReporting", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]); + EnigmaGetCluesWithoutReporting = BooleanOptionItem.Create(Id + 16, "EnigmaClueGetCluesWithoutReporting", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Enigma]); OverrideTasksData.Create(Id + 20, TabGroup.CrewmateRoles, CustomRoles.Enigma); } diff --git a/Roles/Crewmate/Escort.cs b/Roles/Crewmate/Escort.cs index 11cee827c..f82557cc6 100644 --- a/Roles/Crewmate/Escort.cs +++ b/Roles/Crewmate/Escort.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Roles.Neutral; -using System.Collections.Generic; using static EHR.Translator; namespace EHR.Roles.Crewmate @@ -17,10 +17,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Escort); - CD = FloatOptionItem.Create(Id + 10, "EscortCD", new(2.5f, 60f, 2.5f), 30f, TabGroup.CrewmateRoles, false) + CD = FloatOptionItem.Create(Id + 10, "EscortCD", new(2.5f, 60f, 2.5f), 30f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Escort]) .SetValueFormat(OptionFormat.Seconds); - UseLimit = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 3, TabGroup.CrewmateRoles, false) + UseLimit = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 3, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Escort]) .SetValueFormat(OptionFormat.Times); UsePet = Options.CreatePetUseSetting(Id + 12, CustomRoles.Escort); diff --git a/Roles/Crewmate/Express.cs b/Roles/Crewmate/Express.cs index 2776828eb..977b97676 100644 --- a/Roles/Crewmate/Express.cs +++ b/Roles/Crewmate/Express.cs @@ -13,10 +13,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(5585, TabGroup.CrewmateRoles, CustomRoles.Express); - Options.ExpressSpeed = FloatOptionItem.Create(5587, "ExpressSpeed", new(0.25f, 5f, 0.25f), 1.5f, TabGroup.CrewmateRoles, false) + Options.ExpressSpeed = FloatOptionItem.Create(5587, "ExpressSpeed", new(0.25f, 5f, 0.25f), 1.5f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Express]) .SetValueFormat(OptionFormat.Multiplier); - Options.ExpressSpeedDur = IntegerOptionItem.Create(5588, "ExpressSpeedDur", new(0, 90, 1), 5, TabGroup.CrewmateRoles, false) + Options.ExpressSpeedDur = IntegerOptionItem.Create(5588, "ExpressSpeedDur", new(0, 90, 1), 5, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Express]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/Farseer.cs b/Roles/Crewmate/Farseer.cs index ff1e9afe6..78d573835 100644 --- a/Roles/Crewmate/Farseer.cs +++ b/Roles/Crewmate/Farseer.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Impostor; using EHR.Roles.Neutral; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -32,13 +32,13 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Farseer); - FarseerCooldown = FloatOptionItem.Create(Id + 10, "FarseerRevealCooldown", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles, false) + FarseerCooldown = FloatOptionItem.Create(Id + 10, "FarseerRevealCooldown", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Farseer]) .SetValueFormat(OptionFormat.Seconds); - FarseerRevealTime = FloatOptionItem.Create(Id + 11, "FarseerRevealTime", new(0f, 30f, 1f), 10f, TabGroup.CrewmateRoles, false) + FarseerRevealTime = FloatOptionItem.Create(Id + 11, "FarseerRevealTime", new(0f, 30f, 1f), 10f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Farseer]) .SetValueFormat(OptionFormat.Seconds); - Vision = FloatOptionItem.Create(Id + 12, "FarseerVision", new(0f, 1f, 0.05f), 0.25f, TabGroup.CrewmateRoles, false) + Vision = FloatOptionItem.Create(Id + 12, "FarseerVision", new(0f, 1f, 0.05f), 0.25f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Farseer]) .SetValueFormat(OptionFormat.Multiplier); UsePet = CreatePetUseSetting(Id + 13, CustomRoles.Farseer); diff --git a/Roles/Crewmate/Gaulois.cs b/Roles/Crewmate/Gaulois.cs index 38b42163f..f07fb50e1 100644 --- a/Roles/Crewmate/Gaulois.cs +++ b/Roles/Crewmate/Gaulois.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -19,13 +19,13 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Gaulois); - CD = FloatOptionItem.Create(Id + 5, "AbilityCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.CrewmateRoles, false) + CD = FloatOptionItem.Create(Id + 5, "AbilityCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Gaulois]) .SetValueFormat(OptionFormat.Seconds); - AdditionalSpeed = FloatOptionItem.Create(Id + 6, "GauloisSpeedBoost", new(0f, 2f, 0.05f), 0.5f, TabGroup.CrewmateRoles, false) + AdditionalSpeed = FloatOptionItem.Create(Id + 6, "GauloisSpeedBoost", new(0f, 2f, 0.05f), 0.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Gaulois]) .SetValueFormat(OptionFormat.Multiplier); - UseLimitOpt = IntegerOptionItem.Create(Id + 7, "AbilityUseLimit", new(1, 14, 1), 3, TabGroup.CrewmateRoles, false) + UseLimitOpt = IntegerOptionItem.Create(Id + 7, "AbilityUseLimit", new(1, 14, 1), 3, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Gaulois]) .SetValueFormat(OptionFormat.Times); UsePet = CreatePetUseSetting(Id + 8, CustomRoles.Gaulois); diff --git a/Roles/Crewmate/Grenadier.cs b/Roles/Crewmate/Grenadier.cs index 4a881ced2..5268c246f 100644 --- a/Roles/Crewmate/Grenadier.cs +++ b/Roles/Crewmate/Grenadier.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using HarmonyLib; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Text; +using AmongUs.GameOptions; +using EHR.Modules; +using HarmonyLib; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -19,24 +19,24 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(6800, TabGroup.CrewmateRoles, CustomRoles.Grenadier); - GrenadierSkillCooldown = FloatOptionItem.Create(6810, "GrenadierSkillCooldown", new(0f, 180f, 1f), 25f, TabGroup.CrewmateRoles, false) + GrenadierSkillCooldown = FloatOptionItem.Create(6810, "GrenadierSkillCooldown", new(0f, 180f, 1f), 25f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Grenadier]) .SetValueFormat(OptionFormat.Seconds); - GrenadierSkillDuration = FloatOptionItem.Create(6811, "GrenadierSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles, false) + GrenadierSkillDuration = FloatOptionItem.Create(6811, "GrenadierSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Grenadier]) .SetValueFormat(OptionFormat.Seconds); - GrenadierCauseVision = FloatOptionItem.Create(6812, "GrenadierCauseVision", new(0f, 5f, 0.05f), 0.3f, TabGroup.CrewmateRoles, false) + GrenadierCauseVision = FloatOptionItem.Create(6812, "GrenadierCauseVision", new(0f, 5f, 0.05f), 0.3f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Grenadier]) .SetValueFormat(OptionFormat.Multiplier); - GrenadierCanAffectNeutral = BooleanOptionItem.Create(6813, "GrenadierCanAffectNeutral", false, TabGroup.CrewmateRoles, false) + GrenadierCanAffectNeutral = BooleanOptionItem.Create(6813, "GrenadierCanAffectNeutral", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Grenadier]); - GrenadierSkillMaxOfUseage = IntegerOptionItem.Create(6814, "GrenadierSkillMaxOfUseage", new(0, 180, 1), 2, TabGroup.CrewmateRoles, false) + GrenadierSkillMaxOfUseage = IntegerOptionItem.Create(6814, "GrenadierSkillMaxOfUseage", new(0, 180, 1), 2, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Grenadier]) .SetValueFormat(OptionFormat.Times); - GrenadierAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(6815, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles, false) + GrenadierAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(6815, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Grenadier]) .SetValueFormat(OptionFormat.Times); - GrenadierAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(6816, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + GrenadierAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(6816, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Grenadier]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Jailer.cs b/Roles/Crewmate/Jailer.cs index b2d687849..a00ce5a5e 100644 --- a/Roles/Crewmate/Jailer.cs +++ b/Roles/Crewmate/Jailer.cs @@ -1,7 +1,7 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using static EHR.Options; using static EHR.Translator; @@ -22,9 +22,9 @@ public class Jailor : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Jailor); - JailCooldown = FloatOptionItem.Create(Id + 10, "JailorJailCooldown", new(0f, 60f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jailor]) + JailCooldown = FloatOptionItem.Create(Id + 10, "JailorJailCooldown", new(0f, 60f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jailor]) .SetValueFormat(OptionFormat.Seconds); - notifyJailedOnMeeting = BooleanOptionItem.Create(Id + 18, "notifyJailedOnMeeting", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jailor]); + notifyJailedOnMeeting = BooleanOptionItem.Create(Id + 18, "notifyJailedOnMeeting", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jailor]); UsePet = CreatePetUseSetting(Id + 11, CustomRoles.Jailor); } diff --git a/Roles/Crewmate/Judge.cs b/Roles/Crewmate/Judge.cs index 8747aa861..0942e3da9 100644 --- a/Roles/Crewmate/Judge.cs +++ b/Roles/Crewmate/Judge.cs @@ -1,10 +1,10 @@ -using EHR.Modules; -using HarmonyLib; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using EHR.Modules; +using HarmonyLib; +using Hazel; using UnityEngine; using static EHR.Translator; using Object = UnityEngine.Object; @@ -40,21 +40,21 @@ public class Judge : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Judge); - TrialLimitPerMeeting = FloatOptionItem.Create(Id + 10, "TrialLimitPerMeeting", new(0f, 15f, 1f), 1f, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); - TrialLimitPerGame = FloatOptionItem.Create(Id + 9, "TrialLimitPerGame", new(0f, 30f, 1f), 3f, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); - CanTrialMadmate = BooleanOptionItem.Create(Id + 12, "JudgeCanTrialMadmate", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); - CanTrialCharmed = BooleanOptionItem.Create(Id + 16, "JudgeCanTrialCharmed", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); + TrialLimitPerMeeting = FloatOptionItem.Create(Id + 10, "TrialLimitPerMeeting", new(0f, 15f, 1f), 1f, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); + TrialLimitPerGame = FloatOptionItem.Create(Id + 9, "TrialLimitPerGame", new(0f, 30f, 1f), 3f, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); + CanTrialMadmate = BooleanOptionItem.Create(Id + 12, "JudgeCanTrialMadmate", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); + CanTrialCharmed = BooleanOptionItem.Create(Id + 16, "JudgeCanTrialCharmed", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); //CanTrialSidekick = BooleanOptionItem.Create(Id + 19, "JudgeCanTrialSidekick", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); //CanTrialInfected = BooleanOptionItem.Create(Id + 20, "JudgeCanTrialInfected", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); //CanTrialContagious = BooleanOptionItem.Create(Id + 21, "JudgeCanTrialContagious", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); - CanTrialCrewKilling = BooleanOptionItem.Create(Id + 13, "JudgeCanTrialnCrewKilling", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); - CanTrialNeutralB = BooleanOptionItem.Create(Id + 14, "JudgeCanTrialNeutralB", false, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); - CanTrialNeutralE = BooleanOptionItem.Create(Id + 17, "JudgeCanTrialNeutralE", false, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); - CanTrialNeutralC = BooleanOptionItem.Create(Id + 18, "JudgeCanTrialNeutralC", false, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); - CanTrialNeutralK = BooleanOptionItem.Create(Id + 15, "JudgeCanTrialNeutralK", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); - TryHideMsg = BooleanOptionItem.Create(Id + 11, "JudgeTryHideMsg", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetColor(Color.green); - JudgeAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 19, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.3f, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 20, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); + CanTrialCrewKilling = BooleanOptionItem.Create(Id + 13, "JudgeCanTrialnCrewKilling", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); + CanTrialNeutralB = BooleanOptionItem.Create(Id + 14, "JudgeCanTrialNeutralB", false, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); + CanTrialNeutralE = BooleanOptionItem.Create(Id + 17, "JudgeCanTrialNeutralE", false, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); + CanTrialNeutralC = BooleanOptionItem.Create(Id + 18, "JudgeCanTrialNeutralC", false, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); + CanTrialNeutralK = BooleanOptionItem.Create(Id + 15, "JudgeCanTrialNeutralK", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]); + TryHideMsg = BooleanOptionItem.Create(Id + 11, "JudgeTryHideMsg", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetColor(Color.green); + JudgeAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 19, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.3f, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 20, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Judge]).SetValueFormat(OptionFormat.Times); } public override void Init() diff --git a/Roles/Crewmate/Lighter.cs b/Roles/Crewmate/Lighter.cs index 5fa894fba..6d91eb564 100644 --- a/Roles/Crewmate/Lighter.cs +++ b/Roles/Crewmate/Lighter.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Text; +using System.Text; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -15,25 +15,25 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupSingleRoleOptions(6850, TabGroup.CrewmateRoles, CustomRoles.Lighter); - LighterSkillCooldown = FloatOptionItem.Create(6852, "LighterSkillCooldown", new(0f, 180f, 1f), 25f, TabGroup.CrewmateRoles, false) + LighterSkillCooldown = FloatOptionItem.Create(6852, "LighterSkillCooldown", new(0f, 180f, 1f), 25f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Lighter]) .SetValueFormat(OptionFormat.Seconds); - LighterSkillDuration = FloatOptionItem.Create(6853, "LighterSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles, false) + LighterSkillDuration = FloatOptionItem.Create(6853, "LighterSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Lighter]) .SetValueFormat(OptionFormat.Seconds); - LighterVisionNormal = FloatOptionItem.Create(6854, "LighterVisionNormal", new(0f, 5f, 0.05f), 0.9f, TabGroup.CrewmateRoles, false) + LighterVisionNormal = FloatOptionItem.Create(6854, "LighterVisionNormal", new(0f, 5f, 0.05f), 0.9f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Lighter]) .SetValueFormat(OptionFormat.Multiplier); - LighterVisionOnLightsOut = FloatOptionItem.Create(6855, "LighterVisionOnLightsOut", new(0f, 5f, 0.05f), 0.35f, TabGroup.CrewmateRoles, false) + LighterVisionOnLightsOut = FloatOptionItem.Create(6855, "LighterVisionOnLightsOut", new(0f, 5f, 0.05f), 0.35f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Lighter]) .SetValueFormat(OptionFormat.Multiplier); - LighterSkillMaxOfUseage = IntegerOptionItem.Create(6856, "AbilityUseLimit", new(0, 180, 1), 2, TabGroup.CrewmateRoles, false) + LighterSkillMaxOfUseage = IntegerOptionItem.Create(6856, "AbilityUseLimit", new(0, 180, 1), 2, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Lighter]) .SetValueFormat(OptionFormat.Times); - LighterAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(6857, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles, false) + LighterAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(6857, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Lighter]) .SetValueFormat(OptionFormat.Times); - LighterAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(6858, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + LighterAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(6858, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Lighter]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Luckey.cs b/Roles/Crewmate/Luckey.cs index d1f75ffc7..0ab523b3b 100644 --- a/Roles/Crewmate/Luckey.cs +++ b/Roles/Crewmate/Luckey.cs @@ -8,7 +8,7 @@ public static void SetupCustomOption() { Options.SetupRoleOptions(5800, TabGroup.CrewmateRoles, CustomRoles.Luckey); - Options.LuckeyProbability = IntegerOptionItem.Create(5900, "LuckeyProbability", new(0, 100, 5), 50, TabGroup.CrewmateRoles, false) + Options.LuckeyProbability = IntegerOptionItem.Create(5900, "LuckeyProbability", new(0, 100, 5), 50, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Luckey]) .SetValueFormat(OptionFormat.Percent); } diff --git a/Roles/Crewmate/Marshall.cs b/Roles/Crewmate/Marshall.cs index daf6a26d0..8279b38a0 100644 --- a/Roles/Crewmate/Marshall.cs +++ b/Roles/Crewmate/Marshall.cs @@ -13,7 +13,7 @@ public class Marshall : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Marshall); - OptionMadmateCanFindMarshall = BooleanOptionItem.Create(Id + 14, "MadmateCanFindMarshall", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Marshall]); + OptionMadmateCanFindMarshall = BooleanOptionItem.Create(Id + 14, "MadmateCanFindMarshall", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Marshall]); OverrideTasksData.Create(Id + 20, TabGroup.CrewmateRoles, CustomRoles.Marshall); } diff --git a/Roles/Crewmate/Mayor.cs b/Roles/Crewmate/Mayor.cs index 9c7aa09f2..bab8f5da9 100644 --- a/Roles/Crewmate/Mayor.cs +++ b/Roles/Crewmate/Mayor.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -71,19 +71,19 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(9500, TabGroup.CrewmateRoles, CustomRoles.Mayor); - MayorAdditionalVote = IntegerOptionItem.Create(9510, "MayorAdditionalVote", new(0, 90, 1), 3, TabGroup.CrewmateRoles, false) + MayorAdditionalVote = IntegerOptionItem.Create(9510, "MayorAdditionalVote", new(0, 90, 1), 3, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mayor]) .SetValueFormat(OptionFormat.Votes); - MayorHasPortableButton = BooleanOptionItem.Create(9511, "MayorHasPortableButton", false, TabGroup.CrewmateRoles, false) + MayorHasPortableButton = BooleanOptionItem.Create(9511, "MayorHasPortableButton", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mayor]); - MayorNumOfUseButton = IntegerOptionItem.Create(9512, "MayorNumOfUseButton", new(1, 90, 1), 1, TabGroup.CrewmateRoles, false) + MayorNumOfUseButton = IntegerOptionItem.Create(9512, "MayorNumOfUseButton", new(1, 90, 1), 1, TabGroup.CrewmateRoles) .SetParent(MayorHasPortableButton) .SetValueFormat(OptionFormat.Times); - MayorHideVote = BooleanOptionItem.Create(9513, "MayorHideVote", false, TabGroup.CrewmateRoles, false) + MayorHideVote = BooleanOptionItem.Create(9513, "MayorHideVote", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mayor]); - MayorRevealWhenDoneTasks = BooleanOptionItem.Create(9514, "MayorRevealWhenDoneTasks", false, TabGroup.CrewmateRoles, false) + MayorRevealWhenDoneTasks = BooleanOptionItem.Create(9514, "MayorRevealWhenDoneTasks", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mayor]); - MayorSeesVoteColorsWhenDoneTasks = BooleanOptionItem.Create(9515, "MayorSeesVoteColorsWhenDoneTasks", false, TabGroup.CrewmateRoles, false) + MayorSeesVoteColorsWhenDoneTasks = BooleanOptionItem.Create(9515, "MayorSeesVoteColorsWhenDoneTasks", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mayor]); MayorTasks = OverrideTasksData.Create(9516, TabGroup.CrewmateRoles, CustomRoles.Mayor); } diff --git a/Roles/Crewmate/Medic.cs b/Roles/Crewmate/Medic.cs index eb0515899..70e48f597 100644 --- a/Roles/Crewmate/Medic.cs +++ b/Roles/Crewmate/Medic.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using HarmonyLib; using Hazel; -using System.Collections.Generic; -using System.Linq; namespace EHR.Roles.Crewmate; @@ -52,27 +52,27 @@ public class Medic : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Medic); - WhoCanSeeProtect = StringOptionItem.Create(Id + 2, "MedicWhoCanSeeProtect", MedicWhoCanSeeProtectName, 0, TabGroup.CrewmateRoles, false) + WhoCanSeeProtect = StringOptionItem.Create(Id + 2, "MedicWhoCanSeeProtect", MedicWhoCanSeeProtectName, 0, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]); - KnowShieldBroken = StringOptionItem.Create(Id + 3, "MedicKnowShieldBroken", MedicWhoCanSeeProtectName, 1, TabGroup.CrewmateRoles, false) + KnowShieldBroken = StringOptionItem.Create(Id + 3, "MedicKnowShieldBroken", MedicWhoCanSeeProtectName, 1, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]); - ShieldDeactivatesWhenMedicDies = BooleanOptionItem.Create(Id + 4, "MedicShieldDeactivatesWhenMedicDies", true, TabGroup.CrewmateRoles, false) + ShieldDeactivatesWhenMedicDies = BooleanOptionItem.Create(Id + 4, "MedicShieldDeactivatesWhenMedicDies", true, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]); - ShieldDeactivationIsVisible = StringOptionItem.Create(Id + 5, "MedicShielDeactivationIsVisible", ShieldDeactivationIsVisibleOption, 0, TabGroup.CrewmateRoles, false) + ShieldDeactivationIsVisible = StringOptionItem.Create(Id + 5, "MedicShielDeactivationIsVisible", ShieldDeactivationIsVisibleOption, 0, TabGroup.CrewmateRoles) .SetParent(ShieldDeactivatesWhenMedicDies); - ShieldBreaksOnKillAttempt = BooleanOptionItem.Create(Id + 6, "MedicShieldBreaksOnKillAttempt", true, TabGroup.CrewmateRoles, false) + ShieldBreaksOnKillAttempt = BooleanOptionItem.Create(Id + 6, "MedicShieldBreaksOnKillAttempt", true, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]); - ShieldBreakIsVisible = StringOptionItem.Create(Id + 7, "MedicShieldBreakIsVisible", ShieldDeactivationIsVisibleOption, 0, TabGroup.CrewmateRoles, false) + ShieldBreakIsVisible = StringOptionItem.Create(Id + 7, "MedicShieldBreakIsVisible", ShieldDeactivationIsVisibleOption, 0, TabGroup.CrewmateRoles) .SetParent(ShieldBreaksOnKillAttempt); - ResetCooldown = FloatOptionItem.Create(Id + 8, "MedicResetCooldown", new(0f, 120f, 1f), 15f, TabGroup.CrewmateRoles, false) + ResetCooldown = FloatOptionItem.Create(Id + 8, "MedicResetCooldown", new(0f, 120f, 1f), 15f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]) .SetValueFormat(OptionFormat.Seconds); - GuesserIgnoreShield = BooleanOptionItem.Create(Id + 9, "MedicShieldedCanBeGuessed", true, TabGroup.CrewmateRoles, false) + GuesserIgnoreShield = BooleanOptionItem.Create(Id + 9, "MedicShieldedCanBeGuessed", true, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]); - AmountOfShields = IntegerOptionItem.Create(Id + 10, "MedicAmountOfShields", new(1, 14, 1), 1, TabGroup.CrewmateRoles, false) + AmountOfShields = IntegerOptionItem.Create(Id + 10, "MedicAmountOfShields", new(1, 14, 1), 1, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]); UsePet = Options.CreatePetUseSetting(Id + 11, CustomRoles.Medic); - CD = FloatOptionItem.Create(Id + 12, "AbilityCooldown", new(0f, 180f, 2.5f), 7.5f, TabGroup.CrewmateRoles, false) + CD = FloatOptionItem.Create(Id + 12, "AbilityCooldown", new(0f, 180f, 2.5f), 7.5f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Medic]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/Mediumshiper.cs b/Roles/Crewmate/Mediumshiper.cs index a1243af3e..2394b13d3 100644 --- a/Roles/Crewmate/Mediumshiper.cs +++ b/Roles/Crewmate/Mediumshiper.cs @@ -19,13 +19,13 @@ public class Mediumshiper : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Mediumshiper); - ContactLimitOpt = IntegerOptionItem.Create(Id + 10, "MediumshiperContactLimit", new(0, 15, 1), 1, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Mediumshiper]) + ContactLimitOpt = IntegerOptionItem.Create(Id + 10, "MediumshiperContactLimit", new(0, 15, 1), 1, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Mediumshiper]) .SetValueFormat(OptionFormat.Times); - OnlyReceiveMsgFromCrew = BooleanOptionItem.Create(Id + 11, "MediumshiperOnlyReceiveMsgFromCrew", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Mediumshiper]); - MediumAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + OnlyReceiveMsgFromCrew = BooleanOptionItem.Create(Id + 11, "MediumshiperOnlyReceiveMsgFromCrew", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Mediumshiper]); + MediumAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Mediumshiper]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Mediumshiper]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Merchant.cs b/Roles/Crewmate/Merchant.cs index 9169ee46f..1ba162bfc 100644 --- a/Roles/Crewmate/Merchant.cs +++ b/Roles/Crewmate/Merchant.cs @@ -1,6 +1,6 @@ -using EHR.Roles.Neutral; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Roles.Neutral; using static EHR.Options; using static EHR.Translator; @@ -95,22 +95,22 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Merchant); - OptionMaxSell = IntegerOptionItem.Create(Id + 2, "MerchantMaxSell", new(1, 20, 1), 5, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]).SetValueFormat(OptionFormat.Times); - OptionMoneyPerSell = IntegerOptionItem.Create(Id + 3, "MerchantMoneyPerSell", new(1, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]).SetValueFormat(OptionFormat.Times); - OptionMoneyRequiredToBribe = IntegerOptionItem.Create(Id + 4, "MerchantMoneyRequiredToBribe", new(1, 70, 1), 5, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]).SetValueFormat(OptionFormat.Times); - OptionNotifyBribery = BooleanOptionItem.Create(Id + 5, "MerchantNotifyBribery", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanTargetCrew = BooleanOptionItem.Create(Id + 6, "MerchantTargetCrew", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanTargetImpostor = BooleanOptionItem.Create(Id + 7, "MerchantTargetImpostor", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanTargetNeutral = BooleanOptionItem.Create(Id + 8, "MerchantTargetNeutral", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanSellBalanced = BooleanOptionItem.Create(Id + 9, "MerchantSellBalanced", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanSellHelpful = BooleanOptionItem.Create(Id + 10, "MerchantSellHelpful", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanSellHarmful = BooleanOptionItem.Create(Id + 11, "MerchantSellHarmful", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanSellNeutral = BooleanOptionItem.Create(Id + 12, "MerchantSellNeutral", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionCanSellExperimental = BooleanOptionItem.Create(Id + 13, "MerchantSellExperimental", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionSellOnlyEnabledAddons = BooleanOptionItem.Create(Id + 16, "MerchantSellOnlyEnabledAddons", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionSellOnlyHarmfulToEvil = BooleanOptionItem.Create(Id + 14, "MerchantSellHarmfulToEvil", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionSellOnlyHelpfulToCrew = BooleanOptionItem.Create(Id + 15, "MerchantSellHelpfulToCrew", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); - OptionGivesAllMoneyOnBribe = BooleanOptionItem.Create(Id + 17, "MerchantGivesAllMoneyOnBribe", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionMaxSell = IntegerOptionItem.Create(Id + 2, "MerchantMaxSell", new(1, 20, 1), 5, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]).SetValueFormat(OptionFormat.Times); + OptionMoneyPerSell = IntegerOptionItem.Create(Id + 3, "MerchantMoneyPerSell", new(1, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]).SetValueFormat(OptionFormat.Times); + OptionMoneyRequiredToBribe = IntegerOptionItem.Create(Id + 4, "MerchantMoneyRequiredToBribe", new(1, 70, 1), 5, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]).SetValueFormat(OptionFormat.Times); + OptionNotifyBribery = BooleanOptionItem.Create(Id + 5, "MerchantNotifyBribery", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanTargetCrew = BooleanOptionItem.Create(Id + 6, "MerchantTargetCrew", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanTargetImpostor = BooleanOptionItem.Create(Id + 7, "MerchantTargetImpostor", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanTargetNeutral = BooleanOptionItem.Create(Id + 8, "MerchantTargetNeutral", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanSellBalanced = BooleanOptionItem.Create(Id + 9, "MerchantSellBalanced", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanSellHelpful = BooleanOptionItem.Create(Id + 10, "MerchantSellHelpful", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanSellHarmful = BooleanOptionItem.Create(Id + 11, "MerchantSellHarmful", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanSellNeutral = BooleanOptionItem.Create(Id + 12, "MerchantSellNeutral", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionCanSellExperimental = BooleanOptionItem.Create(Id + 13, "MerchantSellExperimental", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionSellOnlyEnabledAddons = BooleanOptionItem.Create(Id + 16, "MerchantSellOnlyEnabledAddons", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionSellOnlyHarmfulToEvil = BooleanOptionItem.Create(Id + 14, "MerchantSellHarmfulToEvil", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionSellOnlyHelpfulToCrew = BooleanOptionItem.Create(Id + 15, "MerchantSellHelpfulToCrew", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); + OptionGivesAllMoneyOnBribe = BooleanOptionItem.Create(Id + 17, "MerchantGivesAllMoneyOnBribe", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Merchant]); OverrideTasksData.Create(Id + 18, TabGroup.CrewmateRoles, CustomRoles.Merchant); } diff --git a/Roles/Crewmate/Monarch.cs b/Roles/Crewmate/Monarch.cs index ceff3fa20..228993403 100644 --- a/Roles/Crewmate/Monarch.cs +++ b/Roles/Crewmate/Monarch.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -17,9 +17,9 @@ public class Monarch : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Monarch); - KnightCooldown = FloatOptionItem.Create(Id + 10, "MonarchKnightCooldown", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Monarch]) + KnightCooldown = FloatOptionItem.Create(Id + 10, "MonarchKnightCooldown", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Monarch]) .SetValueFormat(OptionFormat.Seconds); - KnightMax = IntegerOptionItem.Create(Id + 12, "MonarchKnightMax", new(1, 15, 1), 2, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Monarch]) + KnightMax = IntegerOptionItem.Create(Id + 12, "MonarchKnightMax", new(1, 15, 1), 2, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Monarch]) .SetValueFormat(OptionFormat.Times); UsePet = CreatePetUseSetting(Id + 11, CustomRoles.Monarch); } diff --git a/Roles/Crewmate/Monitor.cs b/Roles/Crewmate/Monitor.cs index 0c100b24c..e74892ea7 100644 --- a/Roles/Crewmate/Monitor.cs +++ b/Roles/Crewmate/Monitor.cs @@ -10,7 +10,7 @@ internal static class Monitor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Monitor); - CanCheckCamera = BooleanOptionItem.Create(Id + 10, "CanCheckCamera", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Monitor]); - CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Monitor]); + CanCheckCamera = BooleanOptionItem.Create(Id + 10, "CanCheckCamera", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Monitor]); + CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Monitor]); } } \ No newline at end of file diff --git a/Roles/Crewmate/Mortician.cs b/Roles/Crewmate/Mortician.cs index 6b36a25c8..c9b0a5e59 100644 --- a/Roles/Crewmate/Mortician.cs +++ b/Roles/Crewmate/Mortician.cs @@ -1,6 +1,6 @@ -using EHR.Modules; +using System.Collections.Generic; +using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; @@ -19,7 +19,7 @@ public class Mortician : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Mortician); - ShowArrows = BooleanOptionItem.Create(Id + 2, "ShowArrows", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Mortician]); + ShowArrows = BooleanOptionItem.Create(Id + 2, "ShowArrows", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Mortician]); } public override void Init() diff --git a/Roles/Crewmate/NiceEraser.cs b/Roles/Crewmate/NiceEraser.cs index e2dacbf15..89ca494c9 100644 --- a/Roles/Crewmate/NiceEraser.cs +++ b/Roles/Crewmate/NiceEraser.cs @@ -18,9 +18,9 @@ internal class NiceEraser : RoleBase public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.NiceEraser); - EraseLimitOpt = IntegerOptionItem.Create(Id + 2, "EraseLimit", new(1, 15, 1), 1, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceEraser]) + EraseLimitOpt = IntegerOptionItem.Create(Id + 2, "EraseLimit", new(1, 15, 1), 1, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceEraser]) .SetValueFormat(OptionFormat.Times); - HideVote = BooleanOptionItem.Create(Id + 3, "NiceEraserHideVote", false, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceEraser]); + HideVote = BooleanOptionItem.Create(Id + 3, "NiceEraserHideVote", false, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceEraser]); CancelVote = Options.CreateVoteCancellingUseSetting(Id + 4, CustomRoles.NiceEraser, TabGroup.CrewmateRoles); } diff --git a/Roles/Crewmate/NiceGuesser.cs b/Roles/Crewmate/NiceGuesser.cs index d31a39ba8..024017662 100644 --- a/Roles/Crewmate/NiceGuesser.cs +++ b/Roles/Crewmate/NiceGuesser.cs @@ -8,14 +8,14 @@ namespace EHR.Roles.Crewmate public void SetupCustomOption() { SetupRoleOptions(8600, TabGroup.CrewmateRoles, CustomRoles.NiceGuesser); - GGCanGuessTime = IntegerOptionItem.Create(8610, "GuesserCanGuessTimes", new(0, 15, 1), 15, TabGroup.CrewmateRoles, false) + GGCanGuessTime = IntegerOptionItem.Create(8610, "GuesserCanGuessTimes", new(0, 15, 1), 15, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.NiceGuesser]) .SetValueFormat(OptionFormat.Times); - GGCanGuessCrew = BooleanOptionItem.Create(8611, "GGCanGuessCrew", true, TabGroup.CrewmateRoles, false) + GGCanGuessCrew = BooleanOptionItem.Create(8611, "GGCanGuessCrew", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.NiceGuesser]); - GGCanGuessAdt = BooleanOptionItem.Create(8612, "GGCanGuessAdt", false, TabGroup.CrewmateRoles, false) + GGCanGuessAdt = BooleanOptionItem.Create(8612, "GGCanGuessAdt", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.NiceGuesser]); - GGTryHideMsg = BooleanOptionItem.Create(8613, "GuesserTryHideMsg", true, TabGroup.CrewmateRoles, false) + GGTryHideMsg = BooleanOptionItem.Create(8613, "GuesserTryHideMsg", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.NiceGuesser]) .SetColor(Color.green); } diff --git a/Roles/Crewmate/NiceHacker.cs b/Roles/Crewmate/NiceHacker.cs index 557f32298..2bc0a9893 100644 --- a/Roles/Crewmate/NiceHacker.cs +++ b/Roles/Crewmate/NiceHacker.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Text; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; using UnityEngine; namespace EHR.Roles.Crewmate @@ -32,21 +32,21 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.NiceHacker); - AbilityCD = FloatOptionItem.Create(Id + 10, "AbilityCD", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) + AbilityCD = FloatOptionItem.Create(Id + 10, "AbilityCD", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 2, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) + UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 2, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) .SetValueFormat(OptionFormat.Times); - NiceHackerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + NiceHackerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) .SetValueFormat(OptionFormat.Times); - ModdedClientAbilityUseSecondsMultiplier = FloatOptionItem.Create(Id + 14, "NiceHackerModdedClientAbilityUseSecondsMultiplier", new(0f, 70f, 1f), 3f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) + ModdedClientAbilityUseSecondsMultiplier = FloatOptionItem.Create(Id + 14, "NiceHackerModdedClientAbilityUseSecondsMultiplier", new(0f, 70f, 1f), 3f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) .SetValueFormat(OptionFormat.Seconds); - ModdedClientCanMoveWhileViewingMap = BooleanOptionItem.Create(Id + 15, "NiceHackerModdedClientCanMoveWhileViewingMap", false, TabGroup.CrewmateRoles, false) + ModdedClientCanMoveWhileViewingMap = BooleanOptionItem.Create(Id + 15, "NiceHackerModdedClientCanMoveWhileViewingMap", false, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]); - VanillaClientSeesInfoFor = FloatOptionItem.Create(Id + 16, "NiceHackerVanillaClientSeesInfoFor", new(0f, 70f, 1f), 4f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) + VanillaClientSeesInfoFor = FloatOptionItem.Create(Id + 16, "NiceHackerVanillaClientSeesInfoFor", new(0f, 70f, 1f), 4f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.NiceHacker]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/NiceSwapper.cs b/Roles/Crewmate/NiceSwapper.cs index 12926ff81..dacc7ddcf 100644 --- a/Roles/Crewmate/NiceSwapper.cs +++ b/Roles/Crewmate/NiceSwapper.cs @@ -1,9 +1,9 @@ -using EHR.Modules; -using HarmonyLib; -using Hazel; -using System; +using System; using System.Linq; using System.Text.RegularExpressions; +using EHR.Modules; +using HarmonyLib; +using Hazel; using UnityEngine; using static EHR.Translator; using Object = UnityEngine.Object; @@ -27,17 +27,17 @@ public class NiceSwapper : RoleBase public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.NiceSwapper); - SwapMax = IntegerOptionItem.Create(Id + 3, "NiceSwapperMax", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]) + SwapMax = IntegerOptionItem.Create(Id + 3, "NiceSwapperMax", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]) .SetValueFormat(OptionFormat.Times); - CanSwapSelf = BooleanOptionItem.Create(Id + 2, "CanSwapSelfVotes", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]); - CanStartMeeting = BooleanOptionItem.Create(Id + 4, "JesterCanUseButton", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]); - NiceSwapperAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 6, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.3f, TabGroup.CrewmateRoles, false) + CanSwapSelf = BooleanOptionItem.Create(Id + 2, "CanSwapSelfVotes", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]); + CanStartMeeting = BooleanOptionItem.Create(Id + 4, "JesterCanUseButton", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]); + NiceSwapperAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 6, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.3f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 7, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 7, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]) .SetValueFormat(OptionFormat.Times); - HideMsg = BooleanOptionItem.Create(Id + 5, "SwapperHideMsg", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]); + HideMsg = BooleanOptionItem.Create(Id + 5, "SwapperHideMsg", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.NiceSwapper]); } public override void Init() diff --git a/Roles/Crewmate/Oracle.cs b/Roles/Crewmate/Oracle.cs index 45bdcd3b3..1421ca382 100644 --- a/Roles/Crewmate/Oracle.cs +++ b/Roles/Crewmate/Oracle.cs @@ -21,16 +21,16 @@ public class Oracle : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Oracle); - CheckLimitOpt = IntegerOptionItem.Create(Id + 10, "OracleSkillLimit", new(0, 10, 1), 0, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Oracle]) + CheckLimitOpt = IntegerOptionItem.Create(Id + 10, "OracleSkillLimit", new(0, 10, 1), 0, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Oracle]) .SetValueFormat(OptionFormat.Times); - HideVote = BooleanOptionItem.Create(Id + 12, "OracleHideVote", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Oracle]); - FailChance = IntegerOptionItem.Create(Id + 13, "FailChance", new(0, 100, 5), 0, TabGroup.CrewmateRoles, false) + HideVote = BooleanOptionItem.Create(Id + 12, "OracleHideVote", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Oracle]); + FailChance = IntegerOptionItem.Create(Id + 13, "FailChance", new(0, 100, 5), 0, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Oracle]) .SetValueFormat(OptionFormat.Percent); - OracleAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 14, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + OracleAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 14, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Oracle]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 15, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 15, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Oracle]) .SetValueFormat(OptionFormat.Times); CancelVote = CreateVoteCancellingUseSetting(Id + 11, CustomRoles.Oracle, TabGroup.CrewmateRoles); diff --git a/Roles/Crewmate/Paranoia.cs b/Roles/Crewmate/Paranoia.cs index b2dd8c5e3..15434c924 100644 --- a/Roles/Crewmate/Paranoia.cs +++ b/Roles/Crewmate/Paranoia.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -14,10 +14,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(7800, TabGroup.CrewmateRoles, CustomRoles.Paranoia); - ParanoiaNumOfUseButton = IntegerOptionItem.Create(7810, "ParanoiaNumOfUseButton", new(0, 90, 1), 3, TabGroup.CrewmateRoles, false) + ParanoiaNumOfUseButton = IntegerOptionItem.Create(7810, "ParanoiaNumOfUseButton", new(0, 90, 1), 3, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Paranoia]) .SetValueFormat(OptionFormat.Times); - ParanoiaVentCooldown = FloatOptionItem.Create(7811, "ParanoiaVentCooldown", new(0, 180, 1), 10, TabGroup.CrewmateRoles, false) + ParanoiaVentCooldown = FloatOptionItem.Create(7811, "ParanoiaVentCooldown", new(0, 180, 1), 10, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Paranoia]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/ParityCop.cs b/Roles/Crewmate/ParityCop.cs index da8a12223..78933cebe 100644 --- a/Roles/Crewmate/ParityCop.cs +++ b/Roles/Crewmate/ParityCop.cs @@ -1,8 +1,8 @@ -using EHR.Modules; -using HarmonyLib; using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using HarmonyLib; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -37,21 +37,21 @@ public class ParityCop : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.ParityCop); - TryHideMsg = BooleanOptionItem.Create(Id + 10, "ParityCopTryHideMsg", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) + TryHideMsg = BooleanOptionItem.Create(Id + 10, "ParityCopTryHideMsg", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) .SetColor(Color.green); - ParityCheckLimitMax = IntegerOptionItem.Create(Id + 11, "MaxParityCheckLimit", new(0, 20, 1), 2, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) + ParityCheckLimitMax = IntegerOptionItem.Create(Id + 11, "MaxParityCheckLimit", new(0, 20, 1), 2, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) .SetValueFormat(OptionFormat.Times); - ParityCheckLimitPerMeeting = IntegerOptionItem.Create(Id + 12, "ParityCheckLimitPerMeeting", new(1, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) + ParityCheckLimitPerMeeting = IntegerOptionItem.Create(Id + 12, "ParityCheckLimitPerMeeting", new(1, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) .SetValueFormat(OptionFormat.Times); - ParityCheckEgoistCountType = StringOptionItem.Create(Id + 13, "ParityCheckEgoistickCountMode", PcEgoistCountMode, 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]); - ParityCheckBaitCountType = BooleanOptionItem.Create(Id + 14, "ParityCheckBaitCountMode", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]); - ParityCheckTargetKnow = BooleanOptionItem.Create(Id + 15, "ParityCheckTargetKnow", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]); - ParityCheckOtherTargetKnow = BooleanOptionItem.Create(Id + 16, "ParityCheckOtherTargetKnow", true, TabGroup.CrewmateRoles, false).SetParent(ParityCheckTargetKnow); - ParityCheckRevealTargetTeam = BooleanOptionItem.Create(Id + 17, "ParityCheckRevealTarget", false, TabGroup.CrewmateRoles, false).SetParent(ParityCheckOtherTargetKnow); - ParityAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 18, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles, false) + ParityCheckEgoistCountType = StringOptionItem.Create(Id + 13, "ParityCheckEgoistickCountMode", PcEgoistCountMode, 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]); + ParityCheckBaitCountType = BooleanOptionItem.Create(Id + 14, "ParityCheckBaitCountMode", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]); + ParityCheckTargetKnow = BooleanOptionItem.Create(Id + 15, "ParityCheckTargetKnow", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]); + ParityCheckOtherTargetKnow = BooleanOptionItem.Create(Id + 16, "ParityCheckOtherTargetKnow", true, TabGroup.CrewmateRoles).SetParent(ParityCheckTargetKnow); + ParityCheckRevealTargetTeam = BooleanOptionItem.Create(Id + 17, "ParityCheckRevealTarget", false, TabGroup.CrewmateRoles).SetParent(ParityCheckOtherTargetKnow); + ParityAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 18, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 19, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 19, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.ParityCop]) .SetValueFormat(OptionFormat.Times); OverrideTasksData.Create(Id + 20, TabGroup.CrewmateRoles, CustomRoles.ParityCop); diff --git a/Roles/Crewmate/Perceiver.cs b/Roles/Crewmate/Perceiver.cs index 81c3f4d7b..434a9b9b0 100644 --- a/Roles/Crewmate/Perceiver.cs +++ b/Roles/Crewmate/Perceiver.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Linq; +using System.Linq; +using AmongUs.GameOptions; using UnityEngine; namespace EHR.Roles.Crewmate @@ -16,17 +16,17 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Perceiver); - Radius = FloatOptionItem.Create(Id + 2, "PerceiverRadius", new(0.25f, 10f, 0.25f), 2.5f, TabGroup.CrewmateRoles, false) + Radius = FloatOptionItem.Create(Id + 2, "PerceiverRadius", new(0.25f, 10f, 0.25f), 2.5f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Perceiver]) .SetValueFormat(OptionFormat.Multiplier); CD = Options.CreateCDSetting(Id + 3, TabGroup.CrewmateRoles, CustomRoles.Perceiver); - Limit = IntegerOptionItem.Create(Id + 4, "AbilityUseLimit", new(0, 20, 1), 0, TabGroup.CrewmateRoles, false) + Limit = IntegerOptionItem.Create(Id + 4, "AbilityUseLimit", new(0, 20, 1), 0, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Perceiver]) .SetValueFormat(OptionFormat.Times); - PerceiverAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 5, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles, false) + PerceiverAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 5, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Perceiver]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 6, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 6, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Perceiver]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Psychic.cs b/Roles/Crewmate/Psychic.cs index 5f1f06c9e..b5e436482 100644 --- a/Roles/Crewmate/Psychic.cs +++ b/Roles/Crewmate/Psychic.cs @@ -1,10 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using HarmonyLib; using Hazel; -using System; -using System.Collections.Generic; -using System.Linq; using static EHR.Options; namespace EHR.Roles.Crewmate; @@ -26,12 +26,12 @@ public class Psychic : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Psychic); - CanSeeNum = IntegerOptionItem.Create(Id + 2, "PsychicCanSeeNum", new(1, 10, 1), 3, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]) + CanSeeNum = IntegerOptionItem.Create(Id + 2, "PsychicCanSeeNum", new(1, 10, 1), 3, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]) .SetValueFormat(OptionFormat.Pieces); - Fresh = BooleanOptionItem.Create(Id + 6, "PsychicFresh", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); - CkshowEvil = BooleanOptionItem.Create(Id + 3, "CrewKillingRed", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); - NBshowEvil = BooleanOptionItem.Create(Id + 4, "NBareRed", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); - NEshowEvil = BooleanOptionItem.Create(Id + 5, "NEareRed", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); + Fresh = BooleanOptionItem.Create(Id + 6, "PsychicFresh", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); + CkshowEvil = BooleanOptionItem.Create(Id + 3, "CrewKillingRed", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); + NBshowEvil = BooleanOptionItem.Create(Id + 4, "NBareRed", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); + NEshowEvil = BooleanOptionItem.Create(Id + 5, "NEareRed", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Psychic]); } public override void Init() diff --git a/Roles/Crewmate/Rabbit.cs b/Roles/Crewmate/Rabbit.cs index d9f41f2b9..7ca3122a4 100644 --- a/Roles/Crewmate/Rabbit.cs +++ b/Roles/Crewmate/Rabbit.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using Hazel; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; namespace EHR.Roles.Crewmate { @@ -63,7 +63,7 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Rabbit); - OptionTaskTrigger = IntegerOptionItem.Create(Id + 2, "RabbitMinTasks", new(0, 90, 1), 3, TabGroup.CrewmateRoles, false) + OptionTaskTrigger = IntegerOptionItem.Create(Id + 2, "RabbitMinTasks", new(0, 90, 1), 3, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Rabbit]); Options.OverrideTasksData.Create(Id + 3, TabGroup.CrewmateRoles, CustomRoles.Rabbit); } diff --git a/Roles/Crewmate/Randomizer.cs b/Roles/Crewmate/Randomizer.cs index 81c48f6db..0f41c30b9 100644 --- a/Roles/Crewmate/Randomizer.cs +++ b/Roles/Crewmate/Randomizer.cs @@ -1,10 +1,10 @@ -using EHR.Modules; +using System; +using System.Collections.Generic; +using System.Linq; +using EHR.Modules; using EHR.Roles.Impostor; using EHR.Roles.Neutral; using HarmonyLib; -using System; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Roles.Crewmate.Randomizer; @@ -473,16 +473,16 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Randomizer); - EffectFrequencyOpt = IntegerOptionItem.Create(Id + 2, "RandomizerEffectFrequency", new(1, 90, 1), 10, TabGroup.CrewmateRoles, false) + EffectFrequencyOpt = IntegerOptionItem.Create(Id + 2, "RandomizerEffectFrequency", new(1, 90, 1), 10, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Randomizer]) .SetValueFormat(OptionFormat.Seconds); - EffectDurMin = IntegerOptionItem.Create(Id + 3, "RandomizerEffectDurMin", new(1, 90, 1), 5, TabGroup.CrewmateRoles, false) + EffectDurMin = IntegerOptionItem.Create(Id + 3, "RandomizerEffectDurMin", new(1, 90, 1), 5, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Randomizer]) .SetValueFormat(OptionFormat.Seconds); - EffectDurMax = IntegerOptionItem.Create(Id + 4, "RandomizerEffectDurMax", new(1, 90, 1), 15, TabGroup.CrewmateRoles, false) + EffectDurMax = IntegerOptionItem.Create(Id + 4, "RandomizerEffectDurMax", new(1, 90, 1), 15, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Randomizer]) .SetValueFormat(OptionFormat.Seconds); - NotifyOpt = BooleanOptionItem.Create(Id + 5, "RandomizerNotifyOpt", true, TabGroup.CrewmateRoles, false) + NotifyOpt = BooleanOptionItem.Create(Id + 5, "RandomizerNotifyOpt", true, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Randomizer]); } diff --git a/Roles/Crewmate/Ricochet.cs b/Roles/Crewmate/Ricochet.cs index fe3cca68f..efe4dc0cb 100644 --- a/Roles/Crewmate/Ricochet.cs +++ b/Roles/Crewmate/Ricochet.cs @@ -1,6 +1,6 @@ +using System.Collections.Generic; using EHR.Modules; using Hazel; -using System.Collections.Generic; namespace EHR.Roles.Crewmate { @@ -22,12 +22,12 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Ricochet); - UseLimitOpt = IntegerOptionItem.Create(Id + 10, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ricochet]) + UseLimitOpt = IntegerOptionItem.Create(Id + 10, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Ricochet]) .SetValueFormat(OptionFormat.Times); - RicochetAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 11, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles, false) + RicochetAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 11, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ricochet]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ricochet]) .SetValueFormat(OptionFormat.Times); CancelVote = CreateVoteCancellingUseSetting(Id + 12, CustomRoles.Ricochet, TabGroup.CrewmateRoles); diff --git a/Roles/Crewmate/SabotageMaster.cs b/Roles/Crewmate/SabotageMaster.cs index c7770d40e..1a19d52b8 100644 --- a/Roles/Crewmate/SabotageMaster.cs +++ b/Roles/Crewmate/SabotageMaster.cs @@ -1,7 +1,7 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; namespace EHR.Roles.Crewmate; @@ -29,23 +29,23 @@ public class SabotageMaster : RoleBase public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.SabotageMaster); - SkillLimit = IntegerOptionItem.Create(Id + 10, "SabotageMasterSkillLimit", new(0, 80, 1), 2, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]) + SkillLimit = IntegerOptionItem.Create(Id + 10, "SabotageMasterSkillLimit", new(0, 80, 1), 2, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]) .SetValueFormat(OptionFormat.Times); - FixesDoors = BooleanOptionItem.Create(Id + 11, "SabotageMasterFixesDoors", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); - FixesReactors = BooleanOptionItem.Create(Id + 12, "SabotageMasterFixesReactors", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); - FixesOxygens = BooleanOptionItem.Create(Id + 13, "SabotageMasterFixesOxygens", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); - FixesComms = BooleanOptionItem.Create(Id + 14, "SabotageMasterFixesCommunications", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); - FixesElectrical = BooleanOptionItem.Create(Id + 15, "SabotageMasterFixesElectrical", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); - SMAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 16, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 3f, TabGroup.CrewmateRoles, false) + FixesDoors = BooleanOptionItem.Create(Id + 11, "SabotageMasterFixesDoors", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); + FixesReactors = BooleanOptionItem.Create(Id + 12, "SabotageMasterFixesReactors", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); + FixesOxygens = BooleanOptionItem.Create(Id + 13, "SabotageMasterFixesOxygens", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); + FixesComms = BooleanOptionItem.Create(Id + 14, "SabotageMasterFixesCommunications", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); + FixesElectrical = BooleanOptionItem.Create(Id + 15, "SabotageMasterFixesElectrical", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]); + SMAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 16, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 3f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 19, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 19, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]) .SetValueFormat(OptionFormat.Times); - UsesUsedWhenFixingReactorOrO2 = FloatOptionItem.Create(Id + 17, "SMUsesUsedWhenFixingReactorOrO2", new(0f, 5f, 0.1f), 4f, TabGroup.CrewmateRoles, false) + UsesUsedWhenFixingReactorOrO2 = FloatOptionItem.Create(Id + 17, "SMUsesUsedWhenFixingReactorOrO2", new(0f, 5f, 0.1f), 4f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]) .SetValueFormat(OptionFormat.Times); - UsesUsedWhenFixingLightsOrComms = FloatOptionItem.Create(Id + 18, "SMUsesUsedWhenFixingLightsOrComms", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + UsesUsedWhenFixingLightsOrComms = FloatOptionItem.Create(Id + 18, "SMUsesUsedWhenFixingLightsOrComms", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.SabotageMaster]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/SecurityGuard.cs b/Roles/Crewmate/SecurityGuard.cs index a3922f883..28dd3f2fc 100644 --- a/Roles/Crewmate/SecurityGuard.cs +++ b/Roles/Crewmate/SecurityGuard.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -15,19 +15,19 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(6860, TabGroup.CrewmateRoles, CustomRoles.SecurityGuard); - SecurityGuardSkillCooldown = FloatOptionItem.Create(6862, "SecurityGuardSkillCooldown", new(0f, 180f, 1f), 15f, TabGroup.CrewmateRoles, false) + SecurityGuardSkillCooldown = FloatOptionItem.Create(6862, "SecurityGuardSkillCooldown", new(0f, 180f, 1f), 15f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SecurityGuard]) .SetValueFormat(OptionFormat.Seconds); - SecurityGuardSkillDuration = FloatOptionItem.Create(6863, "SecurityGuardSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles, false) + SecurityGuardSkillDuration = FloatOptionItem.Create(6863, "SecurityGuardSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SecurityGuard]) .SetValueFormat(OptionFormat.Seconds); - SecurityGuardSkillMaxOfUseage = IntegerOptionItem.Create(6866, "AbilityUseLimit", new(0, 180, 1), 1, TabGroup.CrewmateRoles, false) + SecurityGuardSkillMaxOfUseage = IntegerOptionItem.Create(6866, "AbilityUseLimit", new(0, 180, 1), 1, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SecurityGuard]) .SetValueFormat(OptionFormat.Times); - SecurityGuardAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(6867, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles, false) + SecurityGuardAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(6867, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SecurityGuard]) .SetValueFormat(OptionFormat.Times); - SecurityGuardAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(6868, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + SecurityGuardAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(6868, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SecurityGuard]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Sentinel.cs b/Roles/Crewmate/Sentinel.cs index 36aa4345a..fa91bdbc1 100644 --- a/Roles/Crewmate/Sentinel.cs +++ b/Roles/Crewmate/Sentinel.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -136,13 +136,13 @@ namespace EHR.Roles.Crewmate { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Sentinel); PatrolCooldown = CreateCDSetting(Id + 2, TabGroup.CrewmateRoles, CustomRoles.Sentinel); - PatrolDuration = IntegerOptionItem.Create(Id + 3, "SentinelPatrolDuration", new(1, 90, 1), 5, TabGroup.CrewmateRoles, false) + PatrolDuration = IntegerOptionItem.Create(Id + 3, "SentinelPatrolDuration", new(1, 90, 1), 5, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sentinel]) .SetValueFormat(OptionFormat.Seconds); - LoweredVision = FloatOptionItem.Create(Id + 4, "FFA_LowerVision", new(0.05f, 3f, 0.05f), 0.2f, TabGroup.CrewmateRoles, false) + LoweredVision = FloatOptionItem.Create(Id + 4, "FFA_LowerVision", new(0.05f, 3f, 0.05f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sentinel]) .SetValueFormat(OptionFormat.Multiplier); - PatrolRadius = FloatOptionItem.Create(Id + 5, "SentinelPatrolRadius", new(0.1f, 25f, 0.1f), 5f, TabGroup.CrewmateRoles, false) + PatrolRadius = FloatOptionItem.Create(Id + 5, "SentinelPatrolRadius", new(0.1f, 25f, 0.1f), 5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sentinel]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/Crewmate/Sentry.cs b/Roles/Crewmate/Sentry.cs index dcc03a3d7..93ed5e5d9 100644 --- a/Roles/Crewmate/Sentry.cs +++ b/Roles/Crewmate/Sentry.cs @@ -1,6 +1,6 @@ -using HarmonyLib; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using HarmonyLib; namespace EHR.Roles.Impostor { @@ -26,19 +26,19 @@ namespace EHR.Roles.Impostor { const int id = 11370; Options.SetupRoleOptions(id, TabGroup.CrewmateRoles, CustomRoles.Sentry); - ShowInfoCooldown = IntegerOptionItem.Create(id + 2, "AbilityCooldown", new(1, 60, 1), 15, TabGroup.CrewmateRoles, false) + ShowInfoCooldown = IntegerOptionItem.Create(id + 2, "AbilityCooldown", new(1, 60, 1), 15, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sentry]) .SetValueFormat(OptionFormat.Seconds); - ShowInfoDuration = IntegerOptionItem.Create(id + 3, "Sentry.ShowInfoDuration", new(1, 60, 1), 5, TabGroup.CrewmateRoles, false) + ShowInfoDuration = IntegerOptionItem.Create(id + 3, "Sentry.ShowInfoDuration", new(1, 60, 1), 5, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sentry]) .SetValueFormat(OptionFormat.Seconds); - PlayersKnowAboutCamera = BooleanOptionItem.Create(id + 4, "Sentry.PlayersKnowAboutCamera", true, TabGroup.CrewmateRoles, false) + PlayersKnowAboutCamera = BooleanOptionItem.Create(id + 4, "Sentry.PlayersKnowAboutCamera", true, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sentry]); - AbilityUseLimit = IntegerOptionItem.Create(id + 5, "AbilityUseLimit", new(0, 20, 1), 0, TabGroup.CrewmateRoles, false) + AbilityUseLimit = IntegerOptionItem.Create(id + 5, "AbilityUseLimit", new(0, 20, 1), 0, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sentry]); - AbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(id + 6, "AbilityUseGainWithEachTaskCompleted", new(0.1f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + AbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(id + 6, "AbilityUseGainWithEachTaskCompleted", new(0.1f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sentry]); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(id + 7, "AbilityChargesWhenFinishedTasks", new(0.1f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(id + 7, "AbilityChargesWhenFinishedTasks", new(0.1f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sentry]); } diff --git a/Roles/Crewmate/Sheriff.cs b/Roles/Crewmate/Sheriff.cs index 72410383d..d23387549 100644 --- a/Roles/Crewmate/Sheriff.cs +++ b/Roles/Crewmate/Sheriff.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; using System; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; namespace EHR.Roles.Crewmate; @@ -41,28 +41,28 @@ public class Sheriff : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Sheriff); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 60f, 2.5f), 22.5f, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 60f, 2.5f), 22.5f, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]) .SetValueFormat(OptionFormat.Seconds); - MisfireKillsTarget = BooleanOptionItem.Create(Id + 11, "SheriffMisfireKillsTarget", false, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - ShotLimitOpt = IntegerOptionItem.Create(Id + 12, "SheriffShotLimit", new(1, 15, 1), 5, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]) + MisfireKillsTarget = BooleanOptionItem.Create(Id + 11, "SheriffMisfireKillsTarget", false, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + ShotLimitOpt = IntegerOptionItem.Create(Id + 12, "SheriffShotLimit", new(1, 15, 1), 5, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]) .SetValueFormat(OptionFormat.Times); - ShowShotLimit = BooleanOptionItem.Create(Id + 13, "SheriffShowShotLimit", false, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillAllAlive = BooleanOptionItem.Create(Id + 15, "SheriffCanKillAllAlive", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillMadmate = BooleanOptionItem.Create(Id + 17, "SheriffCanKillMadmate", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillCharmed = BooleanOptionItem.Create(Id + 22, "SheriffCanKillCharmed", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillLovers = BooleanOptionItem.Create(Id + 24, "SheriffCanKillLovers", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillSidekicks = BooleanOptionItem.Create(Id + 23, "SheriffCanKillSidekick", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillEgoists = BooleanOptionItem.Create(Id + 25, "SheriffCanKillEgoist", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillInfected = BooleanOptionItem.Create(Id + 26, "SheriffCanKillInfected", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillContagious = BooleanOptionItem.Create(Id + 27, "SheriffCanKillContagious", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillNeutrals = BooleanOptionItem.Create(Id + 16, "SheriffCanKillNeutrals", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - CanKillNeutralsMode = StringOptionItem.Create(Id + 14, "SheriffCanKillNeutralsMode", KillOption, 0, TabGroup.CrewmateRoles, false).SetParent(CanKillNeutrals); + ShowShotLimit = BooleanOptionItem.Create(Id + 13, "SheriffShowShotLimit", false, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillAllAlive = BooleanOptionItem.Create(Id + 15, "SheriffCanKillAllAlive", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillMadmate = BooleanOptionItem.Create(Id + 17, "SheriffCanKillMadmate", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillCharmed = BooleanOptionItem.Create(Id + 22, "SheriffCanKillCharmed", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillLovers = BooleanOptionItem.Create(Id + 24, "SheriffCanKillLovers", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillSidekicks = BooleanOptionItem.Create(Id + 23, "SheriffCanKillSidekick", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillEgoists = BooleanOptionItem.Create(Id + 25, "SheriffCanKillEgoist", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillInfected = BooleanOptionItem.Create(Id + 26, "SheriffCanKillInfected", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillContagious = BooleanOptionItem.Create(Id + 27, "SheriffCanKillContagious", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillNeutrals = BooleanOptionItem.Create(Id + 16, "SheriffCanKillNeutrals", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + CanKillNeutralsMode = StringOptionItem.Create(Id + 14, "SheriffCanKillNeutralsMode", KillOption, 0, TabGroup.CrewmateRoles).SetParent(CanKillNeutrals); SetUpNeutralOptions(Id + 30); - SidekickSheriffCanGoBerserk = BooleanOptionItem.Create(Id + 28, "SidekickSheriffCanGoBerserk", true, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - SetNonCrewCanKill = BooleanOptionItem.Create(Id + 18, "SheriffSetMadCanKill", false, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); - NonCrewCanKillImp = BooleanOptionItem.Create(Id + 19, "SheriffMadCanKillImp", true, TabGroup.CrewmateRoles, false).SetParent(SetNonCrewCanKill); - NonCrewCanKillCrew = BooleanOptionItem.Create(Id + 21, "SheriffMadCanKillCrew", true, TabGroup.CrewmateRoles, false).SetParent(SetNonCrewCanKill); - NonCrewCanKillNeutral = BooleanOptionItem.Create(Id + 20, "SheriffMadCanKillNeutral", true, TabGroup.CrewmateRoles, false).SetParent(SetNonCrewCanKill); + SidekickSheriffCanGoBerserk = BooleanOptionItem.Create(Id + 28, "SidekickSheriffCanGoBerserk", true, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + SetNonCrewCanKill = BooleanOptionItem.Create(Id + 18, "SheriffSetMadCanKill", false, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sheriff]); + NonCrewCanKillImp = BooleanOptionItem.Create(Id + 19, "SheriffMadCanKillImp", true, TabGroup.CrewmateRoles).SetParent(SetNonCrewCanKill); + NonCrewCanKillCrew = BooleanOptionItem.Create(Id + 21, "SheriffMadCanKillCrew", true, TabGroup.CrewmateRoles).SetParent(SetNonCrewCanKill); + NonCrewCanKillNeutral = BooleanOptionItem.Create(Id + 20, "SheriffMadCanKillNeutral", true, TabGroup.CrewmateRoles).SetParent(SetNonCrewCanKill); UsePet = Options.CreatePetUseSetting(Id + 29, CustomRoles.Sheriff); } @@ -80,7 +80,7 @@ public class Sheriff : RoleBase parent ??= Options.CustomRoleSpawnChances[CustomRoles.Sheriff]; var roleName = Utils.GetRoleName(role); Dictionary replacementDic = new() { { "%role%", Utils.ColorString(Utils.GetRoleColor(role), roleName) } }; - KillTargetOptions[role] = BooleanOptionItem.Create(id, "SheriffCanKill%role%", defaultValue, TabGroup.CrewmateRoles, false).SetParent(parent); + KillTargetOptions[role] = BooleanOptionItem.Create(id, "SheriffCanKill%role%", defaultValue, TabGroup.CrewmateRoles).SetParent(parent); KillTargetOptions[role].ReplacementDictionary = replacementDic; } diff --git a/Roles/Crewmate/Snitch.cs b/Roles/Crewmate/Snitch.cs index 63281c5c8..dc124d805 100644 --- a/Roles/Crewmate/Snitch.cs +++ b/Roles/Crewmate/Snitch.cs @@ -32,11 +32,11 @@ public class Snitch : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Snitch); - OptionEnableTargetArrow = BooleanOptionItem.Create(Id + 10, "SnitchEnableTargetArrow", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); - OptionCanGetColoredArrow = BooleanOptionItem.Create(Id + 11, "SnitchCanGetArrowColor", true, TabGroup.CrewmateRoles, false).SetParent(OptionEnableTargetArrow); - OptionCanFindNeutralKiller = BooleanOptionItem.Create(Id + 12, "SnitchCanFindNeutralKiller", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); - OptionCanFindMadmate = BooleanOptionItem.Create(Id + 14, "SnitchCanFindMadmate", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); - OptionRemainingTasks = IntegerOptionItem.Create(Id + 13, "SnitchRemainingTaskFound", new(0, 10, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); + OptionEnableTargetArrow = BooleanOptionItem.Create(Id + 10, "SnitchEnableTargetArrow", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); + OptionCanGetColoredArrow = BooleanOptionItem.Create(Id + 11, "SnitchCanGetArrowColor", true, TabGroup.CrewmateRoles).SetParent(OptionEnableTargetArrow); + OptionCanFindNeutralKiller = BooleanOptionItem.Create(Id + 12, "SnitchCanFindNeutralKiller", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); + OptionCanFindMadmate = BooleanOptionItem.Create(Id + 14, "SnitchCanFindMadmate", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); + OptionRemainingTasks = IntegerOptionItem.Create(Id + 13, "SnitchRemainingTaskFound", new(0, 10, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Snitch]); OverrideTasksData.Create(Id + 20, TabGroup.CrewmateRoles, CustomRoles.Snitch); } diff --git a/Roles/Crewmate/Speedrunner.cs b/Roles/Crewmate/Speedrunner.cs index b3fe8bff6..f48651dc6 100644 --- a/Roles/Crewmate/Speedrunner.cs +++ b/Roles/Crewmate/Speedrunner.cs @@ -1,5 +1,5 @@ -using EHR.Modules; -using System.Linq; +using System.Linq; +using EHR.Modules; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -22,9 +22,9 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(9170, TabGroup.CrewmateRoles, CustomRoles.Speedrunner); - SpeedrunnerNotifyKillers = BooleanOptionItem.Create(9178, "SpeedrunnerNotifyKillers", true, TabGroup.CrewmateRoles, false) + SpeedrunnerNotifyKillers = BooleanOptionItem.Create(9178, "SpeedrunnerNotifyKillers", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Speedrunner]); - SpeedrunnerNotifyAtXTasksLeft = IntegerOptionItem.Create(9179, "SpeedrunnerNotifyAtXTasksLeft", new(0, 90, 1), 3, TabGroup.CrewmateRoles, false) + SpeedrunnerNotifyAtXTasksLeft = IntegerOptionItem.Create(9179, "SpeedrunnerNotifyAtXTasksLeft", new(0, 90, 1), 3, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Speedrunner]); SpeedrunnerTasks = OverrideTasksData.Create(9180, TabGroup.CrewmateRoles, CustomRoles.Speedrunner); } diff --git a/Roles/Crewmate/Spiritualist.cs b/Roles/Crewmate/Spiritualist.cs index 794ed34f0..9f0b0a1a7 100644 --- a/Roles/Crewmate/Spiritualist.cs +++ b/Roles/Crewmate/Spiritualist.cs @@ -22,9 +22,9 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Spiritualist); - ShowGhostArrowEverySeconds = FloatOptionItem.Create(Id + 10, "SpiritualistShowGhostArrowEverySeconds", new(1f, 60f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritualist]) + ShowGhostArrowEverySeconds = FloatOptionItem.Create(Id + 10, "SpiritualistShowGhostArrowEverySeconds", new(1f, 60f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritualist]) .SetValueFormat(OptionFormat.Seconds); - ShowGhostArrowForSeconds = FloatOptionItem.Create(Id + 11, "SpiritualistShowGhostArrowForSeconds", new(1f, 60f, 1f), 2f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritualist]) + ShowGhostArrowForSeconds = FloatOptionItem.Create(Id + 11, "SpiritualistShowGhostArrowForSeconds", new(1f, 60f, 1f), 2f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritualist]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/Spy.cs b/Roles/Crewmate/Spy.cs index e78555c2f..019d55817 100644 --- a/Roles/Crewmate/Spy.cs +++ b/Roles/Crewmate/Spy.cs @@ -1,6 +1,6 @@ +using System.Collections.Generic; using EHR.Modules; using Hazel; -using System.Collections.Generic; namespace EHR.Roles.Crewmate { @@ -22,16 +22,16 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Spy); - UseLimitOpt = IntegerOptionItem.Create(Id + 10, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false) + UseLimitOpt = IntegerOptionItem.Create(Id + 10, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Spy]) .SetValueFormat(OptionFormat.Times); - SpyRedNameDur = FloatOptionItem.Create(Id + 11, "SpyRedNameDur", new(0f, 70f, 1f), 3f, TabGroup.CrewmateRoles, false) + SpyRedNameDur = FloatOptionItem.Create(Id + 11, "SpyRedNameDur", new(0f, 70f, 1f), 3f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Spy]) .SetValueFormat(OptionFormat.Seconds); - SpyAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles, false) + SpyAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.5f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Spy]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 13, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Spy]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/SuperStar.cs b/Roles/Crewmate/SuperStar.cs index 6312a75e7..bf5cb2bfd 100644 --- a/Roles/Crewmate/SuperStar.cs +++ b/Roles/Crewmate/SuperStar.cs @@ -11,7 +11,7 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(6000, TabGroup.CrewmateRoles, CustomRoles.SuperStar); - Options.EveryOneKnowSuperStar = BooleanOptionItem.Create(6010, "EveryOneKnowSuperStar", true, TabGroup.CrewmateRoles, false) + Options.EveryOneKnowSuperStar = BooleanOptionItem.Create(6010, "EveryOneKnowSuperStar", true, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.SuperStar]); } diff --git a/Roles/Crewmate/SwordsMan.cs b/Roles/Crewmate/SwordsMan.cs index e8af07b9d..74abefb3a 100644 --- a/Roles/Crewmate/SwordsMan.cs +++ b/Roles/Crewmate/SwordsMan.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; namespace EHR.Roles.Crewmate; @@ -17,7 +17,7 @@ public class SwordsMan : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.SwordsMan); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", false, TabGroup.CrewmateRoles, false) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", false, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.SwordsMan]); UsePet = Options.CreatePetUseSetting(Id + 10, CustomRoles.SwordsMan); } diff --git a/Roles/Crewmate/Tether.cs b/Roles/Crewmate/Tether.cs index 143246ea0..d345b9f90 100644 --- a/Roles/Crewmate/Tether.cs +++ b/Roles/Crewmate/Tether.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; +using System.Text; using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; -using System.Text; namespace EHR.Roles.Crewmate { @@ -25,14 +25,14 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Tether); - VentCooldown = FloatOptionItem.Create(Id + 10, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Tether]) + VentCooldown = FloatOptionItem.Create(Id + 10, "VentCooldown", new(0f, 70f, 1f), 15f, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Tether]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Tether]) + UseLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Tether]) .SetValueFormat(OptionFormat.Times); - TetherAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles, false) + TetherAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tether]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 14, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 14, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tether]) .SetValueFormat(OptionFormat.Times); CancelVote = CreateVoteCancellingUseSetting(Id + 13, CustomRoles.Tether, TabGroup.CrewmateRoles); diff --git a/Roles/Crewmate/TimeManager.cs b/Roles/Crewmate/TimeManager.cs index e173ea07b..932c72152 100644 --- a/Roles/Crewmate/TimeManager.cs +++ b/Roles/Crewmate/TimeManager.cs @@ -13,11 +13,11 @@ public class TimeManager : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.TimeManager); - IncreaseMeetingTime = IntegerOptionItem.Create(Id + 10, "TimeManagerIncreaseMeetingTime", new(1, 30, 1), 5, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeManager]) + IncreaseMeetingTime = IntegerOptionItem.Create(Id + 10, "TimeManagerIncreaseMeetingTime", new(1, 30, 1), 5, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeManager]) .SetValueFormat(OptionFormat.Seconds); - MeetingTimeLimit = IntegerOptionItem.Create(Id + 11, "TimeManagerLimitMeetingTime", new(100, 500, 10), 150, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeManager]) + MeetingTimeLimit = IntegerOptionItem.Create(Id + 11, "TimeManagerLimitMeetingTime", new(100, 500, 10), 150, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeManager]) .SetValueFormat(OptionFormat.Seconds); - MadMinMeetingTimeLimit = IntegerOptionItem.Create(Id + 12, "MadTimeManagerLimitMeetingTime", new(5, 150, 5), 50, TabGroup.CrewmateRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeManager]) + MadMinMeetingTimeLimit = IntegerOptionItem.Create(Id + 12, "MadTimeManagerLimitMeetingTime", new(5, 150, 5), 50, TabGroup.CrewmateRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeManager]) .SetValueFormat(OptionFormat.Seconds); Options.OverrideTasksData.Create(Id + 13, TabGroup.CrewmateRoles, CustomRoles.TimeManager); } diff --git a/Roles/Crewmate/TimeMaster.cs b/Roles/Crewmate/TimeMaster.cs index 6b4e95757..431ef3469 100644 --- a/Roles/Crewmate/TimeMaster.cs +++ b/Roles/Crewmate/TimeMaster.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; +using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; @@ -17,19 +17,19 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(8950, TabGroup.CrewmateRoles, CustomRoles.TimeMaster); - TimeMasterSkillCooldown = FloatOptionItem.Create(8960, "TimeMasterSkillCooldown", new(0f, 180f, 1f), 20f, TabGroup.CrewmateRoles, false) + TimeMasterSkillCooldown = FloatOptionItem.Create(8960, "TimeMasterSkillCooldown", new(0f, 180f, 1f), 20f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.TimeMaster]) .SetValueFormat(OptionFormat.Seconds); - TimeMasterSkillDuration = FloatOptionItem.Create(8961, "TimeMasterSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles, false) + TimeMasterSkillDuration = FloatOptionItem.Create(8961, "TimeMasterSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.TimeMaster]) .SetValueFormat(OptionFormat.Seconds); - TimeMasterMaxUses = IntegerOptionItem.Create(8962, "TimeMasterMaxUses", new(0, 180, 1), 1, TabGroup.CrewmateRoles, false) + TimeMasterMaxUses = IntegerOptionItem.Create(8962, "TimeMasterMaxUses", new(0, 180, 1), 1, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.TimeMaster]) .SetValueFormat(OptionFormat.Times); - TimeMasterAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(8963, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles, false) + TimeMasterAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(8963, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.4f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.TimeMaster]) .SetValueFormat(OptionFormat.Times); - TimeMasterAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(8964, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + TimeMasterAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(8964, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.TimeMaster]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Tornado.cs b/Roles/Crewmate/Tornado.cs index 1dfcde803..c50bd6c36 100644 --- a/Roles/Crewmate/Tornado.cs +++ b/Roles/Crewmate/Tornado.cs @@ -1,8 +1,8 @@ -using EHR.Modules; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -29,13 +29,13 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Tornado); - TornadoCooldown = IntegerOptionItem.Create(Id + 2, "TornadoCooldown", new(1, 90, 1), 15, TabGroup.CrewmateRoles, false) + TornadoCooldown = IntegerOptionItem.Create(Id + 2, "TornadoCooldown", new(1, 90, 1), 15, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tornado]) .SetValueFormat(OptionFormat.Seconds); - TornadoDuration = IntegerOptionItem.Create(Id + 3, "TornadoDuration", new(1, 90, 1), 25, TabGroup.CrewmateRoles, false) + TornadoDuration = IntegerOptionItem.Create(Id + 3, "TornadoDuration", new(1, 90, 1), 25, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tornado]) .SetValueFormat(OptionFormat.Seconds); - TornadoRange = FloatOptionItem.Create(Id + 4, "TornadoRange", new(0.5f, 25f, 0.5f), 3f, TabGroup.CrewmateRoles, false) + TornadoRange = FloatOptionItem.Create(Id + 4, "TornadoRange", new(0.5f, 25f, 0.5f), 3f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tornado]) .SetValueFormat(OptionFormat.Multiplier); diff --git a/Roles/Crewmate/Tracefinder.cs b/Roles/Crewmate/Tracefinder.cs index 81bf185e2..1c7b2a700 100644 --- a/Roles/Crewmate/Tracefinder.cs +++ b/Roles/Crewmate/Tracefinder.cs @@ -1,8 +1,8 @@ +using System; +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; @@ -22,16 +22,16 @@ public class Tracefinder : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Tracefinder); - VitalsCooldown = FloatOptionItem.Create(Id + 10, "VitalsCooldown", new(1f, 60f, 1f), 25f, TabGroup.CrewmateRoles, false) + VitalsCooldown = FloatOptionItem.Create(Id + 10, "VitalsCooldown", new(1f, 60f, 1f), 25f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracefinder]) .SetValueFormat(OptionFormat.Seconds); - VitalsDuration = FloatOptionItem.Create(Id + 11, "VitalsDuration", new(1f, 30f, 1f), 1f, TabGroup.CrewmateRoles, false) + VitalsDuration = FloatOptionItem.Create(Id + 11, "VitalsDuration", new(1f, 30f, 1f), 1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracefinder]) .SetValueFormat(OptionFormat.Seconds); - ArrowDelayMin = FloatOptionItem.Create(Id + 12, "ArrowDelayMin", new(1f, 30f, 1f), 2f, TabGroup.CrewmateRoles, false) + ArrowDelayMin = FloatOptionItem.Create(Id + 12, "ArrowDelayMin", new(1f, 30f, 1f), 2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracefinder]) .SetValueFormat(OptionFormat.Seconds); - ArrowDelayMax = FloatOptionItem.Create(Id + 13, "ArrowDelayMax", new(1f, 30f, 1f), 7f, TabGroup.CrewmateRoles, false) + ArrowDelayMax = FloatOptionItem.Create(Id + 13, "ArrowDelayMax", new(1f, 30f, 1f), 7f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracefinder]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Crewmate/Tracker.cs b/Roles/Crewmate/Tracker.cs index a8464653d..cc90fa728 100644 --- a/Roles/Crewmate/Tracker.cs +++ b/Roles/Crewmate/Tracker.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using Hazel; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -28,17 +28,17 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.CrewmateRoles, CustomRoles.Tracker); - TrackLimitOpt = IntegerOptionItem.Create(Id + 5, "DivinatorSkillLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]) + TrackLimitOpt = IntegerOptionItem.Create(Id + 5, "DivinatorSkillLimit", new(0, 20, 1), 1, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]) .SetValueFormat(OptionFormat.Times); - CanGetColoredArrow = BooleanOptionItem.Create(Id + 6, "TrackerCanGetArrowColor", true, TabGroup.CrewmateRoles, false) + CanGetColoredArrow = BooleanOptionItem.Create(Id + 6, "TrackerCanGetArrowColor", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]); - OptionCanSeeLastRoomInMeeting = BooleanOptionItem.Create(Id + 7, "EvilTrackerCanSeeLastRoomInMeeting", true, TabGroup.CrewmateRoles, false) + OptionCanSeeLastRoomInMeeting = BooleanOptionItem.Create(Id + 7, "EvilTrackerCanSeeLastRoomInMeeting", true, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]); - HideVote = BooleanOptionItem.Create(Id + 8, "TrackerHideVote", false, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]); - TrackerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 9, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + HideVote = BooleanOptionItem.Create(Id + 8, "TrackerHideVote", false, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]); + TrackerAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(Id + 9, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]) .SetValueFormat(OptionFormat.Times); - AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 3, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + AbilityChargesWhenFinishedTasks = FloatOptionItem.Create(Id + 3, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Tracker]) .SetValueFormat(OptionFormat.Times); CancelVote = CreateVoteCancellingUseSetting(Id + 4, CustomRoles.Tracker, TabGroup.CrewmateRoles); diff --git a/Roles/Crewmate/Transporter.cs b/Roles/Crewmate/Transporter.cs index de881e77c..1241b5632 100644 --- a/Roles/Crewmate/Transporter.cs +++ b/Roles/Crewmate/Transporter.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using EHR.Roles.Neutral; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using EHR.Roles.Neutral; namespace EHR.Roles.Crewmate { @@ -13,7 +13,7 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { Options.SetupRoleOptions(6200, TabGroup.CrewmateRoles, CustomRoles.Transporter); - Options.TransporterTeleportMax = IntegerOptionItem.Create(6210, "TransporterTeleportMax", new(0, 90, 1), 5, TabGroup.CrewmateRoles, false) + Options.TransporterTeleportMax = IntegerOptionItem.Create(6210, "TransporterTeleportMax", new(0, 90, 1), 5, TabGroup.CrewmateRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Transporter]) .SetValueFormat(OptionFormat.Times); Options.TransporterTasks = Options.OverrideTasksData.Create(6211, TabGroup.CrewmateRoles, CustomRoles.Transporter); diff --git a/Roles/Crewmate/Ventguard.cs b/Roles/Crewmate/Ventguard.cs index da9912bd1..fdebac5cc 100644 --- a/Roles/Crewmate/Ventguard.cs +++ b/Roles/Crewmate/Ventguard.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -14,14 +14,14 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupSingleRoleOptions(5525, TabGroup.CrewmateRoles, CustomRoles.Ventguard); - VentguardAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(5527, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles, false) + VentguardAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(5527, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 1f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ventguard]) .SetValueFormat(OptionFormat.Times); - VentguardAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(5530, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + VentguardAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(5530, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Ventguard]) .SetValueFormat(OptionFormat.Times); - VentguardMaxGuards = IntegerOptionItem.Create(5528, "VentguardMaxGuards", new(1, 30, 1), 3, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ventguard]); - VentguardBlockDoesNotAffectCrew = BooleanOptionItem.Create(5529, "VentguardBlockDoesNotAffectCrew", true, TabGroup.CrewmateRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ventguard]); + VentguardMaxGuards = IntegerOptionItem.Create(5528, "VentguardMaxGuards", new(1, 30, 1), 3, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Ventguard]); + VentguardBlockDoesNotAffectCrew = BooleanOptionItem.Create(5529, "VentguardBlockDoesNotAffectCrew", true, TabGroup.CrewmateRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Ventguard]); } public override void Add(byte playerId) diff --git a/Roles/Crewmate/Veteran.cs b/Roles/Crewmate/Veteran.cs index 23e146c80..52648d144 100644 --- a/Roles/Crewmate/Veteran.cs +++ b/Roles/Crewmate/Veteran.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; +using AmongUs.GameOptions; +using EHR.Modules; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -16,19 +16,19 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupRoleOptions(8908, TabGroup.CrewmateRoles, CustomRoles.Veteran); - VeteranSkillCooldown = FloatOptionItem.Create(8910, "VeteranSkillCooldown", new(0f, 180f, 1f), 20f, TabGroup.CrewmateRoles, false) + VeteranSkillCooldown = FloatOptionItem.Create(8910, "VeteranSkillCooldown", new(0f, 180f, 1f), 20f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Veteran]) .SetValueFormat(OptionFormat.Seconds); - VeteranSkillDuration = FloatOptionItem.Create(8911, "VeteranSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles, false) + VeteranSkillDuration = FloatOptionItem.Create(8911, "VeteranSkillDuration", new(0f, 180f, 1f), 10f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Veteran]) .SetValueFormat(OptionFormat.Seconds); - VeteranSkillMaxOfUseage = IntegerOptionItem.Create(8912, "VeteranSkillMaxOfUseage", new(0, 180, 1), 1, TabGroup.CrewmateRoles, false) + VeteranSkillMaxOfUseage = IntegerOptionItem.Create(8912, "VeteranSkillMaxOfUseage", new(0, 180, 1), 1, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Veteran]) .SetValueFormat(OptionFormat.Times); - VeteranAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(8913, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.3f, TabGroup.CrewmateRoles, false) + VeteranAbilityUseGainWithEachTaskCompleted = FloatOptionItem.Create(8913, "AbilityUseGainWithEachTaskCompleted", new(0f, 5f, 0.1f), 0.3f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Veteran]) .SetValueFormat(OptionFormat.Times); - VeteranAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(8914, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles, false) + VeteranAbilityChargesWhenFinishedTasks = FloatOptionItem.Create(8914, "AbilityChargesWhenFinishedTasks", new(0f, 5f, 0.1f), 0.2f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Veteran]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Crewmate/Witness.cs b/Roles/Crewmate/Witness.cs index fc3b8aea0..f0fae82ee 100644 --- a/Roles/Crewmate/Witness.cs +++ b/Roles/Crewmate/Witness.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Crewmate @@ -14,10 +14,10 @@ namespace EHR.Roles.Crewmate public static void SetupCustomOption() { SetupSingleRoleOptions(8550, TabGroup.CrewmateRoles, CustomRoles.Witness); - WitnessCD = FloatOptionItem.Create(8552, "AbilityCD", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles, false) + WitnessCD = FloatOptionItem.Create(8552, "AbilityCD", new(0f, 60f, 2.5f), 15f, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Witness]) .SetValueFormat(OptionFormat.Seconds); - WitnessTime = IntegerOptionItem.Create(8553, "WitnessTime", new(0, 90, 1), 10, TabGroup.CrewmateRoles, false) + WitnessTime = IntegerOptionItem.Create(8553, "WitnessTime", new(0, 90, 1), 10, TabGroup.CrewmateRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Witness]) .SetValueFormat(OptionFormat.Seconds); WitnessUsePet = CreatePetUseSetting(8554, CustomRoles.Witness); diff --git a/Roles/Impostor/AntiAdminer.cs b/Roles/Impostor/AntiAdminer.cs index 761c2061b..2e02c79e7 100644 --- a/Roles/Impostor/AntiAdminer.cs +++ b/Roles/Impostor/AntiAdminer.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Roles.Crewmate; -using EHR.Roles.Neutral; -using System; +using System; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Roles.Crewmate; +using EHR.Roles.Neutral; using UnityEngine; namespace EHR.Roles.Impostor; @@ -32,13 +32,13 @@ internal class AntiAdminer : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.AntiAdminer); - CanCheckCamera = BooleanOptionItem.Create(Id + 10, "CanCheckCamera", true, TabGroup.ImpostorRoles, false) + CanCheckCamera = BooleanOptionItem.Create(Id + 10, "CanCheckCamera", true, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.AntiAdminer]); - EnableExtraAbility = BooleanOptionItem.Create(Id + 11, "EnableExtraAbility", true, TabGroup.ImpostorRoles, false) + EnableExtraAbility = BooleanOptionItem.Create(Id + 11, "EnableExtraAbility", true, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.AntiAdminer]); - CanOnlyUseWhileAnyWatch = BooleanOptionItem.Create(Id + 12, "CanOnlyUseWhileAnyWatch", true, TabGroup.ImpostorRoles, false) + CanOnlyUseWhileAnyWatch = BooleanOptionItem.Create(Id + 12, "CanOnlyUseWhileAnyWatch", true, TabGroup.ImpostorRoles) .SetParent(EnableExtraAbility); - Delay = FloatOptionItem.Create(Id + 13, "AADelay", new(0f, 20f, 0.5f), 5f, TabGroup.ImpostorRoles, false) + Delay = FloatOptionItem.Create(Id + 13, "AADelay", new(0f, 20f, 0.5f), 5f, TabGroup.ImpostorRoles) .SetParent(EnableExtraAbility) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Assassin.cs b/Roles/Impostor/Assassin.cs index 063e07e23..1fbdeb67a 100644 --- a/Roles/Impostor/Assassin.cs +++ b/Roles/Impostor/Assassin.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using Hazel; -using System.Collections.Generic; using static EHR.Options; using static EHR.Translator; @@ -28,13 +28,13 @@ internal class Assassin : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Assassin); - MarkCooldownOpt = FloatOptionItem.Create(Id + 10, "AssassinMarkCooldown", new(0f, 180f, 0.5f), 1f, TabGroup.ImpostorRoles, false) + MarkCooldownOpt = FloatOptionItem.Create(Id + 10, "AssassinMarkCooldown", new(0f, 180f, 0.5f), 1f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Assassin]) .SetValueFormat(OptionFormat.Seconds); - AssassinateCooldownOpt = FloatOptionItem.Create(Id + 11, "AssassinAssassinateCooldown", new(0f, 180f, 0.5f), 18.5f, TabGroup.ImpostorRoles, false) + AssassinateCooldownOpt = FloatOptionItem.Create(Id + 11, "AssassinAssassinateCooldown", new(0f, 180f, 0.5f), 18.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Assassin]) .SetValueFormat(OptionFormat.Seconds); - CanKillAfterAssassinateOpt = BooleanOptionItem.Create(Id + 12, "AssassinCanKillAfterAssassinate", true, TabGroup.ImpostorRoles, false) + CanKillAfterAssassinateOpt = BooleanOptionItem.Create(Id + 12, "AssassinCanKillAfterAssassinate", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Assassin]); } diff --git a/Roles/Impostor/BallLightning.cs b/Roles/Impostor/BallLightning.cs index 9ccdd7c54..3063b4004 100644 --- a/Roles/Impostor/BallLightning.cs +++ b/Roles/Impostor/BallLightning.cs @@ -1,9 +1,9 @@ -using EHR.Modules; +using System.Collections.Generic; +using EHR.Modules; using EHR.Patches; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; @@ -24,11 +24,11 @@ public class BallLightning : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.BallLightning); - KillCooldown = FloatOptionItem.Create(Id + 10, "BallLightningKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.BallLightning]) + KillCooldown = FloatOptionItem.Create(Id + 10, "BallLightningKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.BallLightning]) .SetValueFormat(OptionFormat.Seconds); - ConvertTime = FloatOptionItem.Create(Id + 12, "BallLightningConvertTime", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.BallLightning]) + ConvertTime = FloatOptionItem.Create(Id + 12, "BallLightningConvertTime", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.BallLightning]) .SetValueFormat(OptionFormat.Seconds); - KillerConvertGhost = BooleanOptionItem.Create(Id + 14, "BallLightningKillerConvertGhost", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.BallLightning]); + KillerConvertGhost = BooleanOptionItem.Create(Id + 14, "BallLightningKillerConvertGhost", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.BallLightning]); } public override void Init() diff --git a/Roles/Impostor/Blackmailer.cs b/Roles/Impostor/Blackmailer.cs index 7a7480088..61c3d1294 100644 --- a/Roles/Impostor/Blackmailer.cs +++ b/Roles/Impostor/Blackmailer.cs @@ -1,5 +1,5 @@ -using HarmonyLib; -using System.Linq; +using System.Linq; +using HarmonyLib; namespace EHR.Roles.Impostor { diff --git a/Roles/Impostor/Bomber.cs b/Roles/Impostor/Bomber.cs index 35fb4818b..38966dde0 100644 --- a/Roles/Impostor/Bomber.cs +++ b/Roles/Impostor/Bomber.cs @@ -16,28 +16,28 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(2400, TabGroup.ImpostorRoles, CustomRoles.Bomber); - BomberRadius = FloatOptionItem.Create(2018, "BomberRadius", new(0.5f, 5f, 0.5f), 2f, TabGroup.ImpostorRoles, false) + BomberRadius = FloatOptionItem.Create(2018, "BomberRadius", new(0.5f, 5f, 0.5f), 2f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bomber]) .SetValueFormat(OptionFormat.Multiplier); - BomberCanKill = BooleanOptionItem.Create(2015, "CanKill", false, TabGroup.ImpostorRoles, false) + BomberCanKill = BooleanOptionItem.Create(2015, "CanKill", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bomber]); - BomberKillCD = FloatOptionItem.Create(2020, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + BomberKillCD = FloatOptionItem.Create(2020, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(BomberCanKill) .SetValueFormat(OptionFormat.Seconds); - BombCooldown = FloatOptionItem.Create(2030, "BombCooldown", new(5f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles, false) + BombCooldown = FloatOptionItem.Create(2030, "BombCooldown", new(5f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bomber]) .SetValueFormat(OptionFormat.Seconds); - ImpostorsSurviveBombs = BooleanOptionItem.Create(2031, "ImpostorsSurviveBombs", true, TabGroup.ImpostorRoles, false) + ImpostorsSurviveBombs = BooleanOptionItem.Create(2031, "ImpostorsSurviveBombs", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bomber]); - BomberDiesInExplosion = BooleanOptionItem.Create(2032, "BomberDiesInExplosion", true, TabGroup.ImpostorRoles, false) + BomberDiesInExplosion = BooleanOptionItem.Create(2032, "BomberDiesInExplosion", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bomber]); - NukerChance = IntegerOptionItem.Create(2033, "NukerChance", new(0, 100, 5), 0, TabGroup.ImpostorRoles, false) + NukerChance = IntegerOptionItem.Create(2033, "NukerChance", new(0, 100, 5), 0, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bomber]) .SetValueFormat(OptionFormat.Percent); - NukeCooldown = FloatOptionItem.Create(2035, "NukeCooldown", new(5f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles, false) + NukeCooldown = FloatOptionItem.Create(2035, "NukeCooldown", new(5f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles) .SetParent(NukerChance) .SetValueFormat(OptionFormat.Seconds); - NukeRadius = FloatOptionItem.Create(2034, "NukeRadius", new(5f, 100f, 1f), 25f, TabGroup.ImpostorRoles, false) + NukeRadius = FloatOptionItem.Create(2034, "NukeRadius", new(5f, 100f, 1f), 25f, TabGroup.ImpostorRoles) .SetParent(NukerChance) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/Impostor/BoobyTrap.cs b/Roles/Impostor/BoobyTrap.cs index 7a70a6b85..ba834940a 100644 --- a/Roles/Impostor/BoobyTrap.cs +++ b/Roles/Impostor/BoobyTrap.cs @@ -15,10 +15,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(16500, TabGroup.ImpostorRoles, CustomRoles.BoobyTrap); - BTKillCooldown = FloatOptionItem.Create(16510, "KillCooldown", new(2.5f, 180f, 2.5f), 20f, TabGroup.ImpostorRoles, false) + BTKillCooldown = FloatOptionItem.Create(16510, "KillCooldown", new(2.5f, 180f, 2.5f), 20f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.BoobyTrap]) .SetValueFormat(OptionFormat.Seconds); - TrapOnlyWorksOnTheBodyBoobyTrap = BooleanOptionItem.Create(16511, "TrapOnlyWorksOnTheBodyBoobyTrap", true, TabGroup.ImpostorRoles, false) + TrapOnlyWorksOnTheBodyBoobyTrap = BooleanOptionItem.Create(16511, "TrapOnlyWorksOnTheBodyBoobyTrap", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.BoobyTrap]); } diff --git a/Roles/Impostor/BountyHunter.cs b/Roles/Impostor/BountyHunter.cs index b30b5623f..eb6238a36 100644 --- a/Roles/Impostor/BountyHunter.cs +++ b/Roles/Impostor/BountyHunter.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using Hazel; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using UnityEngine; using static EHR.Translator; @@ -30,13 +30,13 @@ public class BountyHunter : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.BountyHunter); - OptionTargetChangeTime = FloatOptionItem.Create(Id + 10, "BountyTargetChangeTime", new(10f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]) + OptionTargetChangeTime = FloatOptionItem.Create(Id + 10, "BountyTargetChangeTime", new(10f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]) .SetValueFormat(OptionFormat.Seconds); - OptionSuccessKillCooldown = FloatOptionItem.Create(Id + 11, "BountySuccessKillCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]) + OptionSuccessKillCooldown = FloatOptionItem.Create(Id + 11, "BountySuccessKillCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]) .SetValueFormat(OptionFormat.Seconds); - OptionFailureKillCooldown = FloatOptionItem.Create(Id + 12, "BountyFailureKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]) + OptionFailureKillCooldown = FloatOptionItem.Create(Id + 12, "BountyFailureKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]) .SetValueFormat(OptionFormat.Seconds); - OptionShowTargetArrow = BooleanOptionItem.Create(Id + 13, "BountyShowTargetArrow", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]); + OptionShowTargetArrow = BooleanOptionItem.Create(Id + 13, "BountyShowTargetArrow", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.BountyHunter]); } public override void Init() diff --git a/Roles/Impostor/Camouflager.cs b/Roles/Impostor/Camouflager.cs index 266fe3392..fabd2957d 100644 --- a/Roles/Impostor/Camouflager.cs +++ b/Roles/Impostor/Camouflager.cs @@ -18,16 +18,16 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Camouflager); - CamouflageCooldown = FloatOptionItem.Create(Id + 2, "CamouflageCooldown", new(1f, 60f, 1f), 25f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]) + CamouflageCooldown = FloatOptionItem.Create(Id + 2, "CamouflageCooldown", new(1f, 60f, 1f), 25f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]) .SetValueFormat(OptionFormat.Seconds); - CamouflageDuration = FloatOptionItem.Create(Id + 3, "CamouflageDuration", new(1f, 30f, 1f), 12f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]) + CamouflageDuration = FloatOptionItem.Create(Id + 3, "CamouflageDuration", new(1f, 30f, 1f), 12f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]) .SetValueFormat(OptionFormat.Seconds); - CamoLimitOpt = IntegerOptionItem.Create(Id + 4, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]) + CamoLimitOpt = IntegerOptionItem.Create(Id + 4, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]) .SetValueFormat(OptionFormat.Times); - CamoAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 5, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles, false) + CamoAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 5, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]) .SetValueFormat(OptionFormat.Times); - DoesntSpawnOnFungle = BooleanOptionItem.Create(Id + 6, "DoesntSpawnOnFungle", false, TabGroup.ImpostorRoles, false) + DoesntSpawnOnFungle = BooleanOptionItem.Create(Id + 6, "DoesntSpawnOnFungle", false, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Camouflager]); } diff --git a/Roles/Impostor/Cantankerous.cs b/Roles/Impostor/Cantankerous.cs index 41dadeb6e..64dab15d5 100644 --- a/Roles/Impostor/Cantankerous.cs +++ b/Roles/Impostor/Cantankerous.cs @@ -15,13 +15,13 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Cantankerous); - KCD = FloatOptionItem.Create(Id + 5, "KillCooldown", new(0f, 60f, 2.5f), 22.5f, TabGroup.ImpostorRoles, false) + KCD = FloatOptionItem.Create(Id + 5, "KillCooldown", new(0f, 60f, 2.5f), 22.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Cantankerous]) .SetValueFormat(OptionFormat.Seconds); - PointsGainedPerEjection = IntegerOptionItem.Create(Id + 6, "CantankerousPointsGainedPerEjection", new(1, 5, 1), 2, TabGroup.ImpostorRoles, false) + PointsGainedPerEjection = IntegerOptionItem.Create(Id + 6, "CantankerousPointsGainedPerEjection", new(1, 5, 1), 2, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Cantankerous]) .SetValueFormat(OptionFormat.Times); - StartingPoints = IntegerOptionItem.Create(Id + 7, "CantankerousStartingPoints", new(0, 5, 1), 1, TabGroup.ImpostorRoles, false) + StartingPoints = IntegerOptionItem.Create(Id + 7, "CantankerousStartingPoints", new(0, 5, 1), 1, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Cantankerous]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Capitalism.cs b/Roles/Impostor/Capitalism.cs index 6921bcbb9..66c5ae76e 100644 --- a/Roles/Impostor/Capitalism.cs +++ b/Roles/Impostor/Capitalism.cs @@ -14,10 +14,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(16600, TabGroup.ImpostorRoles, CustomRoles.Capitalism); - CapitalismSkillCooldown = FloatOptionItem.Create(16610, "CapitalismSkillCooldown", new(0f, 60f, 1f), 10f, TabGroup.ImpostorRoles, false) + CapitalismSkillCooldown = FloatOptionItem.Create(16610, "CapitalismSkillCooldown", new(0f, 60f, 1f), 10f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Capitalism]) .SetValueFormat(OptionFormat.Seconds); - CapitalismKillCooldown = FloatOptionItem.Create(16611, "KillCooldown", new(2.5f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles, false) + CapitalismKillCooldown = FloatOptionItem.Create(16611, "KillCooldown", new(2.5f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Capitalism]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Changeling.cs b/Roles/Impostor/Changeling.cs index 33cdfd9ab..bdb51c501 100644 --- a/Roles/Impostor/Changeling.cs +++ b/Roles/Impostor/Changeling.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using System; +using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; using static EHR.Options; namespace EHR.Roles.Impostor @@ -32,9 +32,9 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Changeling); - CanPickPartnerRole = BooleanOptionItem.Create(Id + 10, "CanPickPartnerRole", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Changeling]); - CanKillBeforeRoleChange = BooleanOptionItem.Create(Id + 11, "CanKillBeforeRoleChange", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Changeling]); - AvailableRoles = StringOptionItem.Create(Id + 12, "AvailableRoles", AvailableRolesMode, 0, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Changeling]); + CanPickPartnerRole = BooleanOptionItem.Create(Id + 10, "CanPickPartnerRole", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Changeling]); + CanKillBeforeRoleChange = BooleanOptionItem.Create(Id + 11, "CanKillBeforeRoleChange", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Changeling]); + AvailableRoles = StringOptionItem.Create(Id + 12, "AvailableRoles", AvailableRolesMode, 0, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Changeling]); } public static List GetAvailableRoles(bool check = false) diff --git a/Roles/Impostor/Chronomancer.cs b/Roles/Impostor/Chronomancer.cs index 03008a37e..dfbfea0ef 100644 --- a/Roles/Impostor/Chronomancer.cs +++ b/Roles/Impostor/Chronomancer.cs @@ -1,6 +1,6 @@ -using EHR.Modules; +using System.Collections.Generic; +using EHR.Modules; using Hazel; -using System.Collections.Generic; using static EHR.Options; namespace EHR.Roles.Impostor @@ -22,13 +22,13 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Chronomancer); - KCD = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false) + KCD = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Chronomancer]) .SetValueFormat(OptionFormat.Seconds); - ChargeInterval = IntegerOptionItem.Create(Id + 12, "ChargeInterval", new(1, 20, 1), 5, TabGroup.ImpostorRoles, false) + ChargeInterval = IntegerOptionItem.Create(Id + 12, "ChargeInterval", new(1, 20, 1), 5, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Chronomancer]) .SetValueFormat(OptionFormat.Seconds); - ChargeLossInterval = IntegerOptionItem.Create(Id + 13, "ChargeLossInterval", new(1, 50, 1), 25, TabGroup.ImpostorRoles, false) + ChargeLossInterval = IntegerOptionItem.Create(Id + 13, "ChargeLossInterval", new(1, 50, 1), 25, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Chronomancer]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Cleaner.cs b/Roles/Impostor/Cleaner.cs index b8bfe7ced..d0215e3d4 100644 --- a/Roles/Impostor/Cleaner.cs +++ b/Roles/Impostor/Cleaner.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Roles.Neutral; -using System.Collections.Generic; using static EHR.Options; namespace EHR.Roles.Impostor @@ -22,10 +22,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(2600, TabGroup.ImpostorRoles, CustomRoles.Cleaner); - CleanerKillCooldown = FloatOptionItem.Create(2610, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + CleanerKillCooldown = FloatOptionItem.Create(2610, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Cleaner]) .SetValueFormat(OptionFormat.Seconds); - KillCooldownAfterCleaning = FloatOptionItem.Create(2611, "KillCooldownAfterCleaning", new(0f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles, false) + KillCooldownAfterCleaning = FloatOptionItem.Create(2611, "KillCooldownAfterCleaning", new(0f, 180f, 2.5f), 60f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Cleaner]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Commander.cs b/Roles/Impostor/Commander.cs index 2154bb5af..d8f46ee0a 100644 --- a/Roles/Impostor/Commander.cs +++ b/Roles/Impostor/Commander.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using System; +using System; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; using UnityEngine; namespace EHR.Roles.Impostor @@ -35,9 +35,9 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Commander); - CannotSpawnAsSoloImp = BooleanOptionItem.Create(Id + 2, "CannotSpawnAsSoloImp", true, TabGroup.ImpostorRoles, false) + CannotSpawnAsSoloImp = BooleanOptionItem.Create(Id + 2, "CannotSpawnAsSoloImp", true, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Commander]); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 3, "ShapeshiftCooldown", new(0f, 60f, 1f), 1f, TabGroup.ImpostorRoles, false) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 3, "ShapeshiftCooldown", new(0f, 60f, 1f), 1f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Commander]); } diff --git a/Roles/Impostor/Consort.cs b/Roles/Impostor/Consort.cs index 34ab7beb4..f6d630513 100644 --- a/Roles/Impostor/Consort.cs +++ b/Roles/Impostor/Consort.cs @@ -1,5 +1,5 @@ -using EHR.Roles.Neutral; -using System.Collections.Generic; +using System.Collections.Generic; +using EHR.Roles.Neutral; using static EHR.Translator; namespace EHR.Roles.Impostor @@ -15,10 +15,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Consort); - CD = FloatOptionItem.Create(Id + 10, "EscortCD", new(2.5f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + CD = FloatOptionItem.Create(Id + 10, "EscortCD", new(2.5f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Consort]) .SetValueFormat(OptionFormat.Seconds); - UseLimit = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 3, TabGroup.ImpostorRoles, false) + UseLimit = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(1, 20, 1), 3, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Consort]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Councillor.cs b/Roles/Impostor/Councillor.cs index 5a3fbcf93..25493ae5f 100644 --- a/Roles/Impostor/Councillor.cs +++ b/Roles/Impostor/Councillor.cs @@ -1,11 +1,11 @@ -using EHR.Modules; -using EHR.Roles.Crewmate; -using HarmonyLib; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using EHR.Modules; +using EHR.Roles.Crewmate; +using HarmonyLib; +using Hazel; using UnityEngine; using static EHR.Translator; using Object = UnityEngine.Object; @@ -26,15 +26,15 @@ public class Councillor : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Councillor); - KillCooldown = FloatOptionItem.Create(Id + 15, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]) + KillCooldown = FloatOptionItem.Create(Id + 15, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]) .SetValueFormat(OptionFormat.Seconds); - MurderLimitPerMeeting = IntegerOptionItem.Create(Id + 10, "MurderLimitPerMeeting", new(0, 15, 1), 0, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]) + MurderLimitPerMeeting = IntegerOptionItem.Create(Id + 10, "MurderLimitPerMeeting", new(0, 15, 1), 0, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]) .SetValueFormat(OptionFormat.Times); - CanMurderMadmate = BooleanOptionItem.Create(Id + 12, "CouncillorCanMurderMadmate", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]); - CanMurderImpostor = BooleanOptionItem.Create(Id + 16, "CouncillorCanMurderImpostor", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]); - TryHideMsg = BooleanOptionItem.Create(Id + 11, "CouncillorTryHideMsg", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]) + CanMurderMadmate = BooleanOptionItem.Create(Id + 12, "CouncillorCanMurderMadmate", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]); + CanMurderImpostor = BooleanOptionItem.Create(Id + 16, "CouncillorCanMurderImpostor", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]); + TryHideMsg = BooleanOptionItem.Create(Id + 11, "CouncillorTryHideMsg", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]) .SetColor(Color.green); - CouncillorAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 17, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.2f, TabGroup.ImpostorRoles, false) + CouncillorAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 17, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.2f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Councillor]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Crewpostor.cs b/Roles/Impostor/Crewpostor.cs index 16017de49..452590572 100644 --- a/Roles/Impostor/Crewpostor.cs +++ b/Roles/Impostor/Crewpostor.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; @@ -18,15 +18,15 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(4800, TabGroup.ImpostorRoles, CustomRoles.Crewpostor); - CrewpostorCanKillAllies = BooleanOptionItem.Create(4810, "CanKillAllies", true, TabGroup.ImpostorRoles, false) + CrewpostorCanKillAllies = BooleanOptionItem.Create(4810, "CanKillAllies", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Crewpostor]); - CrewpostorKnowsAllies = BooleanOptionItem.Create(4811, "CrewpostorKnowsAllies", true, TabGroup.ImpostorRoles, false) + CrewpostorKnowsAllies = BooleanOptionItem.Create(4811, "CrewpostorKnowsAllies", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Crewpostor]); - AlliesKnowCrewpostor = BooleanOptionItem.Create(4812, "AlliesKnowCrewpostor", true, TabGroup.ImpostorRoles, false) + AlliesKnowCrewpostor = BooleanOptionItem.Create(4812, "AlliesKnowCrewpostor", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Crewpostor]); - CrewpostorLungeKill = BooleanOptionItem.Create(4813, "CrewpostorLungeKill", true, TabGroup.ImpostorRoles, false) + CrewpostorLungeKill = BooleanOptionItem.Create(4813, "CrewpostorLungeKill", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Crewpostor]); - CrewpostorKillAfterTask = IntegerOptionItem.Create(4814, "CrewpostorKillAfterTask", new(1, 50, 1), 1, TabGroup.ImpostorRoles, false) + CrewpostorKillAfterTask = IntegerOptionItem.Create(4814, "CrewpostorKillAfterTask", new(1, 50, 1), 1, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Crewpostor]); CrewpostorTasks = OverrideTasksData.Create(4815, TabGroup.ImpostorRoles, CustomRoles.Crewpostor); } diff --git a/Roles/Impostor/CursedWolf.cs b/Roles/Impostor/CursedWolf.cs index d55b9d1f1..d51670009 100644 --- a/Roles/Impostor/CursedWolf.cs +++ b/Roles/Impostor/CursedWolf.cs @@ -18,10 +18,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(1000, TabGroup.ImpostorRoles, CustomRoles.CursedWolf); //TOH_Y - Options.GuardSpellTimes = IntegerOptionItem.Create(1010, "GuardSpellTimes", new(1, 15, 1), 3, TabGroup.ImpostorRoles, false) + Options.GuardSpellTimes = IntegerOptionItem.Create(1010, "GuardSpellTimes", new(1, 15, 1), 3, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.CursedWolf]) .SetValueFormat(OptionFormat.Times); - Options.killAttacker = BooleanOptionItem.Create(1011, "killAttacker", true, TabGroup.ImpostorRoles, false) + Options.killAttacker = BooleanOptionItem.Create(1011, "killAttacker", true, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.CursedWolf]); } diff --git a/Roles/Impostor/Dazzler.cs b/Roles/Impostor/Dazzler.cs index 10d4a0d11..3f5da843e 100644 --- a/Roles/Impostor/Dazzler.cs +++ b/Roles/Impostor/Dazzler.cs @@ -1,6 +1,6 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Roles.Neutral; -using System.Collections.Generic; using static EHR.Options; using static EHR.Translator; @@ -23,16 +23,16 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Dazzler); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "DazzleCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "DazzleCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) .SetValueFormat(OptionFormat.Seconds); - CauseVision = FloatOptionItem.Create(Id + 13, "DazzlerCauseVision", new(0f, 5f, 0.05f), 0.4f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) + CauseVision = FloatOptionItem.Create(Id + 13, "DazzlerCauseVision", new(0f, 5f, 0.05f), 0.4f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) .SetValueFormat(OptionFormat.Multiplier); - DazzleLimitOpt = IntegerOptionItem.Create(Id + 14, "DazzlerDazzleLimit", new(0, 15, 1), 1, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) + DazzleLimitOpt = IntegerOptionItem.Create(Id + 14, "DazzlerDazzleLimit", new(0, 15, 1), 1, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) .SetValueFormat(OptionFormat.Times); - ResetDazzledVisionOnDeath = BooleanOptionItem.Create(Id + 15, "DazzlerResetDazzledVisionOnDeath", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]); - DazzlerAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 16, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.5f, TabGroup.ImpostorRoles, false) + ResetDazzledVisionOnDeath = BooleanOptionItem.Create(Id + 15, "DazzlerResetDazzledVisionOnDeath", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]); + DazzlerAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 16, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Dazzler]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Deathpact.cs b/Roles/Impostor/Deathpact.cs index 93aa86551..6a803169e 100644 --- a/Roles/Impostor/Deathpact.cs +++ b/Roles/Impostor/Deathpact.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; +using System.Linq; using AmongUs.GameOptions; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -33,19 +33,19 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Deathpact); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "DeathPactCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "DeathPactCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) .SetValueFormat(OptionFormat.Seconds); - DeathpactDuration = FloatOptionItem.Create(Id + 13, "DeathpactDuration", new(0f, 180f, 2.5f), 17.5f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) + DeathpactDuration = FloatOptionItem.Create(Id + 13, "DeathpactDuration", new(0f, 180f, 2.5f), 17.5f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) .SetValueFormat(OptionFormat.Seconds); - NumberOfPlayersInPact = IntegerOptionItem.Create(Id + 14, "DeathpactNumberOfPlayersInPact", new(2, 5, 1), 2, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) + NumberOfPlayersInPact = IntegerOptionItem.Create(Id + 14, "DeathpactNumberOfPlayersInPact", new(2, 5, 1), 2, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]) .SetValueFormat(OptionFormat.Times); - ShowArrowsToOtherPlayersInPact = BooleanOptionItem.Create(Id + 15, "DeathpactShowArrowsToOtherPlayersInPact", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]); - ReduceVisionWhileInPact = BooleanOptionItem.Create(Id + 16, "DeathpactReduceVisionWhileInPact", false, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]); - VisionWhileInPact = FloatOptionItem.Create(Id + 17, "DeathpactVisionWhileInPact", new(0f, 5f, 0.05f), 0.4f, TabGroup.ImpostorRoles, false).SetParent(ReduceVisionWhileInPact) + ShowArrowsToOtherPlayersInPact = BooleanOptionItem.Create(Id + 15, "DeathpactShowArrowsToOtherPlayersInPact", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]); + ReduceVisionWhileInPact = BooleanOptionItem.Create(Id + 16, "DeathpactReduceVisionWhileInPact", false, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]); + VisionWhileInPact = FloatOptionItem.Create(Id + 17, "DeathpactVisionWhileInPact", new(0f, 5f, 0.05f), 0.4f, TabGroup.ImpostorRoles).SetParent(ReduceVisionWhileInPact) .SetValueFormat(OptionFormat.Multiplier); - KillDeathpactPlayersOnMeeting = BooleanOptionItem.Create(Id + 18, "DeathpactKillPlayersInDeathpactOnMeeting", false, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]); + KillDeathpactPlayersOnMeeting = BooleanOptionItem.Create(Id + 18, "DeathpactKillPlayersInDeathpactOnMeeting", false, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Deathpact]); } public override void Init() diff --git a/Roles/Impostor/Devourer.cs b/Roles/Impostor/Devourer.cs index d7739d778..df7232abc 100644 --- a/Roles/Impostor/Devourer.cs +++ b/Roles/Impostor/Devourer.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using EHR.Roles.Neutral; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Roles.Neutral; using static EHR.Options; using static EHR.Translator; @@ -32,15 +32,15 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Devourer); - DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) + DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) .SetValueFormat(OptionFormat.Seconds); - ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 1.5f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) + ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 1.5f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) .SetValueFormat(OptionFormat.Seconds); - MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 0.5f), 21f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) + MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 0.5f), 21f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 14, "DevourCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 14, "DevourCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]) .SetValueFormat(OptionFormat.Seconds); - HideNameOfConsumedPlayer = BooleanOptionItem.Create(Id + 16, "DevourerHideNameConsumed", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]); + HideNameOfConsumedPlayer = BooleanOptionItem.Create(Id + 16, "DevourerHideNameConsumed", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Devourer]); } public override void Init() diff --git a/Roles/Impostor/Disperser.cs b/Roles/Impostor/Disperser.cs index f5826f67a..fd47d5187 100644 --- a/Roles/Impostor/Disperser.cs +++ b/Roles/Impostor/Disperser.cs @@ -21,13 +21,13 @@ public class Disperser : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Disperser); - DisperserShapeshiftCooldown = FloatOptionItem.Create(Id + 5, "ShapeshiftCooldown", new(1f, 60f, 1f), 20f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Disperser]) + DisperserShapeshiftCooldown = FloatOptionItem.Create(Id + 5, "ShapeshiftCooldown", new(1f, 60f, 1f), 20f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Disperser]) .SetValueFormat(OptionFormat.Seconds); - DisperserShapeshiftDuration = FloatOptionItem.Create(Id + 6, "ShapeshiftDuration", new(1f, 30f, 1f), 1f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Disperser]) + DisperserShapeshiftDuration = FloatOptionItem.Create(Id + 6, "ShapeshiftDuration", new(1f, 30f, 1f), 1f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Disperser]) .SetValueFormat(OptionFormat.Seconds); - DisperserLimitOpt = IntegerOptionItem.Create(Id + 7, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Disperser]) + DisperserLimitOpt = IntegerOptionItem.Create(Id + 7, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Disperser]) .SetValueFormat(OptionFormat.Times); - DisperserAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 8, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles, false) + DisperserAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 8, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Disperser]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Duellist.cs b/Roles/Impostor/Duellist.cs index 04ebe630d..bae088e33 100644 --- a/Roles/Impostor/Duellist.cs +++ b/Roles/Impostor/Duellist.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; -using System.Collections.Generic; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; @@ -18,7 +18,7 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Duellist); - SSCD = FloatOptionItem.Create(Id + 5, "ShapeshiftCooldown", new(0f, 60f, 2.5f), 15f, TabGroup.ImpostorRoles, false) + SSCD = FloatOptionItem.Create(Id + 5, "ShapeshiftCooldown", new(0f, 60f, 2.5f), 15f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Duellist]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Eraser.cs b/Roles/Impostor/Eraser.cs index 4f6218b8d..41735903c 100644 --- a/Roles/Impostor/Eraser.cs +++ b/Roles/Impostor/Eraser.cs @@ -1,5 +1,5 @@ -using EHR.Roles.Crewmate; -using System.Collections.Generic; +using System.Collections.Generic; +using EHR.Roles.Crewmate; using static EHR.Translator; namespace EHR.Roles.Impostor; @@ -33,11 +33,11 @@ internal class Eraser : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Eraser); - EraseMethod = StringOptionItem.Create(Id + 10, "EraseMethod", EraseMode, 0, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]); - WhenTargetIsNeutral = StringOptionItem.Create(Id + 11, "WhenTargetIsNeutral", WhenTargetIsNeutralAction, 0, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]); - EraseLimitOpt = IntegerOptionItem.Create(Id + 12, "EraseLimit", new(1, 15, 1), 1, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]) + EraseMethod = StringOptionItem.Create(Id + 10, "EraseMethod", EraseMode, 0, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]); + WhenTargetIsNeutral = StringOptionItem.Create(Id + 11, "WhenTargetIsNeutral", WhenTargetIsNeutralAction, 0, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]); + EraseLimitOpt = IntegerOptionItem.Create(Id + 12, "EraseLimit", new(1, 15, 1), 1, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]) .SetValueFormat(OptionFormat.Times); - HideVote = BooleanOptionItem.Create(Id + 13, "EraserHideVote", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]); + HideVote = BooleanOptionItem.Create(Id + 13, "EraserHideVote", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Eraser]); CancelVote = Options.CreateVoteCancellingUseSetting(Id + 14, CustomRoles.Eraser, TabGroup.ImpostorRoles); } diff --git a/Roles/Impostor/Escapee.cs b/Roles/Impostor/Escapee.cs index bf293c339..64100553e 100644 --- a/Roles/Impostor/Escapee.cs +++ b/Roles/Impostor/Escapee.cs @@ -13,7 +13,7 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(3600, TabGroup.ImpostorRoles, CustomRoles.Escapee); - Options.EscapeeSSCD = FloatOptionItem.Create(3611, "ShapeshiftCooldown", new(1f, 180f, 1f), 5f, TabGroup.ImpostorRoles, false) + Options.EscapeeSSCD = FloatOptionItem.Create(3611, "ShapeshiftCooldown", new(1f, 180f, 1f), 5f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Escapee]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/EvilDiviner.cs b/Roles/Impostor/EvilDiviner.cs index c5ecfe814..4b4bf0cdb 100644 --- a/Roles/Impostor/EvilDiviner.cs +++ b/Roles/Impostor/EvilDiviner.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Neutral; using Hazel; -using System.Collections.Generic; using static EHR.Options; namespace EHR.Roles.Impostor @@ -26,11 +26,11 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.EvilDiviner); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.EvilDiviner]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.EvilDiviner]) .SetValueFormat(OptionFormat.Seconds); - DivinationMaxCount = IntegerOptionItem.Create(Id + 11, "DivinationMaxCount", new(0, 15, 1), 1, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.EvilDiviner]) + DivinationMaxCount = IntegerOptionItem.Create(Id + 11, "DivinationMaxCount", new(0, 15, 1), 1, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.EvilDiviner]) .SetValueFormat(OptionFormat.Times); - EDAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles, false) + EDAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilDiviner]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/EvilGuesser.cs b/Roles/Impostor/EvilGuesser.cs index 054c0a8f2..6b0cf03e3 100644 --- a/Roles/Impostor/EvilGuesser.cs +++ b/Roles/Impostor/EvilGuesser.cs @@ -8,16 +8,16 @@ namespace EHR.Roles.Impostor public void SetupCustomOption() { SetupRoleOptions(1200, TabGroup.ImpostorRoles, CustomRoles.EvilGuesser); - EGCanGuessTime = IntegerOptionItem.Create(1205, "GuesserCanGuessTimes", new(1, 15, 1), 15, TabGroup.ImpostorRoles, false) + EGCanGuessTime = IntegerOptionItem.Create(1205, "GuesserCanGuessTimes", new(1, 15, 1), 15, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilGuesser]) .SetValueFormat(OptionFormat.Times); - EGCanGuessImp = BooleanOptionItem.Create(1206, "EGCanGuessImp", true, TabGroup.ImpostorRoles, false) + EGCanGuessImp = BooleanOptionItem.Create(1206, "EGCanGuessImp", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilGuesser]); - EGCanGuessAdt = BooleanOptionItem.Create(1207, "EGCanGuessAdt", false, TabGroup.ImpostorRoles, false) + EGCanGuessAdt = BooleanOptionItem.Create(1207, "EGCanGuessAdt", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilGuesser]); - EGCanGuessTaskDoneSnitch = BooleanOptionItem.Create(1208, "EGCanGuessTaskDoneSnitch", true, TabGroup.ImpostorRoles, false) + EGCanGuessTaskDoneSnitch = BooleanOptionItem.Create(1208, "EGCanGuessTaskDoneSnitch", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilGuesser]); - EGTryHideMsg = BooleanOptionItem.Create(1209, "GuesserTryHideMsg", true, TabGroup.ImpostorRoles, false) + EGTryHideMsg = BooleanOptionItem.Create(1209, "GuesserTryHideMsg", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilGuesser]) .SetColor(Color.green); } diff --git a/Roles/Impostor/EvilTracker.cs b/Roles/Impostor/EvilTracker.cs index dc5f6e48a..52d8cc617 100644 --- a/Roles/Impostor/EvilTracker.cs +++ b/Roles/Impostor/EvilTracker.cs @@ -1,11 +1,11 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; -using Il2CppSystem.Text; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; +using Il2CppSystem.Text; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -53,11 +53,11 @@ public class EvilTracker : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.EvilTracker); - OptionCanSeeKillFlash = BooleanOptionItem.Create(Id + 10, "EvilTrackerCanSeeKillFlash", true, TabGroup.ImpostorRoles, false) + OptionCanSeeKillFlash = BooleanOptionItem.Create(Id + 10, "EvilTrackerCanSeeKillFlash", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilTracker]); - OptionTargetMode = StringOptionItem.Create(Id + 11, "EvilTrackerTargetMode", TargetModeText, 2, TabGroup.ImpostorRoles, false) + OptionTargetMode = StringOptionItem.Create(Id + 11, "EvilTrackerTargetMode", TargetModeText, 2, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilTracker]); - OptionCanSeeLastRoomInMeeting = BooleanOptionItem.Create(Id + 12, "EvilTrackerCanSeeLastRoomInMeeting", false, TabGroup.ImpostorRoles, false) + OptionCanSeeLastRoomInMeeting = BooleanOptionItem.Create(Id + 12, "EvilTrackerCanSeeLastRoomInMeeting", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.EvilTracker]); } diff --git a/Roles/Impostor/FireWorks.cs b/Roles/Impostor/FireWorks.cs index 2ab2d7fd2..610c98091 100644 --- a/Roles/Impostor/FireWorks.cs +++ b/Roles/Impostor/FireWorks.cs @@ -1,9 +1,9 @@ +using System; +using System.Collections.Generic; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using Hazel; -using System; -using System.Collections.Generic; using UnityEngine; using static EHR.Translator; @@ -39,12 +39,12 @@ public class FireWorks : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.FireWorks); - FireWorksCount = IntegerOptionItem.Create(Id + 10, "FireWorksMaxCount", new(1, 10, 1), 3, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]) + FireWorksCount = IntegerOptionItem.Create(Id + 10, "FireWorksMaxCount", new(1, 10, 1), 3, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]) .SetValueFormat(OptionFormat.Pieces); - FireWorksRadius = FloatOptionItem.Create(Id + 11, "FireWorksRadius", new(0.5f, 5f, 0.5f), 2f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]) + FireWorksRadius = FloatOptionItem.Create(Id + 11, "FireWorksRadius", new(0.5f, 5f, 0.5f), 2f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]) .SetValueFormat(OptionFormat.Multiplier); - CanKill = BooleanOptionItem.Create(Id + 12, "CanKill", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]); - CanIgniteBeforePlacingAllFireworks = BooleanOptionItem.Create(Id + 13, "CanIgniteBeforePlacingAllFireworks", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]); + CanKill = BooleanOptionItem.Create(Id + 12, "CanKill", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]); + CanIgniteBeforePlacingAllFireworks = BooleanOptionItem.Create(Id + 13, "CanIgniteBeforePlacingAllFireworks", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.FireWorks]); } public override void Init() diff --git a/Roles/Impostor/Freezer.cs b/Roles/Impostor/Freezer.cs index 0a626250c..c393b83e2 100644 --- a/Roles/Impostor/Freezer.cs +++ b/Roles/Impostor/Freezer.cs @@ -15,10 +15,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Freezer); - FreezeCooldown = FloatOptionItem.Create(Id + 2, "FreezeCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + FreezeCooldown = FloatOptionItem.Create(Id + 2, "FreezeCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Freezer]) .SetValueFormat(OptionFormat.Seconds); - FreezeDuration = FloatOptionItem.Create(Id + 3, "FreezeDuration", new(0f, 180f, 0.5f), 10f, TabGroup.ImpostorRoles, false) + FreezeDuration = FloatOptionItem.Create(Id + 3, "FreezeDuration", new(0f, 180f, 0.5f), 10f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Freezer]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Gambler.cs b/Roles/Impostor/Gambler.cs index 8b90e277a..51fe7bff6 100644 --- a/Roles/Impostor/Gambler.cs +++ b/Roles/Impostor/Gambler.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Roles.Crewmate; -using EHR.Roles.Neutral; -using System; +using System; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Roles.Crewmate; +using EHR.Roles.Neutral; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; @@ -45,36 +45,36 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Gambler); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - KillDelay = IntegerOptionItem.Create(Id + 11, "GamblerKillDelay", new(0, 10, 1), 3, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + KillDelay = IntegerOptionItem.Create(Id + 11, "GamblerKillDelay", new(0, 10, 1), 3, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - ShieldDur = IntegerOptionItem.Create(Id + 12, "GamblerShieldDur", new(1, 30, 1), 15, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + ShieldDur = IntegerOptionItem.Create(Id + 12, "GamblerShieldDur", new(1, 30, 1), 15, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - FreezeDur = IntegerOptionItem.Create(Id + 13, "GamblerFreezeDur", new(1, 10, 1), 3, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + FreezeDur = IntegerOptionItem.Create(Id + 13, "GamblerFreezeDur", new(1, 10, 1), 3, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - LowVision = FloatOptionItem.Create(Id + 14, "GamblerLowVision", new(0f, 1f, 0.05f), 0.7f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + LowVision = FloatOptionItem.Create(Id + 14, "GamblerLowVision", new(0f, 1f, 0.05f), 0.7f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Multiplier); - LowVisionDur = IntegerOptionItem.Create(Id + 15, "GamblerLowVisionDur", new(1, 30, 1), 10, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + LowVisionDur = IntegerOptionItem.Create(Id + 15, "GamblerLowVisionDur", new(1, 30, 1), 10, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - Speed = FloatOptionItem.Create(Id + 16, "GamblerSpeedup", new(0.1f, 3f, 0.05f), 1.5f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + Speed = FloatOptionItem.Create(Id + 16, "GamblerSpeedup", new(0.1f, 3f, 0.05f), 1.5f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Multiplier); - SpeedDur = IntegerOptionItem.Create(Id + 17, "GamblerSpeedupDur", new(1, 20, 1), 5, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + SpeedDur = IntegerOptionItem.Create(Id + 17, "GamblerSpeedupDur", new(1, 20, 1), 5, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - BSRDelay = IntegerOptionItem.Create(Id + 18, "GamblerBSRDelay", new(0, 10, 1), 2, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + BSRDelay = IntegerOptionItem.Create(Id + 18, "GamblerBSRDelay", new(0, 10, 1), 2, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - HighKCD = FloatOptionItem.Create(Id + 19, "GamblerHighKCD", new(10f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + HighKCD = FloatOptionItem.Create(Id + 19, "GamblerHighKCD", new(10f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - LowKCD = FloatOptionItem.Create(Id + 20, "GamblerLowKCD", new(10f, 60f, 2.5f), 17.5f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + LowKCD = FloatOptionItem.Create(Id + 20, "GamblerLowKCD", new(10f, 60f, 2.5f), 17.5f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - TPDelay = IntegerOptionItem.Create(Id + 21, "GamblerTPDelay", new(0, 10, 1), 2, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) + TPDelay = IntegerOptionItem.Create(Id + 21, "GamblerTPDelay", new(0, 10, 1), 2, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Seconds); - WhatToIgnore = BooleanOptionItem.Create(Id + 22, "GamblerWhatToIgnore", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]); - IgnoreMedicShield = BooleanOptionItem.Create(Id + 23, "GamblerIgnoreMedicShield", true, TabGroup.ImpostorRoles, false).SetParent(WhatToIgnore); - IgnoreCursedWolfAndJinx = BooleanOptionItem.Create(Id + 24, "GamblerIgnoreCursedWolfAndJinx", true, TabGroup.ImpostorRoles, false).SetParent(WhatToIgnore); - IgnoreVeteranAlert = BooleanOptionItem.Create(Id + 25, "GamblerIgnoreVeteranAlert", false, TabGroup.ImpostorRoles, false).SetParent(WhatToIgnore); - IgnorePestilence = BooleanOptionItem.Create(Id + 26, "GamblerIgnorePestilence", false, TabGroup.ImpostorRoles, false).SetParent(WhatToIgnore); - PositiveEffectChance = IntegerOptionItem.Create(Id + 27, "GamblerPositiveEffectChance", new(0, 100, 5), 70, TabGroup.ImpostorRoles, false) + WhatToIgnore = BooleanOptionItem.Create(Id + 22, "GamblerWhatToIgnore", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]); + IgnoreMedicShield = BooleanOptionItem.Create(Id + 23, "GamblerIgnoreMedicShield", true, TabGroup.ImpostorRoles).SetParent(WhatToIgnore); + IgnoreCursedWolfAndJinx = BooleanOptionItem.Create(Id + 24, "GamblerIgnoreCursedWolfAndJinx", true, TabGroup.ImpostorRoles).SetParent(WhatToIgnore); + IgnoreVeteranAlert = BooleanOptionItem.Create(Id + 25, "GamblerIgnoreVeteranAlert", false, TabGroup.ImpostorRoles).SetParent(WhatToIgnore); + IgnorePestilence = BooleanOptionItem.Create(Id + 26, "GamblerIgnorePestilence", false, TabGroup.ImpostorRoles).SetParent(WhatToIgnore); + PositiveEffectChance = IntegerOptionItem.Create(Id + 27, "GamblerPositiveEffectChance", new(0, 100, 5), 70, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Gambler]) .SetValueFormat(OptionFormat.Percent); } diff --git a/Roles/Impostor/Gangster.cs b/Roles/Impostor/Gangster.cs index 9bb05dd8d..dfba67531 100644 --- a/Roles/Impostor/Gangster.cs +++ b/Roles/Impostor/Gangster.cs @@ -21,17 +21,17 @@ public class Gangster : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Gangster); - KillCooldown = FloatOptionItem.Create(Id + 10, "GangsterRecruitCooldown", new(0f, 60f, 2.5f), 7.5f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]) + KillCooldown = FloatOptionItem.Create(Id + 10, "GangsterRecruitCooldown", new(0f, 60f, 2.5f), 7.5f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]) .SetValueFormat(OptionFormat.Seconds); - RecruitLimitOpt = IntegerOptionItem.Create(Id + 12, "GangsterRecruitLimit", new(1, 5, 1), 1, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]) + RecruitLimitOpt = IntegerOptionItem.Create(Id + 12, "GangsterRecruitLimit", new(1, 5, 1), 1, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]) .SetValueFormat(OptionFormat.Times); - SheriffCanBeMadmate = BooleanOptionItem.Create(Id + 14, "GanSheriffCanBeMadmate", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); - MayorCanBeMadmate = BooleanOptionItem.Create(Id + 15, "GanMayorCanBeMadmate", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); - NGuesserCanBeMadmate = BooleanOptionItem.Create(Id + 16, "GanNGuesserCanBeMadmate", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); - JudgeCanBeMadmate = BooleanOptionItem.Create(Id + 17, "GanJudgeCanBeMadmate", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); - MarshallCanBeMadmate = BooleanOptionItem.Create(Id + 18, "GanMarshallCanBeMadmate", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); - FarseerCanBeMadmate = BooleanOptionItem.Create(Id + 19, "GanFarseerCanBeMadmate", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); + SheriffCanBeMadmate = BooleanOptionItem.Create(Id + 14, "GanSheriffCanBeMadmate", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); + MayorCanBeMadmate = BooleanOptionItem.Create(Id + 15, "GanMayorCanBeMadmate", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); + NGuesserCanBeMadmate = BooleanOptionItem.Create(Id + 16, "GanNGuesserCanBeMadmate", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); + JudgeCanBeMadmate = BooleanOptionItem.Create(Id + 17, "GanJudgeCanBeMadmate", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); + MarshallCanBeMadmate = BooleanOptionItem.Create(Id + 18, "GanMarshallCanBeMadmate", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); + FarseerCanBeMadmate = BooleanOptionItem.Create(Id + 19, "GanFarseerCanBeMadmate", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); //RetributionistCanBeMadmate = BooleanOptionItem.Create(Id + 20, "GanRetributionistCanBeMadmate", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Gangster]); } diff --git a/Roles/Impostor/Generator.cs b/Roles/Impostor/Generator.cs index 9c9e29e7a..87dab904b 100644 --- a/Roles/Impostor/Generator.cs +++ b/Roles/Impostor/Generator.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using System; +using System; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; namespace EHR.Roles.Impostor { @@ -47,18 +47,18 @@ namespace EHR.Roles.Impostor { const int id = 11380; Options.SetupRoleOptions(id, TabGroup.ImpostorRoles, CustomRoles.Generator); - ChargesGainedPerSecond = IntegerOptionItem.Create(id + 2, "Generator.ChargesGainedEverySecond", new(1, 30, 1), 1, TabGroup.ImpostorRoles, false) + ChargesGainedPerSecond = IntegerOptionItem.Create(id + 2, "Generator.ChargesGainedEverySecond", new(1, 30, 1), 1, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Generator]); - StartingCharges = IntegerOptionItem.Create(id + 3, "Generator.StartingCharges", new(0, 100, 1), 0, TabGroup.ImpostorRoles, false) + StartingCharges = IntegerOptionItem.Create(id + 3, "Generator.StartingCharges", new(0, 100, 1), 0, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Generator]); - ChargesLostWhileShiftedPerSecond = IntegerOptionItem.Create(id + 4, "Generator.ChargesLostWhileShiftedPerSecond", new(1, 30, 1), 1, TabGroup.ImpostorRoles, false) + ChargesLostWhileShiftedPerSecond = IntegerOptionItem.Create(id + 4, "Generator.ChargesLostWhileShiftedPerSecond", new(1, 30, 1), 1, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Generator]); - MaxChargesStored = IntegerOptionItem.Create(id + 5, "Generator.MaxChargesStored", new(0, 200, 1), 100, TabGroup.ImpostorRoles, false) + MaxChargesStored = IntegerOptionItem.Create(id + 5, "Generator.MaxChargesStored", new(0, 200, 1), 100, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Generator]); foreach (var action in EnumHelper.GetAllValues()) { - var option = IntegerOptionItem.Create(id + 6 + (int)action, $"Generator.{action}.Cost", new(0, 100, 1), action.GetDefaultCost(), TabGroup.ImpostorRoles, false) + var option = IntegerOptionItem.Create(id + 6 + (int)action, $"Generator.{action}.Cost", new(0, 100, 1), action.GetDefaultCost(), TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Generator]); ActionCostSettings.Add(action, option); } diff --git a/Roles/Impostor/Greedier.cs b/Roles/Impostor/Greedier.cs index 312f06c70..e5cecf903 100644 --- a/Roles/Impostor/Greedier.cs +++ b/Roles/Impostor/Greedier.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Neutral; using Hazel; -using System.Collections.Generic; -using System.Linq; namespace EHR.Roles.Impostor; @@ -29,11 +29,11 @@ public class Greedier : RoleBase // Also used for Imitator as the NK version of public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Greedier); - OddKillCooldown = FloatOptionItem.Create(Id + 10, "OddKillCooldown", new(0f, 60f, 2.5f), 27.5f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Greedier]) + OddKillCooldown = FloatOptionItem.Create(Id + 10, "OddKillCooldown", new(0f, 60f, 2.5f), 27.5f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Greedier]) .SetValueFormat(OptionFormat.Seconds); - EvenKillCooldown = FloatOptionItem.Create(Id + 11, "EvenKillCooldown", new(0f, 30f, 2.5f), 15f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Greedier]) + EvenKillCooldown = FloatOptionItem.Create(Id + 11, "EvenKillCooldown", new(0f, 30f, 2.5f), 15f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Greedier]) .SetValueFormat(OptionFormat.Seconds); - AfterMeetingKillCooldown = FloatOptionItem.Create(Id + 12, "AfterMeetingKillCooldown", new(0f, 30f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Greedier]) + AfterMeetingKillCooldown = FloatOptionItem.Create(Id + 12, "AfterMeetingKillCooldown", new(0f, 30f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Greedier]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Hacker.cs b/Roles/Impostor/Hacker.cs index 27cd908e5..0f50157aa 100644 --- a/Roles/Impostor/Hacker.cs +++ b/Roles/Impostor/Hacker.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -19,11 +19,11 @@ public class Hacker : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Hacker); - KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hacker]) + KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hacker]) .SetValueFormat(OptionFormat.Seconds); - HackLimitOpt = IntegerOptionItem.Create(Id + 3, "HackLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hacker]) + HackLimitOpt = IntegerOptionItem.Create(Id + 3, "HackLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hacker]) .SetValueFormat(OptionFormat.Times); - HackerAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 4, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.2f, TabGroup.ImpostorRoles, false) + HackerAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 4, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.2f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Hacker]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Hangman.cs b/Roles/Impostor/Hangman.cs index be1824e05..544cb4f5e 100644 --- a/Roles/Impostor/Hangman.cs +++ b/Roles/Impostor/Hangman.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Roles.Crewmate; -using System.Collections.Generic; using static EHR.Options; namespace EHR.Roles.Impostor; @@ -19,15 +19,15 @@ public class Hangman : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Hangman); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 2, "ShapeshiftCooldown", new(1f, 60f, 1f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 2, "ShapeshiftCooldown", new(1f, 60f, 1f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftDuration = FloatOptionItem.Create(Id + 3, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) + ShapeshiftDuration = FloatOptionItem.Create(Id + 3, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) .SetValueFormat(OptionFormat.Seconds); - KCD = FloatOptionItem.Create(Id + 4, "KillCooldownOnStrangle", new(1f, 90f, 1f), 40f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) + KCD = FloatOptionItem.Create(Id + 4, "KillCooldownOnStrangle", new(1f, 90f, 1f), 40f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) .SetValueFormat(OptionFormat.Seconds); - HangmanLimitOpt = IntegerOptionItem.Create(Id + 5, "AbilityUseLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) + HangmanLimitOpt = IntegerOptionItem.Create(Id + 5, "AbilityUseLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) .SetValueFormat(OptionFormat.Times); - HangmanAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 6, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles, false) + HangmanAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 6, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.3f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Hangman]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Hitman.cs b/Roles/Impostor/Hitman.cs index 54de14667..c1c2e5868 100644 --- a/Roles/Impostor/Hitman.cs +++ b/Roles/Impostor/Hitman.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using static EHR.Options; using static EHR.Utils; @@ -22,11 +22,11 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Hitman); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hitman]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hitman]) .SetValueFormat(OptionFormat.Seconds); - SuccessKCD = FloatOptionItem.Create(Id + 11, "HitmanLowKCD", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hitman]) + SuccessKCD = FloatOptionItem.Create(Id + 11, "HitmanLowKCD", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hitman]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 12, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Hitman]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 12, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Hitman]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/ImperiusCurse.cs b/Roles/Impostor/ImperiusCurse.cs index 43e38093d..c85d5d2c6 100644 --- a/Roles/Impostor/ImperiusCurse.cs +++ b/Roles/Impostor/ImperiusCurse.cs @@ -11,10 +11,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(3700, TabGroup.ImpostorRoles, CustomRoles.ImperiusCurse); - ShapeImperiusCurseShapeshiftDuration = FloatOptionItem.Create(3710, "ShapeshiftDuration", new(2.5f, 300f, 2.5f), 20f, TabGroup.ImpostorRoles, false) + ShapeImperiusCurseShapeshiftDuration = FloatOptionItem.Create(3710, "ShapeshiftDuration", new(2.5f, 300f, 2.5f), 20f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.ImperiusCurse]) .SetValueFormat(OptionFormat.Seconds); - ImperiusCurseShapeshiftCooldown = FloatOptionItem.Create(3711, "ShapeshiftCooldown", new(1f, 180f, 1f), 30f, TabGroup.ImpostorRoles, false) + ImperiusCurseShapeshiftCooldown = FloatOptionItem.Create(3711, "ShapeshiftCooldown", new(1f, 180f, 1f), 30f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.ImperiusCurse]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/ImpostorVanillaRoles.cs b/Roles/Impostor/ImpostorVanillaRoles.cs index b05518a6b..bf5d90a80 100644 --- a/Roles/Impostor/ImpostorVanillaRoles.cs +++ b/Roles/Impostor/ImpostorVanillaRoles.cs @@ -10,10 +10,10 @@ namespace EHR.Roles.Impostor { SetupRoleOptions(300, Tab, CustomRoles.ImpostorEHR); SetupRoleOptions(400, Tab, CustomRoles.ShapeshifterEHR); - ShapeshiftCD = FloatOptionItem.Create(402, "ShapeshiftCooldown", new(1f, 180f, 1f), 30f, Tab, false) + ShapeshiftCD = FloatOptionItem.Create(402, "ShapeshiftCooldown", new(1f, 180f, 1f), 30f, Tab) .SetParent(CustomRoleSpawnChances[CustomRoles.ShapeshifterEHR]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftDur = FloatOptionItem.Create(403, "ShapeshiftDuration", new(1f, 60f, 1f), 10f, Tab, false) + ShapeshiftDur = FloatOptionItem.Create(403, "ShapeshiftDuration", new(1f, 60f, 1f), 10f, Tab) .SetParent(CustomRoleSpawnChances[CustomRoles.ShapeshifterEHR]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Inhibitor.cs b/Roles/Impostor/Inhibitor.cs index 5a5eee99a..730550502 100644 --- a/Roles/Impostor/Inhibitor.cs +++ b/Roles/Impostor/Inhibitor.cs @@ -12,10 +12,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(1500, TabGroup.ImpostorRoles, CustomRoles.Inhibitor); - InhibitorCD = FloatOptionItem.Create(1510, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.ImpostorRoles, false) + InhibitorCD = FloatOptionItem.Create(1510, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Inhibitor]) .SetValueFormat(OptionFormat.Seconds); - InhibitorCDAfterMeetings = FloatOptionItem.Create(1511, "AfterMeetingKillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.ImpostorRoles, false) + InhibitorCDAfterMeetings = FloatOptionItem.Create(1511, "AfterMeetingKillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Inhibitor]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Kamikaze.cs b/Roles/Impostor/Kamikaze.cs index b1da90aca..5bd0d6dfb 100644 --- a/Roles/Impostor/Kamikaze.cs +++ b/Roles/Impostor/Kamikaze.cs @@ -21,13 +21,13 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Kamikaze); - MarkCD = FloatOptionItem.Create(Id + 2, "KamikazeMarkCD", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + MarkCD = FloatOptionItem.Create(Id + 2, "KamikazeMarkCD", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Kamikaze]) .SetValueFormat(OptionFormat.Seconds); - KamikazeLimitOpt = IntegerOptionItem.Create(Id + 3, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles, false) + KamikazeLimitOpt = IntegerOptionItem.Create(Id + 3, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Kamikaze]) .SetValueFormat(OptionFormat.Times); - KamikazeAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 4, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.5f, TabGroup.ImpostorRoles, false) + KamikazeAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 4, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Kamikaze]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Kidnapper.cs b/Roles/Impostor/Kidnapper.cs index d1014ee55..2d413c661 100644 --- a/Roles/Impostor/Kidnapper.cs +++ b/Roles/Impostor/Kidnapper.cs @@ -13,7 +13,7 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Kidnapper); - SSCD = FloatOptionItem.Create(Id + 2, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + SSCD = FloatOptionItem.Create(Id + 2, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Kidnapper]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Librarian.cs b/Roles/Impostor/Librarian.cs index 361d75e2e..e98cf7fba 100644 --- a/Roles/Impostor/Librarian.cs +++ b/Roles/Impostor/Librarian.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -28,20 +28,20 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Librarian); - Radius = FloatOptionItem.Create(Id + 5, "LibrarianRadius", new(0.5f, 5f, 0.5f), 3f, TabGroup.ImpostorRoles, false) + Radius = FloatOptionItem.Create(Id + 5, "LibrarianRadius", new(0.5f, 5f, 0.5f), 3f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Librarian]) .SetValueFormat(OptionFormat.Multiplier); - ShowSSAnimation = BooleanOptionItem.Create(Id + 6, "LibrarianShowSSAnimation", false, TabGroup.ImpostorRoles, false) + ShowSSAnimation = BooleanOptionItem.Create(Id + 6, "LibrarianShowSSAnimation", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Librarian]); - SSCD = FloatOptionItem.Create(Id + 7, "ShapeshiftCooldown", new(2.5f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + SSCD = FloatOptionItem.Create(Id + 7, "ShapeshiftCooldown", new(2.5f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(ShowSSAnimation) .SetValueFormat(OptionFormat.Seconds); - SSDur = FloatOptionItem.Create(Id + 8, "ShapeshiftDuration", new(2.5f, 60f, 2.5f), 10f, TabGroup.ImpostorRoles, false) + SSDur = FloatOptionItem.Create(Id + 8, "ShapeshiftDuration", new(2.5f, 60f, 2.5f), 10f, TabGroup.ImpostorRoles) .SetParent(ShowSSAnimation) .SetValueFormat(OptionFormat.Seconds); - CanKillWhileShifted = BooleanOptionItem.Create(Id + 9, "CanKillWhileShifted", false, TabGroup.ImpostorRoles, false) + CanKillWhileShifted = BooleanOptionItem.Create(Id + 9, "CanKillWhileShifted", false, TabGroup.ImpostorRoles) .SetParent(ShowSSAnimation); - NameDuration = IntegerOptionItem.Create(Id + 10, "LibrarianNameNotifyDuration", new(1, 30, 1), 10, TabGroup.ImpostorRoles, false) + NameDuration = IntegerOptionItem.Create(Id + 10, "LibrarianNameNotifyDuration", new(1, 30, 1), 10, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Librarian]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Lurker.cs b/Roles/Impostor/Lurker.cs index c11efdf06..d9e032d0d 100644 --- a/Roles/Impostor/Lurker.cs +++ b/Roles/Impostor/Lurker.cs @@ -14,9 +14,9 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Lurker); - DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(20f, 180f, 1f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lurker]) + DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(20f, 180f, 1f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lurker]) .SetValueFormat(OptionFormat.Seconds); - ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 10f, 1f), 1f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lurker]) + ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 10f, 1f), 1f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lurker]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Mafia.cs b/Roles/Impostor/Mafia.cs index f405b8f92..c6a98b19a 100644 --- a/Roles/Impostor/Mafia.cs +++ b/Roles/Impostor/Mafia.cs @@ -1,10 +1,10 @@ -using AmongUs.GameOptions; +using System; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using HarmonyLib; using Hazel; -using System; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -22,15 +22,15 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(3100, TabGroup.ImpostorRoles, CustomRoles.Mafia); - MafiaCanKillNum = IntegerOptionItem.Create(3200, "MafiaCanKillNum", new(0, 15, 1), 1, TabGroup.ImpostorRoles, false) + MafiaCanKillNum = IntegerOptionItem.Create(3200, "MafiaCanKillNum", new(0, 15, 1), 1, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mafia]) .SetValueFormat(OptionFormat.Players); - LegacyMafia = BooleanOptionItem.Create(3210, "LegacyMafia", false, TabGroup.ImpostorRoles, false) + LegacyMafia = BooleanOptionItem.Create(3210, "LegacyMafia", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mafia]); - MafiaShapeshiftCD = FloatOptionItem.Create(3211, "ShapeshiftCooldown", new(1f, 180f, 1f), 15f, TabGroup.ImpostorRoles, false) + MafiaShapeshiftCD = FloatOptionItem.Create(3211, "ShapeshiftCooldown", new(1f, 180f, 1f), 15f, TabGroup.ImpostorRoles) .SetParent(LegacyMafia) .SetValueFormat(OptionFormat.Seconds); - MafiaShapeshiftDur = FloatOptionItem.Create(3212, "ShapeshiftDuration", new(1f, 180f, 1f), 30f, TabGroup.ImpostorRoles, false) + MafiaShapeshiftDur = FloatOptionItem.Create(3212, "ShapeshiftDuration", new(1f, 180f, 1f), 30f, TabGroup.ImpostorRoles) .SetParent(LegacyMafia) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Mafioso.cs b/Roles/Impostor/Mafioso.cs index 10381140a..963b1d69e 100644 --- a/Roles/Impostor/Mafioso.cs +++ b/Roles/Impostor/Mafioso.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System; -using System.Collections.Generic; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; @@ -50,16 +50,16 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Mafioso); - Delay = IntegerOptionItem.Create(Id + 10, "MafiosoDelay", new(1, 10, 1), 3, TabGroup.ImpostorRoles, false) + Delay = IntegerOptionItem.Create(Id + 10, "MafiosoDelay", new(1, 10, 1), 3, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mafioso]) .SetValueFormat(OptionFormat.Seconds); - RewardForKilling = IntegerOptionItem.Create(Id + 11, "MafiosoRewardForKilling", new(0, 100, 5), 40, TabGroup.ImpostorRoles, false) + RewardForKilling = IntegerOptionItem.Create(Id + 11, "MafiosoRewardForKilling", new(0, 100, 5), 40, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mafioso]); - RewardForSabotaging = IntegerOptionItem.Create(Id + 12, "MafiosoRewardForSabotaging", new(0, 100, 5), 25, TabGroup.ImpostorRoles, false) + RewardForSabotaging = IntegerOptionItem.Create(Id + 12, "MafiosoRewardForSabotaging", new(0, 100, 5), 25, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mafioso]); - RewardForVenting = IntegerOptionItem.Create(Id + 13, "MafiosoRewardForVenting", new(0, 100, 5), 10, TabGroup.ImpostorRoles, false) + RewardForVenting = IntegerOptionItem.Create(Id + 13, "MafiosoRewardForVenting", new(0, 100, 5), 10, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mafioso]); - RewardForOtherPlayerEjected = IntegerOptionItem.Create(Id + 14, "MafiosoRewardForOtherPlayerEjected", new(0, 100, 5), 30, TabGroup.ImpostorRoles, false) + RewardForOtherPlayerEjected = IntegerOptionItem.Create(Id + 14, "MafiosoRewardForOtherPlayerEjected", new(0, 100, 5), 30, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mafioso]); } diff --git a/Roles/Impostor/Mastermind.cs b/Roles/Impostor/Mastermind.cs index 1fb4a9818..87c422036 100644 --- a/Roles/Impostor/Mastermind.cs +++ b/Roles/Impostor/Mastermind.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using EHR.Roles.Crewmate; -using System; +using System; using System.Collections.Generic; +using EHR.Modules; +using EHR.Roles.Crewmate; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; @@ -30,12 +30,12 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Mastermind); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Mastermind]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Mastermind]) .SetValueFormat(OptionFormat.Seconds); // Manipulation Cooldown = Kill Cooldown + Delay + Time Limit - TimeLimit = IntegerOptionItem.Create(Id + 12, "MastermindTimeLimit", new(1, 60, 1), 20, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Mastermind]) + TimeLimit = IntegerOptionItem.Create(Id + 12, "MastermindTimeLimit", new(1, 60, 1), 20, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Mastermind]) .SetValueFormat(OptionFormat.Seconds); - Delay = IntegerOptionItem.Create(Id + 13, "MastermindDelay", new(0, 30, 1), 7, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Mastermind]) + Delay = IntegerOptionItem.Create(Id + 13, "MastermindDelay", new(0, 30, 1), 7, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Mastermind]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Miner.cs b/Roles/Impostor/Miner.cs index f88bccb1a..c5004bb33 100644 --- a/Roles/Impostor/Miner.cs +++ b/Roles/Impostor/Miner.cs @@ -11,7 +11,7 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(3800, TabGroup.ImpostorRoles, CustomRoles.Miner); - Options.MinerSSCD = FloatOptionItem.Create(3811, "ShapeshiftCooldown", new(1f, 180f, 1f), 15f, TabGroup.ImpostorRoles, false) + Options.MinerSSCD = FloatOptionItem.Create(3811, "ShapeshiftCooldown", new(1f, 180f, 1f), 15f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Miner]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Minimalism.cs b/Roles/Impostor/Minimalism.cs index 0d70b98ce..d46eb7a1f 100644 --- a/Roles/Impostor/Minimalism.cs +++ b/Roles/Impostor/Minimalism.cs @@ -13,10 +13,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(16300, TabGroup.ImpostorRoles, CustomRoles.Minimalism); - MNKillCooldown = FloatOptionItem.Create(16310, "KillCooldown", new(2.5f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles, false) + MNKillCooldown = FloatOptionItem.Create(16310, "KillCooldown", new(2.5f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Minimalism]) .SetValueFormat(OptionFormat.Seconds); - BypassShields = BooleanOptionItem.Create(16311, "BypassShields", false, TabGroup.ImpostorRoles, false) + BypassShields = BooleanOptionItem.Create(16311, "BypassShields", false, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Minimalism]); } diff --git a/Roles/Impostor/Morphling.cs b/Roles/Impostor/Morphling.cs index 9f7f66087..582d6b2d8 100644 --- a/Roles/Impostor/Morphling.cs +++ b/Roles/Impostor/Morphling.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Impostor; @@ -17,11 +17,11 @@ public class Morphling : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Morphling); - KillCooldown = FloatOptionItem.Create(Id + 14, "KillCooldown", new(0f, 60f, 2.5f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Morphling]) + KillCooldown = FloatOptionItem.Create(Id + 14, "KillCooldown", new(0f, 60f, 2.5f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Morphling]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftCD = FloatOptionItem.Create(Id + 15, "ShapeshiftCooldown", new(1f, 60f, 1f), 20f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Morphling]) + ShapeshiftCD = FloatOptionItem.Create(Id + 15, "ShapeshiftCooldown", new(1f, 60f, 1f), 20f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Morphling]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftDur = FloatOptionItem.Create(Id + 16, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Morphling]) + ShapeshiftDur = FloatOptionItem.Create(Id + 16, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Morphling]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Nullifier.cs b/Roles/Impostor/Nullifier.cs index 0a3e6ca89..7e759359a 100644 --- a/Roles/Impostor/Nullifier.cs +++ b/Roles/Impostor/Nullifier.cs @@ -1,5 +1,5 @@ -using EHR.Roles.Crewmate; -using System.Collections.Generic; +using System.Collections.Generic; +using EHR.Roles.Crewmate; using static EHR.Options; namespace EHR.Roles.Impostor @@ -16,13 +16,13 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Nullifier); - NullCD = FloatOptionItem.Create(Id + 10, "NullCD", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + NullCD = FloatOptionItem.Create(Id + 10, "NullCD", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Nullifier]) .SetValueFormat(OptionFormat.Seconds); - KCD = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false) + KCD = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Nullifier]) .SetValueFormat(OptionFormat.Seconds); - Delay = IntegerOptionItem.Create(Id + 12, "NullifierDelay", new(0, 90, 1), 5, TabGroup.ImpostorRoles, false) + Delay = IntegerOptionItem.Create(Id + 12, "NullifierDelay", new(0, 90, 1), 5, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Nullifier]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/OverKiller.cs b/Roles/Impostor/OverKiller.cs index c2ffe495f..72e612c2b 100644 --- a/Roles/Impostor/OverKiller.cs +++ b/Roles/Impostor/OverKiller.cs @@ -1,9 +1,9 @@ -using EHR.Roles.Crewmate; +using System.Collections.Generic; +using System.Linq; +using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using Hazel; using InnerNet; -using System.Collections.Generic; -using System.Linq; using UnityEngine; namespace EHR.Roles.Impostor diff --git a/Roles/Impostor/Parasite.cs b/Roles/Impostor/Parasite.cs index 08eaa2313..83cb163cd 100644 --- a/Roles/Impostor/Parasite.cs +++ b/Roles/Impostor/Parasite.cs @@ -10,7 +10,7 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupSingleRoleOptions(4900, TabGroup.ImpostorRoles, CustomRoles.Parasite); - Options.ParasiteCD = FloatOptionItem.Create(4910, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + Options.ParasiteCD = FloatOptionItem.Create(4910, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Parasite]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Penguin.cs b/Roles/Impostor/Penguin.cs index 4b376e522..9d0a19b4e 100644 --- a/Roles/Impostor/Penguin.cs +++ b/Roles/Impostor/Penguin.cs @@ -43,15 +43,15 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Penguin); - OptionAbductTimerLimit = FloatOptionItem.Create(Id + 11, "PenguinAbductTimerLimit", new(1f, 20f, 1f), 10f, TabGroup.ImpostorRoles, false) + OptionAbductTimerLimit = FloatOptionItem.Create(Id + 11, "PenguinAbductTimerLimit", new(1f, 20f, 1f), 10f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Penguin]) .SetValueFormat(OptionFormat.Seconds); - OptionMeetingKill = BooleanOptionItem.Create(Id + 12, "PenguinMeetingKill", false, TabGroup.ImpostorRoles, false) + OptionMeetingKill = BooleanOptionItem.Create(Id + 12, "PenguinMeetingKill", false, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Penguin]); - OptionSpeedDuringDrag = FloatOptionItem.Create(Id + 13, "PenguinSpeedDuringDrag", new(0.1f, 3f, 0.1f), 1f, TabGroup.ImpostorRoles, false) + OptionSpeedDuringDrag = FloatOptionItem.Create(Id + 13, "PenguinSpeedDuringDrag", new(0.1f, 3f, 0.1f), 1f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Penguin]) .SetValueFormat(OptionFormat.Multiplier); - OptionVictimCanUseAbilities = BooleanOptionItem.Create(Id + 14, "PenguinVictimCanUseAbilities", false, TabGroup.ImpostorRoles, false) + OptionVictimCanUseAbilities = BooleanOptionItem.Create(Id + 14, "PenguinVictimCanUseAbilities", false, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Penguin]); } diff --git a/Roles/Impostor/Puppeteer.cs b/Roles/Impostor/Puppeteer.cs index 3f4c42335..97ede939a 100644 --- a/Roles/Impostor/Puppeteer.cs +++ b/Roles/Impostor/Puppeteer.cs @@ -1,10 +1,10 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using HarmonyLib; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; @@ -23,37 +23,37 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(3900, TabGroup.ImpostorRoles, CustomRoles.Puppeteer); - PuppeteerCD = FloatOptionItem.Create(3911, "PuppeteerCD", new(2.5f, 60f, 2.5f), 22.5f, TabGroup.ImpostorRoles, false) + PuppeteerCD = FloatOptionItem.Create(3911, "PuppeteerCD", new(2.5f, 60f, 2.5f), 22.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]) .SetValueFormat(OptionFormat.Seconds); - PuppeteerCanKillNormally = BooleanOptionItem.Create(3917, "PuppeteerCanKillNormally", true, TabGroup.ImpostorRoles, false) + PuppeteerCanKillNormally = BooleanOptionItem.Create(3917, "PuppeteerCanKillNormally", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]); - PuppeteerKCD = FloatOptionItem.Create(3912, "PuppeteerKCD", new(2.5f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles, false) + PuppeteerKCD = FloatOptionItem.Create(3912, "PuppeteerKCD", new(2.5f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles) .SetParent(PuppeteerCanKillNormally) .SetValueFormat(OptionFormat.Seconds); - PuppeteerMinDelay = IntegerOptionItem.Create(3913, "PuppeteerMinDelay", new(0, 90, 1), 3, TabGroup.ImpostorRoles, false) + PuppeteerMinDelay = IntegerOptionItem.Create(3913, "PuppeteerMinDelay", new(0, 90, 1), 3, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]) .SetValueFormat(OptionFormat.Seconds); - PuppeteerMaxDelay = IntegerOptionItem.Create(3914, "PuppeteerMaxDelay", new(0, 90, 1), 7, TabGroup.ImpostorRoles, false) + PuppeteerMaxDelay = IntegerOptionItem.Create(3914, "PuppeteerMaxDelay", new(0, 90, 1), 7, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]) .SetValueFormat(OptionFormat.Seconds); - PuppeteerManipulationEndsAfterFixedTime = BooleanOptionItem.Create(3915, "PuppeteerManipulationEndsAfterFixedTime", false, TabGroup.ImpostorRoles, false) + PuppeteerManipulationEndsAfterFixedTime = BooleanOptionItem.Create(3915, "PuppeteerManipulationEndsAfterFixedTime", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]); - PuppeteerManipulationEndsAfterTime = IntegerOptionItem.Create(3916, "PuppeteerManipulationEndsAfterTime", new(0, 90, 1), 30, TabGroup.ImpostorRoles, false) + PuppeteerManipulationEndsAfterTime = IntegerOptionItem.Create(3916, "PuppeteerManipulationEndsAfterTime", new(0, 90, 1), 30, TabGroup.ImpostorRoles) .SetParent(PuppeteerManipulationEndsAfterFixedTime) .SetValueFormat(OptionFormat.Seconds); - PuppeteerManipulationBypassesLazy = BooleanOptionItem.Create(3918, "PuppeteerManipulationBypassesLazy", false, TabGroup.ImpostorRoles, false) + PuppeteerManipulationBypassesLazy = BooleanOptionItem.Create(3918, "PuppeteerManipulationBypassesLazy", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]); - PuppeteerManipulationBypassesLazyGuy = BooleanOptionItem.Create(3922, "PuppeteerManipulationBypassesLazyGuy", false, TabGroup.ImpostorRoles, false) + PuppeteerManipulationBypassesLazyGuy = BooleanOptionItem.Create(3922, "PuppeteerManipulationBypassesLazyGuy", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]); - PuppeteerPuppetCanKillImpostors = BooleanOptionItem.Create(3919, "PuppeteerPuppetCanKillImpostors", false, TabGroup.ImpostorRoles, false) + PuppeteerPuppetCanKillImpostors = BooleanOptionItem.Create(3919, "PuppeteerPuppetCanKillImpostors", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]); - PuppeteerPuppetCanKillPuppeteer = BooleanOptionItem.Create(3920, "PuppeteerPuppetCanKillPuppeteer", false, TabGroup.ImpostorRoles, false) + PuppeteerPuppetCanKillPuppeteer = BooleanOptionItem.Create(3920, "PuppeteerPuppetCanKillPuppeteer", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]); - Options.PuppeteerMaxPuppets = IntegerOptionItem.Create(3921, "PuppeteerMaxPuppets", new(0, 30, 1), 5, TabGroup.ImpostorRoles, false) + Options.PuppeteerMaxPuppets = IntegerOptionItem.Create(3921, "PuppeteerMaxPuppets", new(0, 30, 1), 5, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]) .SetValueFormat(OptionFormat.Times); - PuppeteerDiesAfterMaxPuppets = BooleanOptionItem.Create(3923, "PuppeteerDiesAfterMaxPuppets", false, TabGroup.ImpostorRoles, false) + PuppeteerDiesAfterMaxPuppets = BooleanOptionItem.Create(3923, "PuppeteerDiesAfterMaxPuppets", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Puppeteer]); } diff --git a/Roles/Impostor/QuickShooter.cs b/Roles/Impostor/QuickShooter.cs index fb6317c57..013559b7b 100644 --- a/Roles/Impostor/QuickShooter.cs +++ b/Roles/Impostor/QuickShooter.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System; -using System.Collections.Generic; using UnityEngine; namespace EHR.Roles.Impostor; @@ -20,11 +20,11 @@ internal class QuickShooter : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.QuickShooter); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.QuickShooter]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.QuickShooter]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 12, "QuickShooterShapeshiftCooldown", new(0f, 180f, 2.5f), 40f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.QuickShooter]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 12, "QuickShooterShapeshiftCooldown", new(0f, 180f, 2.5f), 40f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.QuickShooter]) .SetValueFormat(OptionFormat.Seconds); - MeetingReserved = IntegerOptionItem.Create(Id + 14, "MeetingReserved", new(0, 15, 1), 1, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.QuickShooter]) + MeetingReserved = IntegerOptionItem.Create(Id + 14, "MeetingReserved", new(0, 15, 1), 1, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.QuickShooter]) .SetValueFormat(OptionFormat.Pieces); } diff --git a/Roles/Impostor/RiftMaker.cs b/Roles/Impostor/RiftMaker.cs index fddf2c33f..36b8bc0d7 100644 --- a/Roles/Impostor/RiftMaker.cs +++ b/Roles/Impostor/RiftMaker.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Roles.Neutral; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -22,9 +22,9 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.RiftMaker); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.RiftMaker]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.RiftMaker]) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.RiftMaker]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.RiftMaker]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Saboteur.cs b/Roles/Impostor/Saboteur.cs index 359b5757a..3461f6d24 100644 --- a/Roles/Impostor/Saboteur.cs +++ b/Roles/Impostor/Saboteur.cs @@ -12,10 +12,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(10005, TabGroup.ImpostorRoles, CustomRoles.Saboteur); - SaboteurCD = FloatOptionItem.Create(10015, "KillCooldown", new(0f, 180f, 2.5f), 17.5f, TabGroup.ImpostorRoles, false) + SaboteurCD = FloatOptionItem.Create(10015, "KillCooldown", new(0f, 180f, 2.5f), 17.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Saboteur]) .SetValueFormat(OptionFormat.Seconds); - SaboteurCDAfterMeetings = FloatOptionItem.Create(10016, "AfterMeetingKillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false) + SaboteurCDAfterMeetings = FloatOptionItem.Create(10016, "AfterMeetingKillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Saboteur]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Sans.cs b/Roles/Impostor/Sans.cs index 9c461dbb4..326b0042c 100644 --- a/Roles/Impostor/Sans.cs +++ b/Roles/Impostor/Sans.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using EHR.Roles.Neutral; -using System; +using System; using System.Collections.Generic; +using AmongUs.GameOptions; +using EHR.Roles.Neutral; using static EHR.Options; namespace EHR.Roles.Impostor; @@ -30,13 +30,13 @@ public class Sans : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Sans); - DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Sans]) + DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Sans]) .SetValueFormat(OptionFormat.Seconds); - ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 3.5f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Sans]) + ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 3.5f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Sans]) .SetValueFormat(OptionFormat.Seconds); - MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 2.5f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Sans]) + MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 2.5f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Sans]) .SetValueFormat(OptionFormat.Seconds); - BardChance = IntegerOptionItem.Create(Id + 13, "BardChance", new(0, 100, 5), 0, TabGroup.ImpostorRoles, false) + BardChance = IntegerOptionItem.Create(Id + 13, "BardChance", new(0, 100, 5), 0, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sans]) .SetValueFormat(OptionFormat.Percent); } diff --git a/Roles/Impostor/Sapper.cs b/Roles/Impostor/Sapper.cs index d05b442b5..4f643af6e 100644 --- a/Roles/Impostor/Sapper.cs +++ b/Roles/Impostor/Sapper.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; -using EHR.Roles.Neutral; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Text; +using AmongUs.GameOptions; +using EHR.Roles.Neutral; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -24,11 +24,11 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Sapper); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "SapperCD", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Sapper]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 11, "SapperCD", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Sapper]) .SetValueFormat(OptionFormat.Seconds); - Delay = IntegerOptionItem.Create(Id + 12, "SapperDelay", new(1, 15, 1), 5, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Sapper]) + Delay = IntegerOptionItem.Create(Id + 12, "SapperDelay", new(1, 15, 1), 5, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Sapper]) .SetValueFormat(OptionFormat.Times); - Radius = FloatOptionItem.Create(Id + 13, "SapperRadius", new(0f, 10f, 0.25f), 3f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Sapper]) + Radius = FloatOptionItem.Create(Id + 13, "SapperRadius", new(0f, 10f, 0.25f), 3f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Sapper]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/Impostor/Scavenger.cs b/Roles/Impostor/Scavenger.cs index 58da33e52..3a6380e8b 100644 --- a/Roles/Impostor/Scavenger.cs +++ b/Roles/Impostor/Scavenger.cs @@ -13,10 +13,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(4000, TabGroup.ImpostorRoles, CustomRoles.Scavenger); - ScavengerKillCooldown = FloatOptionItem.Create(4010, "KillCooldown", new(0f, 180f, 2.5f), 40f, TabGroup.ImpostorRoles, false) + ScavengerKillCooldown = FloatOptionItem.Create(4010, "KillCooldown", new(0f, 180f, 2.5f), 40f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Scavenger]) .SetValueFormat(OptionFormat.Seconds); - ScavengerKillDuration = FloatOptionItem.Create(4011, "ScavengerKillDuration", new(0f, 90f, 0.5f), 5f, TabGroup.ImpostorRoles, false) + ScavengerKillDuration = FloatOptionItem.Create(4011, "ScavengerKillDuration", new(0f, 90f, 0.5f), 5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Scavenger]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/SerialKiller.cs b/Roles/Impostor/SerialKiller.cs index 02f1b9418..b7cd3b0e2 100644 --- a/Roles/Impostor/SerialKiller.cs +++ b/Roles/Impostor/SerialKiller.cs @@ -18,11 +18,11 @@ public class SerialKiller : RoleBase public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.SerialKiller); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SerialKiller]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SerialKiller]) .SetValueFormat(OptionFormat.Seconds); - TimeLimit = FloatOptionItem.Create(Id + 11, "SerialKillerLimit", new(5f, 180f, 5f), 80f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SerialKiller]) + TimeLimit = FloatOptionItem.Create(Id + 11, "SerialKillerLimit", new(5f, 180f, 5f), 80f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SerialKiller]) .SetValueFormat(OptionFormat.Seconds); - WaitFor1Kill = BooleanOptionItem.Create(Id + 12, "WaitFor1Kill", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SerialKiller]); + WaitFor1Kill = BooleanOptionItem.Create(Id + 12, "WaitFor1Kill", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.SerialKiller]); } public override void Init() diff --git a/Roles/Impostor/Silencer.cs b/Roles/Impostor/Silencer.cs index 4d9b43748..53460199b 100644 --- a/Roles/Impostor/Silencer.cs +++ b/Roles/Impostor/Silencer.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Impostor; @@ -23,10 +23,10 @@ public class Silencer : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Silencer); - SkillCooldown = FloatOptionItem.Create(Id + 5, "SilencerSkillCooldown", new(2.5f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + SkillCooldown = FloatOptionItem.Create(Id + 5, "SilencerSkillCooldown", new(2.5f, 60f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Silencer]) .SetValueFormat(OptionFormat.Seconds); - SilenceMode = StringOptionItem.Create(Id + 4, "SilenceMode", SilenceModes, 1, TabGroup.ImpostorRoles, false) + SilenceMode = StringOptionItem.Create(Id + 4, "SilenceMode", SilenceModes, 1, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Silencer]); } diff --git a/Roles/Impostor/Sniper.cs b/Roles/Impostor/Sniper.cs index e0fee3db3..7bf7021dd 100644 --- a/Roles/Impostor/Sniper.cs +++ b/Roles/Impostor/Sniper.cs @@ -1,10 +1,10 @@ +using System.Collections.Generic; +using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using Hazel; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Translator; @@ -39,13 +39,13 @@ public class Sniper : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Sniper); - SniperBulletCount = IntegerOptionItem.Create(Id + 10, "SniperBulletCount", new(1, 10, 1), 2, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]) + SniperBulletCount = IntegerOptionItem.Create(Id + 10, "SniperBulletCount", new(1, 10, 1), 2, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]) .SetValueFormat(OptionFormat.Pieces); - SniperPrecisionShooting = BooleanOptionItem.Create(Id + 11, "SniperPrecisionShooting", false, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]); - SniperAimAssist = BooleanOptionItem.Create(Id + 12, "SniperAimAssist", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]); - SniperAimAssistOnshot = BooleanOptionItem.Create(Id + 13, "SniperAimAssistOneshot", false, TabGroup.ImpostorRoles, false).SetParent(SniperAimAssist); - CanKillWithBullets = BooleanOptionItem.Create(Id + 14, "SniperCanKill", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]); - ShapeshiftDuration = FloatOptionItem.Create(Id + 15, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]) + SniperPrecisionShooting = BooleanOptionItem.Create(Id + 11, "SniperPrecisionShooting", false, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]); + SniperAimAssist = BooleanOptionItem.Create(Id + 12, "SniperAimAssist", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]); + SniperAimAssistOnshot = BooleanOptionItem.Create(Id + 13, "SniperAimAssistOneshot", false, TabGroup.ImpostorRoles).SetParent(SniperAimAssist); + CanKillWithBullets = BooleanOptionItem.Create(Id + 14, "SniperCanKill", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]); + ShapeshiftDuration = FloatOptionItem.Create(Id + 15, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Sniper]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Stealth.cs b/Roles/Impostor/Stealth.cs index 2befa6eaa..fb2aa383b 100644 --- a/Roles/Impostor/Stealth.cs +++ b/Roles/Impostor/Stealth.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using Hazel; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using UnityEngine; namespace EHR.Roles.Impostor @@ -17,9 +17,9 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Stealth); - optionExcludeImpostors = BooleanOptionItem.Create(Id + 10, "StealthExcludeImpostors", false, TabGroup.ImpostorRoles, false) + optionExcludeImpostors = BooleanOptionItem.Create(Id + 10, "StealthExcludeImpostors", false, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Stealth]); - optionDarkenDuration = FloatOptionItem.Create(Id + 20, "StealthDarkenDuration", new(0.5f, 10f, 0.5f), 3f, TabGroup.ImpostorRoles, false) + optionDarkenDuration = FloatOptionItem.Create(Id + 20, "StealthDarkenDuration", new(0.5f, 10f, 0.5f), 3f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Stealth]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Swapster.cs b/Roles/Impostor/Swapster.cs index 472dca6b0..bb8b7d6f1 100644 --- a/Roles/Impostor/Swapster.cs +++ b/Roles/Impostor/Swapster.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; namespace EHR.Roles.Impostor { @@ -22,7 +22,7 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Swapster); - SSCD = FloatOptionItem.Create(Id + 2, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles, false) + SSCD = FloatOptionItem.Create(Id + 2, "ShapeshiftCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Swapster]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Swiftclaw.cs b/Roles/Impostor/Swiftclaw.cs index 45a72fb8b..b69d1ed90 100644 --- a/Roles/Impostor/Swiftclaw.cs +++ b/Roles/Impostor/Swiftclaw.cs @@ -13,13 +13,13 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Swiftclaw); - DashCD = FloatOptionItem.Create(Id + 2, "SwiftclawDashCD", new(0f, 180f, 2.5f), 15f, TabGroup.ImpostorRoles, false) + DashCD = FloatOptionItem.Create(Id + 2, "SwiftclawDashCD", new(0f, 180f, 2.5f), 15f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Swiftclaw]) .SetValueFormat(OptionFormat.Seconds); - DashDuration = IntegerOptionItem.Create(Id + 3, "SwiftclawDashDur", new(0, 60, 1), 4, TabGroup.ImpostorRoles, false) + DashDuration = IntegerOptionItem.Create(Id + 3, "SwiftclawDashDur", new(0, 60, 1), 4, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Swiftclaw]) .SetValueFormat(OptionFormat.Seconds); - DashSpeed = FloatOptionItem.Create(Id + 4, "SwiftclawDashSpeed", new(0.05f, 3f, 0.05f), 2f, TabGroup.ImpostorRoles, false) + DashSpeed = FloatOptionItem.Create(Id + 4, "SwiftclawDashSpeed", new(0.05f, 3f, 0.05f), 2f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Swiftclaw]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/Impostor/Swooper.cs b/Roles/Impostor/Swooper.cs index 1867cb36b..7823b97ac 100644 --- a/Roles/Impostor/Swooper.cs +++ b/Roles/Impostor/Swooper.cs @@ -1,11 +1,11 @@ -using AmongUs.GameOptions; +using System; +using System.Collections.Generic; +using System.Text; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using Hazel; -using System; -using System.Collections.Generic; -using System.Text; using static EHR.Options; using static EHR.Translator; @@ -37,14 +37,14 @@ public class Swooper : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Swooper); - SwooperCooldown = FloatOptionItem.Create(Id + 2, "SwooperCooldown", new(1f, 60f, 1f), 20f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]) + SwooperCooldown = FloatOptionItem.Create(Id + 2, "SwooperCooldown", new(1f, 60f, 1f), 20f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]) .SetValueFormat(OptionFormat.Seconds); - SwooperDuration = FloatOptionItem.Create(Id + 3, "SwooperDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]) + SwooperDuration = FloatOptionItem.Create(Id + 3, "SwooperDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]) .SetValueFormat(OptionFormat.Seconds); - SwooperVentNormallyOnCooldown = BooleanOptionItem.Create(Id + 4, "SwooperVentNormallyOnCooldown", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]); - SwooperLimitOpt = IntegerOptionItem.Create(Id + 5, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]) + SwooperVentNormallyOnCooldown = BooleanOptionItem.Create(Id + 4, "SwooperVentNormallyOnCooldown", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]); + SwooperLimitOpt = IntegerOptionItem.Create(Id + 5, "AbilityUseLimit", new(0, 5, 1), 1, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]) .SetValueFormat(OptionFormat.Times); - SwooperAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 6, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.5f, TabGroup.ImpostorRoles, false) + SwooperAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 6, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Swooper]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/TimeThief.cs b/Roles/Impostor/TimeThief.cs index 13cf14835..539487bdd 100644 --- a/Roles/Impostor/TimeThief.cs +++ b/Roles/Impostor/TimeThief.cs @@ -14,13 +14,13 @@ public class TimeThief : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.TimeThief); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]) .SetValueFormat(OptionFormat.Seconds); - DecreaseMeetingTime = IntegerOptionItem.Create(Id + 11, "TimeThiefDecreaseMeetingTime", new(0, 100, 1), 10, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]) + DecreaseMeetingTime = IntegerOptionItem.Create(Id + 11, "TimeThiefDecreaseMeetingTime", new(0, 100, 1), 10, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]) .SetValueFormat(OptionFormat.Seconds); - LowerLimitVotingTime = IntegerOptionItem.Create(Id + 12, "TimeThiefLowerLimitVotingTime", new(0, 300, 5), 50, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]) + LowerLimitVotingTime = IntegerOptionItem.Create(Id + 12, "TimeThiefLowerLimitVotingTime", new(0, 300, 5), 50, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]) .SetValueFormat(OptionFormat.Seconds); - ReturnStolenTimeUponDeath = BooleanOptionItem.Create(Id + 13, "TimeThiefReturnStolenTimeUponDeath", true, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]); + ReturnStolenTimeUponDeath = BooleanOptionItem.Create(Id + 13, "TimeThiefReturnStolenTimeUponDeath", true, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.TimeThief]); } public override void Init() diff --git a/Roles/Impostor/Twister.cs b/Roles/Impostor/Twister.cs index 0341ad4c2..4b8d885c5 100644 --- a/Roles/Impostor/Twister.cs +++ b/Roles/Impostor/Twister.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; +using System.Linq; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Neutral; -using System.Collections.Generic; -using System.Linq; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; @@ -20,11 +20,11 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Twister); - ShapeshiftCooldown = FloatOptionItem.Create(Id + 10, "TwisterCooldown", new(1f, 60f, 1f), 30f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Twister]) + ShapeshiftCooldown = FloatOptionItem.Create(Id + 10, "TwisterCooldown", new(1f, 60f, 1f), 30f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Twister]) .SetValueFormat(OptionFormat.Seconds); - TwisterLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Twister]) + TwisterLimitOpt = IntegerOptionItem.Create(Id + 11, "AbilityUseLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Twister]) .SetValueFormat(OptionFormat.Times); - TwisterAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.4f, TabGroup.ImpostorRoles, false) + TwisterAbilityUseGainWithEachKill = FloatOptionItem.Create(Id + 12, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 0.4f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Twister]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Impostor/Underdog.cs b/Roles/Impostor/Underdog.cs index d27295d17..7b2c2744b 100644 --- a/Roles/Impostor/Underdog.cs +++ b/Roles/Impostor/Underdog.cs @@ -10,13 +10,13 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(10025, TabGroup.ImpostorRoles, CustomRoles.Underdog); - UnderdogMaximumPlayersNeededToKill = IntegerOptionItem.Create(10030, "UnderdogMaximumPlayersNeededToKill", new(1, 15, 1), 5, TabGroup.ImpostorRoles, false) + UnderdogMaximumPlayersNeededToKill = IntegerOptionItem.Create(10030, "UnderdogMaximumPlayersNeededToKill", new(1, 15, 1), 5, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Underdog]) .SetValueFormat(OptionFormat.Players); - UnderdogKillCooldown = FloatOptionItem.Create(10031, "KillCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.ImpostorRoles, false) + UnderdogKillCooldown = FloatOptionItem.Create(10031, "KillCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Underdog]) .SetValueFormat(OptionFormat.Seconds); - UnderdogKillCooldownWithMorePlayersAlive = FloatOptionItem.Create(10032, "UnderdogKillCooldownWithMorePlayersAlive", new(0f, 180f, 2.5f), 35f, TabGroup.ImpostorRoles, false) + UnderdogKillCooldownWithMorePlayersAlive = FloatOptionItem.Create(10032, "UnderdogKillCooldownWithMorePlayersAlive", new(0f, 180f, 2.5f), 35f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Underdog]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Undertaker.cs b/Roles/Impostor/Undertaker.cs index 40048405e..24d347af9 100644 --- a/Roles/Impostor/Undertaker.cs +++ b/Roles/Impostor/Undertaker.cs @@ -12,13 +12,13 @@ namespace EHR.Roles.Impostor public void SetupCustomOption() { SetupRoleOptions(Id + 20, TabGroup.ImpostorRoles, CustomRoles.Undertaker); - UndertakerMarkCooldown = FloatOptionItem.Create(Id + 30, "UndertakerMarkCooldown", new(0f, 180f, 0.5f), 1f, TabGroup.ImpostorRoles, false) + UndertakerMarkCooldown = FloatOptionItem.Create(Id + 30, "UndertakerMarkCooldown", new(0f, 180f, 0.5f), 1f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Undertaker]) .SetValueFormat(OptionFormat.Seconds); - UndertakerAssassinateCooldown = FloatOptionItem.Create(Id + 31, "UndertakerAssassinateCooldown", new(0f, 180f, 0.5f), 18.5f, TabGroup.ImpostorRoles, false) + UndertakerAssassinateCooldown = FloatOptionItem.Create(Id + 31, "UndertakerAssassinateCooldown", new(0f, 180f, 0.5f), 18.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Undertaker]) .SetValueFormat(OptionFormat.Seconds); - UndertakerCanKillAfterAssassinate = BooleanOptionItem.Create(Id + 32, "UndertakerCanKillAfterAssassinate", true, TabGroup.ImpostorRoles, false) + UndertakerCanKillAfterAssassinate = BooleanOptionItem.Create(Id + 32, "UndertakerCanKillAfterAssassinate", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Undertaker]); } } diff --git a/Roles/Impostor/Vampire.cs b/Roles/Impostor/Vampire.cs index 5f577f80b..00d0af9d6 100644 --- a/Roles/Impostor/Vampire.cs +++ b/Roles/Impostor/Vampire.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; +using System.Linq; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Translator; @@ -30,7 +30,7 @@ public class Vampire : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Vampire); - OptionKillDelay = FloatOptionItem.Create(Id + 10, "VampireKillDelay", new(1f, 30f, 1f), 3f, TabGroup.ImpostorRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Vampire]) + OptionKillDelay = FloatOptionItem.Create(Id + 10, "VampireKillDelay", new(1f, 30f, 1f), 3f, TabGroup.ImpostorRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Vampire]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Vindicator.cs b/Roles/Impostor/Vindicator.cs index ad2f8bafe..8135f7b92 100644 --- a/Roles/Impostor/Vindicator.cs +++ b/Roles/Impostor/Vindicator.cs @@ -7,10 +7,10 @@ namespace EHR.Roles.Impostor public void SetupCustomOption() { SetupRoleOptions(3400, TabGroup.ImpostorRoles, CustomRoles.Vindicator); - VindicatorAdditionalVote = IntegerOptionItem.Create(3410, "MayorAdditionalVote", new(1, 30, 1), 1, TabGroup.ImpostorRoles, false) + VindicatorAdditionalVote = IntegerOptionItem.Create(3410, "MayorAdditionalVote", new(1, 30, 1), 1, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Vindicator]) .SetValueFormat(OptionFormat.Votes); - VindicatorHideVote = BooleanOptionItem.Create(3411, "MayorHideVote", false, TabGroup.ImpostorRoles, false) + VindicatorHideVote = BooleanOptionItem.Create(3411, "MayorHideVote", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Vindicator]); } } diff --git a/Roles/Impostor/Visionary.cs b/Roles/Impostor/Visionary.cs index 895de9ceb..d8b99d0ad 100644 --- a/Roles/Impostor/Visionary.cs +++ b/Roles/Impostor/Visionary.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; namespace EHR.Roles.Impostor { @@ -17,13 +17,13 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { Options.SetupRoleOptions(16150, TabGroup.ImpostorRoles, CustomRoles.Visionary); - UseLimit = IntegerOptionItem.Create(16152, "AbilityUseLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles, false) + UseLimit = IntegerOptionItem.Create(16152, "AbilityUseLimit", new(0, 5, 1), 0, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Visionary]) .SetValueFormat(OptionFormat.Times); - VisionaryAbilityUseGainWithEachKill = FloatOptionItem.Create(16153, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 1f, TabGroup.ImpostorRoles, false) + VisionaryAbilityUseGainWithEachKill = FloatOptionItem.Create(16153, "AbilityUseGainWithEachKill", new(0f, 5f, 0.1f), 1f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Visionary]) .SetValueFormat(OptionFormat.Times); - ShapeshiftCooldown = FloatOptionItem.Create(16154, "ShapeshiftCooldown", new(1f, 60f, 1f), 15f, TabGroup.ImpostorRoles, false) + ShapeshiftCooldown = FloatOptionItem.Create(16154, "ShapeshiftCooldown", new(1f, 60f, 1f), 15f, TabGroup.ImpostorRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Visionary]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Warlock.cs b/Roles/Impostor/Warlock.cs index 42e3f8a61..157f3d1a3 100644 --- a/Roles/Impostor/Warlock.cs +++ b/Roles/Impostor/Warlock.cs @@ -1,10 +1,11 @@ -using AmongUs.GameOptions; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; -using System; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; @@ -34,19 +35,19 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(4600, TabGroup.ImpostorRoles, CustomRoles.Warlock); - WarlockCanKillAllies = BooleanOptionItem.Create(4610, "CanKillAllies", true, TabGroup.ImpostorRoles, false) + WarlockCanKillAllies = BooleanOptionItem.Create(4610, "CanKillAllies", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Warlock]); - WarlockCanKillSelf = BooleanOptionItem.Create(4611, "CanKillSelf", false, TabGroup.ImpostorRoles, false) + WarlockCanKillSelf = BooleanOptionItem.Create(4611, "CanKillSelf", false, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Warlock]); - KillCooldown = FloatOptionItem.Create(4613, "KillCooldown", new(0f, 180f, 1f), 30f, TabGroup.ImpostorRoles, false) + KillCooldown = FloatOptionItem.Create(4613, "KillCooldown", new(0f, 180f, 1f), 30f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Warlock]) .SetValueFormat(OptionFormat.Seconds); - CurseCooldown = FloatOptionItem.Create(4614, "CurseCooldown", new(0f, 180f, 1f), 30f, TabGroup.ImpostorRoles, false) + CurseCooldown = FloatOptionItem.Create(4614, "CurseCooldown", new(0f, 180f, 1f), 30f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Warlock]) .SetValueFormat(OptionFormat.Seconds); - FreezeAfterCurseKill = BooleanOptionItem.Create(4615, "FreezeAfterCurseKill", true, TabGroup.ImpostorRoles, false) + FreezeAfterCurseKill = BooleanOptionItem.Create(4615, "FreezeAfterCurseKill", true, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Warlock]); - FreezeDurationAfterCurseKill = FloatOptionItem.Create(4616, "FreezeDuration", new(0f, 60f, 1f), 4f, TabGroup.ImpostorRoles, false) + FreezeDurationAfterCurseKill = FloatOptionItem.Create(4616, "FreezeDuration", new(0f, 60f, 1f), 4f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Warlock]) .SetValueFormat(OptionFormat.Seconds); } @@ -283,7 +284,7 @@ namespace EHR.Roles.Impostor if (seer.IsModClient() && !hud) return string.Empty; if (Main.PlayerStates[seer.PlayerId].Role is not Warlock { IsEnable: true } wl) return string.Empty; - var sb = new System.Text.StringBuilder(); + var sb = new StringBuilder(); if (wl.KCD > 0f) sb.Append($"<#ffa500>{Translator.GetString("KillCooldown")}: <#ffffff>{(int)Math.Round(wl.KCD)}s"); if (wl.CurseCD > 0f) sb.Append($"{(sb.Length > 0 ? "\n" : string.Empty)}<#00ffa5>{Translator.GetString("CurseCooldown")}: <#ffffff>{(int)Math.Round(wl.CurseCD)}s"); return hud ? sb.ToString() : $"{sb}"; diff --git a/Roles/Impostor/Wildling.cs b/Roles/Impostor/Wildling.cs index 7f5a9fa71..2591c4b9a 100644 --- a/Roles/Impostor/Wildling.cs +++ b/Roles/Impostor/Wildling.cs @@ -1,10 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Text; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Neutral; using Hazel; -using System; -using System.Collections.Generic; -using System.Text; using static EHR.Options; namespace EHR.Roles.Impostor; @@ -35,13 +35,13 @@ public class Wildling : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Wildling); - ProtectDurationOpt = FloatOptionItem.Create(Id + 14, "BKProtectDuration", new(1f, 30f, 1f), 15f, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Wildling]) + ProtectDurationOpt = FloatOptionItem.Create(Id + 14, "BKProtectDuration", new(1f, 30f, 1f), 15f, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Wildling]) .SetValueFormat(OptionFormat.Seconds); - CanVentOpt = BooleanOptionItem.Create(Id + 15, "CanVent", true, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Wildling]); - CanShapeshiftOpt = BooleanOptionItem.Create(Id + 16, "CanShapeshift", false, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Wildling]); - ShapeshiftCDOpt = FloatOptionItem.Create(Id + 17, "ShapeshiftCooldown", new(1f, 60f, 1f), 30f, TabGroup.ImpostorRoles, false).SetParent(CanShapeshiftOpt) + CanVentOpt = BooleanOptionItem.Create(Id + 15, "CanVent", true, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Wildling]); + CanShapeshiftOpt = BooleanOptionItem.Create(Id + 16, "CanShapeshift", false, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Wildling]); + ShapeshiftCDOpt = FloatOptionItem.Create(Id + 17, "ShapeshiftCooldown", new(1f, 60f, 1f), 30f, TabGroup.ImpostorRoles).SetParent(CanShapeshiftOpt) .SetValueFormat(OptionFormat.Seconds); - ShapeshiftDurOpt = FloatOptionItem.Create(Id + 18, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles, false).SetParent(CanShapeshiftOpt) + ShapeshiftDurOpt = FloatOptionItem.Create(Id + 18, "ShapeshiftDuration", new(1f, 30f, 1f), 10f, TabGroup.ImpostorRoles).SetParent(CanShapeshiftOpt) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Witch.cs b/Roles/Impostor/Witch.cs index a283db801..d63c0b803 100644 --- a/Roles/Impostor/Witch.cs +++ b/Roles/Impostor/Witch.cs @@ -1,10 +1,10 @@ +using System.Collections.Generic; +using System.Text; using EHR.Modules; using EHR.Patches; using EHR.Roles.Crewmate; using EHR.Roles.Neutral; using Hazel; -using System.Collections.Generic; -using System.Text; using static EHR.Options; using static EHR.Translator; @@ -40,7 +40,7 @@ public class Witch : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.Witch); - ModeSwitchAction = StringOptionItem.Create(Id + 10, "WitchModeSwitchAction", SwitchTriggerText, 2, TabGroup.ImpostorRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Witch]); + ModeSwitchAction = StringOptionItem.Create(Id + 10, "WitchModeSwitchAction", SwitchTriggerText, 2, TabGroup.ImpostorRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Witch]); } public override void Init() diff --git a/Roles/Impostor/YinYanger.cs b/Roles/Impostor/YinYanger.cs index 60cd74503..970c6b2bf 100644 --- a/Roles/Impostor/YinYanger.cs +++ b/Roles/Impostor/YinYanger.cs @@ -1,6 +1,6 @@ -using EHR.Modules; +using System.Collections.Generic; +using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; using static EHR.Utils; @@ -22,10 +22,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.ImpostorRoles, CustomRoles.YinYanger); - YinYangCD = FloatOptionItem.Create(Id + 5, "YinYangCD", new(0f, 60f, 2.5f), 12.5f, TabGroup.ImpostorRoles, false) + YinYangCD = FloatOptionItem.Create(Id + 5, "YinYangCD", new(0f, 60f, 2.5f), 12.5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.YinYanger]) .SetValueFormat(OptionFormat.Seconds); - KCD = FloatOptionItem.Create(Id + 6, "KillCooldown", new(0f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles, false) + KCD = FloatOptionItem.Create(Id + 6, "KillCooldown", new(0f, 60f, 2.5f), 25f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.YinYanger]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Impostor/Zombie.cs b/Roles/Impostor/Zombie.cs index 508e80170..db8b8c94b 100644 --- a/Roles/Impostor/Zombie.cs +++ b/Roles/Impostor/Zombie.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System; +using System; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Impostor @@ -12,10 +12,10 @@ namespace EHR.Roles.Impostor public static void SetupCustomOption() { SetupRoleOptions(16400, TabGroup.ImpostorRoles, CustomRoles.Zombie); - ZombieKillCooldown = FloatOptionItem.Create(16410, "KillCooldown", new(0f, 180f, 2.5f), 5f, TabGroup.ImpostorRoles, false) + ZombieKillCooldown = FloatOptionItem.Create(16410, "KillCooldown", new(0f, 180f, 2.5f), 5f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Zombie]) .SetValueFormat(OptionFormat.Seconds); - ZombieSpeedReduce = FloatOptionItem.Create(16411, "ZombieSpeedReduce", new(0.0f, 1.0f, 0.1f), 0.1f, TabGroup.ImpostorRoles, false) + ZombieSpeedReduce = FloatOptionItem.Create(16411, "ZombieSpeedReduce", new(0.0f, 1.0f, 0.1f), 0.1f, TabGroup.ImpostorRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Zombie]) .SetValueFormat(OptionFormat.Multiplier); } diff --git a/Roles/Neutral/Agitater.cs b/Roles/Neutral/Agitater.cs index 89664b57e..47e501d73 100644 --- a/Roles/Neutral/Agitater.cs +++ b/Roles/Neutral/Agitater.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using Hazel; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Translator; @@ -30,15 +30,15 @@ public class Agitater : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Agitater); - AgiTaterBombCooldown = FloatOptionItem.Create(Id + 10, "AgitaterBombCooldown", new(10f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]) + AgiTaterBombCooldown = FloatOptionItem.Create(Id + 10, "AgitaterBombCooldown", new(10f, 180f, 2.5f), 20f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]) .SetValueFormat(OptionFormat.Seconds); - PassCooldown = FloatOptionItem.Create(Id + 11, "AgitaterPassCooldown", new(0f, 5f, 0.25f), 1f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]) + PassCooldown = FloatOptionItem.Create(Id + 11, "AgitaterPassCooldown", new(0f, 5f, 0.25f), 1f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]) .SetValueFormat(OptionFormat.Seconds); - BombExplodeCooldown = FloatOptionItem.Create(Id + 12, "BombExplodeCooldown", new(1f, 60f, 1f), 10f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]) + BombExplodeCooldown = FloatOptionItem.Create(Id + 12, "BombExplodeCooldown", new(1f, 60f, 1f), 10f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]) .SetValueFormat(OptionFormat.Seconds); - AgitaterCanGetBombed = BooleanOptionItem.Create(Id + 13, "AgitaterCanGetBombed", false, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]); - AgitaterAutoReportBait = BooleanOptionItem.Create(Id + 14, "AgitaterAutoReportBait", false, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]); - HasImpostorVision = BooleanOptionItem.Create(Id + 15, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]); + AgitaterCanGetBombed = BooleanOptionItem.Create(Id + 13, "AgitaterCanGetBombed", false, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]); + AgitaterAutoReportBait = BooleanOptionItem.Create(Id + 14, "AgitaterAutoReportBait", false, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]); + HasImpostorVision = BooleanOptionItem.Create(Id + 15, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Agitater]); } public override void Init() diff --git a/Roles/Neutral/Amnesiac.cs b/Roles/Neutral/Amnesiac.cs index 4edb0dbe2..fc22632a7 100644 --- a/Roles/Neutral/Amnesiac.cs +++ b/Roles/Neutral/Amnesiac.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; using System; using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -34,17 +34,17 @@ public class Amnesiac : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Amnesiac); - RememberMode = StringOptionItem.Create(Id + 9, "RememberMode", RememberModes, 0, TabGroup.NeutralRoles, false) + RememberMode = StringOptionItem.Create(Id + 9, "RememberMode", RememberModes, 0, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Amnesiac]); - RememberCooldown = FloatOptionItem.Create(Id + 10, "RememberCooldown", new(0f, 180f, 2.5f), 5f, TabGroup.NeutralRoles, false) + RememberCooldown = FloatOptionItem.Create(Id + 10, "RememberCooldown", new(0f, 180f, 2.5f), 5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Amnesiac]) .SetValueFormat(OptionFormat.Seconds); - RefugeeKillCD = FloatOptionItem.Create(Id + 11, "RefugeeKillCD", new(0f, 180f, 2.5f), 25f, TabGroup.NeutralRoles, false) + RefugeeKillCD = FloatOptionItem.Create(Id + 11, "RefugeeKillCD", new(0f, 180f, 2.5f), 25f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Amnesiac]) .SetValueFormat(OptionFormat.Seconds); - IncompatibleNeutralMode = StringOptionItem.Create(Id + 12, "IncompatibleNeutralMode", AmnesiacIncompatibleNeutralMode, 0, TabGroup.NeutralRoles, false) + IncompatibleNeutralMode = StringOptionItem.Create(Id + 12, "IncompatibleNeutralMode", AmnesiacIncompatibleNeutralMode, 0, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Amnesiac]); - CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", false, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Amnesiac]); } diff --git a/Roles/Neutral/Arsonist.cs b/Roles/Neutral/Arsonist.cs index 73b4a1006..650b3dc18 100644 --- a/Roles/Neutral/Arsonist.cs +++ b/Roles/Neutral/Arsonist.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Modules; using UnityEngine; using static EHR.Options; @@ -19,19 +19,19 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(10400, TabGroup.NeutralRoles, CustomRoles.Arsonist); - ArsonistDouseTime = FloatOptionItem.Create(10410, "ArsonistDouseTime", new(0f, 90f, 1f), 3f, TabGroup.NeutralRoles, false) + ArsonistDouseTime = FloatOptionItem.Create(10410, "ArsonistDouseTime", new(0f, 90f, 1f), 3f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Arsonist]) .SetValueFormat(OptionFormat.Seconds); - ArsonistCooldown = FloatOptionItem.Create(10411, "Cooldown", new(0f, 60f, 1f), 10f, TabGroup.NeutralRoles, false) + ArsonistCooldown = FloatOptionItem.Create(10411, "Cooldown", new(0f, 60f, 1f), 10f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Arsonist]) .SetValueFormat(OptionFormat.Seconds); - ArsonistCanIgniteAnytime = BooleanOptionItem.Create(10413, "ArsonistCanIgniteAnytime", false, TabGroup.NeutralRoles, false) + ArsonistCanIgniteAnytime = BooleanOptionItem.Create(10413, "ArsonistCanIgniteAnytime", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Arsonist]); - ArsonistMinPlayersToIgnite = IntegerOptionItem.Create(10414, "ArsonistMinPlayersToIgnite", new(1, 14, 1), 1, TabGroup.NeutralRoles, false) + ArsonistMinPlayersToIgnite = IntegerOptionItem.Create(10414, "ArsonistMinPlayersToIgnite", new(1, 14, 1), 1, TabGroup.NeutralRoles) .SetParent(ArsonistCanIgniteAnytime); - ArsonistMaxPlayersToIgnite = IntegerOptionItem.Create(10415, "ArsonistMaxPlayersToIgnite", new(1, 14, 1), 3, TabGroup.NeutralRoles, false) + ArsonistMaxPlayersToIgnite = IntegerOptionItem.Create(10415, "ArsonistMaxPlayersToIgnite", new(1, 14, 1), 3, TabGroup.NeutralRoles) .SetParent(ArsonistCanIgniteAnytime); - ArsonistKeepsGameGoing = BooleanOptionItem.Create(10412, "ArsonistKeepsGameGoing", false, TabGroup.NeutralRoles, false) + ArsonistKeepsGameGoing = BooleanOptionItem.Create(10412, "ArsonistKeepsGameGoing", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Arsonist]); } diff --git a/Roles/Neutral/Bandit.cs b/Roles/Neutral/Bandit.cs index 7e0cf1ccc..055eaa901 100644 --- a/Roles/Neutral/Bandit.cs +++ b/Roles/Neutral/Bandit.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; @@ -32,14 +32,14 @@ public class Bandit : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Bandit); - MaxSteals = IntegerOptionItem.Create(Id + 10, "BanditMaxSteals", new(1, 20, 1), 3, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); - KillCooldown = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]) + MaxSteals = IntegerOptionItem.Create(Id + 10, "BanditMaxSteals", new(1, 20, 1), 3, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); + KillCooldown = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]) .SetValueFormat(OptionFormat.Seconds); - StealMode = StringOptionItem.Create(Id + 12, "BanditStealMode", BanditStealModeOpt, 0, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); - CanStealBetrayalAddon = BooleanOptionItem.Create(Id + 13, "BanditCanStealBetrayalAddon", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); - CanStealImpOnlyAddon = BooleanOptionItem.Create(Id + 14, "BanditCanStealImpOnlyAddon", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); - CanVent = BooleanOptionItem.Create(Id + 16, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); - HasImpostorVision = BooleanOptionItem.Create(Id + 17, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); + StealMode = StringOptionItem.Create(Id + 12, "BanditStealMode", BanditStealModeOpt, 0, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); + CanStealBetrayalAddon = BooleanOptionItem.Create(Id + 13, "BanditCanStealBetrayalAddon", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); + CanStealImpOnlyAddon = BooleanOptionItem.Create(Id + 14, "BanditCanStealImpOnlyAddon", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); + CanVent = BooleanOptionItem.Create(Id + 16, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); + HasImpostorVision = BooleanOptionItem.Create(Id + 17, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Bandit]); } public override void Init() diff --git a/Roles/Neutral/Bargainer.cs b/Roles/Neutral/Bargainer.cs new file mode 100644 index 000000000..97ef81956 --- /dev/null +++ b/Roles/Neutral/Bargainer.cs @@ -0,0 +1,390 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text; +using AmongUs.GameOptions; +using UnityEngine; +using static EHR.Options; + +namespace EHR.Roles.Neutral +{ + internal class Bargainer : RoleBase + { + public static bool On; + + private static OptionItem KillCooldown; + private static OptionItem CanVent; + private static OptionItem HasImpostorVision; + private static OptionItem StartingMoney; + private static readonly Dictionary MoneySettings = []; + private static readonly Dictionary ItemSettings = []; + private static OptionItem ShieldDuration; + private static OptionItem ShieldTime; + private static OptionItem ReducedKillCooldown; + private static OptionItem AlignmentVisible; + private static OptionItem AlignmentVisibleDuration; + + enum AlignmentVisibleOptions + { + Forever, + UntilNextMeeting, + UntilNextReveal, + ForSpecifiedTime + } + + private static int AlignmentVisibleValue => (AlignmentVisibleOptions)AlignmentVisible.GetValue() switch + { + AlignmentVisibleOptions.Forever => int.MaxValue, + AlignmentVisibleOptions.UntilNextMeeting => int.MaxValue, + AlignmentVisibleOptions.UntilNextReveal => int.MaxValue, + AlignmentVisibleOptions.ForSpecifiedTime => AlignmentVisibleDuration.GetInt(), + + _ => 0 + }; + + enum ShieldDurationOptions + { + UntilNextMeeting, + ForSpecifiedTime + } + + private static int ShieldDurationValue => (ShieldDurationOptions)ShieldDuration.GetValue() switch + { + ShieldDurationOptions.UntilNextMeeting => int.MaxValue, + ShieldDurationOptions.ForSpecifiedTime => ShieldTime.GetInt(), + + _ => 0 + }; + + private static Dictionary Gains = []; + private static Dictionary Costs = []; + + private static readonly Dictionary Icons = new() + { + [Item.EnergyDrink] = Utils.ColorString(Color.magenta, "\u2668"), + [Item.LensOfTruth] = "\u2600", + [Item.BandAid] = Utils.ColorString(Color.green, "\u2764") + }; + + private static IEnumerable ShopLocations + { + get + { + var mapName = Main.CurrentMap.ToString(); + var devices = DisableDevice.DevicePos.SkipWhile(x => !x.Key.StartsWith(mapName)).TakeWhile(x => x.Key.StartsWith(mapName)); + return devices.Select(x => x.Value); + } + } + + enum MoneyGainingAction + { + Kill, + Sabotage, + SurviveMeeting + } + + public enum Item + { + None, + EnergyDrink, + LensOfTruth, + BandAid + } + + private byte BargainerId; + private int Money; + private bool InShop; + private Item SelectedItem; + private IEnumerable OrderedItems; + + public List<(Item Item, long ActivateTimeStamp, int Duration, byte Target)> ActiveItems = []; + + public static void SetupCustomOption() + { + int id = 14880; + const TabGroup tab = TabGroup.NeutralRoles; + + SetupRoleOptions(id++, tab, CustomRoles.Bargainer); + + KillCooldown = FloatOptionItem.Create(++id, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, tab) + .SetParent(CustomRoleSpawnChances[CustomRoles.Bargainer]) + .SetValueFormat(OptionFormat.Seconds); + CanVent = BooleanOptionItem.Create(++id, "CanVent", true, tab) + .SetParent(CustomRoleSpawnChances[CustomRoles.Bargainer]); + HasImpostorVision = BooleanOptionItem.Create(++id, "ImpostorVision", true, tab) + .SetParent(CustomRoleSpawnChances[CustomRoles.Bargainer]); + StartingMoney = IntegerOptionItem.Create(++id, "Bargainer.StartingMoney", new(0, 100, 5), 0, tab) + .SetParent(CustomRoleSpawnChances[CustomRoles.Bargainer]); + + foreach (var action in EnumHelper.GetAllValues()) + { + var boolOpt = BooleanOptionItem.Create(++id, $"Bargainer.{action}.Enabled", true, tab) + .SetParent(CustomRoleSpawnChances[CustomRoles.Bargainer]); + var intOpt = IntegerOptionItem.Create(++id, $"Bargainer.{action}.Amount", new(0, 100, 5), GetDefaultValue(), tab) + .SetParent(boolOpt); + + MoneySettings[action] = (boolOpt, intOpt); + continue; + + int GetDefaultValue() => action switch + { + MoneyGainingAction.Kill => 30, + MoneyGainingAction.Sabotage => 10, + MoneyGainingAction.SurviveMeeting => 20, + + _ => 0 + }; + } + + foreach (var item in EnumHelper.GetAllValues()) + { + if (item == Item.None) continue; + + var boolOpt = BooleanOptionItem.Create(++id, $"Bargainer.{item}.Enabled", true, tab) + .SetParent(CustomRoleSpawnChances[CustomRoles.Bargainer]); + var intOpt = IntegerOptionItem.Create(++id, $"Bargainer.{item}.Cost", new(0, 200, 5), GetDefaultValue(), tab) + .SetParent(boolOpt); + SetupExtraSettings(); + + ItemSettings[item] = (boolOpt, intOpt); + continue; + + int GetDefaultValue() => item switch + { + Item.EnergyDrink => 40, + Item.LensOfTruth => 60, + Item.BandAid => 20, + + _ => 0 + }; + + void SetupExtraSettings() + { + switch (item) + { + case Item.BandAid: + ShieldDuration = StringOptionItem.Create(++id, $"Bargainer.{item}.DurationSwitch", EnumHelper.GetAllNames(), 0, tab) + .SetParent(boolOpt); + ShieldTime = IntegerOptionItem.Create(++id, $"Bargainer.{item}.Duration", new(0, 60, 1), 20, tab) + .SetParent(ShieldDuration) + .SetValueFormat(OptionFormat.Seconds); + break; + case Item.EnergyDrink: + ReducedKillCooldown = FloatOptionItem.Create(++id, $"Bargainer.{item}.ReducedKCD", new(0f, 180f, 0.5f), 17.5f, tab) + .SetParent(boolOpt) + .SetValueFormat(OptionFormat.Seconds); + break; + case Item.LensOfTruth: + AlignmentVisible = StringOptionItem.Create(++id, $"Bargainer.{item}.DurationSwitch", EnumHelper.GetAllNames(), (int)AlignmentVisibleOptions.UntilNextReveal, tab) + .SetParent(boolOpt); + AlignmentVisibleDuration = IntegerOptionItem.Create(++id, $"Bargainer.{item}.Duration", new(1, 30, 1), 10, tab) + .SetParent(AlignmentVisible) + .SetValueFormat(OptionFormat.Seconds); + break; + } + } + } + } + + public override void Init() + { + On = false; + + Gains = []; + foreach (var kvp in MoneySettings) + { + if (kvp.Value.Enabled.GetBool()) + { + Gains[kvp.Key] = kvp.Value.Amount.GetInt(); + } + } + + Costs = []; + foreach (var kvp in ItemSettings) + { + if (kvp.Value.Enabled.GetBool()) + { + Costs[kvp.Key] = kvp.Value.Cost.GetInt(); + } + } + } + + public override void Add(byte playerId) + { + On = true; + + BargainerId = playerId; + Money = StartingMoney.GetInt(); + Update(); + + InShop = false; + SelectedItem = Item.None; + ActiveItems = []; + + if (!AmongUsClient.Instance.AmHost) return; + if (!Main.ResetCamPlayerList.Contains(playerId)) + Main.ResetCamPlayerList.Add(playerId); + } + + public override bool IsEnable => On; + public override void SetKillCooldown(byte id) => Main.AllPlayerKillCooldown[id] = ActiveItems.Any(x => x.Item == Item.EnergyDrink) ? ReducedKillCooldown.GetFloat() : KillCooldown.GetFloat(); + public override void ApplyGameOptions(IGameOptions opt, byte id) => opt.SetVision(HasImpostorVision.GetBool()); + public override bool CanUseImpostorVentButton(PlayerControl pc) => CanVent.GetBool(); + public override bool CanUseSabotage(PlayerControl pc) => pc.IsAlive(); + + void Update() => BargainerId.SetAbilityUseLimit(Money); + + public override void OnMurder(PlayerControl killer, PlayerControl target) + { + if (Gains.TryGetValue(MoneyGainingAction.Kill, out int gain)) + { + Money += gain; + Update(); + } + } + + public override bool OnSabotage(PlayerControl pc) + { + if (Gains.TryGetValue(MoneyGainingAction.Sabotage, out var gain)) + { + Money += gain; + Update(); + } + + return true; + } + + public override void AfterMeetingTasks() + { + if (Gains.TryGetValue(MoneyGainingAction.SurviveMeeting, out var gain)) + { + Money += gain; + Update(); + } + } + + public override void OnFixedUpdate(PlayerControl pc) + { + if (!GameStates.IsInTask || !pc.IsAlive()) + { + InShop = false; + ActiveItems.Clear(); + Money = 0; + return; + } + + var wasInShop = InShop; + InShop = ShopLocations.Any(x => Vector2.Distance(pc.Pos(), x) < DisableDevice.UsableDistance()); + + switch (wasInShop) + { + case true when !InShop && ActiveItems.All(x => x.Item != SelectedItem) && Costs.TryGetValue(SelectedItem, out var cost) && cost <= Money: + { + (int duration, byte target) = GetData(SelectedItem); + ActiveItems.Add((SelectedItem, Utils.TimeStamp, duration, target)); + Money -= cost; + Update(); + + pc.Notify(string.Format(Translator.GetString("Bargainer.Notify.PurchasedItem"), Translator.GetString($"Bargainer.{SelectedItem}"))); + + switch (SelectedItem) + { + case Item.EnergyDrink: + pc.ResetKillCooldown(); + pc.SyncSettings(); + if (Main.KillTimers[pc.PlayerId] > ReducedKillCooldown.GetFloat()) pc.SetKillCooldown(ReducedKillCooldown.GetFloat()); + break; + case Item.LensOfTruth: + Utils.NotifyRoles(SpecifySeer: pc, SpecifyTarget: Utils.GetPlayerById(target)); + break; + } + + break; + + static (int Duration, byte Target) GetData(Item item) => item switch + { + Item.EnergyDrink => (int.MaxValue, byte.MaxValue), + Item.LensOfTruth => (AlignmentVisibleValue, Main.AllAlivePlayerControls[IRandom.Instance.Next(Main.AllAlivePlayerControls.Length)].PlayerId), + Item.BandAid => (ShieldDurationValue, byte.MaxValue), + + _ => (0, byte.MaxValue) + }; + } + case false when InShop: + { + OrderedItems = Costs.OrderByDescending(x => x.Value <= Money).Select(x => x.Key).Append(Item.None); + SelectedItem = OrderedItems.FirstOrDefault(); + Utils.NotifyRoles(SpecifySeer: pc, SpecifyTarget: pc); + break; + } + } + + ActiveItems.RemoveAll(x => x.Item == Item.None); + + foreach (var item in ActiveItems.Where(x => x.Duration != int.MaxValue && x.ActivateTimeStamp + x.Duration < Utils.TimeStamp)) + { + ActiveItems.Remove(item); + Utils.NotifyRoles(SpecifySeer: pc, SpecifyTarget: Utils.GetPlayerById(item.Target) ?? pc); + } + } + + public override void OnPet(PlayerControl pc) + { + var list = OrderedItems.ToList(); + SelectedItem = list[(list.IndexOf(SelectedItem) + 1) % list.Count]; + } + + public override bool OnCheckMurderAsTarget(PlayerControl killer, PlayerControl target) + { + return ActiveItems.All(x => x.Item != Item.BandAid); + } + + public override void OnReportDeadBody() + { + List indexesToRemove = []; + + for (int i = 0; i < ActiveItems.Count; i++) + { + switch (ActiveItems[i].Item) + { + case Item.LensOfTruth: + if ((AlignmentVisibleOptions)AlignmentVisible.GetValue() is AlignmentVisibleOptions.ForSpecifiedTime or AlignmentVisibleOptions.UntilNextMeeting) + indexesToRemove.Add(i); + break; + default: + indexesToRemove.Add(i); + break; + } + } + + foreach (var index in indexesToRemove) ActiveItems.RemoveAt(index); + } + + public static bool KnowRole(PlayerControl seer, PlayerControl target) + { + return Main.PlayerStates[seer.PlayerId].Role is Bargainer bg && bg.ActiveItems.Any(x => x.Target == target.PlayerId); + } + + public static string GetSuffix(PlayerControl seer) + { + if (Main.PlayerStates[seer.PlayerId].Role is not Bargainer bg) return string.Empty; + + string result = string.Empty; + + if (bg.InShop) + { + result += string.Format(Translator.GetString("Bargainer.Suffix.InShop"), Translator.GetString($"Bargainer.{bg.SelectedItem}")); + result += "\n"; + } + + result += string.Join(' ', bg.ActiveItems.Select(x => + { + var timeLeft = x.Duration - (Utils.TimeStamp - x.ActivateTimeStamp); + var icon = Icons[x.Item]; + if (x.Item == Item.LensOfTruth && x.Target != byte.MaxValue) icon = Utils.ColorString(Main.PlayerColors[x.Target], icon); + return seer.IsModClient() && timeLeft < 10 ? $"{icon} ({timeLeft}s)" : icon; + })); + + return result; + } + } +} \ No newline at end of file diff --git a/Roles/Neutral/BloodKnight.cs b/Roles/Neutral/BloodKnight.cs index 9866189c7..d7a133198 100644 --- a/Roles/Neutral/BloodKnight.cs +++ b/Roles/Neutral/BloodKnight.cs @@ -14,11 +14,11 @@ public class BloodKnight : ISettingHolder public void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.BloodKnight); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]); - ProtectDuration = FloatOptionItem.Create(Id + 14, "BKProtectDuration", new(1f, 30f, 1f), 15f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]); + ProtectDuration = FloatOptionItem.Create(Id + 14, "BKProtectDuration", new(1f, 30f, 1f), 15f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.BloodKnight]) .SetValueFormat(OptionFormat.Seconds); } } \ No newline at end of file diff --git a/Roles/Neutral/Bubble.cs b/Roles/Neutral/Bubble.cs index 217f617e7..2b06a0dd2 100644 --- a/Roles/Neutral/Bubble.cs +++ b/Roles/Neutral/Bubble.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using HarmonyLib; using Hazel; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; using static EHR.Utils; @@ -31,23 +31,23 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Bubble); - KillCooldown = FloatOptionItem.Create(Id + 2, "BubbleCD", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 2, "BubbleCD", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bubble]) .SetValueFormat(OptionFormat.Seconds); - HasImpostorVision = BooleanOptionItem.Create(Id + 6, "ImpostorVision", true, TabGroup.NeutralRoles, false) + HasImpostorVision = BooleanOptionItem.Create(Id + 6, "ImpostorVision", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bubble]); - NotifyDelay = IntegerOptionItem.Create(Id + 3, "BubbleTargetNotifyDelay", new(0, 60, 1), 3, TabGroup.NeutralRoles, false) + NotifyDelay = IntegerOptionItem.Create(Id + 3, "BubbleTargetNotifyDelay", new(0, 60, 1), 3, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bubble]) .SetValueFormat(OptionFormat.Seconds); - ExplodeDelay = IntegerOptionItem.Create(Id + 4, "BubbleExplosionDelay", new(0, 60, 1), 10, TabGroup.NeutralRoles, false) + ExplodeDelay = IntegerOptionItem.Create(Id + 4, "BubbleExplosionDelay", new(0, 60, 1), 10, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bubble]) .SetValueFormat(OptionFormat.Seconds); - BubbleDiesIfInRange = BooleanOptionItem.Create(Id + 5, "BubbleDiesIfInRange", true, TabGroup.NeutralRoles, false) + BubbleDiesIfInRange = BooleanOptionItem.Create(Id + 5, "BubbleDiesIfInRange", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bubble]); - ExplosionRadius = FloatOptionItem.Create(Id + 7, "BubbleExplosionRadius", new(0.1f, 5f, 0.1f), 3f, TabGroup.NeutralRoles, false) + ExplosionRadius = FloatOptionItem.Create(Id + 7, "BubbleExplosionRadius", new(0.1f, 5f, 0.1f), 3f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bubble]) .SetValueFormat(OptionFormat.Multiplier); - CanVent = BooleanOptionItem.Create(Id + 8, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 8, "CanVent", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Bubble]); } diff --git a/Roles/Neutral/Cherokious.cs b/Roles/Neutral/Cherokious.cs index 8107cb877..7d9ce5040 100644 --- a/Roles/Neutral/Cherokious.cs +++ b/Roles/Neutral/Cherokious.cs @@ -14,7 +14,7 @@ namespace EHR.Roles.Impostor { const int id = 13860; Options.SetupRoleOptions(id, TabGroup.NeutralRoles, CustomRoles.Cherokious); - KillCooldown = IntegerOptionItem.Create(id + 2, "KillCooldown", new(0, 60, 1), 15, TabGroup.NeutralRoles, false) + KillCooldown = IntegerOptionItem.Create(id + 2, "KillCooldown", new(0, 60, 1), 15, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Cherokious]) .SetValueFormat(OptionFormat.Seconds); Tasks = Options.OverrideTasksData.Create(id + 3, TabGroup.NeutralRoles, CustomRoles.Cherokious); diff --git a/Roles/Neutral/Collector.cs b/Roles/Neutral/Collector.cs index b43275abd..af44ed498 100644 --- a/Roles/Neutral/Collector.cs +++ b/Roles/Neutral/Collector.cs @@ -1,8 +1,8 @@ -using EHR.Modules; +using System.Collections.Generic; +using System.Linq; +using EHR.Modules; using EHR.Patches; using Hazel; -using System.Collections.Generic; -using System.Linq; namespace EHR.Roles.Neutral; @@ -17,7 +17,7 @@ public class Collector : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Collector); - CollectorCollectAmount = IntegerOptionItem.Create(Id + 13, "CollectorCollectAmount", new(1, 60, 1), 30, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Collector]) + CollectorCollectAmount = IntegerOptionItem.Create(Id + 13, "CollectorCollectAmount", new(1, 60, 1), 30, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Collector]) .SetValueFormat(OptionFormat.Votes); } diff --git a/Roles/Neutral/DarkHide.cs b/Roles/Neutral/DarkHide.cs index ba69567e5..4f25ff70e 100644 --- a/Roles/Neutral/DarkHide.cs +++ b/Roles/Neutral/DarkHide.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; using InnerNet; -using System.Collections.Generic; namespace EHR.Roles.Neutral; @@ -24,12 +24,12 @@ public class DarkHide : RoleBase public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.DarkHide); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); - HasImpostorVision = BooleanOptionItem.Create(Id + 11, "ImpostorVision", false, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); - CanCountNeutralKiller = BooleanOptionItem.Create(Id + 12, "CanCountNeutralKiller", false, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); - SnatchesWin = BooleanOptionItem.Create(Id + 13, "SnatchesWin", false, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); + CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); + HasImpostorVision = BooleanOptionItem.Create(Id + 11, "ImpostorVision", false, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); + CanCountNeutralKiller = BooleanOptionItem.Create(Id + 12, "CanCountNeutralKiller", false, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); + SnatchesWin = BooleanOptionItem.Create(Id + 13, "SnatchesWin", false, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.DarkHide]); } public override void Init() diff --git a/Roles/Neutral/Doomsayer.cs b/Roles/Neutral/Doomsayer.cs index 761c2e390..4316e04af 100644 --- a/Roles/Neutral/Doomsayer.cs +++ b/Roles/Neutral/Doomsayer.cs @@ -1,6 +1,6 @@ -using EHR.Modules; +using System.Collections.Generic; +using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; namespace EHR.Roles.Neutral; @@ -31,7 +31,7 @@ public class Doomsayer : RoleBase public static void SetupCustomOption() { Options.SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Doomsayer); - DoomsayerAmountOfGuessesToWin = IntegerOptionItem.Create(Id + 10, "DoomsayerAmountOfGuessesToWin", new(1, 10, 1), 3, TabGroup.NeutralRoles, false) + DoomsayerAmountOfGuessesToWin = IntegerOptionItem.Create(Id + 10, "DoomsayerAmountOfGuessesToWin", new(1, 10, 1), 3, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Doomsayer]) .SetValueFormat(OptionFormat.Times); DCanGuessImpostors = BooleanOptionItem.Create(Id + 12, "DCanGuessImpostors", true, TabGroup.NeutralRoles, true) @@ -40,16 +40,16 @@ public class Doomsayer : RoleBase .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Doomsayer]); DCanGuessNeutrals = BooleanOptionItem.Create(Id + 14, "DCanGuessNeutrals", true, TabGroup.NeutralRoles, true) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Doomsayer]); - DCanGuessAdt = BooleanOptionItem.Create(Id + 15, "DCanGuessAdt", false, TabGroup.NeutralRoles, false) + DCanGuessAdt = BooleanOptionItem.Create(Id + 15, "DCanGuessAdt", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Doomsayer]); AdvancedSettings = BooleanOptionItem.Create(Id + 16, "DoomsayerAdvancedSettings", true, TabGroup.NeutralRoles, true) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Doomsayer]); - MaxNumberOfGuessesPerMeeting = IntegerOptionItem.Create(Id + 17, "DoomsayerMaxNumberOfGuessesPerMeeting", new(1, 10, 1), 2, TabGroup.NeutralRoles, false) + MaxNumberOfGuessesPerMeeting = IntegerOptionItem.Create(Id + 17, "DoomsayerMaxNumberOfGuessesPerMeeting", new(1, 10, 1), 2, TabGroup.NeutralRoles) .SetParent(AdvancedSettings); KillCorrectlyGuessedPlayers = BooleanOptionItem.Create(Id + 18, "DoomsayerKillCorrectlyGuessedPlayers", true, TabGroup.NeutralRoles, true) .SetParent(AdvancedSettings); - DoesNotSuicideWhenMisguessing = BooleanOptionItem.Create(Id + 19, "DoomsayerDoesNotSuicideWhenMisguessing", true, TabGroup.NeutralRoles, false) + DoesNotSuicideWhenMisguessing = BooleanOptionItem.Create(Id + 19, "DoomsayerDoesNotSuicideWhenMisguessing", true, TabGroup.NeutralRoles) .SetParent(AdvancedSettings); MisguessRolePrevGuessRoleUntilNextMeeting = BooleanOptionItem.Create(Id + 20, "DoomsayerMisguessRolePrevGuessRoleUntilNextMeeting", true, TabGroup.NeutralRoles, true) .SetParent(DoesNotSuicideWhenMisguessing); diff --git a/Roles/Neutral/Doppelganger.cs b/Roles/Neutral/Doppelganger.cs index 7abb8617e..060a94f2b 100644 --- a/Roles/Neutral/Doppelganger.cs +++ b/Roles/Neutral/Doppelganger.cs @@ -1,8 +1,8 @@ -using EHR.Modules; +using System.Collections.Generic; +using System.Linq; +using EHR.Modules; using EHR.Roles.Impostor; using Hazel; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; @@ -36,11 +36,11 @@ public class Doppelganger : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Doppelganger); - MaxSteals = IntegerOptionItem.Create(Id + 10, "DoppelMaxSteals", new(1, 14, 1), 9, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]); - KillCooldown = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]) + MaxSteals = IntegerOptionItem.Create(Id + 10, "DoppelMaxSteals", new(1, 14, 1), 9, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]); + KillCooldown = FloatOptionItem.Create(Id + 11, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]) .SetValueFormat(OptionFormat.Seconds); - ResetMode = StringOptionItem.Create(Id + 12, "DGResetMode", ResetModes, 0, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]); - ResetTimer = FloatOptionItem.Create(Id + 13, "DGResetTimer", new(0f, 60f, 1f), 30f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]) + ResetMode = StringOptionItem.Create(Id + 12, "DGResetMode", ResetModes, 0, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]); + ResetTimer = FloatOptionItem.Create(Id + 13, "DGResetTimer", new(0f, 60f, 1f), 30f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Doppelganger]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Neutral/Eclipse.cs b/Roles/Neutral/Eclipse.cs index f091b459e..93d00b373 100644 --- a/Roles/Neutral/Eclipse.cs +++ b/Roles/Neutral/Eclipse.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; using System; using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -21,18 +21,18 @@ public class Eclipse : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Eclipse); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Eclipse]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Eclipse]) .SetValueFormat(OptionFormat.Seconds); - StartVision = FloatOptionItem.Create(Id + 11, "EclipseStartVision", new(0.1f, 5f, 0.1f), 0.5f, TabGroup.NeutralRoles, false) + StartVision = FloatOptionItem.Create(Id + 11, "EclipseStartVision", new(0.1f, 5f, 0.1f), 0.5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Eclipse]) .SetValueFormat(OptionFormat.Multiplier); - VisionIncrease = FloatOptionItem.Create(Id + 12, "EclipseVisionIncrease", new(0.05f, 5f, 0.05f), 0.1f, TabGroup.NeutralRoles, false) + VisionIncrease = FloatOptionItem.Create(Id + 12, "EclipseVisionIncrease", new(0.05f, 5f, 0.05f), 0.1f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Eclipse]) .SetValueFormat(OptionFormat.Multiplier); - MaxVision = FloatOptionItem.Create(Id + 13, "EclipseMaxVision", new(0.25f, 5f, 0.25f), 1.5f, TabGroup.NeutralRoles, false) + MaxVision = FloatOptionItem.Create(Id + 13, "EclipseMaxVision", new(0.25f, 5f, 0.25f), 1.5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Eclipse]) .SetValueFormat(OptionFormat.Multiplier); - CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Eclipse]); + CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Eclipse]); } public override void Init() diff --git a/Roles/Neutral/Enderman.cs b/Roles/Neutral/Enderman.cs index 189ccf15b..c73e6b0cc 100644 --- a/Roles/Neutral/Enderman.cs +++ b/Roles/Neutral/Enderman.cs @@ -22,12 +22,12 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Enderman); - KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Enderman]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 3, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 3, "CanVent", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Enderman]); - Time = IntegerOptionItem.Create(Id + 4, "EndermanSecondsBeforeTP", new(1, 60, 1), 7, TabGroup.NeutralRoles, false) + Time = IntegerOptionItem.Create(Id + 4, "EndermanSecondsBeforeTP", new(1, 60, 1), 7, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Enderman]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Neutral/Executioner.cs b/Roles/Neutral/Executioner.cs index bfafac2d9..96cabfc4e 100644 --- a/Roles/Neutral/Executioner.cs +++ b/Roles/Neutral/Executioner.cs @@ -1,8 +1,8 @@ -using EHR.Modules; -using Hazel; using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using Hazel; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -39,13 +39,13 @@ public class Executioner : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Executioner); - CanTargetImpostor = BooleanOptionItem.Create(Id + 10, "ExecutionerCanTargetImpostor", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); - CanTargetNeutralKiller = BooleanOptionItem.Create(Id + 12, "ExecutionerCanTargetNeutralKiller", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); - CanTargetNeutralBenign = BooleanOptionItem.Create(Id + 14, "CanTargetNeutralBenign", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); - CanTargetNeutralEvil = BooleanOptionItem.Create(Id + 15, "CanTargetNeutralEvil", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); - CanTargetNeutralChaos = BooleanOptionItem.Create(Id + 16, "CanTargetNeutralChaos", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); - KnowTargetRole = BooleanOptionItem.Create(Id + 13, "KnowTargetRole", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); - ChangeRolesAfterTargetKilled = StringOptionItem.Create(Id + 11, "ExecutionerChangeRolesAfterTargetKilled", CRoleChangeRoles.Select(x => x.ToColoredString()).ToArray(), 1, TabGroup.NeutralRoles, false, noTranslation: true).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); + CanTargetImpostor = BooleanOptionItem.Create(Id + 10, "ExecutionerCanTargetImpostor", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); + CanTargetNeutralKiller = BooleanOptionItem.Create(Id + 12, "ExecutionerCanTargetNeutralKiller", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); + CanTargetNeutralBenign = BooleanOptionItem.Create(Id + 14, "CanTargetNeutralBenign", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); + CanTargetNeutralEvil = BooleanOptionItem.Create(Id + 15, "CanTargetNeutralEvil", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); + CanTargetNeutralChaos = BooleanOptionItem.Create(Id + 16, "CanTargetNeutralChaos", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); + KnowTargetRole = BooleanOptionItem.Create(Id + 13, "KnowTargetRole", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); + ChangeRolesAfterTargetKilled = StringOptionItem.Create(Id + 11, "ExecutionerChangeRolesAfterTargetKilled", CRoleChangeRoles.Select(x => x.ToColoredString()).ToArray(), 1, TabGroup.NeutralRoles, noTranslation: true).SetParent(CustomRoleSpawnChances[CustomRoles.Executioner]); } public override void Init() diff --git a/Roles/Neutral/FFF.cs b/Roles/Neutral/FFF.cs index 011fd36da..6f0d4c113 100644 --- a/Roles/Neutral/FFF.cs +++ b/Roles/Neutral/FFF.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Neutral @@ -29,16 +29,16 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.FFF, zeroOne: false); - MisFireKillTarget = BooleanOptionItem.Create(Id + 11, "FFFMisFireKillTarget", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.FFF]); - ChooseConverted = BooleanOptionItem.Create(Id + 12, "FFFChooseConverted", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.FFF]); - CanKillMadmate = BooleanOptionItem.Create(Id + 13, "FFFCanKillMadmate", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); - CanKillCharmed = BooleanOptionItem.Create(Id + 14, "FFFCanKillCharmed", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); - CanKillLovers = BooleanOptionItem.Create(Id + 15, "FFFCanKillLovers", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); - CanKillSidekicks = BooleanOptionItem.Create(Id + 16, "FFFCanKillSidekick", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); - CanKillEgoists = BooleanOptionItem.Create(Id + 17, "FFFCanKillEgoist", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); - CanKillInfected = BooleanOptionItem.Create(Id + 18, "FFFCanKillInfected", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); - CanKillContagious = BooleanOptionItem.Create(Id + 19, "FFFCanKillContagious", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); - CanKillUndead = BooleanOptionItem.Create(Id + 21, "FFFCanKillUndead", true, TabGroup.NeutralRoles, false).SetParent(ChooseConverted); + MisFireKillTarget = BooleanOptionItem.Create(Id + 11, "FFFMisFireKillTarget", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.FFF]); + ChooseConverted = BooleanOptionItem.Create(Id + 12, "FFFChooseConverted", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.FFF]); + CanKillMadmate = BooleanOptionItem.Create(Id + 13, "FFFCanKillMadmate", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); + CanKillCharmed = BooleanOptionItem.Create(Id + 14, "FFFCanKillCharmed", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); + CanKillLovers = BooleanOptionItem.Create(Id + 15, "FFFCanKillLovers", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); + CanKillSidekicks = BooleanOptionItem.Create(Id + 16, "FFFCanKillSidekick", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); + CanKillEgoists = BooleanOptionItem.Create(Id + 17, "FFFCanKillEgoist", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); + CanKillInfected = BooleanOptionItem.Create(Id + 18, "FFFCanKillInfected", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); + CanKillContagious = BooleanOptionItem.Create(Id + 19, "FFFCanKillContagious", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); + CanKillUndead = BooleanOptionItem.Create(Id + 21, "FFFCanKillUndead", true, TabGroup.NeutralRoles).SetParent(ChooseConverted); } public override void Init() diff --git a/Roles/Neutral/Gamer.cs b/Roles/Neutral/Gamer.cs index bbce4b501..66affe79c 100644 --- a/Roles/Neutral/Gamer.cs +++ b/Roles/Neutral/Gamer.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; @@ -26,17 +26,17 @@ public class Gamer : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Gamer); - KillCooldown = FloatOptionItem.Create(Id + 10, "GamerKillCooldown", new(1f, 180f, 1f), 2f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) + KillCooldown = FloatOptionItem.Create(Id + 10, "GamerKillCooldown", new(1f, 180f, 1f), 2f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]); - HealthMax = IntegerOptionItem.Create(Id + 15, "GamerHealthMax", new(5, 300, 5), 100, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]); + HealthMax = IntegerOptionItem.Create(Id + 15, "GamerHealthMax", new(5, 300, 5), 100, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) .SetValueFormat(OptionFormat.Health); - Damage = IntegerOptionItem.Create(Id + 16, "GamerDamage", new(1, 100, 1), 15, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) + Damage = IntegerOptionItem.Create(Id + 16, "GamerDamage", new(1, 100, 1), 15, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) .SetValueFormat(OptionFormat.Health); - SelfHealthMax = IntegerOptionItem.Create(Id + 17, "GamerSelfHealthMax", new(100, 100, 5), 100, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) + SelfHealthMax = IntegerOptionItem.Create(Id + 17, "GamerSelfHealthMax", new(100, 100, 5), 100, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) .SetValueFormat(OptionFormat.Health); - SelfDamage = IntegerOptionItem.Create(Id + 18, "GamerSelfDamage", new(1, 100, 1), 35, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) + SelfDamage = IntegerOptionItem.Create(Id + 18, "GamerSelfDamage", new(1, 100, 1), 35, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Gamer]) .SetValueFormat(OptionFormat.Health); } diff --git a/Roles/Neutral/Glitch.cs b/Roles/Neutral/Glitch.cs index 621073d82..958ab0588 100644 --- a/Roles/Neutral/Glitch.cs +++ b/Roles/Neutral/Glitch.cs @@ -1,10 +1,10 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; using System; using System.Collections.Generic; using System.Linq; using System.Text; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -42,19 +42,19 @@ public class Glitch : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Glitch); - KillCooldown = IntegerOptionItem.Create(Id + 10, "KillCooldown", new(0, 180, 1), 25, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) + KillCooldown = IntegerOptionItem.Create(Id + 10, "KillCooldown", new(0, 180, 1), 25, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) .SetValueFormat(OptionFormat.Seconds); - HackCooldown = IntegerOptionItem.Create(Id + 11, "HackCooldown", new(0, 180, 1), 20, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) + HackCooldown = IntegerOptionItem.Create(Id + 11, "HackCooldown", new(0, 180, 1), 20, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) .SetValueFormat(OptionFormat.Seconds); - HackDuration = FloatOptionItem.Create(Id + 14, "HackDuration", new(0f, 60f, 1f), 15f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) + HackDuration = FloatOptionItem.Create(Id + 14, "HackDuration", new(0f, 60f, 1f), 15f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) .SetValueFormat(OptionFormat.Seconds); - MimicCooldown = IntegerOptionItem.Create(Id + 15, "MimicCooldown", new(0, 180, 1), 30, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) + MimicCooldown = IntegerOptionItem.Create(Id + 15, "MimicCooldown", new(0, 180, 1), 30, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) .SetValueFormat(OptionFormat.Seconds); - MimicDuration = FloatOptionItem.Create(Id + 16, "MimicDuration", new(0f, 60f, 1f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) + MimicDuration = FloatOptionItem.Create(Id + 16, "MimicDuration", new(0f, 60f, 1f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]); - CanVote = BooleanOptionItem.Create(Id + 17, "CanVote", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]); + CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]); + CanVote = BooleanOptionItem.Create(Id + 17, "CanVote", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Glitch]); } public override void Init() diff --git a/Roles/Neutral/God.cs b/Roles/Neutral/God.cs index 6c5853f47..8b5f0d960 100644 --- a/Roles/Neutral/God.cs +++ b/Roles/Neutral/God.cs @@ -7,9 +7,9 @@ namespace EHR.Roles.Neutral public void SetupCustomOption() { SetupRoleOptions(18200, TabGroup.NeutralRoles, CustomRoles.God); - NotifyGodAlive = BooleanOptionItem.Create(18210, "NotifyGodAlive", true, TabGroup.NeutralRoles, false) + NotifyGodAlive = BooleanOptionItem.Create(18210, "NotifyGodAlive", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.God]); - GodCanGuess = BooleanOptionItem.Create(18211, "CanGuess", false, TabGroup.NeutralRoles, false) + GodCanGuess = BooleanOptionItem.Create(18211, "CanGuess", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.God]); } } diff --git a/Roles/Neutral/HeadHunter.cs b/Roles/Neutral/HeadHunter.cs index 0afa6c686..407b0739e 100644 --- a/Roles/Neutral/HeadHunter.cs +++ b/Roles/Neutral/HeadHunter.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; using System; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -29,20 +29,20 @@ public class HeadHunter : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.HeadHunter); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 27.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 27.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) .SetValueFormat(OptionFormat.Seconds); - SuccessKillCooldown = FloatOptionItem.Create(Id + 11, "HHSuccessKCDDecrease", new(0f, 180f, 0.5f), 3f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) + SuccessKillCooldown = FloatOptionItem.Create(Id + 11, "HHSuccessKCDDecrease", new(0f, 180f, 0.5f), 3f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) .SetValueFormat(OptionFormat.Seconds); - FailureKillCooldown = FloatOptionItem.Create(Id + 12, "HHFailureKCDIncrease", new(0f, 180f, 0.5f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) + FailureKillCooldown = FloatOptionItem.Create(Id + 12, "HHFailureKCDIncrease", new(0f, 180f, 0.5f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]); - HasImpostorVision = BooleanOptionItem.Create(Id + 14, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]); - NumOfTargets = IntegerOptionItem.Create(Id + 15, "HHNumOfTargets", new(0, 10, 1), 3, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]); + HasImpostorVision = BooleanOptionItem.Create(Id + 14, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]); + NumOfTargets = IntegerOptionItem.Create(Id + 15, "HHNumOfTargets", new(0, 10, 1), 3, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) .SetValueFormat(OptionFormat.Times); - MaxKCD = FloatOptionItem.Create(Id + 16, "HHMaxKCD", new(0f, 180f, 2.5f), 40f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) + MaxKCD = FloatOptionItem.Create(Id + 16, "HHMaxKCD", new(0f, 180f, 2.5f), 40f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) .SetValueFormat(OptionFormat.Seconds); - MinKCD = FloatOptionItem.Create(Id + 17, "HHMinKCD", new(0f, 180f, 2.5f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) + MinKCD = FloatOptionItem.Create(Id + 17, "HHMinKCD", new(0f, 180f, 2.5f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HeadHunter]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Neutral/HexMaster.cs b/Roles/Neutral/HexMaster.cs index a63f36a5f..2bf5c272e 100644 --- a/Roles/Neutral/HexMaster.cs +++ b/Roles/Neutral/HexMaster.cs @@ -11,6 +11,6 @@ public class HexMaster : ISettingHolder public void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.HexMaster); - ModeSwitchAction = StringOptionItem.Create(Id + 10, "WitchModeSwitchAction", Witch.SwitchTriggerText, 2, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]); + ModeSwitchAction = StringOptionItem.Create(Id + 10, "WitchModeSwitchAction", Witch.SwitchTriggerText, 2, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.HexMaster]); } } \ No newline at end of file diff --git a/Roles/Neutral/Hookshot.cs b/Roles/Neutral/Hookshot.cs index 04c8726e7..97bbf5959 100644 --- a/Roles/Neutral/Hookshot.cs +++ b/Roles/Neutral/Hookshot.cs @@ -23,12 +23,12 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Hookshot); - KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Hookshot]) .SetValueFormat(OptionFormat.Seconds); - HasImpostorVision = BooleanOptionItem.Create(Id + 3, "ImpostorVision", true, TabGroup.NeutralRoles, false) + HasImpostorVision = BooleanOptionItem.Create(Id + 3, "ImpostorVision", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Hookshot]); - CanVent = BooleanOptionItem.Create(Id + 4, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 4, "CanVent", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Hookshot]); } diff --git a/Roles/Neutral/Imitator.cs b/Roles/Neutral/Imitator.cs index ebdbf537b..0bcdbac0d 100644 --- a/Roles/Neutral/Imitator.cs +++ b/Roles/Neutral/Imitator.cs @@ -14,13 +14,13 @@ public class Imitator : ISettingHolder public void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Imitator); - OddKillCooldown = FloatOptionItem.Create(Id + 10, "OddKillCooldown", new(0f, 60f, 2.5f), 27.5f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]) + OddKillCooldown = FloatOptionItem.Create(Id + 10, "OddKillCooldown", new(0f, 60f, 2.5f), 27.5f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]) .SetValueFormat(OptionFormat.Seconds); - EvenKillCooldown = FloatOptionItem.Create(Id + 11, "EvenKillCooldown", new(0f, 30f, 2.5f), 15f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]) + EvenKillCooldown = FloatOptionItem.Create(Id + 11, "EvenKillCooldown", new(0f, 30f, 2.5f), 15f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]) .SetValueFormat(OptionFormat.Seconds); - AfterMeetingKillCooldown = FloatOptionItem.Create(Id + 12, "AfterMeetingKillCooldown", new(0f, 30f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]) + AfterMeetingKillCooldown = FloatOptionItem.Create(Id + 12, "AfterMeetingKillCooldown", new(0f, 30f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]); - HasImpostorVision = BooleanOptionItem.Create(Id + 14, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]); + CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", true, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]); + HasImpostorVision = BooleanOptionItem.Create(Id + 14, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Imitator]); } } \ No newline at end of file diff --git a/Roles/Neutral/Impartial.cs b/Roles/Neutral/Impartial.cs index ce7221d44..f90774045 100644 --- a/Roles/Neutral/Impartial.cs +++ b/Roles/Neutral/Impartial.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; +using AmongUs.GameOptions; namespace EHR.Roles.Neutral { @@ -46,21 +46,21 @@ namespace EHR.Roles.Neutral NeutralMaxOpt = CreateSetting(id + 5, false, "Neutral"); CrewMinOpt = CreateSetting(id + 6, true, "Crew"); CrewMaxOpt = CreateSetting(id + 7, false, "Crew"); - CanVent = BooleanOptionItem.Create(id + 8, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(id + 8, "CanVent", true, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Impartial]); - CanVentAfterWinning = BooleanOptionItem.Create(id + 9, "EvenAfterWinning", false, TabGroup.NeutralRoles, false) + CanVentAfterWinning = BooleanOptionItem.Create(id + 9, "EvenAfterWinning", false, TabGroup.NeutralRoles) .SetParent(CanVent); - HasImpVision = BooleanOptionItem.Create(id + 10, "ImpostorVision", true, TabGroup.NeutralRoles, false) + HasImpVision = BooleanOptionItem.Create(id + 10, "ImpostorVision", true, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Impartial]); - HasImpVisionAfterWinning = BooleanOptionItem.Create(id + 11, "EvenAfterWinning", false, TabGroup.NeutralRoles, false) + HasImpVisionAfterWinning = BooleanOptionItem.Create(id + 11, "EvenAfterWinning", false, TabGroup.NeutralRoles) .SetParent(HasImpVision); - CanWinWhenKillingMore = BooleanOptionItem.Create(id + 12, "ImpartialCanWinWhenKillingMore", false, TabGroup.NeutralRoles, false) + CanWinWhenKillingMore = BooleanOptionItem.Create(id + 12, "ImpartialCanWinWhenKillingMore", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Impartial]); } static OptionItem CreateSetting(int id, bool min, string roleType) { - var opt = IntegerOptionItem.Create(id, $"Impartial{roleType}{(min ? "min" : "max")}", new(0, 14, 1), 1, TabGroup.NeutralRoles, false) + var opt = IntegerOptionItem.Create(id, $"Impartial{roleType}{(min ? "min" : "max")}", new(0, 14, 1), 1, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Impartial]); opt.ReplacementDictionary = ReplacementDictionary; return opt; diff --git a/Roles/Neutral/Innocent.cs b/Roles/Neutral/Innocent.cs index 4f6b37e15..671f2494b 100644 --- a/Roles/Neutral/Innocent.cs +++ b/Roles/Neutral/Innocent.cs @@ -10,7 +10,7 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { Options.SetupRoleOptions(10800, TabGroup.NeutralRoles, CustomRoles.Innocent); - Options.InnocentCanWinByImp = BooleanOptionItem.Create(10810, "InnocentCanWinByImp", false, TabGroup.NeutralRoles, false) + Options.InnocentCanWinByImp = BooleanOptionItem.Create(10810, "InnocentCanWinByImp", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Innocent]); } diff --git a/Roles/Neutral/Jackal.cs b/Roles/Neutral/Jackal.cs index bd9d82679..afb019035 100644 --- a/Roles/Neutral/Jackal.cs +++ b/Roles/Neutral/Jackal.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using HarmonyLib; using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using HarmonyLib; using static EHR.Options; using static EHR.Translator; @@ -39,30 +39,30 @@ public class Jackal : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Jackal); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); - CanSabotage = BooleanOptionItem.Create(Id + 12, "CanSabotage", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); - CanWinBySabotageWhenNoImpAlive = BooleanOptionItem.Create(Id + 14, "JackalCanWinBySabotageWhenNoImpAlive", true, TabGroup.NeutralRoles, false).SetParent(CanSabotage); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); - ResetKillCooldownWhenSbGetKilled = BooleanOptionItem.Create(Id + 16, "ResetKillCooldownWhenPlayerGetKilled", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); - ResetKillCooldownOn = FloatOptionItem.Create(Id + 28, "ResetKillCooldownOn", new(0f, 180f, 2.5f), 15f, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); + CanSabotage = BooleanOptionItem.Create(Id + 12, "CanSabotage", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); + CanWinBySabotageWhenNoImpAlive = BooleanOptionItem.Create(Id + 14, "JackalCanWinBySabotageWhenNoImpAlive", true, TabGroup.NeutralRoles).SetParent(CanSabotage); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); + ResetKillCooldownWhenSbGetKilled = BooleanOptionItem.Create(Id + 16, "ResetKillCooldownWhenPlayerGetKilled", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); + ResetKillCooldownOn = FloatOptionItem.Create(Id + 28, "ResetKillCooldownOn", new(0f, 180f, 2.5f), 15f, TabGroup.NeutralRoles) .SetParent(ResetKillCooldownWhenSbGetKilled) .SetValueFormat(OptionFormat.Seconds); - JackalCanKillSidekick = BooleanOptionItem.Create(Id + 15, "JackalCanKillSidekick", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); - CanRecruitSidekick = BooleanOptionItem.Create(Id + 17, "JackalCanRecruitSidekick", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); - SidekickAssignMode = StringOptionItem.Create(Id + 29, "SidekickAssignMode", SidekickAssignModeStrings, 0, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); - SidekickRecruitLimitOpt = IntegerOptionItem.Create(Id + 18, "JackalSidekickRecruitLimit", new(0, 15, 1), 0, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick) + JackalCanKillSidekick = BooleanOptionItem.Create(Id + 15, "JackalCanKillSidekick", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); + CanRecruitSidekick = BooleanOptionItem.Create(Id + 17, "JackalCanRecruitSidekick", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jackal]); + SidekickAssignMode = StringOptionItem.Create(Id + 29, "SidekickAssignMode", SidekickAssignModeStrings, 0, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick); + SidekickRecruitLimitOpt = IntegerOptionItem.Create(Id + 18, "JackalSidekickRecruitLimit", new(0, 15, 1), 0, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick) .SetValueFormat(OptionFormat.Times); - KillCooldownSK = FloatOptionItem.Create(Id + 20, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick) + KillCooldownSK = FloatOptionItem.Create(Id + 20, "KillCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick) .SetValueFormat(OptionFormat.Seconds); - CanVentSK = BooleanOptionItem.Create(Id + 21, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); - CanSabotageSK = BooleanOptionItem.Create(Id + 22, "CanSabotage", true, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); - SidekickCanKillJackal = BooleanOptionItem.Create(Id + 23, "SidekickCanKillJackal", false, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); + CanVentSK = BooleanOptionItem.Create(Id + 21, "CanVent", true, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick); + CanSabotageSK = BooleanOptionItem.Create(Id + 22, "CanSabotage", true, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick); + SidekickCanKillJackal = BooleanOptionItem.Create(Id + 23, "SidekickCanKillJackal", false, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick); // SidekickKnowOtherSidekick = BooleanOptionItem.Create(6050585, "SidekickKnowOtherSidekick", false, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); // SidekickKnowOtherSidekickRole = BooleanOptionItem.Create(6050590, "SidekickKnowOtherSidekickRole", false, TabGroup.NeutralRoles, false).SetParent(SidekickKnowOtherSidekick); - SidekickCanKillSidekick = BooleanOptionItem.Create(Id + 24, "SidekickCanKillSidekick", false, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); - SidekickCountMode = StringOptionItem.Create(Id + 25, "SidekickCountMode", Options.SidekickCountMode, 0, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); + SidekickCanKillSidekick = BooleanOptionItem.Create(Id + 24, "SidekickCanKillSidekick", false, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick); + SidekickCountMode = StringOptionItem.Create(Id + 25, "SidekickCountMode", Options.SidekickCountMode, 0, TabGroup.NeutralRoles).SetParent(CanRecruitSidekick); // SidekickCanWinWithOriginalTeam = BooleanOptionItem.Create(6050795, "SidekickCanWinWithOriginalTeam", false, TabGroup.NeutralRoles, false).SetParent(CanRecruitSidekick); } diff --git a/Roles/Neutral/Jester.cs b/Roles/Neutral/Jester.cs index 3de441e1a..31a70fa31 100644 --- a/Roles/Neutral/Jester.cs +++ b/Roles/Neutral/Jester.cs @@ -11,13 +11,13 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(10900, TabGroup.NeutralRoles, CustomRoles.Jester); - JesterCanUseButton = BooleanOptionItem.Create(10910, "JesterCanUseButton", false, TabGroup.NeutralRoles, false) + JesterCanUseButton = BooleanOptionItem.Create(10910, "JesterCanUseButton", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Jester]); - JesterCanVent = BooleanOptionItem.Create(10911, "CanVent", false, TabGroup.NeutralRoles, false) + JesterCanVent = BooleanOptionItem.Create(10911, "CanVent", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Jester]); - JesterHasImpostorVision = BooleanOptionItem.Create(10913, "ImpostorVision", false, TabGroup.NeutralRoles, false) + JesterHasImpostorVision = BooleanOptionItem.Create(10913, "ImpostorVision", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Jester]); - SunnyboyChance = IntegerOptionItem.Create(10912, "SunnyboyChance", new(0, 100, 5), 0, TabGroup.NeutralRoles, false) + SunnyboyChance = IntegerOptionItem.Create(10912, "SunnyboyChance", new(0, 100, 5), 0, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Jester]) .SetValueFormat(OptionFormat.Percent); } diff --git a/Roles/Neutral/Jinx.cs b/Roles/Neutral/Jinx.cs index 020ec0e8e..518841cbc 100644 --- a/Roles/Neutral/Jinx.cs +++ b/Roles/Neutral/Jinx.cs @@ -15,13 +15,13 @@ public class Jinx : ISettingHolder public void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Jinx); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]); - JinxSpellTimes = IntegerOptionItem.Create(Id + 14, "JinxSpellTimes", new(0, 15, 1), 1, TabGroup.NeutralRoles, false) - .SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]) - .SetValueFormat(OptionFormat.Times); - KillAttacker = BooleanOptionItem.Create(Id + 12, "killAttacker", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]); + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]); + JinxSpellTimes = IntegerOptionItem.Create(Id + 14, "JinxSpellTimes", new(0, 15, 1), 1, TabGroup.NeutralRoles) + .SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]) + .SetValueFormat(OptionFormat.Times); + KillAttacker = BooleanOptionItem.Create(Id + 12, "killAttacker", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Jinx]); } } diff --git a/Roles/Neutral/Juggernaut.cs b/Roles/Neutral/Juggernaut.cs index 2d099241f..667a91d8e 100644 --- a/Roles/Neutral/Juggernaut.cs +++ b/Roles/Neutral/Juggernaut.cs @@ -15,13 +15,13 @@ public class Juggernaut : ISettingHolder public void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Juggernaut); - DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]) + DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]) .SetValueFormat(OptionFormat.Seconds); - ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 4f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]) + ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 4f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]) .SetValueFormat(OptionFormat.Seconds); - MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 2.5f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]) + MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 2.5f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]) .SetValueFormat(OptionFormat.Seconds); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]); - CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]); + CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Juggernaut]); } } \ No newline at end of file diff --git a/Roles/Neutral/Lawyer.cs b/Roles/Neutral/Lawyer.cs index 50d44729c..2f62d20b3 100644 --- a/Roles/Neutral/Lawyer.cs +++ b/Roles/Neutral/Lawyer.cs @@ -1,9 +1,9 @@ -using EHR.Modules; -using HarmonyLib; -using Hazel; using System; using System.Collections.Generic; using System.Linq; +using EHR.Modules; +using HarmonyLib; +using Hazel; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -52,13 +52,13 @@ public class Lawyer : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Lawyer); - CanTargetImpostor = BooleanOptionItem.Create(Id + 10, "LawyerCanTargetImpostor", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); - CanTargetNeutralKiller = BooleanOptionItem.Create(Id + 11, "LawyerCanTargetNeutralKiller", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); - CanTargetCrewmate = BooleanOptionItem.Create(Id + 12, "LawyerCanTargetCrewmate", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); - CanTargetJester = BooleanOptionItem.Create(Id + 13, "LawyerCanTargetJester", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); - KnowTargetRole = BooleanOptionItem.Create(Id + 14, "KnowTargetRole", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); - TargetKnowsLawyer = BooleanOptionItem.Create(Id + 15, "TargetKnowsLawyer", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); - ChangeRolesAfterTargetKilled = StringOptionItem.Create(Id + 16, "LawyerChangeRolesAfterTargetKilled", ChangeRoles, 2, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); + CanTargetImpostor = BooleanOptionItem.Create(Id + 10, "LawyerCanTargetImpostor", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); + CanTargetNeutralKiller = BooleanOptionItem.Create(Id + 11, "LawyerCanTargetNeutralKiller", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); + CanTargetCrewmate = BooleanOptionItem.Create(Id + 12, "LawyerCanTargetCrewmate", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); + CanTargetJester = BooleanOptionItem.Create(Id + 13, "LawyerCanTargetJester", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); + KnowTargetRole = BooleanOptionItem.Create(Id + 14, "KnowTargetRole", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); + TargetKnowsLawyer = BooleanOptionItem.Create(Id + 15, "TargetKnowsLawyer", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); + ChangeRolesAfterTargetKilled = StringOptionItem.Create(Id + 16, "LawyerChangeRolesAfterTargetKilled", ChangeRoles, 2, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Lawyer]); } public override void Init() diff --git a/Roles/Neutral/Magician.cs b/Roles/Neutral/Magician.cs index 91b907f52..f359e786f 100644 --- a/Roles/Neutral/Magician.cs +++ b/Roles/Neutral/Magician.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using EHR.Roles.Crewmate; using System.Collections.Generic; using System.Linq; using System.Text; +using AmongUs.GameOptions; +using EHR.Modules; +using EHR.Roles.Crewmate; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -47,33 +47,33 @@ public class Magician : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Magician); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Seconds); - SlownessValue = FloatOptionItem.Create(Id + 11, "MagicianSlownessValue", new(0f, 1f, 0.05f), 1f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + SlownessValue = FloatOptionItem.Create(Id + 11, "MagicianSlownessValue", new(0f, 1f, 0.05f), 1f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Multiplier); - SlownessRadius = FloatOptionItem.Create(Id + 12, "MagicianSlownessRadius", new(0f, 10f, 0.25f), 3f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + SlownessRadius = FloatOptionItem.Create(Id + 12, "MagicianSlownessRadius", new(0f, 10f, 0.25f), 3f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Multiplier); - SlownessDur = IntegerOptionItem.Create(Id + 13, "MagicianSlownessDur", new(1, 30, 1), 10, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + SlownessDur = IntegerOptionItem.Create(Id + 13, "MagicianSlownessDur", new(1, 30, 1), 10, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Seconds); - Speed = FloatOptionItem.Create(Id + 14, "MagicianSpeedup", new(0.1f, 3f, 0.05f), 1.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + Speed = FloatOptionItem.Create(Id + 14, "MagicianSpeedup", new(0.1f, 3f, 0.05f), 1.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Multiplier); - SpeedDur = IntegerOptionItem.Create(Id + 15, "MagicianSpeedupDur", new(1, 20, 1), 10, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + SpeedDur = IntegerOptionItem.Create(Id + 15, "MagicianSpeedupDur", new(1, 20, 1), 10, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Seconds); - LowKCD = FloatOptionItem.Create(Id + 16, "MagicianLowKCD", new(1f, 20f, 1f), 5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + LowKCD = FloatOptionItem.Create(Id + 16, "MagicianLowKCD", new(1f, 20f, 1f), 5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Seconds); - BlindDur = IntegerOptionItem.Create(Id + 17, "MagicianBlindDur", new(1, 20, 1), 5, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + BlindDur = IntegerOptionItem.Create(Id + 17, "MagicianBlindDur", new(1, 20, 1), 5, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Seconds); - BlindRadius = FloatOptionItem.Create(Id + 18, "MagicianBlindRadius", new(0f, 10f, 0.25f), 3f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + BlindRadius = FloatOptionItem.Create(Id + 18, "MagicianBlindRadius", new(0f, 10f, 0.25f), 3f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Multiplier); - ClearPortalAfterMeeting = BooleanOptionItem.Create(Id + 19, "MagicianClearPortalAfterMeeting", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]); - BombRadius = FloatOptionItem.Create(Id + 20, "MagicianBombRadius", new(0f, 10f, 0.25f), 3f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + ClearPortalAfterMeeting = BooleanOptionItem.Create(Id + 19, "MagicianClearPortalAfterMeeting", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]); + BombRadius = FloatOptionItem.Create(Id + 20, "MagicianBombRadius", new(0f, 10f, 0.25f), 3f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Multiplier); - BombDelay = IntegerOptionItem.Create(Id + 21, "MagicianBombDelay", new(0, 10, 1), 3, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) + BombDelay = IntegerOptionItem.Create(Id + 21, "MagicianBombDelay", new(0, 10, 1), 3, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 22, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]); - HasImpostorVision = BooleanOptionItem.Create(Id + 23, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]); + CanVent = BooleanOptionItem.Create(Id + 22, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]); + HasImpostorVision = BooleanOptionItem.Create(Id + 23, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Magician]); } public override void Init() diff --git a/Roles/Neutral/Mario.cs b/Roles/Neutral/Mario.cs index d66877762..d5ac9edfa 100644 --- a/Roles/Neutral/Mario.cs +++ b/Roles/Neutral/Mario.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; @@ -15,10 +15,10 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(18300, TabGroup.NeutralRoles, CustomRoles.Mario); - MarioVentNumWin = IntegerOptionItem.Create(18310, "MarioVentNumWin", new(0, 900, 5), 40, TabGroup.NeutralRoles, false) + MarioVentNumWin = IntegerOptionItem.Create(18310, "MarioVentNumWin", new(0, 900, 5), 40, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mario]) .SetValueFormat(OptionFormat.Times); - MarioVentCD = FloatOptionItem.Create(18311, "VentCooldown", new(0f, 180f, 1f), 15f, TabGroup.NeutralRoles, false) + MarioVentCD = FloatOptionItem.Create(18311, "VentCooldown", new(0f, 180f, 1f), 15f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mario]) .SetValueFormat(OptionFormat.Seconds); } @@ -42,13 +42,13 @@ namespace EHR.Roles.Neutral public override string GetProgressText(byte playerId, bool comms) { - return Utils.ColorString(Color.white, $"- {CollectionExtensions.GetValueOrDefault(MarioVentCount, playerId, 0)}/{MarioVentNumWin.GetInt()}"); + return Utils.ColorString(Color.white, $"- {MarioVentCount.GetValueOrDefault(playerId, 0)}/{MarioVentNumWin.GetInt()}"); } public override void SetButtonTexts(HudManager hud, byte id) { hud.AbilityButton.buttonLabelText.text = Translator.GetString("MarioVentButtonText"); - hud.AbilityButton?.SetUsesRemaining(MarioVentNumWin.GetInt() - CollectionExtensions.GetValueOrDefault(MarioVentCount, id, 0)); + hud.AbilityButton?.SetUsesRemaining(MarioVentNumWin.GetInt() - MarioVentCount.GetValueOrDefault(id, 0)); } public override void OnFixedUpdate(PlayerControl pc) diff --git a/Roles/Neutral/Maverick.cs b/Roles/Neutral/Maverick.cs index 290899a9f..c9ac95842 100644 --- a/Roles/Neutral/Maverick.cs +++ b/Roles/Neutral/Maverick.cs @@ -19,14 +19,14 @@ public class Maverick : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Maverick); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 35f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 35f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Maverick]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Maverick]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false) + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Maverick]); - MinKillsToWin = IntegerOptionItem.Create(Id + 12, "DQNumOfKillsNeeded", new(0, 14, 1), 2, TabGroup.NeutralRoles, false) + MinKillsToWin = IntegerOptionItem.Create(Id + 12, "DQNumOfKillsNeeded", new(0, 14, 1), 2, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Maverick]); } diff --git a/Roles/Neutral/Medusa.cs b/Roles/Neutral/Medusa.cs index 9da9f9db4..f2427dd93 100644 --- a/Roles/Neutral/Medusa.cs +++ b/Roles/Neutral/Medusa.cs @@ -14,11 +14,11 @@ public class Medusa : ISettingHolder public void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Medusa); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]) .SetValueFormat(OptionFormat.Seconds); - KillCooldownAfterStoneGazing = FloatOptionItem.Create(Id + 14, "KillCooldownAfterStoneGazing", new(0f, 180f, 2.5f), 60f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]) + KillCooldownAfterStoneGazing = FloatOptionItem.Create(Id + 14, "KillCooldownAfterStoneGazing", new(0f, 180f, 2.5f), 60f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]); + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Medusa]); } } diff --git a/Roles/Neutral/Mycologist.cs b/Roles/Neutral/Mycologist.cs index 44c7ebbd3..cffbc629f 100644 --- a/Roles/Neutral/Mycologist.cs +++ b/Roles/Neutral/Mycologist.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; -using System.Linq; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; @@ -35,20 +35,20 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Mycologist); - KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mycologist]) .SetValueFormat(OptionFormat.Seconds); - HasImpostorVision = BooleanOptionItem.Create(Id + 7, "ImpostorVision", true, TabGroup.NeutralRoles, false) + HasImpostorVision = BooleanOptionItem.Create(Id + 7, "ImpostorVision", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mycologist]); - SpreadAction = StringOptionItem.Create(Id + 3, "MycologistAction", SpreadMode, 1, TabGroup.NeutralRoles, false) + SpreadAction = StringOptionItem.Create(Id + 3, "MycologistAction", SpreadMode, 1, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mycologist]); - CD = IntegerOptionItem.Create(Id + 4, "AbilityCooldown", new(1, 90, 1), 15, TabGroup.NeutralRoles, false) + CD = IntegerOptionItem.Create(Id + 4, "AbilityCooldown", new(1, 90, 1), 15, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mycologist]) .SetValueFormat(OptionFormat.Seconds); - InfectRadius = FloatOptionItem.Create(Id + 5, "InfectRadius", new(0.1f, 5f, 0.1f), 3f, TabGroup.NeutralRoles, false) + InfectRadius = FloatOptionItem.Create(Id + 5, "InfectRadius", new(0.1f, 5f, 0.1f), 3f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mycologist]) .SetValueFormat(OptionFormat.Multiplier); - InfectTime = IntegerOptionItem.Create(Id + 6, "InfectDelay", new(0, 60, 1), 5, TabGroup.NeutralRoles, false) + InfectTime = IntegerOptionItem.Create(Id + 6, "InfectDelay", new(0, 60, 1), 5, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Mycologist]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Neutral/NSerialKiller.cs b/Roles/Neutral/NSerialKiller.cs index 9a5b730c2..d177e9b6e 100644 --- a/Roles/Neutral/NSerialKiller.cs +++ b/Roles/Neutral/NSerialKiller.cs @@ -15,10 +15,10 @@ public class NSerialKiller : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.NSerialKiller); - KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.NSerialKiller]) + KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.NSerialKiller]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 3, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.NSerialKiller]); - HasImpostorVision = BooleanOptionItem.Create(Id + 4, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.NSerialKiller]); + CanVent = BooleanOptionItem.Create(Id + 3, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.NSerialKiller]); + HasImpostorVision = BooleanOptionItem.Create(Id + 4, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.NSerialKiller]); } public override void Init() diff --git a/Roles/Neutral/Necromancer.cs b/Roles/Neutral/Necromancer.cs index b1f8dcdde..9b65d539e 100644 --- a/Roles/Neutral/Necromancer.cs +++ b/Roles/Neutral/Necromancer.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -28,15 +28,15 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Necromancer); - CD = FloatOptionItem.Create(Id + 2, "NecromancerCD", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles, false) + CD = FloatOptionItem.Create(Id + 2, "NecromancerCD", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]) .SetValueFormat(OptionFormat.Seconds); - DKCD = FloatOptionItem.Create(Id + 10, "DKCD", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles, false) + DKCD = FloatOptionItem.Create(Id + 10, "DKCD", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]) .SetValueFormat(OptionFormat.Seconds); - KnowTargetRole = BooleanOptionItem.Create(Id + 13, "NecromancerKnowTargetRole", true, TabGroup.NeutralRoles, false) + KnowTargetRole = BooleanOptionItem.Create(Id + 13, "NecromancerKnowTargetRole", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]); - UndeadCountMode = StringOptionItem.Create(Id + 15, "UndeadCountMode", UndeadCountModeStrings, 0, TabGroup.NeutralRoles, false) + UndeadCountMode = StringOptionItem.Create(Id + 15, "UndeadCountMode", UndeadCountModeStrings, 0, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Necromancer]); } diff --git a/Roles/Neutral/Opportunist.cs b/Roles/Neutral/Opportunist.cs index 0dfceb4af..5db39d10f 100644 --- a/Roles/Neutral/Opportunist.cs +++ b/Roles/Neutral/Opportunist.cs @@ -23,7 +23,7 @@ public static void SetupCustomOption() { Options.SetupRoleOptions(10100, TabGroup.NeutralRoles, CustomRoles.Opportunist); - Options.OppoImmuneToAttacksWhenTasksDone = BooleanOptionItem.Create(10110, "ImmuneToAttacksWhenTasksDone", false, TabGroup.NeutralRoles, false) + Options.OppoImmuneToAttacksWhenTasksDone = BooleanOptionItem.Create(10110, "ImmuneToAttacksWhenTasksDone", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Opportunist]); Options.OpportunistTasks = Options.OverrideTasksData.Create(10111, TabGroup.NeutralRoles, CustomRoles.Opportunist); } diff --git a/Roles/Neutral/Pelican.cs b/Roles/Neutral/Pelican.cs index 82945f99d..81650b23e 100644 --- a/Roles/Neutral/Pelican.cs +++ b/Roles/Neutral/Pelican.cs @@ -1,9 +1,9 @@ -using AmongUs.GameOptions; +using System; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using Hazel; -using System; -using System.Collections.Generic; using UnityEngine; namespace EHR.Roles.Neutral; @@ -20,9 +20,9 @@ public class Pelican : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Pelican); - KillCooldown = FloatOptionItem.Create(Id + 10, "PelicanKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pelican]) + KillCooldown = FloatOptionItem.Create(Id + 10, "PelicanKillCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pelican]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pelican]); + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pelican]); } public override void Init() diff --git a/Roles/Neutral/Phantom.cs b/Roles/Neutral/Phantom.cs index 40440bfa3..a6810aaa9 100644 --- a/Roles/Neutral/Phantom.cs +++ b/Roles/Neutral/Phantom.cs @@ -7,11 +7,11 @@ namespace EHR.Roles.Neutral public void SetupCustomOption() { SetupRoleOptions(11400, TabGroup.NeutralRoles, CustomRoles.Phantom); - PhantomCanVent = BooleanOptionItem.Create(11410, "CanVent", false, TabGroup.NeutralRoles, false) + PhantomCanVent = BooleanOptionItem.Create(11410, "CanVent", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Phantom]); - PhantomSnatchesWin = BooleanOptionItem.Create(11411, "SnatchesWin", false, TabGroup.NeutralRoles, false) + PhantomSnatchesWin = BooleanOptionItem.Create(11411, "SnatchesWin", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Phantom]); - PhantomCanGuess = BooleanOptionItem.Create(11412, "CanGuess", false, TabGroup.NeutralRoles, false) + PhantomCanGuess = BooleanOptionItem.Create(11412, "CanGuess", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Phantom]); PhantomTasks = OverrideTasksData.Create(11413, TabGroup.NeutralRoles, CustomRoles.Phantom); } diff --git a/Roles/Neutral/Pickpocket.cs b/Roles/Neutral/Pickpocket.cs index 791ceff28..634b24cf3 100644 --- a/Roles/Neutral/Pickpocket.cs +++ b/Roles/Neutral/Pickpocket.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -17,11 +17,11 @@ public class Pickpocket : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Pickpocket); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pickpocket]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pickpocket]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pickpocket]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pickpocket]); - VotesPerKill = FloatOptionItem.Create(Id + 12, "VotesPerKill", new(0.1f, 10f, 0.1f), 0.3f, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pickpocket]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pickpocket]); + VotesPerKill = FloatOptionItem.Create(Id + 12, "VotesPerKill", new(0.1f, 10f, 0.1f), 0.3f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Pickpocket]); } diff --git a/Roles/Neutral/PlagueBearer.cs b/Roles/Neutral/PlagueBearer.cs index 247e93890..02d15b7e6 100644 --- a/Roles/Neutral/PlagueBearer.cs +++ b/Roles/Neutral/PlagueBearer.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using static EHR.Options; using static EHR.Translator; @@ -24,13 +24,13 @@ public class PlagueBearer : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.PlagueBearer); - PlagueBearerCDOpt = FloatOptionItem.Create(Id + 10, "PlagueBearerCD", new(0f, 180f, 2.5f), 17.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PlagueBearer]) + PlagueBearerCDOpt = FloatOptionItem.Create(Id + 10, "PlagueBearerCD", new(0f, 180f, 2.5f), 17.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.PlagueBearer]) .SetValueFormat(OptionFormat.Seconds); - PestilenceCDOpt = FloatOptionItem.Create(Id + 11, "PestilenceCD", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.PlagueBearer]) + PestilenceCDOpt = FloatOptionItem.Create(Id + 11, "PestilenceCD", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.PlagueBearer]) .SetValueFormat(OptionFormat.Seconds); - PestilenceCanVent = BooleanOptionItem.Create(Id + 12, "PestilenceCanVent", true, TabGroup.NeutralRoles, false) + PestilenceCanVent = BooleanOptionItem.Create(Id + 12, "PestilenceCanVent", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.PlagueBearer]); - PestilenceHasImpostorVision = BooleanOptionItem.Create(Id + 13, "PestilenceHasImpostorVision", true, TabGroup.NeutralRoles, false) + PestilenceHasImpostorVision = BooleanOptionItem.Create(Id + 13, "PestilenceHasImpostorVision", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.PlagueBearer]); } diff --git a/Roles/Neutral/PlagueDoctor.cs b/Roles/Neutral/PlagueDoctor.cs index 55066c233..17bd0c312 100644 --- a/Roles/Neutral/PlagueDoctor.cs +++ b/Roles/Neutral/PlagueDoctor.cs @@ -1,10 +1,10 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using Hazel; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; +using AmongUs.GameOptions; +using EHR.Modules; +using Hazel; using UnityEngine; namespace EHR.Roles.Neutral @@ -33,22 +33,22 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.PlagueDoctor); - OptionInfectLimit = IntegerOptionItem.Create(Id + 10, "PlagueDoctorInfectLimit", new(1, 3, 1), 1, TabGroup.NeutralRoles, false) + OptionInfectLimit = IntegerOptionItem.Create(Id + 10, "PlagueDoctorInfectLimit", new(1, 3, 1), 1, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.PlagueDoctor]) .SetValueFormat(OptionFormat.Times); - OptionInfectWhenKilled = BooleanOptionItem.Create(Id + 11, "PlagueDoctorInfectWhenKilled", false, TabGroup.NeutralRoles, false) + OptionInfectWhenKilled = BooleanOptionItem.Create(Id + 11, "PlagueDoctorInfectWhenKilled", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.PlagueDoctor]); - OptionInfectTime = FloatOptionItem.Create(Id + 12, "PlagueDoctorInfectTime", new(3f, 20f, 1f), 8f, TabGroup.NeutralRoles, false) + OptionInfectTime = FloatOptionItem.Create(Id + 12, "PlagueDoctorInfectTime", new(3f, 20f, 1f), 8f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.PlagueDoctor]) .SetValueFormat(OptionFormat.Seconds); - OptionInfectDistance = FloatOptionItem.Create(Id + 13, "PlagueDoctorInfectDistance", new(0.5f, 2f, 0.25f), 1.5f, TabGroup.NeutralRoles, false) + OptionInfectDistance = FloatOptionItem.Create(Id + 13, "PlagueDoctorInfectDistance", new(0.5f, 2f, 0.25f), 1.5f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.PlagueDoctor]); - OptionInfectInactiveTime = FloatOptionItem.Create(Id + 14, "PlagueDoctorInfectInactiveTime", new(0.5f, 10f, 0.5f), 5f, TabGroup.NeutralRoles, false) + OptionInfectInactiveTime = FloatOptionItem.Create(Id + 14, "PlagueDoctorInfectInactiveTime", new(0.5f, 10f, 0.5f), 5f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.PlagueDoctor]) .SetValueFormat(OptionFormat.Seconds); - OptionInfectCanInfectSelf = BooleanOptionItem.Create(Id + 15, "PlagueDoctorCanInfectSelf", false, TabGroup.NeutralRoles, false) + OptionInfectCanInfectSelf = BooleanOptionItem.Create(Id + 15, "PlagueDoctorCanInfectSelf", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.PlagueDoctor]); - OptionInfectCanInfectVent = BooleanOptionItem.Create(Id + 16, "PlagueDoctorCanInfectVent", false, TabGroup.NeutralRoles, false) + OptionInfectCanInfectVent = BooleanOptionItem.Create(Id + 16, "PlagueDoctorCanInfectVent", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.PlagueDoctor]); } diff --git a/Roles/Neutral/Poisoner.cs b/Roles/Neutral/Poisoner.cs index 40ff9c58b..c065a5281 100644 --- a/Roles/Neutral/Poisoner.cs +++ b/Roles/Neutral/Poisoner.cs @@ -10,10 +10,10 @@ public class Poisoner : ISettingHolder public void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Poisoner); - KillCooldown = FloatOptionItem.Create(Id + 10, "PoisonCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]) + KillCooldown = FloatOptionItem.Create(Id + 10, "PoisonCooldown", new(0f, 180f, 2.5f), 25f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]) .SetValueFormat(OptionFormat.Seconds); - OptionKillDelay = FloatOptionItem.Create(Id + 11, "PoisonerKillDelay", new(1f, 30f, 1f), 3f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]) + OptionKillDelay = FloatOptionItem.Create(Id + 11, "PoisonerKillDelay", new(1f, 30f, 1f), 3f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]); + CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Poisoner]); } } diff --git a/Roles/Neutral/Postman.cs b/Roles/Neutral/Postman.cs index a93457522..9ee7a0e1b 100644 --- a/Roles/Neutral/Postman.cs +++ b/Roles/Neutral/Postman.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -23,11 +23,11 @@ public class Postman : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Postman); - KillCooldown = FloatOptionItem.Create(Id + 10, "DeliverCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]) + KillCooldown = FloatOptionItem.Create(Id + 10, "DeliverCooldown", new(0f, 180f, 2.5f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]); - DieWhenTargetDies = BooleanOptionItem.Create(Id + 12, "PostmanDiesWhenTargetDies", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]); + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]); + DieWhenTargetDies = BooleanOptionItem.Create(Id + 12, "PostmanDiesWhenTargetDies", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Postman]); } public override void Init() diff --git a/Roles/Neutral/Predator.cs b/Roles/Neutral/Predator.cs index 115869254..508a55040 100644 --- a/Roles/Neutral/Predator.cs +++ b/Roles/Neutral/Predator.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using HarmonyLib; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using HarmonyLib; namespace EHR.Roles.Neutral { @@ -23,16 +23,16 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Predator); - NumOfRolesToKill = IntegerOptionItem.Create(Id + 2, "NumOfRolesToKill", new(1, 10, 1), 3, TabGroup.NeutralRoles, false) + NumOfRolesToKill = IntegerOptionItem.Create(Id + 2, "NumOfRolesToKill", new(1, 10, 1), 3, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Predator]); - MaxImpRolePicks = IntegerOptionItem.Create(Id + 3, "MaxImpRolePicks", new(1, 10, 1), 1, TabGroup.NeutralRoles, false) + MaxImpRolePicks = IntegerOptionItem.Create(Id + 3, "MaxImpRolePicks", new(1, 10, 1), 1, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Predator]); - KillCooldown = FloatOptionItem.Create(Id + 4, "KillCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 4, "KillCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Predator]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 5, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 5, "CanVent", true, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Predator]); - HasImpVision = BooleanOptionItem.Create(Id + 6, "ImpostorVision", false, TabGroup.NeutralRoles, false) + HasImpVision = BooleanOptionItem.Create(Id + 6, "ImpostorVision", false, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Predator]); } diff --git a/Roles/Neutral/Provocateur.cs b/Roles/Neutral/Provocateur.cs index 69abb3a7e..0d7836498 100644 --- a/Roles/Neutral/Provocateur.cs +++ b/Roles/Neutral/Provocateur.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; +using AmongUs.GameOptions; namespace EHR.Roles.Neutral { diff --git a/Roles/Neutral/Pursuer.cs b/Roles/Neutral/Pursuer.cs index d87558edd..7f220a1a3 100644 --- a/Roles/Neutral/Pursuer.cs +++ b/Roles/Neutral/Pursuer.cs @@ -1,5 +1,5 @@ -using EHR.Modules; -using System.Collections.Generic; +using System.Collections.Generic; +using EHR.Modules; namespace EHR.Roles.Neutral; @@ -16,9 +16,9 @@ public class Pursuer : RoleBase public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Pursuer); - PursuerSkillCooldown = FloatOptionItem.Create(Id + 10, "PursuerSkillCooldown", new(2.5f, 60f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pursuer]) + PursuerSkillCooldown = FloatOptionItem.Create(Id + 10, "PursuerSkillCooldown", new(2.5f, 60f, 2.5f), 20f, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pursuer]) .SetValueFormat(OptionFormat.Seconds); - PursuerSkillLimitTimes = IntegerOptionItem.Create(Id + 11, "PursuerSkillLimitTimes", new(1, 99, 1), 2, TabGroup.NeutralRoles, false).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pursuer]) + PursuerSkillLimitTimes = IntegerOptionItem.Create(Id + 11, "PursuerSkillLimitTimes", new(1, 99, 1), 2, TabGroup.NeutralRoles).SetParent(Options.CustomRoleSpawnChances[CustomRoles.Pursuer]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Neutral/Pyromaniac.cs b/Roles/Neutral/Pyromaniac.cs index f181fe2f0..0c588c4e9 100644 --- a/Roles/Neutral/Pyromaniac.cs +++ b/Roles/Neutral/Pyromaniac.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -20,14 +20,14 @@ public class Pyromaniac : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Pyromaniac); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]) .SetValueFormat(OptionFormat.Seconds); - DouseCooldown = FloatOptionItem.Create(Id + 11, "PyroDouseCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]) + DouseCooldown = FloatOptionItem.Create(Id + 11, "PyroDouseCooldown", new(0f, 180f, 2.5f), 20f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]) .SetValueFormat(OptionFormat.Seconds); - BurnCooldown = FloatOptionItem.Create(Id + 12, "PyroBurnCooldown", new(0f, 180f, 2.5f), 5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]) + BurnCooldown = FloatOptionItem.Create(Id + 12, "PyroBurnCooldown", new(0f, 180f, 2.5f), 5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]); - HasImpostorVision = BooleanOptionItem.Create(Id + 14, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]); + CanVent = BooleanOptionItem.Create(Id + 13, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]); + HasImpostorVision = BooleanOptionItem.Create(Id + 14, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Pyromaniac]); } public override void Init() diff --git a/Roles/Neutral/Reckless.cs b/Roles/Neutral/Reckless.cs index d36d06ef9..3081a2b7b 100644 --- a/Roles/Neutral/Reckless.cs +++ b/Roles/Neutral/Reckless.cs @@ -15,13 +15,13 @@ public class Reckless : ISettingHolder public void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Reckless); - DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]) + DefaultKillCooldown = FloatOptionItem.Create(Id + 10, "SansDefaultKillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]) .SetValueFormat(OptionFormat.Seconds); - ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]) + ReduceKillCooldown = FloatOptionItem.Create(Id + 11, "SansReduceKillCooldown", new(0f, 30f, 0.5f), 5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]) .SetValueFormat(OptionFormat.Seconds); - MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 2.5f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]) + MinKillCooldown = FloatOptionItem.Create(Id + 12, "SansMinKillCooldown", new(0f, 30f, 2.5f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]) .SetValueFormat(OptionFormat.Seconds); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]); - CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]); + CanVent = BooleanOptionItem.Create(Id + 14, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Reckless]); } } diff --git a/Roles/Neutral/Revolutionist.cs b/Roles/Neutral/Revolutionist.cs index 80910b26d..0dd1b4e0d 100644 --- a/Roles/Neutral/Revolutionist.cs +++ b/Roles/Neutral/Revolutionist.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Modules; using UnityEngine; using static EHR.Options; @@ -22,19 +22,19 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(18400, TabGroup.NeutralRoles, CustomRoles.Revolutionist); - RevolutionistDrawTime = FloatOptionItem.Create(18410, "RevolutionistDrawTime", new(0f, 90f, 1f), 3f, TabGroup.NeutralRoles, false) + RevolutionistDrawTime = FloatOptionItem.Create(18410, "RevolutionistDrawTime", new(0f, 90f, 1f), 3f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Revolutionist]) .SetValueFormat(OptionFormat.Seconds); - RevolutionistCooldown = FloatOptionItem.Create(18411, "RevolutionistCooldown", new(0f, 100f, 1f), 10f, TabGroup.NeutralRoles, false) + RevolutionistCooldown = FloatOptionItem.Create(18411, "RevolutionistCooldown", new(0f, 100f, 1f), 10f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Revolutionist]) .SetValueFormat(OptionFormat.Seconds); - RevolutionistDrawCount = IntegerOptionItem.Create(18412, "RevolutionistDrawCount", new(0, 14, 1), 6, TabGroup.NeutralRoles, false) + RevolutionistDrawCount = IntegerOptionItem.Create(18412, "RevolutionistDrawCount", new(0, 14, 1), 6, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Revolutionist]) .SetValueFormat(OptionFormat.Players); - RevolutionistKillProbability = IntegerOptionItem.Create(18413, "RevolutionistKillProbability", new(0, 100, 5), 15, TabGroup.NeutralRoles, false) + RevolutionistKillProbability = IntegerOptionItem.Create(18413, "RevolutionistKillProbability", new(0, 100, 5), 15, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Revolutionist]) .SetValueFormat(OptionFormat.Percent); - RevolutionistVentCountDown = FloatOptionItem.Create(18414, "RevolutionistVentCountDown", new(0f, 180f, 1f), 15f, TabGroup.NeutralRoles, false) + RevolutionistVentCountDown = FloatOptionItem.Create(18414, "RevolutionistVentCountDown", new(0f, 180f, 1f), 15f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Revolutionist]) .SetValueFormat(OptionFormat.Seconds); } @@ -142,7 +142,7 @@ namespace EHR.Roles.Neutral { var rv_target = RevolutionistTimer[playerId].PLAYER; var rv_time = RevolutionistTimer[playerId].TIMER; - if (!ExtendedPlayerControl.IsAlive(rv_target)) + if (!rv_target.IsAlive()) { RevolutionistTimer.Remove(playerId); } @@ -156,11 +156,11 @@ namespace EHR.Roles.Neutral RPC.ResetCurrentDrawTarget(playerId); if (IRandom.Instance.Next(1, 100) <= RevolutionistKillProbability.GetInt()) { - ExtendedPlayerControl.SetRealKiller(rv_target, player); + rv_target.SetRealKiller(player); Main.PlayerStates[rv_target.PlayerId].deathReason = PlayerState.DeathReason.Sacrifice; player.Kill(rv_target); Main.PlayerStates[rv_target.PlayerId].SetDead(); - Logger.Info($"Revolutionist: {player.GetNameWithRole().RemoveHtmlTags()} killed {ExtendedPlayerControl.GetNameWithRole(rv_target).RemoveHtmlTags()}", "Revolutionist"); + Logger.Info($"Revolutionist: {player.GetNameWithRole().RemoveHtmlTags()} killed {rv_target.GetNameWithRole().RemoveHtmlTags()}", "Revolutionist"); } } else diff --git a/Roles/Neutral/Ritualist.cs b/Roles/Neutral/Ritualist.cs index 4a4ababd5..2c091a5f2 100644 --- a/Roles/Neutral/Ritualist.cs +++ b/Roles/Neutral/Ritualist.cs @@ -14,12 +14,12 @@ namespace EHR.Roles.Neutral public void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Ritualist); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]) .SetValueFormat(OptionFormat.Seconds); - RitualMaxCount = IntegerOptionItem.Create(Id + 11, "RitualMaxCount", new(0, 15, 1), 1, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]) + RitualMaxCount = IntegerOptionItem.Create(Id + 11, "RitualMaxCount", new(0, 15, 1), 1, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]) .SetValueFormat(OptionFormat.Times); - CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]); + CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Ritualist]); } } } \ No newline at end of file diff --git a/Roles/Neutral/Romantic.cs b/Roles/Neutral/Romantic.cs index 212892acc..3f62c8f0d 100644 --- a/Roles/Neutral/Romantic.cs +++ b/Roles/Neutral/Romantic.cs @@ -1,7 +1,7 @@ -using EHR.Modules; -using Hazel; using System; using System.Collections.Generic; +using EHR.Modules; +using Hazel; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -33,20 +33,20 @@ public class Romantic : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Romantic); - BetCooldown = FloatOptionItem.Create(Id + 10, "RomanticBetCooldown", new(0f, 60f, 1f), 7f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) + BetCooldown = FloatOptionItem.Create(Id + 10, "RomanticBetCooldown", new(0f, 60f, 1f), 7f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) .SetValueFormat(OptionFormat.Seconds); - ProtectCooldown = FloatOptionItem.Create(Id + 11, "RomanticProtectCooldown", new(0f, 60f, 2.5f), 25f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) + ProtectCooldown = FloatOptionItem.Create(Id + 11, "RomanticProtectCooldown", new(0f, 60f, 2.5f), 25f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) .SetValueFormat(OptionFormat.Seconds); - ProtectDuration = FloatOptionItem.Create(Id + 12, "RomanticProtectDuration", new(0f, 60f, 2.5f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) + ProtectDuration = FloatOptionItem.Create(Id + 12, "RomanticProtectDuration", new(0f, 60f, 2.5f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) .SetValueFormat(OptionFormat.Seconds); - KnowTargetRole = BooleanOptionItem.Create(Id + 13, "RomanticKnowTargetRole", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); - BetTargetKnowRomantic = BooleanOptionItem.Create(Id + 14, "RomanticBetTargetKnowRomantic", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); - VengefulKCD = FloatOptionItem.Create(Id + 15, "VengefulKCD", new(0f, 60f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) + KnowTargetRole = BooleanOptionItem.Create(Id + 13, "RomanticKnowTargetRole", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); + BetTargetKnowRomantic = BooleanOptionItem.Create(Id + 14, "RomanticBetTargetKnowRomantic", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); + VengefulKCD = FloatOptionItem.Create(Id + 15, "VengefulKCD", new(0f, 60f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) .SetValueFormat(OptionFormat.Seconds); - VengefulCanVent = BooleanOptionItem.Create(Id + 16, "VengefulCanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); - RuthlessKCD = FloatOptionItem.Create(Id + 17, "RuthlessKCD", new(0f, 60f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) + VengefulCanVent = BooleanOptionItem.Create(Id + 16, "VengefulCanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); + RuthlessKCD = FloatOptionItem.Create(Id + 17, "RuthlessKCD", new(0f, 60f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]) .SetValueFormat(OptionFormat.Seconds); - RuthlessCanVent = BooleanOptionItem.Create(Id + 18, "RuthlessCanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); + RuthlessCanVent = BooleanOptionItem.Create(Id + 18, "RuthlessCanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Romantic]); } public override void Init() diff --git a/Roles/Neutral/SchrodingersCat.cs b/Roles/Neutral/SchrodingersCat.cs index 8f98dbe27..a6c376ad4 100644 --- a/Roles/Neutral/SchrodingersCat.cs +++ b/Roles/Neutral/SchrodingersCat.cs @@ -11,7 +11,7 @@ { const int id = 13840; Options.SetupRoleOptions(id, TabGroup.NeutralRoles, CustomRoles.SchrodingersCat); - WinsWithCrewIfNotAttacked = BooleanOptionItem.Create(id + 2, "SchrodingersCat.WinsWithCrewIfNotAttacked", true, TabGroup.NeutralRoles, false) + WinsWithCrewIfNotAttacked = BooleanOptionItem.Create(id + 2, "SchrodingersCat.WinsWithCrewIfNotAttacked", true, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.SchrodingersCat]); } diff --git a/Roles/Neutral/Sidekick.cs b/Roles/Neutral/Sidekick.cs index e15761409..cd49b90df 100644 --- a/Roles/Neutral/Sidekick.cs +++ b/Roles/Neutral/Sidekick.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; namespace EHR.Roles.Neutral; diff --git a/Roles/Neutral/SoulHunter.cs b/Roles/Neutral/SoulHunter.cs index 23e4f662f..a4a09eb82 100644 --- a/Roles/Neutral/SoulHunter.cs +++ b/Roles/Neutral/SoulHunter.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System; +using System.Linq; +using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System; -using System.Linq; using static EHR.Options; using static EHR.Translator; using static EHR.Utils; @@ -30,19 +30,19 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.SoulHunter); - CanVent = BooleanOptionItem.Create(Id + 3, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 3, "CanVent", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SoulHunter]); - HasImpostorVision = BooleanOptionItem.Create(Id + 4, "ImpostorVision", true, TabGroup.NeutralRoles, false) + HasImpostorVision = BooleanOptionItem.Create(Id + 4, "ImpostorVision", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SoulHunter]); - NumOfSoulsToWin = IntegerOptionItem.Create(Id + 5, "SoulHunterNumOfSoulsToWin", new(1, 14, 1), 3, TabGroup.NeutralRoles, false) + NumOfSoulsToWin = IntegerOptionItem.Create(Id + 5, "SoulHunterNumOfSoulsToWin", new(1, 14, 1), 3, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SoulHunter]); - WaitingTimeAfterMeeting = IntegerOptionItem.Create(Id + 6, "SoulHunterFreezeTimeAfterMeeting", new(0, 90, 1), 3, TabGroup.NeutralRoles, false) + WaitingTimeAfterMeeting = IntegerOptionItem.Create(Id + 6, "SoulHunterFreezeTimeAfterMeeting", new(0, 90, 1), 3, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SoulHunter]) .SetValueFormat(OptionFormat.Seconds); - TimeToKillTarget = IntegerOptionItem.Create(Id + 7, "SoulHunterTimeToKillTarget", new(1, 90, 1), 30, TabGroup.NeutralRoles, false) + TimeToKillTarget = IntegerOptionItem.Create(Id + 7, "SoulHunterTimeToKillTarget", new(1, 90, 1), 30, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SoulHunter]) .SetValueFormat(OptionFormat.Seconds); - GetSoulForSuicide = BooleanOptionItem.Create(Id + 8, "SoulHunterGetSoulForSuicide", true, TabGroup.NeutralRoles, false) + GetSoulForSuicide = BooleanOptionItem.Create(Id + 8, "SoulHunterGetSoulForSuicide", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.SoulHunter]); } diff --git a/Roles/Neutral/Spiritcaller.cs b/Roles/Neutral/Spiritcaller.cs index 09cd79ad4..4916b26dd 100644 --- a/Roles/Neutral/Spiritcaller.cs +++ b/Roles/Neutral/Spiritcaller.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; +using System.Collections.Generic; +using AmongUs.GameOptions; using EHR.Modules; -using System.Collections.Generic; using static EHR.Options; using static EHR.Translator; @@ -28,21 +28,21 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Spiritcaller); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 60f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 60f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]); - ImpostorVision = BooleanOptionItem.Create(Id + 12, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]); - SpiritMax = IntegerOptionItem.Create(Id + 13, "SpiritcallerSpiritMax", new(1, 15, 1), 2, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]); + ImpostorVision = BooleanOptionItem.Create(Id + 12, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]); + SpiritMax = IntegerOptionItem.Create(Id + 13, "SpiritcallerSpiritMax", new(1, 15, 1), 2, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) .SetValueFormat(OptionFormat.Times); - SpiritAbilityCooldown = FloatOptionItem.Create(Id + 14, "SpiritcallerSpiritAbilityCooldown", new(5f, 90f, 1f), 30f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) + SpiritAbilityCooldown = FloatOptionItem.Create(Id + 14, "SpiritcallerSpiritAbilityCooldown", new(5f, 90f, 1f), 30f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) .SetValueFormat(OptionFormat.Seconds); - SpiritFreezeTime = FloatOptionItem.Create(Id + 15, "SpiritcallerFreezeTime", new(0f, 30f, 1f), 3f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) + SpiritFreezeTime = FloatOptionItem.Create(Id + 15, "SpiritcallerFreezeTime", new(0f, 30f, 1f), 3f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) .SetValueFormat(OptionFormat.Seconds); - SpiritProtectTime = FloatOptionItem.Create(Id + 16, "SpiritcallerProtectTime", new(0f, 30f, 1f), 5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) + SpiritProtectTime = FloatOptionItem.Create(Id + 16, "SpiritcallerProtectTime", new(0f, 30f, 1f), 5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) .SetValueFormat(OptionFormat.Seconds); - SpiritCauseVision = FloatOptionItem.Create(Id + 17, "SpiritcallerCauseVision", new(0f, 5f, 0.05f), 0.4f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) + SpiritCauseVision = FloatOptionItem.Create(Id + 17, "SpiritcallerCauseVision", new(0f, 5f, 0.05f), 0.4f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) .SetValueFormat(OptionFormat.Multiplier); - SpiritCauseVisionTime = FloatOptionItem.Create(Id + 18, "SpiritcallerCauseVisionTime", new(0f, 45f, 1f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) + SpiritCauseVisionTime = FloatOptionItem.Create(Id + 18, "SpiritcallerCauseVisionTime", new(0f, 45f, 1f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Spiritcaller]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Neutral/Sprayer.cs b/Roles/Neutral/Sprayer.cs index 85da1e988..ee8473c02 100644 --- a/Roles/Neutral/Sprayer.cs +++ b/Roles/Neutral/Sprayer.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System; +using System; using System.Collections.Generic; +using AmongUs.GameOptions; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -33,29 +33,29 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Sprayer); - KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 2, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]) .SetValueFormat(OptionFormat.Seconds); - HasImpostorVision = BooleanOptionItem.Create(Id + 3, "ImpostorVision", true, TabGroup.NeutralRoles, false) + HasImpostorVision = BooleanOptionItem.Create(Id + 3, "ImpostorVision", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]); - CanVent = BooleanOptionItem.Create(Id + 4, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 4, "CanVent", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]); - CD = IntegerOptionItem.Create(Id + 5, "AbilityCooldown", new(0, 90, 1), 15, TabGroup.NeutralRoles, false) + CD = IntegerOptionItem.Create(Id + 5, "AbilityCooldown", new(0, 90, 1), 15, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]) .SetValueFormat(OptionFormat.Seconds); - UseLimitOpt = IntegerOptionItem.Create(Id + 6, "AbilityUseLimit", new(1, 90, 1), 5, TabGroup.NeutralRoles, false) + UseLimitOpt = IntegerOptionItem.Create(Id + 6, "AbilityUseLimit", new(1, 90, 1), 5, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]) .SetValueFormat(OptionFormat.Times); - LoweredVision = FloatOptionItem.Create(Id + 7, "FFA_LowerVision", new(0.05f, 1.5f, 0.05f), 0.25f, TabGroup.NeutralRoles, false) + LoweredVision = FloatOptionItem.Create(Id + 7, "FFA_LowerVision", new(0.05f, 1.5f, 0.05f), 0.25f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]) .SetValueFormat(OptionFormat.Multiplier); - LoweredSpeed = FloatOptionItem.Create(Id + 8, "FFA_DecreasedSpeed", new(0.05f, 3f, 0.05f), 0.8f, TabGroup.NeutralRoles, false) + LoweredSpeed = FloatOptionItem.Create(Id + 8, "FFA_DecreasedSpeed", new(0.05f, 3f, 0.05f), 0.8f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]) .SetValueFormat(OptionFormat.Multiplier); - EffectDuration = IntegerOptionItem.Create(Id + 10, "NegativeEffectDuration", new(1, 90, 1), 10, TabGroup.NeutralRoles, false) + EffectDuration = IntegerOptionItem.Create(Id + 10, "NegativeEffectDuration", new(1, 90, 1), 10, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]) .SetValueFormat(OptionFormat.Seconds); - MaxTrappedTimes = IntegerOptionItem.Create(Id + 9, "SprayerMaxTrappedTimes", new(1, 90, 1), 3, TabGroup.NeutralRoles, false) + MaxTrappedTimes = IntegerOptionItem.Create(Id + 9, "SprayerMaxTrappedTimes", new(1, 90, 1), 3, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Sprayer]) .SetValueFormat(OptionFormat.Times); } diff --git a/Roles/Neutral/Succubus.cs b/Roles/Neutral/Succubus.cs index 96b271a3b..08f0eb8bf 100644 --- a/Roles/Neutral/Succubus.cs +++ b/Roles/Neutral/Succubus.cs @@ -1,6 +1,6 @@ -using AmongUs.GameOptions; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -30,24 +30,24 @@ public class Succubus : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Succubus); - CharmCooldown = FloatOptionItem.Create(Id + 10, "SuccubusCharmCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.NeutralRoles, false) + CharmCooldown = FloatOptionItem.Create(Id + 10, "SuccubusCharmCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]) .SetValueFormat(OptionFormat.Seconds); - CharmCooldownIncrese = FloatOptionItem.Create(Id + 11, "SuccubusCharmCooldownIncrese", new(0f, 180f, 2.5f), 10f, TabGroup.NeutralRoles, false) + CharmCooldownIncrese = FloatOptionItem.Create(Id + 11, "SuccubusCharmCooldownIncrese", new(0f, 180f, 2.5f), 10f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]) .SetValueFormat(OptionFormat.Seconds); - CharmMax = IntegerOptionItem.Create(Id + 12, "SuccubusCharmMax", new(1, 15, 1), 15, TabGroup.NeutralRoles, false) + CharmMax = IntegerOptionItem.Create(Id + 12, "SuccubusCharmMax", new(1, 15, 1), 15, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]) .SetValueFormat(OptionFormat.Times); - KnowTargetRole = BooleanOptionItem.Create(Id + 13, "SuccubusKnowTargetRole", true, TabGroup.NeutralRoles, false) + KnowTargetRole = BooleanOptionItem.Create(Id + 13, "SuccubusKnowTargetRole", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]); - TargetKnowOtherTarget = BooleanOptionItem.Create(Id + 14, "SuccubusTargetKnowOtherTarget", true, TabGroup.NeutralRoles, false) + TargetKnowOtherTarget = BooleanOptionItem.Create(Id + 14, "SuccubusTargetKnowOtherTarget", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]); - CharmedCountMode = StringOptionItem.Create(Id + 15, "CharmedCountMode", CharmedCountModeStrings, 0, TabGroup.NeutralRoles, false) + CharmedCountMode = StringOptionItem.Create(Id + 15, "CharmedCountMode", CharmedCountModeStrings, 0, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]); - CanCharmNeutral = BooleanOptionItem.Create(Id + 16, "SuccubusCanCharmNeutral", false, TabGroup.NeutralRoles, false) + CanCharmNeutral = BooleanOptionItem.Create(Id + 16, "SuccubusCanCharmNeutral", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]); - CharmedDiesOnSuccubusDeath = BooleanOptionItem.Create(Id + 17, "CharmedDiesOnSuccubusDeath", false, TabGroup.NeutralRoles, false) + CharmedDiesOnSuccubusDeath = BooleanOptionItem.Create(Id + 17, "CharmedDiesOnSuccubusDeath", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Succubus]); } diff --git a/Roles/Neutral/Terrorist.cs b/Roles/Neutral/Terrorist.cs index 37c18ed41..f4821acfd 100644 --- a/Roles/Neutral/Terrorist.cs +++ b/Roles/Neutral/Terrorist.cs @@ -7,9 +7,9 @@ namespace EHR.Roles.Neutral public void SetupCustomOption() { SetupRoleOptions(11500, TabGroup.NeutralRoles, CustomRoles.Terrorist); - CanTerroristSuicideWin = BooleanOptionItem.Create(11510, "CanTerroristSuicideWin", false, TabGroup.NeutralRoles, false) + CanTerroristSuicideWin = BooleanOptionItem.Create(11510, "CanTerroristSuicideWin", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Terrorist]); - TerroristCanGuess = BooleanOptionItem.Create(11511, "CanGuess", true, TabGroup.NeutralRoles, false) + TerroristCanGuess = BooleanOptionItem.Create(11511, "CanGuess", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Terrorist]); TerroristTasks = OverrideTasksData.Create(11512, TabGroup.NeutralRoles, CustomRoles.Terrorist); } diff --git a/Roles/Neutral/Tiger.cs b/Roles/Neutral/Tiger.cs index ff372a5bc..71a755752 100644 --- a/Roles/Neutral/Tiger.cs +++ b/Roles/Neutral/Tiger.cs @@ -18,19 +18,19 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { Options.SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Tiger); - Radius = FloatOptionItem.Create(Id + 2, "TigerRadius", new(0.5f, 10f, 0.5f), 3f, TabGroup.NeutralRoles, false) + Radius = FloatOptionItem.Create(Id + 2, "TigerRadius", new(0.5f, 10f, 0.5f), 3f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Tiger]) .SetValueFormat(OptionFormat.Multiplier); - EnrageCooldown = FloatOptionItem.Create(Id + 3, "EnrageCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.NeutralRoles, false) + EnrageCooldown = FloatOptionItem.Create(Id + 3, "EnrageCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Tiger]) .SetValueFormat(OptionFormat.Seconds); - EnrageDuration = FloatOptionItem.Create(Id + 4, "EnrageDuration", new(1f, 30f, 1f), 10f, TabGroup.NeutralRoles, false) + EnrageDuration = FloatOptionItem.Create(Id + 4, "EnrageDuration", new(1f, 30f, 1f), 10f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Tiger]) .SetValueFormat(OptionFormat.Seconds); - KillCooldown = FloatOptionItem.Create(Id + 5, "KillCooldown", new(2.5f, 60f, 2.5f), 30f, TabGroup.NeutralRoles, false) + KillCooldown = FloatOptionItem.Create(Id + 5, "KillCooldown", new(2.5f, 60f, 2.5f), 30f, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Tiger]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 6, "CanVent", true, TabGroup.NeutralRoles, false) + CanVent = BooleanOptionItem.Create(Id + 6, "CanVent", true, TabGroup.NeutralRoles) .SetParent(Options.CustomRoleSpawnChances[CustomRoles.Tiger]); } diff --git a/Roles/Neutral/Totocalcio.cs b/Roles/Neutral/Totocalcio.cs index ca44dc7be..840d5e7f2 100644 --- a/Roles/Neutral/Totocalcio.cs +++ b/Roles/Neutral/Totocalcio.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; +using System.Linq; using EHR.Modules; using Hazel; using Il2CppSystem; -using System.Collections.Generic; -using System.Linq; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -27,16 +27,16 @@ public class Totocalcio : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Totocalcio); - MaxBetTimes = IntegerOptionItem.Create(Id + 10, "TotocalcioMaxBetTimes", new(1, 5, 1), 3, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) + MaxBetTimes = IntegerOptionItem.Create(Id + 10, "TotocalcioMaxBetTimes", new(1, 5, 1), 3, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) .SetValueFormat(OptionFormat.Times); - BetCooldown = FloatOptionItem.Create(Id + 12, "TotocalcioBetCooldown", new(0f, 60f, 2.5f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) + BetCooldown = FloatOptionItem.Create(Id + 12, "TotocalcioBetCooldown", new(0f, 60f, 2.5f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) .SetValueFormat(OptionFormat.Seconds); - BetCooldownIncrese = FloatOptionItem.Create(Id + 14, "TotocalcioBetCooldownIncrese", new(0f, 60f, 1f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) + BetCooldownIncrese = FloatOptionItem.Create(Id + 14, "TotocalcioBetCooldownIncrese", new(0f, 60f, 1f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) .SetValueFormat(OptionFormat.Seconds); - MaxBetCooldown = FloatOptionItem.Create(Id + 16, "TotocalcioMaxBetCooldown", new(0f, 180f, 2.5f), 70f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) + MaxBetCooldown = FloatOptionItem.Create(Id + 16, "TotocalcioMaxBetCooldown", new(0f, 180f, 2.5f), 70f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]) .SetValueFormat(OptionFormat.Seconds); - KnowTargetRole = BooleanOptionItem.Create(Id + 18, "TotocalcioKnowTargetRole", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]); - BetTargetKnowTotocalcio = BooleanOptionItem.Create(Id + 20, "TotocalcioBetTargetKnowTotocalcio", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]); + KnowTargetRole = BooleanOptionItem.Create(Id + 18, "TotocalcioKnowTargetRole", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]); + BetTargetKnowTotocalcio = BooleanOptionItem.Create(Id + 20, "TotocalcioBetTargetKnowTotocalcio", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Totocalcio]); } public override void Init() diff --git a/Roles/Neutral/Traitor.cs b/Roles/Neutral/Traitor.cs index 9064ad9e2..68ee89b6a 100644 --- a/Roles/Neutral/Traitor.cs +++ b/Roles/Neutral/Traitor.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; namespace EHR.Roles.Neutral; @@ -17,11 +17,11 @@ public class Traitor : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Traitor); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]); - CanSabotage = BooleanOptionItem.Create(Id + 15, "CanUseSabotage", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]); + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]); + CanSabotage = BooleanOptionItem.Create(Id + 15, "CanUseSabotage", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Traitor]); } public override void Init() diff --git a/Roles/Neutral/Vengeance.cs b/Roles/Neutral/Vengeance.cs index dc3dbd273..34103897e 100644 --- a/Roles/Neutral/Vengeance.cs +++ b/Roles/Neutral/Vengeance.cs @@ -1,5 +1,5 @@ -using AmongUs.GameOptions; using System.Collections.Generic; +using AmongUs.GameOptions; using static EHR.Options; using static EHR.Translator; @@ -24,12 +24,12 @@ public class Vengeance : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Vengeance); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]) .SetValueFormat(OptionFormat.Seconds); - RevengeTime = IntegerOptionItem.Create(Id + 11, "VengeanceRevengeTime", new(0, 30, 1), 15, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]) + RevengeTime = IntegerOptionItem.Create(Id + 11, "VengeanceRevengeTime", new(0, 30, 1), 15, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]); + CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vengeance]); } public override void Init() diff --git a/Roles/Neutral/Virus.cs b/Roles/Neutral/Virus.cs index 66b0dcf30..5eacad0d6 100644 --- a/Roles/Neutral/Virus.cs +++ b/Roles/Neutral/Virus.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using EHR.Patches; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Patches; using static EHR.Options; using static EHR.Translator; @@ -35,17 +35,17 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Virus); - KillCooldown = FloatOptionItem.Create(Id + 10, "VirusKillCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]) + KillCooldown = FloatOptionItem.Create(Id + 10, "VirusKillCooldown", new(0f, 60f, 2.5f), 30f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "VirusCanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); - ImpostorVision = BooleanOptionItem.Create(Id + 16, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); - InfectMax = IntegerOptionItem.Create(Id + 12, "VirusInfectMax", new(1, 15, 1), 2, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]) + CanVent = BooleanOptionItem.Create(Id + 11, "VirusCanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); + ImpostorVision = BooleanOptionItem.Create(Id + 16, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); + InfectMax = IntegerOptionItem.Create(Id + 12, "VirusInfectMax", new(1, 15, 1), 2, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]) .SetValueFormat(OptionFormat.Times); - KnowTargetRole = BooleanOptionItem.Create(Id + 13, "VirusKnowTargetRole", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); - TargetKnowOtherTarget = BooleanOptionItem.Create(Id + 14, "VirusTargetKnowOtherTarget", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); - KillInfectedPlayerAfterMeeting = BooleanOptionItem.Create(Id + 15, "VirusKillInfectedPlayerAfterMeeting", false, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); - ContagiousPlayersCanKillEachOther = BooleanOptionItem.Create(Id + 18, "ContagiousPlayersCanKillEachOther", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); - ContagiousCountMode = StringOptionItem.Create(Id + 17, "ContagiousCountMode", ContagiousCountModeStrings, 0, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); + KnowTargetRole = BooleanOptionItem.Create(Id + 13, "VirusKnowTargetRole", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); + TargetKnowOtherTarget = BooleanOptionItem.Create(Id + 14, "VirusTargetKnowOtherTarget", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); + KillInfectedPlayerAfterMeeting = BooleanOptionItem.Create(Id + 15, "VirusKillInfectedPlayerAfterMeeting", false, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); + ContagiousPlayersCanKillEachOther = BooleanOptionItem.Create(Id + 18, "ContagiousPlayersCanKillEachOther", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); + ContagiousCountMode = StringOptionItem.Create(Id + 17, "ContagiousCountMode", ContagiousCountModeStrings, 0, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Virus]); } public override void Init() diff --git a/Roles/Neutral/Vulture.cs b/Roles/Neutral/Vulture.cs index ffa2bcd66..2d27d3efb 100644 --- a/Roles/Neutral/Vulture.cs +++ b/Roles/Neutral/Vulture.cs @@ -1,7 +1,7 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -28,13 +28,13 @@ public class Vulture : RoleBase public static void SetupCustomOption() { SetupRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Vulture); - ArrowsPointingToDeadBody = BooleanOptionItem.Create(Id + 10, "VultureArrowsPointingToDeadBody", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); - NumberOfReportsToWin = IntegerOptionItem.Create(Id + 11, "VultureNumberOfReportsToWin", new(1, 10, 1), 4, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); + ArrowsPointingToDeadBody = BooleanOptionItem.Create(Id + 10, "VultureArrowsPointingToDeadBody", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); + NumberOfReportsToWin = IntegerOptionItem.Create(Id + 11, "VultureNumberOfReportsToWin", new(1, 10, 1), 4, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); CanVent = BooleanOptionItem.Create(Id + 12, "CanVent", true, TabGroup.NeutralRoles, true).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); - VultureReportCD = FloatOptionItem.Create(Id + 13, "VultureReportCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]) + VultureReportCD = FloatOptionItem.Create(Id + 13, "VultureReportCooldown", new(0f, 180f, 2.5f), 15f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]) .SetValueFormat(OptionFormat.Seconds); - MaxEaten = IntegerOptionItem.Create(Id + 14, "VultureMaxEatenInOneRound", new(1, 10, 1), 2, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); - HasImpVision = BooleanOptionItem.Create(Id + 15, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); + MaxEaten = IntegerOptionItem.Create(Id + 14, "VultureMaxEatenInOneRound", new(1, 10, 1), 2, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); + HasImpVision = BooleanOptionItem.Create(Id + 15, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Vulture]); } public override void Init() diff --git a/Roles/Neutral/WeaponMaster.cs b/Roles/Neutral/WeaponMaster.cs index d1342fc22..b7970a593 100644 --- a/Roles/Neutral/WeaponMaster.cs +++ b/Roles/Neutral/WeaponMaster.cs @@ -1,8 +1,8 @@ +using System.Collections.Generic; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using Hazel; -using System.Collections.Generic; using UnityEngine; using static EHR.Options; using static EHR.Translator; @@ -34,13 +34,13 @@ public class WeaponMaster : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.WeaponMaster); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 2.5f), 22.5f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]) .SetValueFormat(OptionFormat.Seconds); - CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]); - HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]); - Radius = FloatOptionItem.Create(Id + 12, "WMRadius", new(0f, 10f, 0.25f), 2f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]) + CanVent = BooleanOptionItem.Create(Id + 11, "CanVent", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]); + HasImpostorVision = BooleanOptionItem.Create(Id + 13, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]); + Radius = FloatOptionItem.Create(Id + 12, "WMRadius", new(0f, 10f, 0.25f), 2f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]) .SetValueFormat(OptionFormat.Multiplier); - HighKCD = FloatOptionItem.Create(Id + 14, "GamblerHighKCD", new(0f, 180f, 2.5f), 35f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]) + HighKCD = FloatOptionItem.Create(Id + 14, "GamblerHighKCD", new(0f, 180f, 2.5f), 35f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.WeaponMaster]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Neutral/Werewolf.cs b/Roles/Neutral/Werewolf.cs index ef1bbc455..89d30ec70 100644 --- a/Roles/Neutral/Werewolf.cs +++ b/Roles/Neutral/Werewolf.cs @@ -1,9 +1,9 @@ +using System.Collections.Generic; +using System.Text; using AmongUs.GameOptions; using EHR.Modules; using EHR.Roles.Crewmate; using Hazel; -using System.Collections.Generic; -using System.Text; using static EHR.Options; using static EHR.Translator; @@ -27,12 +27,12 @@ public class Werewolf : RoleBase public static void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Werewolf); - KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 0.5f), 3f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]) + KillCooldown = FloatOptionItem.Create(Id + 10, "KillCooldown", new(0f, 180f, 0.5f), 3f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]) .SetValueFormat(OptionFormat.Seconds); - HasImpostorVision = BooleanOptionItem.Create(Id + 11, "ImpostorVision", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]); - RampageCD = FloatOptionItem.Create(Id + 12, "WWRampageCD", new(0f, 180f, 2.5f), 35f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]) + HasImpostorVision = BooleanOptionItem.Create(Id + 11, "ImpostorVision", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]); + RampageCD = FloatOptionItem.Create(Id + 12, "WWRampageCD", new(0f, 180f, 2.5f), 35f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]) .SetValueFormat(OptionFormat.Seconds); - RampageDur = FloatOptionItem.Create(Id + 13, "WWRampageDur", new(0f, 180f, 1f), 12f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]) + RampageDur = FloatOptionItem.Create(Id + 13, "WWRampageDur", new(0f, 180f, 1f), 12f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Werewolf]) .SetValueFormat(OptionFormat.Seconds); } diff --git a/Roles/Neutral/Workaholic.cs b/Roles/Neutral/Workaholic.cs index 2cbf2881a..93babbcb8 100644 --- a/Roles/Neutral/Workaholic.cs +++ b/Roles/Neutral/Workaholic.cs @@ -1,7 +1,7 @@ -using AmongUs.GameOptions; -using EHR.Modules; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using AmongUs.GameOptions; +using EHR.Modules; using static EHR.Options; namespace EHR.Roles.Neutral @@ -16,17 +16,17 @@ namespace EHR.Roles.Neutral public static void SetupCustomOption() { SetupRoleOptions(11700, TabGroup.NeutralRoles, CustomRoles.Workaholic); //TOH_Y - WorkaholicCannotWinAtDeath = BooleanOptionItem.Create(11710, "WorkaholicCannotWinAtDeath", true, TabGroup.NeutralRoles, false) + WorkaholicCannotWinAtDeath = BooleanOptionItem.Create(11710, "WorkaholicCannotWinAtDeath", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Workaholic]); - WorkaholicVentCooldown = FloatOptionItem.Create(11711, "VentCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles, false) + WorkaholicVentCooldown = FloatOptionItem.Create(11711, "VentCooldown", new(0f, 180f, 2.5f), 30f, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Workaholic]) .SetValueFormat(OptionFormat.Seconds); - WorkaholicVisibleToEveryone = BooleanOptionItem.Create(11712, "WorkaholicVisibleToEveryone", false, TabGroup.NeutralRoles, false) + WorkaholicVisibleToEveryone = BooleanOptionItem.Create(11712, "WorkaholicVisibleToEveryone", false, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Workaholic]); - WorkaholicGiveAdviceAlive = BooleanOptionItem.Create(11713, "WorkaholicGiveAdviceAlive", false, TabGroup.NeutralRoles, false) + WorkaholicGiveAdviceAlive = BooleanOptionItem.Create(11713, "WorkaholicGiveAdviceAlive", false, TabGroup.NeutralRoles) .SetParent(WorkaholicVisibleToEveryone); WorkaholicTasks = OverrideTasksData.Create(11714, TabGroup.NeutralRoles, CustomRoles.Workaholic); - WorkaholicCanGuess = BooleanOptionItem.Create(11725, "CanGuess", true, TabGroup.NeutralRoles, false) + WorkaholicCanGuess = BooleanOptionItem.Create(11725, "CanGuess", true, TabGroup.NeutralRoles) .SetParent(CustomRoleSpawnChances[CustomRoles.Workaholic]); } diff --git a/Roles/Neutral/Wraith.cs b/Roles/Neutral/Wraith.cs index 156032c34..e52884fb4 100644 --- a/Roles/Neutral/Wraith.cs +++ b/Roles/Neutral/Wraith.cs @@ -13,10 +13,10 @@ public class Wraith : ISettingHolder public void SetupCustomOption() { SetupSingleRoleOptions(Id, TabGroup.NeutralRoles, CustomRoles.Wraith); - WraithCooldown = FloatOptionItem.Create(Id + 2, "WraithCooldown", new(1f, 60f, 1f), 20f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Wraith]) + WraithCooldown = FloatOptionItem.Create(Id + 2, "WraithCooldown", new(1f, 60f, 1f), 20f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Wraith]) .SetValueFormat(OptionFormat.Seconds); - WraithDuration = FloatOptionItem.Create(Id + 3, "WraithDuration", new(1f, 30f, 1f), 10f, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Wraith]) + WraithDuration = FloatOptionItem.Create(Id + 3, "WraithDuration", new(1f, 30f, 1f), 10f, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Wraith]) .SetValueFormat(OptionFormat.Seconds); - WraithVentNormallyOnCooldown = BooleanOptionItem.Create(Id + 4, "WraithVentNormallyOnCooldown", true, TabGroup.NeutralRoles, false).SetParent(CustomRoleSpawnChances[CustomRoles.Wraith]); + WraithVentNormallyOnCooldown = BooleanOptionItem.Create(Id + 4, "WraithVentNormallyOnCooldown", true, TabGroup.NeutralRoles).SetParent(CustomRoleSpawnChances[CustomRoles.Wraith]); } } \ No newline at end of file diff --git a/Roles/RoleBase.cs b/Roles/RoleBase.cs index da8362db9..54fea04f2 100644 --- a/Roles/RoleBase.cs +++ b/Roles/RoleBase.cs @@ -1,8 +1,8 @@ -using AmongUs.GameOptions; +using System; +using System.Text; +using AmongUs.GameOptions; using EHR.Roles.AddOns.Crewmate; using EHR.Roles.AddOns.Impostor; -using System; -using System.Text; namespace EHR { diff --git a/main.cs b/main.cs index d306cda4c..63097b6bc 100644 --- a/main.cs +++ b/main.cs @@ -1,3 +1,8 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Reflection; using AmongUs.GameOptions; using BepInEx; using BepInEx.Configuration; @@ -7,11 +12,6 @@ using EHR; using EHR.Roles.Neutral; using HarmonyLib; using Il2CppInterop.Runtime.Injection; -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reflection; using UnityEngine; [assembly: AssemblyFileVersion(Main.PluginVersion)] @@ -35,8 +35,8 @@ public class Main : BasePlugin public const string DebugKeySalt = "59687b"; public static ConfigEntry DebugKeyInput { get; private set; } public const string PluginGuid = "com.gurge44.endlesshostroles"; - public const string PluginVersion = "3.1.4"; - public const string PluginDisplayVersion = "3.1.4"; + public const string PluginVersion = "3.2.0"; + public const string PluginDisplayVersion = "3.2.0"; public static readonly string SupportedAUVersion = "2024.3.5"; public Harmony Harmony { get; } = new(PluginGuid); @@ -424,6 +424,7 @@ public class Main : BasePlugin { CustomRoles.HexMaster, "#ff00ff" }, { CustomRoles.Wraith, "#4B0082" }, { CustomRoles.NSerialKiller, "#233fcc" }, + { CustomRoles.Bargainer, "#4f2f36" }, { CustomRoles.Tiger, "#fcba03" }, { CustomRoles.SoulHunter, "#3f2c61" }, { CustomRoles.Enderman, "#3c008a" }, @@ -681,6 +682,7 @@ public enum CustomWinner Necromancer = CustomRoles.Necromancer, Wraith = CustomRoles.Wraith, SerialKiller = CustomRoles.NSerialKiller, + Bargainer = CustomRoles.Bargainer, Tiger = CustomRoles.Tiger, Enderman = CustomRoles.Enderman, Mycologist = CustomRoles.Mycologist,