Fixed empty hand syndrome.

AdamKyle · Dec 1, 2023 · 429e87d · 429e87d
1 parent 0c63863
commit 429e87d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/app/Game/CharacterInventory/Handlers/EquipBest/HandleHands.php b/app/Game/CharacterInventory/Handlers/EquipBest/HandleHands.php
@@ -60,7 +60,9 @@ public function handleHands(Character $character, ?InventorySlot $slotToEquip, s
             return $character->refresh();
         }
 
-        if (in_array($slotForPosition->item->type, self::TWO_HANDED)) {
+        if (in_array($slotForPosition->item->type, self::TWO_HANDED) ||
+            in_array($slotToEquip->item->type, self::TWO_HANDED))
+        {
             if ($this->inventoryItemComparison->compareItems($slotToEquip->item, $slotForPosition->item)) {
                 $this->equipItemService->setCharacter($character)->unequipBothHands();
 
@@ -70,7 +72,7 @@ public function handleHands(Character $character, ?InventorySlot $slotToEquip, s
             }
         }
 
-        return $character;
+        return $character->refresh();
     }
 
     protected function equipItem(Character $character, InventorySlot $slotToEquip, string $position) {

diff --git a/app/Game/CharacterInventory/Services/EquipBestItemForSlotsTypesService.php b/app/Game/CharacterInventory/Services/EquipBestItemForSlotsTypesService.php
@@ -89,10 +89,25 @@ protected function processPositions(Character $character): void {
 
             $oppositeHand = EquippablePositions::getOppisitePosition($currentSlot->position);
 
+            $typesForPosition = EquippablePositions::typesForPositions($oppositeHand);
+
+            if ($currentSlot->item->type === WeaponTypes::WEAPON) {
+                $typesForPosition = [ArmourTypes::SHIELD];
+            }
+
+            if ($currentSlot->item->type === ArmourTypes::SHIELD) {
+                $index = array_search(ArmourTypes::SHIELD, $typesForPosition);
+
+                if ($index !== false) {
+                    unset($typesForPosition[$index]);
+                }
+            }
+
             $bestSlot = $this->fetchBestItemForPositionFromInventory
-                ->fetchBestItemForPosition(EquippablePositions::typesForPositions($oppositeHand), $hasSpecialEquipped);
+                ->fetchBestItemForPosition($typesForPosition, $hasSpecialEquipped);
 
             if (!is_null($bestSlot)) {
+
                 $this->handleHands->setCurrentlyEquipped($this->currentlyEquippedSlots)
                     ->handleHands($character, $bestSlot, $oppositeHand);
             }