Skip to content

Commit 1ba12ea

Browse files
GrafDimenzioGrafDimenzio
committed
11.0.0
1 parent 50e798c commit 1ba12ea

File tree

8 files changed

+33
-58
lines changed

8 files changed

+33
-58
lines changed

‎Scp079Rework/Commands/BlackOutCommand.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public CommandResult Execute(CommandContext context)
2929
State = CommandResultState.Error
3030
};
3131

32-
Map.Get.HeavyController.LightsOut(10f, false);
32+
HeavyController.Get.LightsOut(10f, false);
33+
3334
Map.Get.GlitchedCassie("Black out through Scp 0 7 9 Now");
3435

3536
return new CommandResult

‎Scp079Rework/Commands/RobotCommand.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public CommandResult Execute(CommandContext context)
4747
result.State = CommandResultState.NoPermission;
4848
result.Message = "You have destroyed your current robot";
4949
return result;
50-
case "C": role = RoleType.ChaosInsurgency; break;
50+
case "C": role = RoleType.ChaosRifleman; break;
5151
case "D": role = RoleType.ClassD; break;
5252
case "S": role = RoleType.Scientist; break;
5353
case "G": role = RoleType.FacilityGuard; break;
54-
case "M": role = RoleType.NtfLieutenant; break;
54+
case "M": role = RoleType.NtfSergeant; break;
5555
default:
5656
result.Message = $"No Robot was found for {context.Arguments.At(0)}";
5757
result.State = CommandResultState.Error;
@@ -104,15 +104,15 @@ private bool CanSpawnRobot(RoleType role)
104104
}
105105
return false;
106106

107-
case RoleType.ChaosInsurgency:
107+
case RoleType.ChaosRifleman:
108108
if (Scp079Robot.Scp079CRobot >= 1)
109109
{
110110
Scp079Robot.Scp079CRobot--;
111111
return true;
112112
}
113113
return false;
114114

115-
case RoleType.NtfLieutenant:
115+
case RoleType.NtfSergeant:
116116
if (Scp079Robot.Scp079MRobot >= 1)
117117
{
118118
Scp079Robot.Scp079MRobot--;

‎Scp079Rework/Commands/ScpCommand.cs‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
using Synapse.Command;
2-
using Synapse;
3-
using System.Collections.Generic;
1+
using Synapse.Api;
2+
using Synapse.Command;
43
using UnityEngine;
54

65
namespace Scp079Rework.Commands
@@ -30,7 +29,7 @@ public CommandResult Execute(CommandContext context)
3029
State = CommandResultState.Error
3130
};
3231

33-
var cams = GetCameras();
32+
var cams = Map.Get.Cameras;
3433
if(cams.Count > 0)
3534
{
3635
var cam = cams[UnityEngine.Random.Range(0, cams.Count)];
@@ -50,18 +49,5 @@ public CommandResult Execute(CommandContext context)
5049
};
5150
}
5251
}
53-
54-
private List<Camera079> GetCameras()
55-
{
56-
var list = Server.Get.GetObjectsOf<Camera079>();
57-
var cams = new List<Camera079>();
58-
59-
foreach (var player in Server.Get.GetPlayers(x => x.Team == Team.SCP && x.RoleID != (int)RoleType.Scp079))
60-
foreach (var cam in list)
61-
if (Vector3.Distance(cam.transform.position, player.Position) <= 15f)
62-
cams.Add(cam);
63-
64-
return cams;
65-
}
6652
}
6753
}

‎Scp079Rework/Plugin/PluginClass.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace Scp079Rework
1313
Description = "A Plugin which gives Scp-079 a lot of new Features",
1414
LoadPriority = 10,
1515
SynapseMajor = 2,
16-
SynapseMinor = 5,
17-
SynapsePatch = 3,
18-
Version = "v.2.1.0"
16+
SynapseMinor = 7,
17+
SynapsePatch = 0,
18+
Version = "v.2.1.1"
1919
)]
2020
public class PluginClass : AbstractPlugin
2121
{

‎Scp079Rework/Plugin/PluginConfig.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public class PluginConfig : AbstractConfigSection
1818
[Description("The Items with which Scp079-robot spawns")]
1919
public List<SerializedItem> Inventory = new List<SerializedItem>
2020
{
21-
new SerializedItem((int)ItemType.GunUSP,18,0,0,0,UnityEngine.Vector3.one),
22-
new SerializedItem((int)ItemType.Medkit,0,0,0,0,UnityEngine.Vector3.one),
21+
new SerializedItem((int)ItemType.GunCOM18,18f,0u,UnityEngine.Vector3.one),
22+
new SerializedItem((int)ItemType.Medkit,0f,0u,UnityEngine.Vector3.one),
2323
};
2424

2525
[Description("The Amount of D-Personnel Robots Scp-079 can use")]

‎Scp079Rework/Scp079Rework.csproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@
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" />
@@ -62,16 +62,16 @@
6262
<Reference Include="System.Net.Http" />
6363
<Reference Include="System.Xml" />
6464
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\SynapseSL.2.5.3\lib\net472\UnityEngine.dll</HintPath>
65+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.dll</HintPath>
6666
</Reference>
6767
<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>
68+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.CoreModule.dll</HintPath>
6969
</Reference>
7070
<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>
71+
<HintPath>..\packages\SynapseSL.2.7.0-dev4\lib\net472\UnityEngine.PhysicsModule.dll</HintPath>
7272
</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>
73+
<Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
74+
<HintPath>..\packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll</HintPath>
7575
</Reference>
7676
</ItemGroup>
7777
<ItemGroup>

‎Scp079Rework/Scp079Robot.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Collections.Generic;
22
using MEC;
33
using Synapse.Api;
4-
using System.Linq;
54

65
namespace Scp079Rework
76
{
@@ -21,7 +20,6 @@ public class Scp079Robot : Synapse.Api.Roles.Role
2120

2221
public override List<int> GetFriendsID() => PluginClass.Config.RobotFF ? new List<int> { } : new List<int> { (int)Team.SCP };
2322

24-
2523
public override List<int> GetEnemiesID() => new List<int> { (int)Team.RSC, (int)Team.CDP, (int)Team.MTF };
2624

2725
internal bool _bypass = false;
@@ -45,17 +43,7 @@ public override void DeSpawn()
4543
Player.Bypass = _bypass;
4644
if (Map.Get.HeavyController.Is079Recontained) return;
4745

48-
var locked = SynapseController.Server.Map.Round.RoundLock;
49-
SynapseController.Server.Map.Round.RoundLock = true;
50-
Timing.CallDelayed(0.1f, () =>
51-
{
52-
if (Player.RoleID == (int)RoleType.Spectator)
53-
{
54-
Player.RoleID = (int)RoleType.Scp079;
55-
NineTailedFoxAnnouncer.CheckForZombies(SynapseController.Server.Host.gameObject);
56-
}
57-
SynapseController.Server.Map.Round.RoundLock = locked;
58-
});
46+
Player.RoleID = (int)RoleType.Scp079;
5947
}
6048

6149
public static int Scp079DRobot = 1;

‎Scp079Rework/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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" />
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" />
66
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
7-
<package id="YamlDotNet" version="8.1.2" targetFramework="net472" />
7+
<package id="YamlDotNet" version="11.2.1" targetFramework="net472" />
88
</packages>

0 commit comments

Comments
 (0)