From: gendelo3 <gendelo3@gmail.com>
Date: Mon, 15 Nov 2021 16:58:33 +0000 (+0100)
Subject: Merge branch 'Eisbison:main' into bait_show_kill_flash
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=4e4072f617df51599f3e0b97201c8a3e7059d76f;p=rhonda%2Ftheotherroles.git

Merge branch 'Eisbison:main' into bait_show_kill_flash
---

4e4072f617df51599f3e0b97201c8a3e7059d76f
diff --cc TheOtherRoles/CustomOptions.cs
index 041f7ef,30d9fee..922e873
--- a/TheOtherRoles/CustomOptions.cs
+++ b/TheOtherRoles/CustomOptions.cs
@@@ -165,8 -169,18 +169,19 @@@ namespace TheOtherRoles 
          public static CustomOption baitSpawnRate;
          public static CustomOption baitHighlightAllVents;
          public static CustomOption baitReportDelay;
 +        public static CustomOption baitShowKillFlash;
  
+         public static CustomOption vultureSpawnRate;
+         public static CustomOption vultureCooldown;
+         public static CustomOption vultureNumberToWin;
+         public static CustomOption vultureCanUseVents;
+         public static CustomOption vultureShowArrows;
+ 
+         public static CustomOption mediumSpawnRate;
+         public static CustomOption mediumCooldown;
+         public static CustomOption mediumDuration;
+         public static CustomOption mediumOneTimeUse;
+ 
          public static CustomOption maxNumberOfMeetings;
          public static CustomOption blockSkippingInEmergencyMeetings;
          public static CustomOption noVoteIsSelfVote;
@@@ -340,8 -363,12 +364,13 @@@
              baitSpawnRate = CustomOption.Create(330, cs(Bait.color, "Bait"), rates, null, true);
              baitHighlightAllVents = CustomOption.Create(331, "Highlight All Vents If A Vent Is Occupied", false, baitSpawnRate);
              baitReportDelay = CustomOption.Create(332, "Bait Report Delay", 0f, 0f, 10f, 1f, baitSpawnRate);
 +            baitShowKillFlash = CustomOption.Create(335, "Show Flash to Baits Killer", true, baitSpawnRate);
  
+             mediumSpawnRate = CustomOption.Create(360, cs(Medium.color, "Medium"), rates, null, true);
+             mediumCooldown = CustomOption.Create(361, "Medium Questioning Cooldown", 30f, 5f, 120f, 5f, mediumSpawnRate);
+             mediumDuration = CustomOption.Create(362, "Medium Questioning Duration", 3f, 0f, 15f, 1f, mediumSpawnRate);
+             mediumOneTimeUse = CustomOption.Create(363, "Each Soul Can Only Be Questioned Once", false, mediumSpawnRate);
+ 
              // Other options
              maxNumberOfMeetings = CustomOption.Create(3, "Number Of Meetings (excluding Mayor meeting)", 10, 0, 15, 1, null, true);
              blockSkippingInEmergencyMeetings = CustomOption.Create(4, "Block Skipping In Emergency Meetings", false);