Updoot

- Removed JamChance and GlitchChance - Added Cassie Subtitles Option
Marco15453-Archived · Jun 30, 2023 · af7da13 · af7da13
1 parent 786e8b9
commit af7da13
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/Configs/SpawnManager.cs b/Configs/SpawnManager.cs
@@ -25,10 +25,7 @@ public class SpawnManager
         public string NtfAnnouncementCassie { get; private set; } = "MTFUnit epsilon 11 designated {designation} hasentered AllRemaining AwaitingRecontainment {scpnum}";
         public string NtfAnnouncmentCassieNoScp { get; private set; } = "MTFUnit epsilon 11 designated {designation} hasentered AllRemaining NoSCPsLeft";
 
-        [Description("Custom Cassie glitch chance.")]
-        public float GlitchChance { get; private set; } = 0.05f;
-
-        [Description("Custom Cassie jam chance.")]
-        public float JamChance { get; private set; } = 0.05f;
+        [Description("Cassie Subtitles")]
+        public bool Subtitles { get; private set; } = false;
     }
 }
diff --git a/EventHandlers.cs b/EventHandlers.cs
@@ -17,7 +17,7 @@ internal sealed class EventHandlers
 
         private int Respawns = 0;
         private int UIURespawns = 0;
-        private bool UIUSpawns = false;
+        public bool UIUSpawns = false;
 
         public void OnRoundStarted()
         {
@@ -33,6 +33,7 @@ public void OnRespawningTeam(RespawningTeamEventArgs ev)
                 UIURespawns < plugin.Config.SpawnManager.MaxSpawns &&
                 ev.NextKnownTeam == SpawnableTeamType.NineTailedFox)
             {
+                UIUSpawns = true;
                 List<Player> players = new List<Player>();
                 if (ev.Players.Count > plugin.Config.SpawnManager.MaxSquad)
                     players = ev.Players.GetRange(0, plugin.Config.SpawnManager.MaxSquad);
@@ -60,7 +61,6 @@ public void OnRespawningTeam(RespawningTeamEventArgs ev)
                     }
                 }
                 UIURespawns++;
-                UIUSpawns = true;
 
                 ev.NextKnownTeam = SpawnableTeamType.None;
             }
@@ -106,7 +106,7 @@ public void OnAnnouncingNtfEntrance(AnnouncingNtfEntranceEventArgs ev)
             cassieMessage = cassieMessage.Replace("{designation}", $"nato_{ev.UnitName[0]} {ev.UnitNumber}");
 
             if (!string.IsNullOrEmpty(cassieMessage))
-                Cassie.GlitchyMessage(cassieMessage, plugin.Config.SpawnManager.GlitchChance, plugin.Config.SpawnManager.JamChance);
+                Cassie.Message(cassieMessage, isSubtitles: plugin.Config.SpawnManager.Subtitles);
         }
     }
 }
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión
 // utilizando el carácter "*", como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0")]
-[assembly: AssemblyFileVersion("5.0.0")]
+[assembly: AssemblyVersion("5.2.0")]
+[assembly: AssemblyFileVersion("5.2.0")]
diff --git a/UIURescueSquad.cs b/UIURescueSquad.cs
@@ -14,8 +14,8 @@ public class UIURescueSquad : Plugin<Configs.Config>
         public override string Name { get; } = "UIURescueSquad";
         public override string Author { get; } = "JesusQC, Michal78900, maintained by Marco15453";
         public override string Prefix { get; } = "UIURescueSquad";
-        public override Version Version { get; } = new Version(5, 0, 0);
-        public override Version RequiredExiledVersion => new Version(7, 0, 0);
+        public override Version Version { get; } = new Version(5, 2, 0);
+        public override Version RequiredExiledVersion => new Version(7, 1, 0);
 
         private EventHandlers eventHandlers;
 

diff --git a/UIURescueSquad.csproj b/UIURescueSquad.csproj
@@ -39,53 +39,53 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Assembly-CSharp-Publicized.dll</HintPath>
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Assembly-CSharp-Publicized.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>G:\UnRAID Backup\Development\EXILED Plugins\References\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp-Publicized, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Assembly-CSharp-Publicized.dll</HintPath>
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Assembly-CSharp-Publicized.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CommandSystem.Core, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\CommandSystem.Core.dll</HintPath>
+      <HintPath>packages\EXILED.7.1.0\lib\net48\CommandSystem.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.API, Version=7.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.API.dll</HintPath>
+    <Reference Include="Exiled.API, Version=7.1.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.API.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.CreditTags, Version=7.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.CreditTags.dll</HintPath>
+    <Reference Include="Exiled.CreditTags, Version=7.1.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.CreditTags.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.CustomItems, Version=7.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.CustomItems.dll</HintPath>
+    <Reference Include="Exiled.CustomItems, Version=7.1.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.CustomItems.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.CustomRoles, Version=7.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.CustomRoles.dll</HintPath>
+    <Reference Include="Exiled.CustomRoles, Version=7.1.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.CustomRoles.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.Events, Version=7.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.Events.dll</HintPath>
+    <Reference Include="Exiled.Events, Version=7.1.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.Events.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.Loader, Version=7.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.Loader.dll</HintPath>
+    <Reference Include="Exiled.Loader, Version=7.1.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.Loader.dll</HintPath>
     </Reference>
-    <Reference Include="Exiled.Permissions, Version=7.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.Permissions.dll</HintPath>
+    <Reference Include="Exiled.Permissions, Version=7.1.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.Permissions.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Updater, Version=3.1.2.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\Exiled.Updater.dll</HintPath>
+      <HintPath>packages\EXILED.7.1.0\lib\net48\Exiled.Updater.dll</HintPath>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(EXILED_REFERENCES)\Mirror.dll</HintPath>
     </Reference>
     <Reference Include="NorthwoodLib, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\NorthwoodLib.dll</HintPath>
+      <HintPath>packages\EXILED.7.1.0\lib\net48\NorthwoodLib.dll</HintPath>
     </Reference>
     <Reference Include="PluginAPI, Version=12.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\PluginAPI.dll</HintPath>
+      <HintPath>packages\EXILED.7.1.0\lib\net48\PluginAPI.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -105,7 +105,7 @@
       <HintPath>..\..\References\UnityEngine.PhysicsModule.dll</HintPath>
     </Reference>
     <Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>packages\EXILED.7.0.0-rc.3-1\lib\net48\YamlDotNet.dll</HintPath>
+      <HintPath>packages\EXILED.7.1.0\lib\net48\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -118,6 +118,9 @@
     <Compile Include="UIURescueSquad.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Commands\" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

diff --git a/packages.config b/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EXILED" version="7.0.0-rc.3-1" targetFramework="net48" />
+  <package id="EXILED" version="7.1.0" targetFramework="net48" />
 </packages>