I forgor

Author: Noobest1001

ChangeLog.md

@@ -1,22 +1,13 @@
-># Update 3.2.1
->
->>## General
->>> - Added new custom weapon: **AdminAbuse ("Regert")**. Fires a frag grenade on shot and prevents attachment changes.
->>> - Introduced new debug/admin commands for C4 detonation and plugin debugging.
->>> - Improved error handling and logging, including more detailed error messages with timestamps and time zone info.
->
->>## SCP-1162
->>> - Removed the `SCP-1162` item from the game, as it was moved to a dedicated plugin.
->
->>## Sniper
->>> - Prevented attachment changes on the Sniper (SR-118) and provided user feedback.
->>> - Ensured the Sniper's magazine and barrel are emptied after each shot.
->
->>## Utils
->>> - Added and improved utility methods for item handling, color conversion, and candy logic.
->>> - Updated item name mappings and added new item types.
->>> - Improved documentation and code comments for maintainability.
->
->>## Internal
->>> - Refactored and organized command registration and permission checks for better maintainability.
->>> - Improved event subscription management to prevent duplicate event handler calls.
+># Update 3.2.2
+> 
+>> ## General
+>>> - Refactored a lot of code to make it easier to read
+> 
+>>## Plastic (C-4)
+>>> - Added the ability to explode the C-4 via a keybind (default: Delete)
+>>> 
+> 
+>>## Tranquilizer
+>>>- Changed from a person who is tranqed being invulnerable to just having a 60% damage resistance
+>>>
+> 

Commands/Plastic.cs

@@ -4,8 +4,7 @@
 namespace ExtendedItems.Commands
 {
     [CommandHandler(typeof(ClientCommandHandler))]
-
-    class Plastic : ICommand
+    internal class Plastic : ICommand
     {
         public string Command => "detonate";
 
@@ -15,19 +14,18 @@ class Plastic : ICommand
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            Player ply = Player.Get(sender);
+            var ply = Player.Get(sender);
             Log.Debug($"Player: {ply.Nickname} executed the detonate command.");
             if (!Items.Plastic.PlacedCharges.ContainsValue(ply))
             {
                 response = "\n<color=red>You've haven't placed any C4 charges!</color>";
                 return false;
-                
             }
 
-            int i = 0;
+            var i = 0;
             foreach (var charge in Items.Plastic.PlacedCharges.ToList())
             {
-                float posy = charge.Key.Position.y;
+                var posy = charge.Key.Position.y;
                 if (charge.Value != ply) continue;
 
                 if (ply.Position.y >= posy - 100 && ply.Position.y <= posy + 100)
@@ -36,13 +34,15 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                     i++;
                 }
                 else
-                {
-                    ply.SendConsoleMessage($"One of your charges is out of range. You need to get within the zone that it was placed", "yellow");
-                }
+                    ply.SendConsoleMessage(
+                        "One of your charges is out of range. You need to get within the zone that it was placed",
+                        "yellow");
             }
 
-            response = i == 1 ? $"\n<color=green>{i} C4 charge has been detonated!</color>" : $"\n<color=green>{i} C4 charges have been detonated!</color>";
+            response = i == 1
+                ? $"\n<color=green>{i} C4 charge has been detonated!</color>"
+                : $"\n<color=green>{i} C4 charges have been detonated!</color>";
             return true;
         }
     }
-}
+}

Config.cs

@@ -1,8 +1,6 @@
-using Exiled.API.Enums;
+using System.ComponentModel;
 using Exiled.API.Interfaces;
 using ExtendedItems.Items;
-using System.ComponentModel;
-using UnityEngine;
 
 namespace ExtendedItems
 {
@@ -13,12 +11,15 @@ public class Config : IConfig
 
         #region Config Settings
 
-        [Description("Weather a tranqed target hold the item they had when they were tranqed")]
-        public bool ReholdItems { get; set; } = false;
-
         [Description("Weather the Tranq is effective on Tutorials")]
         public bool EffectiveOnTutorials { get; set; } = false;
 
+        [Description("The Distance from Larry a player can be before they can no longer use SCP-1499")]
+        public float LarryDistance { get; set; } = 1f;
+        
+        [Description("Ammount of ammo to remove when Grenade Launcher is fired (Can not be negitive)")]
+        public ushort GrenadeLauncherAmmoUsage { get; set; } = 10;
+
         [Description("The possable hints shown when you Win")]
         public string[] WinHints { get; set; } =
         [
@@ -44,6 +45,7 @@ public class Config : IConfig
         ];
 
         #endregion
+
         #region Custom Items setup
 
         public Coin Coin { get; set; } = new();
@@ -54,8 +56,6 @@ public class Config : IConfig
         public Plastic Plastic { get; set; } = new();
         public AdminAbuse AdminAbuse { get; set; } = new();
 
-
         #endregion
     }
-
-}
+}

ExtendedItems.csproj

@@ -1,5 +1,4 @@
-
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net48</TargetFramework>
@@ -9,15 +8,15 @@
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     </PropertyGroup>
 
-	<PropertyGroup>
-		<NoWarn>$(NoWarn);MSB3270</NoWarn>
-	</PropertyGroup>
+    <PropertyGroup>
+        <NoWarn>$(NoWarn);MSB3270</NoWarn>
+    </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="ExMod.Exiled" Version="9.7.0" />
+        <PackageReference Include="ExMod.Exiled" Version="9.8.1"/>
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 

Items/AdminAbuse.cs

@@ -1,4 +1,5 @@
-using Exiled.API.Enums;
+using System.ComponentModel;
+using Exiled.API.Enums;
 using Exiled.API.Features;
 using Exiled.API.Features.Attributes;
 using Exiled.API.Features.Components;
@@ -8,26 +9,27 @@
 using Exiled.Events.EventArgs.Item;
 using Exiled.Events.EventArgs.Player;
 using InventorySystem.Items.Firearms.Attachments;
-using System.ComponentModel;
 using E = ExtendedItems.Utils;
 using ItemEvents = Exiled.Events.Handlers.Item;
 
 namespace ExtendedItems.Items
 {
-
     [CustomItem(ItemType.GunRevolver)]
     public class AdminAbuse : CustomWeapon
     {
         [Description("thanks to hayden for the idea on buckshot or else it wouldnt have worked")]
         public override uint Id { get; set; } = 799;
+
         public override string Name { get; set; } = "Regert (dont use this because it crashes the server)";
         public override string Description { get; set; } = "you asked for it!";
         public override float Weight { get; set; } = 0f;
         public override float Damage { get; set; } = 0;
+
         public override SpawnProperties? SpawnProperties { get; set; } = new()
         {
             Limit = 0,
         };
+
         public override AttachmentName[] Attachments { get; set; } =
         [
             AttachmentName.CylinderMag7,
@@ -43,7 +45,8 @@ protected override void OnShot(ShotEventArgs ev)
             // so you need to call ev.Firearm.MagazineAmmo :)
             ev.Firearm.MagazineAmmo = E.Subtract((ushort)ev.Firearm.MagazineAmmo);
 
-            throwable.Projectile.GameObject.AddComponent<CollisionHandler>().Init(ev.Player.GameObject, throwable.Projectile.Base);
+            throwable.Projectile.GameObject.AddComponent<CollisionHandler>()
+                .Init(ev.Player.GameObject, throwable.Projectile.Base);
 
             base.OnShot(ev);
         }
@@ -71,9 +74,10 @@ protected override void UnsubscribeEvents()
 
             base.UnsubscribeEvents();
         }
+
         private static IEnumerator<float> Detonate(Throwable throwable)
         {
-            for (; ; )
+            for (;;)
             {
                 float comp = -2;
                 var yVelocity = throwable.Projectile.Rigidbody.linearVelocity.y - comp;

Items/Coin.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel;
 using Exiled.API.Enums;
 using Exiled.API.Features;
 using Exiled.API.Features.Attributes;
@@ -6,10 +7,9 @@
 using Exiled.Events.EventArgs.Player;
 using ExtendedItems.Types;
 using MEC;
-using System.ComponentModel;
 using PlayerStatsSystem;
-using PlayerEvents = Exiled.Events.Handlers.Player;
 using UnityEngine;
+using PlayerEvents = Exiled.Events.Handlers.Player;
 
 namespace ExtendedItems.Items
 {
@@ -26,35 +26,37 @@ public class Coin : CustomItem
             Limit = 3,
             RoomSpawnPoints =
             [
-                new RoomSpawnPoint() { Room = RoomType.LczCafe, Chance = 50 },
-                new RoomSpawnPoint() { Room = RoomType.LczToilets, Chance = 50 },
-                new RoomSpawnPoint() { Room = RoomType.HczArmory, Chance = 50 },
+                new RoomSpawnPoint { Room = RoomType.LczCafe, Chance = 50, },
+                new RoomSpawnPoint { Room = RoomType.LczToilets, Chance = 50, },
+                new RoomSpawnPoint { Room = RoomType.HczArmory, Chance = 50, },
             ],
             DynamicSpawnPoints =
             [
-                new DynamicSpawnPoint() { Location = SpawnLocationType.InsideEscapePrimary, Chance = 50 },
-            ]
+                new DynamicSpawnPoint { Location = SpawnLocationType.InsideEscapePrimary, Chance = 50, },
+            ],
         };
 
         [Description("Effects to give if coin landed on heads.")]
-        private static CoinEffect[] Effects  =>
+        private static CoinEffect[] Effects =>
         [
-            new() { Type = EffectType.DamageReduction, Duration = 15, Intensity = 75 },
-            new() { Type = EffectType.RainbowTaste, Duration = 15, Intensity = byte.MaxValue },
-            new() { Type = EffectType.Invigorated, Duration = 15, Intensity = byte.MaxValue },
-            new() { Type = EffectType.MovementBoost, Duration = 15, Intensity = 75 },
+            new() { Type = EffectType.DamageReduction, Duration = 15, Intensity = 75, },
+            new() { Type = EffectType.RainbowTaste, Duration = 15, Intensity = byte.MaxValue, },
+            new() { Type = EffectType.Invigorated, Duration = 15, Intensity = byte.MaxValue, },
+            new() { Type = EffectType.MovementBoost, Duration = 15, Intensity = 75, },
         ];
 
         protected override void SubscribeEvents()
         {
             PlayerEvents.FlippingCoin += OnFlippingCoin;
+            PlayerEvents.ChangingRole += OnRoleChanging;
 
             base.SubscribeEvents();
         }
 
         protected override void UnsubscribeEvents()
         {
             PlayerEvents.FlippingCoin -= OnFlippingCoin;
+            PlayerEvents.ChangingRole -= OnRoleChanging;
 
             base.UnsubscribeEvents();
         }
@@ -68,27 +70,32 @@ private void OnFlippingCoin(FlippingCoinEventArgs ev)
                 if (ev.IsTails && !ev.Player.IsDead)
                 {
                     ev.Player.Scale = Vector3.zero;
-                    string cause = Plugin.Instance?.Config.LoseCauses.RandomItem() ?? "<Error: Coin Reason Not Found>";
-                    Ragdoll? ragdoll = Ragdoll.CreateAndSpawn(ev.Player.Role.Type, ev.Player.DisplayNickname,
+                    var cause = Plugin.Instance?.Config.LoseCauses.RandomItem() ?? "<Error: Coin Reason Not Found>";
+                    var ragdoll = Ragdoll.CreateAndSpawn(ev.Player.Role.Type, ev.Player.DisplayNickname,
                         new CustomReasonDamageHandler($"{cause}"),
                         ev.Player.Position, ev.Player.Rotation, ev.Player);
 
                     ev.Player.IsGodModeEnabled = false;
 
-                    ev.Player.Explode();
+                    ev.Player.ExplodeEffect(ProjectileType.FragGrenade);
                     ev.Player.Kill($"{cause}");
                     ev.Player.Scale = Vector3.one;
                     return;
                 }
 
                 ev.Player.ShowHint($"{Plugin.Instance?.Config.WinHints.RandomItem()}");
 
-                Effects.ForEach((effect) =>
+                Effects.ForEach(effect =>
                 {
                     ev.Player.EnableEffect(effect.Type, effect.Intensity, effect.Duration, true);
                 });
             });
         }
 
+        private void OnRoleChanging(ChangingRoleEventArgs ev)
+        {
+            ev.Player.Scale = Vector3.one;
+            ev.Player.DisableAllEffects();
+        }
     }
 }