Skip to content

Commit

Permalink
Funni sl update
Browse files Browse the repository at this point in the history
  • Loading branch information
@joker-119
joker-119 committed Dec 1, 2021
1 parent b3080e3 commit db345e6
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 26 deletions.
34 changes: 19 additions & 15 deletions AdminTools/AdminTools.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,36 +43,40 @@
<Reference Include="CommandSystem.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\References\CommandSystem.Core.dll</HintPath>
</Reference>
<Reference Include="Exiled.API, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.API.dll</HintPath>
<Reference Include="Exiled.API, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.API.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.Bootstrap, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Bootstrap.dll</HintPath>
<Reference Include="Exiled.Bootstrap, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Bootstrap.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.CreditTags, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CreditTags.dll</HintPath>
<Reference Include="Exiled.CreditTags, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.CreditTags.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.CustomItems, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CustomItems.dll</HintPath>
<Reference Include="Exiled.CustomItems, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.CustomItems.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.Events, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Events.dll</HintPath>
<Reference Include="Exiled.CustomRoles, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.CustomRoles.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.Loader, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Loader.dll</HintPath>
<Reference Include="Exiled.Events, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Events.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.Permissions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Permissions.dll</HintPath>
<Reference Include="Exiled.Loader, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Loader.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.Permissions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Permissions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Updater.dll</HintPath>
<HintPath>..\packages\EXILED.4.0.0-rc.1\lib\net472\Exiled.Updater.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
Expand Down
4 changes: 2 additions & 2 deletions AdminTools/Commands/Explode/Explode.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
if (ply.Role == RoleType.Spectator || ply.Role == RoleType.None)
continue;

ply.Kill();
ply.Kill("Exploded by admin.");
new ExplosiveGrenade(ItemType.GrenadeHE, ply){ FuseTime = 0f }.SpawnActive(ply.Position, ply);
}
response = "Everyone exploded, Hubert cannot believe you have done this";
Expand All @@ -75,7 +75,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
return false;
}

pl.Kill();
pl.Kill("Exploded by admin.");
new ExplosiveGrenade(ItemType.GrenadeHE, pl){ FuseTime = 0f }.SpawnActive(pl.Position, pl);
response = $"Player \"{pl.Nickname}\" game ended (exploded)";
return true;
Expand Down
4 changes: 2 additions & 2 deletions AdminTools/Commands/Hp/Hp.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
foreach (Player pl in Player.List)
{
if (value <= 0)
pl.Kill();
pl.Kill("Killed by admin.");
else
pl.Health = value;
}
Expand All @@ -68,7 +68,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
}

if (val <= 0)
ply.Kill();
ply.Kill("Killed by admin.");
else
ply.Health = val;
response = $"Player {ply.Nickname}'s HP was set to {val}";
Expand Down
4 changes: 2 additions & 2 deletions AdminTools/Commands/Kill/Kill.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
if (ply.Role == RoleType.Spectator || ply.Role == RoleType.None)
continue;

ply.Kill();
ply.Kill("Killed by admin.");
}

response = "Everyone has been game ended (killed) now";
Expand All @@ -60,7 +60,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
return false;
}

pl.Kill();
pl.Kill("Killed by admin.");
response = $"Player {pl.Nickname} has been game ended (killed) now";
return true;
}
Expand Down
5 changes: 3 additions & 2 deletions AdminTools/EventHandlers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace AdminTools
using InventorySystem.Items.Firearms.Attachments;
using InventorySystem.Items.Pickups;
using InventorySystem.Items.ThrowableProjectiles;
using PlayerStatsSystem;
using Ragdoll = Exiled.API.Features.Ragdoll;

public class EventHandlers
Expand Down Expand Up @@ -84,7 +85,7 @@ public static IEnumerator<float> SpawnBodies(Player player, RoleType role, int c
{
for (int i = 0; i < count; i++)
{
Ragdoll.Spawn(role, DamageTypes.Falldown, "SCP-343", player.Position, default, default, false, 0);
Ragdoll.Spawn(new RagdollInfo(Server.Host.ReferenceHub, new UniversalDamageHandler(0.0f, DeathTranslations.Unknown, string.Empty), role, player.Position, default, "SCP-343", 0));
yield return Timing.WaitForSeconds(0.15f);
}
}
Expand Down Expand Up @@ -210,7 +211,7 @@ public static IEnumerator<float> DoRocket(Player player, float speed)
{
player.IsGodModeEnabled = false;
new ExplosiveGrenade(ItemType.GrenadeHE) {FuseTime = 0.5f}.SpawnActive(player.Position, player);
player.Kill();
player.Kill("Went on a trip in their favorite rocket ship.");
}

yield return Timing.WaitForOneFrame;
Expand Down
4 changes: 2 additions & 2 deletions AdminTools/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.4.0")]
[assembly: AssemblyFileVersion("3.0.4.0")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
2 changes: 1 addition & 1 deletion AdminTools/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EXILED" version="3.0.0-alpha.84" targetFramework="net472" />
<package id="EXILED" version="4.0.0-rc.1" targetFramework="net472" />
</packages>

0 comments on commit db345e6

Please sign in to comment.