Skip to content

Updated to Exiled 3.0.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Redforce04 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to Exiled 3.0.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion SCPSwap/Commands/Scpswap/Scpswap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System;
using System.Linq;


namespace ScpSwap.Commands.ScpSwapCommand
{
[CommandHandler(typeof(ClientCommandHandler))]
Expand Down Expand Up @@ -69,6 +70,11 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
response = "That SCP is blacklisted.";
return false;
}
if(!EventHandlers.plugin.Config.CanZombiesSwap && ply.Role == RoleType.Scp0492)
{
response = "Zombies cannot swap with scp's.";
return false;
}

if (ply.Role == role)
{
Expand All @@ -85,7 +91,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
}
if (EventHandlers.plugin.Config.SwapAllowNewScps)
{
ply.ReferenceHub.characterClassManager.SetPlayersClass(role, ply.ReferenceHub.gameObject);
ply.ReferenceHub.characterClassManager.SetPlayersClass(role, ply.ReferenceHub.gameObject, CharacterClassManager.SpawnReason.ForceClass);
response = "Could not find a player to swap with, you have been made the specified SCP.";
return false;
}
Expand Down
1 change: 1 addition & 0 deletions SCPSwap/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ public sealed class Config : IConfig
public ushort StartMessageTime { get; set; } = 15;
public string DisplayMessageText { get; set; } = "<color=yellow><b>Did you know you can swap classes with other SCP's?</b></color> Simply type <color=orange>.scpswap (role number)</color> in your in-game console (not RA) to swap!";
public List<int> SwapBlacklist { get; private set; } = new List<int>() { 10 };
public bool CanZombiesSwap { get; set; } = false;
}
}
5 changes: 1 addition & 4 deletions SCPSwap/EventHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,7 @@ public void OnWaitingForPlayers()
allowSwaps = false;
}

public void OnConsoleCommand(SendingConsoleCommandEventArgs ev)
{

}


public void BroadcastMessage()
{
Expand Down
8 changes: 3 additions & 5 deletions SCPSwap/SCPSwap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ public class ScpSwap : Plugin<Config>
{
public EventHandlers Handler { get; private set; }
public override string Name => nameof(ScpSwap);
public override string Author => "Originally written by Cyanox, modifications by KoukoCocoa & Thomasjosif";
public override Version Version { get; } = new Version(1, 3, 2);
public override Version RequiredExiledVersion { get; } = new Version(2, 1, 29, 0);
public override string Author => "Originally written by Cyanox, modifications by KoukoCocoa & Thomasjosif, updated to Exiled 3.0.0 by Redforce04";
public override Version Version { get; } = new Version(1, 4, 0);
public override Version RequiredExiledVersion { get; } = new Version(3, 0, 0);

public ScpSwap() { }

Expand All @@ -21,7 +21,6 @@ public override void OnEnabled()
Handlers.Server.RoundStarted += Handler.OnRoundStart;
Handlers.Server.RoundEnded += Handler.OnRoundEnd;
Handlers.Server.RestartingRound += Handler.OnRoundRestart;
Handlers.Server.SendingConsoleCommand += Handler.OnConsoleCommand;
}

public override void OnDisabled()
Expand All @@ -30,7 +29,6 @@ public override void OnDisabled()
Handlers.Server.RoundStarted -= Handler.OnRoundStart;
Handlers.Server.RoundEnded -= Handler.OnRoundEnd;
Handlers.Server.RestartingRound -= Handler.OnRoundRestart;
Handlers.Server.SendingConsoleCommand -= Handler.OnConsoleCommand;
Handler = null;
}

Expand Down
55 changes: 29 additions & 26 deletions SCPSwap/SCPSwap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,43 +32,46 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\..\EXILED_REFERENCES\0Harmony.dll</HintPath>
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Plugins\dependencies\0Harmony.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\EXILED_REFERENCES\Assembly-CSharp.dll</HintPath>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\..\EXILED_REFERENCES\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>..\..\..\..\..\Desktop\SCP\SCPSL_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="CommandSystem.Core, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\EXILED_REFERENCES\CommandSystem.Core.dll</HintPath>
<Reference Include="Assembly-CSharp-Publicized %286%29">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\Assembly-CSharp-Publicized (6).dll</HintPath>
</Reference>
<Reference Include="Exiled.API, Version=2.1.29.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\EXILED.2.1.29\lib\net472\Exiled.API.dll</HintPath>
<Reference Include="CommandSystem.Core">
<HintPath>..\..\..\..\..\Desktop\SCP\SCPSL_Data\Managed\CommandSystem.Core.dll</HintPath>
</Reference>
<Reference Include="Exiled.Bootstrap, Version=2.1.29.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\EXILED.2.1.29\lib\net472\Exiled.Bootstrap.dll</HintPath>
<Reference Include="Exiled.API">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Plugins\dependencies\Exiled.API.dll</HintPath>
</Reference>
<Reference Include="Exiled.Events, Version=2.1.29.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\EXILED.2.1.29\lib\net472\Exiled.Events.dll</HintPath>
<Reference Include="Exiled.CreditTags">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Plugins\Exiled.CreditTags.dll</HintPath>
</Reference>
<Reference Include="Exiled.Loader, Version=2.1.29.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\EXILED.2.1.29\lib\net472\Exiled.Loader.dll</HintPath>
<Reference Include="Exiled.CustomItems">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Plugins\Exiled.CustomItems.dll</HintPath>
</Reference>
<Reference Include="Exiled.Permissions, Version=2.1.29.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\EXILED.2.1.29\lib\net472\Exiled.Permissions.dll</HintPath>
<Reference Include="Exiled.Events">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Plugins\Exiled.Events.dll</HintPath>
</Reference>
<Reference Include="Exiled.Updater, Version=3.0.3.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\EXILED.2.1.29\lib\net472\Exiled.Updater.dll</HintPath>
<Reference Include="Exiled.Loader">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Exiled.Loader.dll</HintPath>
</Reference>
<Reference Include="Exiled.Permissions">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Plugins\Exiled.Permissions.dll</HintPath>
</Reference>
<Reference Include="Exiled.Updater">
<HintPath>..\..\..\..\..\Desktop\SCP Plugin\EXILED\Plugins\Exiled.Updater.dll</HintPath>
</Reference>
<Reference Include="Mirror">
<HintPath>..\..\EXILED_REFERENCES\Mirror.dll</HintPath>
<HintPath>..\..\..\..\..\Desktop\SCP\SCPSL_Data\Managed\Mirror.dll</HintPath>
</Reference>
<Reference Include="NorthwoodLib, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\EXILED_REFERENCES\NorthwoodLib.dll</HintPath>
<Reference Include="NorthwoodLib">
<HintPath>..\..\..\..\..\Desktop\SCP\SCPSL_Data\Managed\NorthwoodLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -79,10 +82,10 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<HintPath>..\..\EXILED_REFERENCES\UnityEngine.dll</HintPath>
<HintPath>..\..\..\..\..\Desktop\SCP\SCPSL_Data\Managed\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\EXILED_REFERENCES\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\..\..\..\Desktop\SCP\SCPSL_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down