Use existing IsAmmunition property

MUnique · Mar 22, 2024 · c23b6b8 · c23b6b8
1 parent 68891cc
commit c23b6b8
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/GameLogic/PlayerActions/Items/MoveItemAction.cs b/src/GameLogic/PlayerActions/Items/MoveItemAction.cs
@@ -238,16 +238,12 @@ private async ValueTask<Movement> CanMoveAsync(Player player, Item item, byte to
                 static bool IsOneHandedOrShield(ItemDefinition definition) =>
                     (definition.ItemSlot!.ItemSlots.Contains(RightHandSlot) && definition.ItemSlot.ItemSlots.Contains(LeftHandSlot)) || definition.Group == 6;
 
-                static bool RightHandOccupied(ItemDefinition definition) => definition != null;
-
-                // Bolts = 7, Arrows = 15
-                static bool IsArrowOrBolt(ItemDefinition definition) =>
-                    definition.Group == 4 && (definition.Number == 7 || definition.Number == 15);
+                var rightHandItemDefinition = storage.GetItem(RightHandSlot)?.Definition!;
 
                 if ((toSlot == LeftHandSlot
                     && itemDefinition.Width >= 2
-                    && RightHandOccupied(storage.GetItem(RightHandSlot)?.Definition!)
-                    && !IsArrowOrBolt(storage.GetItem(RightHandSlot)?.Definition!))
+                    && rightHandItemDefinition != null
+                    && !rightHandItemDefinition.IsAmmunition)
                     || (toSlot == RightHandSlot
                     && IsOneHandedOrShield(itemDefinition)
                     && storage.GetItem(LeftHandSlot)?.Definition!.Width >= 2))