Le funi

Michal78900 · Sep 5, 2021 · 42dc774 · 42dc774
1 parent fc2f6f8
commit 42dc774
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 12 deletions.
diff --git a/WaitAndChillReborn/Config.cs b/WaitAndChillReborn/Config.cs
@@ -1,5 +1,6 @@
 namespace WaitAndChillReborn
 {
+    using Exiled.API.Enums;
     using Exiled.API.Interfaces;
     using System.Collections.Generic;
     using System.ComponentModel;
@@ -49,6 +50,16 @@ public class Config : IConfig
             "Coin",
         };
 
+        [Description("List of ammo given to a player while in lobby:")]
+        public Dictionary<AmmoType, ushort> Ammo { get; private set; } = new Dictionary<AmmoType, ushort>()
+        {
+            { AmmoType.Nato556, 0 },
+            { AmmoType.Nato762, 0 },
+            { AmmoType.Nato9, 0 },
+            { AmmoType.Ammo12Gauge, 0 },
+            { AmmoType.Ammo44Cal, 0 },
+        };
+
         [Description("Allow dealing damage to other players, while in lobby.")]
         public bool AllowDamage { get; private set; } = false;
 

diff --git a/WaitAndChillReborn/Handler.cs b/WaitAndChillReborn/Handler.cs
@@ -10,6 +10,7 @@
     using Exiled.CustomItems.API;
     using Mirror;
     using InventorySystem.Items.ThrowableProjectiles;
+    using Exiled.API.Extensions;
 
     public partial class Handler
     {
@@ -86,7 +87,15 @@ internal void OnVerified(VerifiedEventArgs ev)
                         ev.Player.ChangeEffectIntensity<Scp207>(Config.ColaMultiplier);
                     }
 
-                    ev.Player.ResetInventory(Config.Inventory);
+                    Timing.CallDelayed(0.3f, () =>
+                    {
+                        ev.Player.ResetInventory(Config.Inventory);
+
+                        foreach (var ammo in Config.Ammo)
+                        {
+                            ev.Player.Ammo[ammo.Key.GetItemType()] = ammo.Value;
+                        }
+                    });
                 });
             }
         }
@@ -120,7 +129,15 @@ internal void OnDied(DiedEventArgs ev)
                         ev.Target.ChangeEffectIntensity<Scp207>(Config.ColaMultiplier);
                     }
 
-                    ev.Target.ResetInventory(Config.Inventory);
+                    Timing.CallDelayed(0.3f, () =>
+                    {
+                        ev.Target.ResetInventory(Config.Inventory);
+
+                        foreach (var ammo in Config.Ammo)
+                        {
+                            ev.Target.Ammo[ammo.Key.GetItemType()] = ammo.Value;
+                        }
+                    });
                 });
             }
         }

diff --git a/WaitAndChillReborn/Patches/DroppingAmmoPatch.cs b/WaitAndChillReborn/Patches/DroppingAmmoPatch.cs
@@ -0,0 +1,11 @@
+namespace WaitAndChillReborn.Patches
+{
+    using HarmonyLib;
+    using InventorySystem;
+
+    [HarmonyPatch(typeof(InventoryExtensions), nameof(InventoryExtensions.ServerDropAmmo))]
+    internal static class DroppingAmmoPatch
+    {
+        private static bool Prefix(Inventory inv, ItemType ammoType, ushort amount, bool checkMinimals) => !Handler.IsLobby;
+    }
+}
diff --git a/WaitAndChillReborn/Plugin.cs b/WaitAndChillReborn/Plugin.cs
@@ -78,7 +78,7 @@ public override void OnDisabled()
 
         public override string Name => "WaitAndChillReborn";
         public override string Author => "Michal78900";
-        public override Version Version => new Version(3, 0, 2);
+        public override Version Version => new Version(3, 0, 3);
         public override Version RequiredExiledVersion => new Version(3, 0, 0);
     }
 }
diff --git a/WaitAndChillReborn/WaitAndChillReborn.csproj b/WaitAndChillReborn/WaitAndChillReborn.csproj
@@ -47,28 +47,28 @@
       <HintPath>..\..\..\Desktop\Exiled\CommandSystem.Core.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.API, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.API.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.API.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Bootstrap, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.Bootstrap.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Bootstrap.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.CreditTags, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.CreditTags.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.CreditTags.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.CustomItems, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.CustomItems.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.CustomItems.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Events, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.Events.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Events.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Loader, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.Loader.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Loader.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Permissions, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.Permissions.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Permissions.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.77\lib\net472\Exiled.Updater.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Updater.dll</HintPath>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -101,6 +101,7 @@
     <Compile Include="Patches\BreakableWindowPatch.cs" />
     <Compile Include="Patches\BulletHolePatch.cs" />
     <Compile Include="Patches\DoorDamagePatch.cs" />
+    <Compile Include="Patches\DroppingAmmoPatch.cs" />
     <Compile Include="Patches\GrenadeExplosionDetectedPatch.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/WaitAndChillReborn/packages.config b/WaitAndChillReborn/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EXILED" version="3.0.0-alpha.77" targetFramework="net472" />
+  <package id="EXILED" version="3.0.0-alpha.82" targetFramework="net472" />
 </packages>