diff --git a/Scp035/EventHandlers.cs b/Scp035/EventHandlers.cs index a37dcc8..ce59578 100644 --- a/Scp035/EventHandlers.cs +++ b/Scp035/EventHandlers.cs @@ -1,9 +1,9 @@ -using Synapse; -using Synapse.Api; -using Synapse.Api.Items; +using System.Collections.Generic; using System.Linq; -using System.Collections.Generic; using MEC; +using Synapse; +using Synapse.Api; +using Synapse.Api.Items; namespace Scp035 { @@ -100,7 +100,7 @@ public void Spawn035Item() var items = Map.Get.Items.Where(x => x.State == Synapse.Api.Enum.ItemState.Map); var pos = items.ElementAt(UnityEngine.Random.Range(0, items.Count())).Position; - var item = new SynapseItem(type + 100, 0f, 0, 0, 0); + var item = new SynapseItem(type + 100); item.Drop(pos); } } diff --git a/Scp035/PluginClass.cs b/Scp035/PluginClass.cs index ff4c308..b43bace 100644 --- a/Scp035/PluginClass.cs +++ b/Scp035/PluginClass.cs @@ -1,6 +1,5 @@ using Synapse; using Synapse.Api.Plugin; -using System.Collections.Generic; using Synapse.Translation; namespace Scp035 @@ -13,12 +12,12 @@ namespace Scp035 SynapseMajor = 2, SynapseMinor = 5, SynapsePatch = 3, - Version = "v.1.1.0" + Version = "v.1.1.1" )] public class PluginClass : AbstractPlugin { - [Synapse.Api.Plugin.Config(section = "Scp035")] - public static Config Config; + [Config(section = "Scp035")] + public static PluginConfig Config; [SynapseTranslation] public static new SynapseTranslation Translation { get; set; } @@ -45,7 +44,7 @@ public override void Load() Survived035 = "Das war SCP-035 aber du hast es überlebt", InteractWith035 = "Du kannst nicht mit einem SCP-035 Item interagieren", Pickup035 = "Du hast SCP-035 aufgehoben", - Spawn035 = "Du bist jetzt SCP-0354 - - ..\packages\Lib.Harmony.2.0.4\lib\net472\0Harmony.dll + + ..\packages\Lib.Harmony.2.1.1\lib\net472\0Harmony.dll - ..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp.dll + ..\packages\SynapseSL.2.7.0-dev4\lib\net472\Assembly-CSharp.dll - ..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp-firstpass.dll + ..\packages\SynapseSL.2.7.0-dev4\lib\net472\Assembly-CSharp-firstpass.dll - - ..\packages\LiteDB.5.0.9\lib\net45\LiteDB.dll + + ..\packages\LiteDB.5.0.11\lib\net45\LiteDB.dll - ..\packages\SynapseSL.2.5.3\lib\net472\Mirror.dll + ..\packages\SynapseSL.2.7.0-dev4\lib\net472\Mirror.dll - - ..\packages\SynapseSL.2.5.3\lib\net472\Synapse.dll + + ..\packages\SynapseSL.2.7.0-dev4\lib\net472\Synapse.dll @@ -62,21 +62,21 @@ - ..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.dll + ..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.dll - ..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.CoreModule.dll + ..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.CoreModule.dll - ..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.PhysicsModule.dll + ..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.PhysicsModule.dll - - ..\packages\YamlDotNet.8.1.2\lib\net45\YamlDotNet.dll + + ..\packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll - + diff --git a/Scp035/Scp035PlayerScript.cs b/Scp035/Scp035PlayerScript.cs index 14148e9..021b71b 100644 --- a/Scp035/Scp035PlayerScript.cs +++ b/Scp035/Scp035PlayerScript.cs @@ -1,5 +1,6 @@ using MEC; using Synapse.Api; +using Synapse.Api.Enum; using System.Collections.Generic; namespace Scp035 @@ -22,7 +23,7 @@ public Scp035PlayerScript() { } public override void Spawn() { if(_target == null) - Player.RoleType = RoleType.ChaosInsurgency; + Player.RoleType = RoleType.ChaosRifleman; else { Player.RoleType = _target.RoleType; @@ -35,9 +36,9 @@ public override void Spawn() } Timing.CallDelayed(0.2f, () => Player.Position = _target.Position); - Player.Ammo5 = _target.Ammo5; - Player.Ammo7 = _target.Ammo7; - Player.Ammo9 = _target.Ammo9; + + foreach (var type in (AmmoType[])System.Enum.GetValues(typeof(AmmoType))) + Player.AmmoBox[type] = _target.AmmoBox[type]; _target.RoleID = (int)RoleType.Spectator; diff --git a/Scp035/packages.config b/Scp035/packages.config index 6855d63..3701fb1 100644 --- a/Scp035/packages.config +++ b/Scp035/packages.config @@ -1,8 +1,8 @@  - - - + + + - + \ No newline at end of file