Refactor DropOnSlipSystem

Simple-Station · Apr 27, 2024 · e197e49 · e197e49
1 parent bd7f518
commit e197e49
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/Content.Server/Parkstation/Slippery/DropOnSlipComponent.cs b/Content.Server/Parkstation/Slippery/DropOnSlipComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Server.Parkstation.Slippery;
 
 /// <summary>
-///     Uses provided chance to try and drop the item when slipped, if equipped.
+///     Marks this item as one that may be dropped when its wearer slips with it equipped.
 /// </summary>
 [RegisterComponent]
 public sealed partial class DropOnSlipComponent : Component

diff --git a/Content.Server/Parkstation/Slippery/DropOnSlipSystem.cs b/Content.Server/Parkstation/Slippery/DropOnSlipSystem.cs
@@ -47,33 +47,30 @@ private void HandleSlip(EntityUid entity, InventoryComponent invComp, ParkSlipEv
             if (!_inventory.TryGetSlotEntity(entity, slot.Name, out var item))
                 continue;
 
-            // Check for DropOnSlipComponent
-            if (slot.Name != "pocket1" && slot.Name != "pocket2" && EntityManager.TryGetComponent<Parkstation.Slippery.DropOnSlipComponent>(item, out var dropComp) && _random.NextFloat(0, 100) < dropComp.Chance)
+            if (ShouldBeDropped(entity, slot, item))
             {
                 var popupString = Loc.GetString("system-drop-on-slip-text-component", ("name", entity), ("item", item));
 
                 Drop(entity, item.Value, slot.Name, popupString);
-                continue;
             }
+        }
+    }
 
-            // Check for any items in pockets
-            if (slot.Name == "pocket1" | slot.Name == "pocket2" && _random.NextFloat(0, 100) < PocketDropChance)
-            {
-                var popupString = Loc.GetString("system-drop-on-slip-text-pocket", ("name", entity), ("item", item));
+    private bool ShouldBeDropped(EntityUid entity, SlotDefinition slot, EntityUid? item)
+    {
+        // Check for any items in pockets or other criteria
+        if (slot.SlotFlags == SlotFlags.POCKET && _random.NextFloat(0, 100) < PocketDropChance)
+            return true;
 
-                Drop(entity, item.Value, slot.Name, popupString);
-                continue;
-            }
+        // Check for DropOnSlipComponent
+        if (EntityManager.TryGetComponent<Parkstation.Slippery.DropOnSlipComponent>(item, out var dropComp) && _random.NextFloat(0, 100) < dropComp.Chance)
+            return true;
 
-            // Check for ClumsyComponent
-            if (slot.Name != "jumpsuit" && _random.NextFloat(0, 100) < ClumsyDropChance && HasComp<ClumsyComponent>(entity))
-            {
-                var popupString = Loc.GetString("system-drop-on-slip-text-clumsy", ("name", entity), ("item", item));
+        // Check for ClumsyComponent
+        if (slot.Name != "jumpsuit" && _random.NextFloat(0, 100) < ClumsyDropChance && HasComp<ClumsyComponent>(entity))
+            return true;
 
-                Drop(entity, item.Value, slot.Name, popupString);
-                continue;
-            }
-        }
+        return false;
     }
 
     private void Drop(EntityUid entity, EntityUid item, string slot, string popupString)