11.0.0

SynapseSL · Aug 21, 2021 · a30143a · a30143a
1 parent 6961868
commit a30143a
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 52 deletions.
diff --git a/Scp056/EventHandlers.cs b/Scp056/EventHandlers.cs
@@ -1,6 +1,7 @@
-using Synapse;
+using System.Linq;
+using Synapse;
 using Synapse.Api;
-using System.Linq;
+using Synapse.Api.Enum;
 using UnityEngine;
 
 namespace Scp056
@@ -35,9 +36,8 @@ private void OnCuff(Synapse.Api.Events.SynapseEventArguments.PlayerCuffTargetEve
         {
             if(ev.Target.RoleID == 56)
             {
-                ev.Target.Ammo5 = 0;
-                ev.Target.Ammo7 = 0;
-                ev.Target.Ammo9 = 0;
+                foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
+                    ev.Target.AmmoBox[enumType] = 0;
             }
         }
 
@@ -91,9 +91,9 @@ private void OnKeyPress(Synapse.Api.Events.SynapseEventArguments.PlayerKeyPressE
 
                 case KeyCode.Alpha3: role = RoleType.FacilityGuard; break;
 
-                case KeyCode.Alpha4: role = RoleType.NtfLieutenant; break;
+                case KeyCode.Alpha4: role = RoleType.NtfSergeant; break;
 
-                case KeyCode.Alpha5: role = RoleType.ChaosInsurgency; break;
+                case KeyCode.Alpha5: role = RoleType.ChaosRifleman; break;
 
                 case KeyCode.Alpha6:
                     var targets = Server.Get.GetPlayers(x => x.RealTeam == Team.MTF || x.RealTeam == Team.CDP || x.RealTeam == Team.RSC).Count;

diff --git a/Scp056/PluginClass.cs b/Scp056/PluginClass.cs
@@ -10,9 +10,9 @@ namespace Scp056
         LoadPriority = 1,
         Name = "Scp056",
         SynapseMajor = 2,
-        SynapseMinor = 5,
-        SynapsePatch = 3,
-        Version = "v.1.1.3"
+        SynapseMinor = 7,
+        SynapsePatch = 0,
+        Version = "v.1.1.4"
         )]
     public class PluginClass : AbstractPlugin
     {

diff --git a/Scp056/PluginConfig.cs b/Scp056/PluginConfig.cs
@@ -19,9 +19,9 @@ public class PluginConfig : AbstractConfigSection
         [Description("The Items Scp056 spawns with")]
         public List<SerializedItem> Items = new List<SerializedItem>()
         {
-            new SerializedItem((int)ItemType.GunMP7,35,0,0,0,Vector3.one),
-            new SerializedItem((int)ItemType.Medkit,35,0,0,0,Vector3.one),
-            new SerializedItem((int)ItemType.KeycardGuard,35,0,0,0,Vector3.one),
+            new SerializedItem((int)ItemType.GunFSP9,25,0,Vector3.one),
+            new SerializedItem((int)ItemType.Medkit,0,0,Vector3.one),
+            new SerializedItem((int)ItemType.KeycardGuard,0,0,Vector3.one),
         };
 
         [Description("The Chanche of which Scp056 spawns")]

diff --git a/Scp056/Properties/AssemblyInfo.cs b/Scp056/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.3.0")]
-[assembly: AssemblyFileVersion("1.1.3.0")]
+[assembly: AssemblyVersion("1.1.4.0")]
+[assembly: AssemblyFileVersion("1.1.4.0")]
diff --git a/Scp056/Scp056.csproj b/Scp056/Scp056.csproj
@@ -31,47 +31,45 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.2.0.4\lib\net472\0Harmony.dll</HintPath>
+    <Reference Include="0Harmony, Version=2.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lib.Harmony.2.1.1\lib\net472\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
-    <Reference Include="LiteDB, Version=5.0.9.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
-      <HintPath>..\packages\LiteDB.5.0.9\lib\net45\LiteDB.dll</HintPath>
+    <Reference Include="LiteDB, Version=5.0.11.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
+      <HintPath>..\packages\LiteDB.5.0.11\lib\net45\LiteDB.dll</HintPath>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Mirror.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Mirror.dll</HintPath>
     </Reference>
-    <Reference Include="Synapse, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Synapse.dll</HintPath>
+    <Reference Include="Synapse, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Synapse.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
+      <HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
     </Reference>
-    <Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.8.1.2\lib\net45\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -84,6 +82,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Scp056/Scp056Command.cs b/Scp056/Scp056Command.cs
@@ -40,8 +40,8 @@ public CommandResult Execute(CommandContext context)
                     {
                         case "d": role = RoleType.ClassD; break;
                         case "s": role = RoleType.Scientist; break;
-                        case "c": role = RoleType.ChaosInsurgency; break;
-                        case "m": role = RoleType.NtfLieutenant; break;
+                        case "c": role = RoleType.ChaosRifleman; break;
+                        case "m": role = RoleType.NtfSergeant; break;
                         case "g": role = RoleType.FacilityGuard; break;
 
                         default:

diff --git a/Scp056/Scp056PlayerScript.cs b/Scp056/Scp056PlayerScript.cs
@@ -1,5 +1,6 @@
-using Synapse.Api;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Synapse.Api;
+using Synapse.Api.Enum;
 
 namespace Scp056
 {
@@ -22,31 +23,30 @@ public override void Spawn()
             Player.Health = PluginClass.Config.Scp056Health;
             Player.MaxHealth = PluginClass.Config.Scp056Health;
 
-            Player.Ammo5 = 999;
-            Player.Ammo7 = 999;
-            Player.Ammo9 = 999;
+            foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
+                Player.AmmoBox[enumType] = 999;
 
             Player.OpenReportWindow(PluginClass.PluginTranslation.ActiveTranslation.Spawn.Replace("\\n","\n"));
         }
 
         public override void DeSpawn()
         {
-            if (RoleType.Scp079.GetPlayers().Count > 0)
-                NineTailedFoxAnnouncer.CheckForZombies(Player.gameObject);
+            /*if (RoleType.Scp079.GetPlayers().Count > 0)
+                NineTailedFoxAnnouncer.CheckForZombies(Player.gameObject);*/
 
             Map.Get.AnnounceScpDeath("0 5 6");
 
-            Player.Ammo5 = 0;
-            Player.Ammo7 = 0;
-            Player.Ammo9 = 0;
+            foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
+                Player.AmmoBox[enumType] = 0;
         }
 
         public void SwapRole(RoleType role)
         {
             Player.ChangeRoleAtPosition(role);
-            Player.Ammo5 = 999;
-            Player.Ammo7 = 999;
-            Player.Ammo9 = 999;
+
+            foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
+                Player.AmmoBox[enumType] = 999;
+
             Player.MaxHealth = PluginClass.Config.Scp056Health;
         }
     }

diff --git a/Scp056/app.config b/Scp056/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="LiteDB" publicKeyToken="4ee40123013c9f27" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.11.0" newVersion="5.0.11.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Scp056/packages.config b/Scp056/packages.config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Lib.Harmony" version="2.0.4" targetFramework="net472" />
-  <package id="LiteDB" version="5.0.9" targetFramework="net472" />
-  <package id="SynapseSL" version="2.5.3" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
-  <package id="YamlDotNet" version="8.1.2" targetFramework="net472" />
+  <package id="Lib.Harmony" version="2.1.1" targetFramework="net472" />
+  <package id="LiteDB" version="5.0.11" targetFramework="net472" />
+  <package id="SynapseSL" version="2.7.0-dev4" targetFramework="net472" />
+  <package id="YamlDotNet" version="11.2.1" targetFramework="net472" />
 </packages>