Show in HUD if player has 2 flashbangs

Author: coopryan

infection.json5

@@ -32,6 +32,7 @@
         "Minus": false,
         "Modulus": false,
         "Multiplication": false,
+        "NullSafeMethodCall": false,
         "Plus": false,
         "RoundingFamily": false,
         "TrueValue": false,

server/src/Core/Inventory.php

@@ -87,6 +87,11 @@ public function getEquipped(): Item
         return $this->items[$this->equippedSlot];
     }
 
+    public function getItemSlot(InventorySlot $slot): ?Item
+    {
+        return ($this->items[$slot->value] ?? null);
+    }
+
     private function tryRemoveLastEquippedGrenade(Item $item): void
     {
         $index = array_search($item->getSlot()->value, $this->lastEquippedGrenadeSlots, true);

server/src/Core/Player.php

@@ -329,6 +329,10 @@ public function serialize(): array
             $ammoReserve = $equippedItem->getAmmoReserve();
             $reloading = $equippedItem->isReloading();
         }
+        $filledSlots = $this->inventory->getFilledSlots();
+        if (isset($filledSlots[InventorySlot::SLOT_GRENADE_FLASH->value])) {
+            $filledSlots[InventorySlot::SLOT_GRENADE_FLASH->value]['pcs'] = $this->inventory->getItemSlot(InventorySlot::SLOT_GRENADE_FLASH)?->getQuantity();
+        }
 
         return [
             'id'          => $this->id,
@@ -338,7 +342,7 @@ public function serialize(): array
             'canAttack'   => $canAttack,
             'canBuy'      => $this->world->canBuy($this),
             'canPlant'    => $this->world->canPlant($this),
-            'slots'       => $this->inventory->getFilledSlots(),
+            'slots'       => $filledSlots,
             'health'      => $this->health,
             'position'    => $this->position->toArray(),
             'look'        => $this->sight->toArray(),

test/og/Inventory/InventoryTest.php

@@ -588,15 +588,18 @@ public function testPlayerBuyTwoFlashes(): void
         $this->assertSame($itemPrice, $item->getPrice());
         $this->assertFalse($game->getPlayer(1)->getInventory()->canBuy($item));
         $this->assertSame(2, $item->getQuantity());
+        $this->assertSame(2, $game->getPlayer(1)->serialize()['slots'][InventorySlot::SLOT_GRENADE_FLASH->value]['pcs'] ?? false); // @phpstan-ignore-line
 
         $flashBang1 = $game->getPlayer(1)->dropEquippedItem();
+        $this->assertSame(1, $game->getPlayer(1)->serialize()['slots'][InventorySlot::SLOT_GRENADE_FLASH->value]['pcs'] ?? false); // @phpstan-ignore-line
         $this->assertInstanceOf(Flashbang::class, $flashBang1);
         $flashBang2 = $game->getPlayer(1)->dropEquippedItem();
         $this->assertInstanceOf(Flashbang::class, $flashBang2);
         $this->assertFalse($flashBang1 === $flashBang2);
         $this->assertTrue($item === $flashBang2);
         $this->assertSame(1, $flashBang1->getQuantity());
         $this->assertSame(1, $flashBang2->getQuantity());
+        $this->assertNull($game->getPlayer(1)->serialize()['slots'][InventorySlot::SLOT_GRENADE_FLASH->value]['pcs'] ?? null); // @phpstan-ignore-line
     }
 
     public function testPlayerBuyMaxFourGrenades(): void

www/assets/css/hud.css

@@ -496,6 +496,14 @@
     padding: 8px;
 }
 
+#hud .inventory .grenades span > span.count {
+    padding: 0;
+    font-size: 12px;
+    color: #ffebc5;
+    position: relative;
+    left: -6px;
+}
+
 #hud .inventory .highlight {
     font-weight: bold;
     color: #ffebc5;

www/assets/js/Hud.js

@@ -208,7 +208,8 @@ export class HUD {
                 return
             }
 
-            grenade += `<span${slotId === slot ? ' class="highlight"' : ''}>${Enum.ItemIdToIcon[item.id]}</span>`
+            let grenadeCount = (item.pcs > 1) ? `<span class="count">x${item.pcs}</span>` : ''
+            grenade += `<span${slotId === slot ? ' class="highlight"' : ''}>${Enum.ItemIdToIcon[item.id]}${grenadeCount}</span>`
         })
         this.#elements.inventory.innerHTML = html + `<div class="grenades">${grenade}</div>`
     }