Skip to content

Commit 8ff23c5

Browse files
committed
improved 056 spawning
1 parent ae63d77 commit 8ff23c5

File tree

5 files changed

+30
-14
lines changed

5 files changed

+30
-14
lines changed

Scp056/EventHandlers.cs

+10
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ public EventHandlers()
1414
Server.Get.Events.Player.PlayerDeathEvent += OnDeath;
1515
Server.Get.Events.Round.SpawnPlayersEvent += OnSpawn;
1616
Server.Get.Events.Player.PlayerCuffTargetEvent += OnCuff;
17+
Server.Get.Events.Player.PlayerSetClassEvent += OnSetClass;
18+
}
19+
20+
private void OnSetClass(Synapse.Api.Events.SynapseEventArguments.PlayerSetClassEventArgs ev)
21+
{
22+
if(ev.Player.RoleID == 56 && (ev.Player.CustomRole is Scp056PlayerScript script) && !script.Spawned)
23+
{
24+
script.Spawned = true;
25+
ev.Position = PluginClass.Config.Scp056SpawnPoint.Parse().Position;
26+
}
1727
}
1828

1929
private void OnCuff(Synapse.Api.Events.SynapseEventArguments.PlayerCuffTargetEventArgs ev)

Scp056/PluginClass.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ namespace Scp056
99
Description = "An Plugin which adds the new Role Scp056 to the game",
1010
LoadPriority = 1,
1111
Name = "Scp056",
12-
SynapseMajor = SynapseController.SynapseMajor,
13-
SynapseMinor = SynapseController.SynapseMinor,
14-
SynapsePatch = SynapseController.SynapsePatch,
15-
Version = "v.1.1.1"
12+
SynapseMajor = 2,
13+
SynapseMinor = 4,
14+
SynapsePatch = 1,
15+
Version = "v.1.1.2"
1616
)]
1717
public class PluginClass : AbstractPlugin
1818
{

Scp056/Scp056.csproj

+11-8
Original file line numberDiff line numberDiff line change
@@ -35,37 +35,40 @@
3535
<HintPath>..\packages\Lib.Harmony.2.0.4\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.3.0\lib\net472\Assembly-CSharp.dll</HintPath>
38+
<HintPath>..\packages\SynapseSL.2.4.1\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.3.0\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
41+
<HintPath>..\packages\SynapseSL.2.4.1\lib\net472\Assembly-CSharp-firstpass.dll</HintPath>
4242
</Reference>
4343
<Reference Include="LiteDB, Version=5.0.9.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
4444
<HintPath>..\packages\LiteDB.5.0.9\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.3.0\lib\net472\Mirror.dll</HintPath>
47+
<HintPath>..\packages\SynapseSL.2.4.1\lib\net472\Mirror.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Synapse, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\SynapseSL.2.3.0\lib\net472\Synapse.dll</HintPath>
49+
<Reference Include="Synapse, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\SynapseSL.2.4.1\lib\net472\Synapse.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Core" />
5454
<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>
5558
<Reference Include="System.Xml.Linq" />
5659
<Reference Include="System.Data.DataSetExtensions" />
5760
<Reference Include="Microsoft.CSharp" />
5861
<Reference Include="System.Data" />
5962
<Reference Include="System.Net.Http" />
6063
<Reference Include="System.Xml" />
6164
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\packages\SynapseSL.2.3.0\lib\net472\UnityEngine.dll</HintPath>
65+
<HintPath>..\packages\SynapseSL.2.4.1\lib\net472\UnityEngine.dll</HintPath>
6366
</Reference>
6467
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\SynapseSL.2.3.0\lib\net472\UnityEngine.CoreModule.dll</HintPath>
68+
<HintPath>..\packages\SynapseSL.2.4.1\lib\net472\UnityEngine.CoreModule.dll</HintPath>
6669
</Reference>
6770
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\SynapseSL.2.3.0\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
71+
<HintPath>..\packages\SynapseSL.2.4.1\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
6972
</Reference>
7073
<Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
7174
<HintPath>..\packages\YamlDotNet.8.1.2\lib\net45\YamlDotNet.dll</HintPath>

Scp056/Scp056PlayerScript.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public override System.Collections.Generic.List<Team> GetFriends()
2222

2323
public override void Spawn()
2424
{
25+
Spawned = false;
2526
Player.RoleType = RoleType.FacilityGuard;
26-
Timing.CallDelayed(0.5f, () => Player.Position = PluginClass.Config.Scp056SpawnPoint.Parse().Position);
2727

2828
Player.Inventory.Clear();
2929

@@ -40,6 +40,8 @@ public override void Spawn()
4040
Player.OpenReportWindow(PluginClass.GetTranslation("spawn"));
4141
}
4242

43+
internal bool Spawned = false;
44+
4345
public override void DeSpawn() => NineTailedFoxAnnouncer.CheckForZombies(Player.gameObject);
4446
}
4547
}

Scp056/packages.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="Lib.Harmony" version="2.0.4" targetFramework="net472" />
44
<package id="LiteDB" version="5.0.9" targetFramework="net472" />
5-
<package id="SynapseSL" version="2.3.0" targetFramework="net472" />
5+
<package id="SynapseSL" version="2.4.1" targetFramework="net472" />
6+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
67
<package id="YamlDotNet" version="8.1.2" targetFramework="net472" />
78
</packages>

0 commit comments

Comments
 (0)