SCP 11.1 Update

GabiRP · Dec 1, 2021 · a79a7fd · a79a7fd
1 parent 2b10c0f
commit a79a7fd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/CoinTweaks/CoinTweaks.csproj b/CoinTweaks/CoinTweaks.csproj
@@ -38,40 +38,40 @@
         <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
           <HintPath>F:\ExiledReferences_3\Assembly-CSharp-firstpass.dll</HintPath>
         </Reference>
-        <Reference Include="Exiled.API, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.API.dll</HintPath>
+        <Reference Include="Exiled.API, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.API.dll</HintPath>
           <Private>True</Private>
         </Reference>
-        <Reference Include="Exiled.Bootstrap, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.Bootstrap.dll</HintPath>
+        <Reference Include="Exiled.Bootstrap, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.Bootstrap.dll</HintPath>
           <Private>True</Private>
         </Reference>
-        <Reference Include="Exiled.CreditTags, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.CreditTags.dll</HintPath>
+        <Reference Include="Exiled.CreditTags, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.CreditTags.dll</HintPath>
           <Private>True</Private>
         </Reference>
-        <Reference Include="Exiled.CustomItems, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.CustomItems.dll</HintPath>
+        <Reference Include="Exiled.CustomItems, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.CustomItems.dll</HintPath>
           <Private>True</Private>
         </Reference>
-        <Reference Include="Exiled.CustomRoles, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.CustomRoles.dll</HintPath>
+        <Reference Include="Exiled.CustomRoles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.CustomRoles.dll</HintPath>
           <Private>True</Private>
         </Reference>
-        <Reference Include="Exiled.Events, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.Events.dll</HintPath>
+        <Reference Include="Exiled.Events, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.Events.dll</HintPath>
           <Private>True</Private>
         </Reference>
-        <Reference Include="Exiled.Loader, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.Loader.dll</HintPath>
+        <Reference Include="Exiled.Loader, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.Loader.dll</HintPath>
           <Private>True</Private>
         </Reference>
-        <Reference Include="Exiled.Permissions, Version=3.0.5.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.Permissions.dll</HintPath>
+        <Reference Include="Exiled.Permissions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.Permissions.dll</HintPath>
           <Private>True</Private>
         </Reference>
         <Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\packages\EXILED.3.0.5\lib\net472\Exiled.Updater.dll</HintPath>
+          <HintPath>..\packages\EXILED.4.0.0-rc.4\lib\net472\Exiled.Updater.dll</HintPath>
           <Private>True</Private>
         </Reference>
         <Reference Include="System" />

diff --git a/CoinTweaks/EventHandlers.cs b/CoinTweaks/EventHandlers.cs
@@ -1,4 +1,5 @@
-using Exiled.Events.EventArgs;
+using Exiled.Events.Commands.Show;
+using Exiled.Events.EventArgs;
 using MEC;
 
 namespace CoinTweaks
@@ -27,9 +28,9 @@ internal void OnFlippingCoin(FlippingCoinEventArgs ev)
                 Timing.CallDelayed(plugin.Config.CoinResultTime, () =>
                 {
                     if (plugin.Config.UseHints)
-                        ev.Player.ShowHint(plugin.Translation.CoinResultMessage.Replace("%result%", ev.IsTails ? plugin.Translation.TailsTranslation : plugin.Translation.HeadsTranslation), plugin.Config.CoinResultMessageDuration);
+                        ev.Player.ShowHint($"{plugin.Translation.CoinResultMessage} {(ev.IsTails ? plugin.Translation.TailsTranslation : plugin.Translation.HeadsTranslation)}", plugin.Config.CoinResultMessageDuration);
                     else
-                        ev.Player.Broadcast(plugin.Config.CoinResultMessageDuration, plugin.Translation.CoinResultMessage.Replace("%result%", ev.IsTails ? plugin.Translation.TailsTranslation : plugin.Translation.HeadsTranslation));
+                        ev.Player.Broadcast(plugin.Config.CoinResultMessageDuration, $"{plugin.Translation.CoinResultMessage} {(ev.IsTails ? plugin.Translation.TailsTranslation : plugin.Translation.HeadsTranslation)}");
                 });
             }
         }

diff --git a/CoinTweaks/Properties/AssemblyInfo.cs b/CoinTweaks/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/CoinTweaks/Translations.cs b/CoinTweaks/Translations.cs
@@ -5,8 +5,8 @@ namespace CoinTweaks
 {
     public class Translations : ITranslation
     {
-        [Description("Coin result broadcast/hint (if the above config is true) {result} will be replaced with the flip result")]
-        public string CoinResultMessage { get; set; } = "Coin result: %result%";
+        [Description("Coin result broadcast/hint (if the above config is true) %result% will be replaced with the flip result")]
+        public string CoinResultMessage { get; set; } = "Coin result:";
 
         [Description("Dropping coin broadcast/hint")]
         public string DropCoinMessage { get; set; } = "You accidentaly dropped your coin while flipping it";

diff --git a/CoinTweaks/packages.config b/CoinTweaks/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EXILED" version="3.0.5" targetFramework="net472" />
+  <package id="EXILED" version="4.0.0-rc.4" targetFramework="net472" />
 </packages>