Skip to content

Commit a30143a

Browse files
GrafDimenzioGrafDimenzio
committed
11.0.0
1 parent 6961868 commit a30143a

9 files changed

+69
-52
lines changed

‎Scp056/EventHandlers.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using Synapse;
1+
using System.Linq;
2+
using Synapse;
23
using Synapse.Api;
3-
using System.Linq;
4+
using Synapse.Api.Enum;
45
using UnityEngine;
56

67
namespace Scp056
@@ -35,9 +36,8 @@ private void OnCuff(Synapse.Api.Events.SynapseEventArguments.PlayerCuffTargetEve
3536
{
3637
if(ev.Target.RoleID == 56)
3738
{
38-
ev.Target.Ammo5 = 0;
39-
ev.Target.Ammo7 = 0;
40-
ev.Target.Ammo9 = 0;
39+
foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
40+
ev.Target.AmmoBox[enumType] = 0;
4141
}
4242
}
4343

@@ -91,9 +91,9 @@ private void OnKeyPress(Synapse.Api.Events.SynapseEventArguments.PlayerKeyPressE
9191

9292
case KeyCode.Alpha3: role = RoleType.FacilityGuard; break;
9393

94-
case KeyCode.Alpha4: role = RoleType.NtfLieutenant; break;
94+
case KeyCode.Alpha4: role = RoleType.NtfSergeant; break;
9595

96-
case KeyCode.Alpha5: role = RoleType.ChaosInsurgency; break;
96+
case KeyCode.Alpha5: role = RoleType.ChaosRifleman; break;
9797

9898
case KeyCode.Alpha6:
9999
var targets = Server.Get.GetPlayers(x => x.RealTeam == Team.MTF || x.RealTeam == Team.CDP || x.RealTeam == Team.RSC).Count;

‎Scp056/PluginClass.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace Scp056
1010
LoadPriority = 1,
1111
Name = "Scp056",
1212
SynapseMajor = 2,
13-
SynapseMinor = 5,
14-
SynapsePatch = 3,
15-
Version = "v.1.1.3"
13+
SynapseMinor = 7,
14+
SynapsePatch = 0,
15+
Version = "v.1.1.4"
1616
)]
1717
public class PluginClass : AbstractPlugin
1818
{

‎Scp056/PluginConfig.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public class PluginConfig : AbstractConfigSection
1919
[Description("The Items Scp056 spawns with")]
2020
public List<SerializedItem> Items = new List<SerializedItem>()
2121
{
22-
new SerializedItem((int)ItemType.GunMP7,35,0,0,0,Vector3.one),
23-
new SerializedItem((int)ItemType.Medkit,35,0,0,0,Vector3.one),
24-
new SerializedItem((int)ItemType.KeycardGuard,35,0,0,0,Vector3.one),
22+
new SerializedItem((int)ItemType.GunFSP9,25,0,Vector3.one),
23+
new SerializedItem((int)ItemType.Medkit,0,0,Vector3.one),
24+
new SerializedItem((int)ItemType.KeycardGuard,0,0,Vector3.one),
2525
};
2626

2727
[Description("The Chanche of which Scp056 spawns")]

‎Scp056/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
3333
// indem Sie "*" wie unten gezeigt eingeben:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.3.0")]
36-
[assembly: AssemblyFileVersion("1.1.3.0")]
35+
[assembly: AssemblyVersion("1.1.4.0")]
36+
[assembly: AssemblyFileVersion("1.1.4.0")]

‎Scp056/Scp056.csproj

+16-17
Original file line numberDiff line numberDiff line change
@@ -31,47 +31,45 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="0Harmony, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\Lib.Harmony.2.0.4\lib\net472\0Harmony.dll</HintPath>
34+
<Reference Include="0Harmony, Version=2.1.1.0, Culture=neutral, processorArchitecture=MSIL">
35+
<HintPath>..\packages\Lib.Harmony.2.1.1\lib\net472\0Harmony.dll</HintPath>
3636
</Reference>
3737
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp.dll</HintPath>
38+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Assembly-CSharp.dll</HintPath>
3939
</Reference>
4040
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
41+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
4242
</Reference>
43-
<Reference Include="LiteDB, Version=5.0.9.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
44-
<HintPath>..\packages\LiteDB.5.0.9\lib\net45\LiteDB.dll</HintPath>
43+
<Reference Include="LiteDB, Version=5.0.11.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
44+
<HintPath>..\packages\LiteDB.5.0.11\lib\net45\LiteDB.dll</HintPath>
4545
</Reference>
4646
<Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Mirror.dll</HintPath>
47+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Mirror.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Synapse, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\Synapse.dll</HintPath>
49+
<Reference Include="Synapse, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\Synapse.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Core" />
54+
<Reference Include="System.Numerics" />
5455
<Reference Include="System.Runtime" />
55-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
57-
</Reference>
5856
<Reference Include="System.Xml.Linq" />
5957
<Reference Include="System.Data.DataSetExtensions" />
6058
<Reference Include="Microsoft.CSharp" />
6159
<Reference Include="System.Data" />
6260
<Reference Include="System.Net.Http" />
6361
<Reference Include="System.Xml" />
6462
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.dll</HintPath>
63+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.dll</HintPath>
6664
</Reference>
6765
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.CoreModule.dll</HintPath>
66+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.CoreModule.dll</HintPath>
6967
</Reference>
7068
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
69+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
7270
</Reference>
73-
<Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
74-
<HintPath>..\packages\YamlDotNet.8.1.2\lib\net45\YamlDotNet.dll</HintPath>
71+
<Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
72+
<HintPath>..\packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll</HintPath>
7573
</Reference>
7674
</ItemGroup>
7775
<ItemGroup>
@@ -84,6 +82,7 @@
8482
<Compile Include="Properties\AssemblyInfo.cs" />
8583
</ItemGroup>
8684
<ItemGroup>
85+
<None Include="app.config" />
8786
<None Include="packages.config" />
8887
</ItemGroup>
8988
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Scp056/Scp056Command.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public CommandResult Execute(CommandContext context)
4040
{
4141
case "d": role = RoleType.ClassD; break;
4242
case "s": role = RoleType.Scientist; break;
43-
case "c": role = RoleType.ChaosInsurgency; break;
44-
case "m": role = RoleType.NtfLieutenant; break;
43+
case "c": role = RoleType.ChaosRifleman; break;
44+
case "m": role = RoleType.NtfSergeant; break;
4545
case "g": role = RoleType.FacilityGuard; break;
4646

4747
default:

‎Scp056/Scp056PlayerScript.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
using Synapse.Api;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
2+
using Synapse.Api;
3+
using Synapse.Api.Enum;
34

45
namespace Scp056
56
{
@@ -22,31 +23,30 @@ public override void Spawn()
2223
Player.Health = PluginClass.Config.Scp056Health;
2324
Player.MaxHealth = PluginClass.Config.Scp056Health;
2425

25-
Player.Ammo5 = 999;
26-
Player.Ammo7 = 999;
27-
Player.Ammo9 = 999;
26+
foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
27+
Player.AmmoBox[enumType] = 999;
2828

2929
Player.OpenReportWindow(PluginClass.PluginTranslation.ActiveTranslation.Spawn.Replace("\\n","\n"));
3030
}
3131

3232
public override void DeSpawn()
3333
{
34-
if (RoleType.Scp079.GetPlayers().Count > 0)
35-
NineTailedFoxAnnouncer.CheckForZombies(Player.gameObject);
34+
/*if (RoleType.Scp079.GetPlayers().Count > 0)
35+
NineTailedFoxAnnouncer.CheckForZombies(Player.gameObject);*/
3636

3737
Map.Get.AnnounceScpDeath("0 5 6");
3838

39-
Player.Ammo5 = 0;
40-
Player.Ammo7 = 0;
41-
Player.Ammo9 = 0;
39+
foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
40+
Player.AmmoBox[enumType] = 0;
4241
}
4342

4443
public void SwapRole(RoleType role)
4544
{
4645
Player.ChangeRoleAtPosition(role);
47-
Player.Ammo5 = 999;
48-
Player.Ammo7 = 999;
49-
Player.Ammo9 = 999;
46+
47+
foreach (var enumType in (AmmoType[])typeof(AmmoType).GetEnumValues())
48+
Player.AmmoBox[enumType] = 999;
49+
5050
Player.MaxHealth = PluginClass.Config.Scp056Health;
5151
}
5252
}

‎Scp056/app.config

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="LiteDB" publicKeyToken="4ee40123013c9f27" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.0.11.0" newVersion="5.0.11.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
16+
</dependentAssembly>
17+
</assemblyBinding>
18+
</runtime>
19+
</configuration>

‎Scp056/packages.config

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Lib.Harmony" version="2.0.4" targetFramework="net472" />
4-
<package id="LiteDB" version="5.0.9" targetFramework="net472" />
5-
<package id="SynapseSL" version="2.5.3" targetFramework="net472" />
6-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
7-
<package id="YamlDotNet" version="8.1.2" targetFramework="net472" />
3+
<package id="Lib.Harmony" version="2.1.1" targetFramework="net472" />
4+
<package id="LiteDB" version="5.0.11" targetFramework="net472" />
5+
<package id="SynapseSL" version="2.7.0-dev4" targetFramework="net472" />
6+
<package id="YamlDotNet" version="11.2.1" targetFramework="net472" />
87
</packages>

0 commit comments

Comments
 (0)