quake2ts 0.0.230 → 0.0.231

package/packages/game/dist/esm/index.js

@@ -1401,24 +1401,38 @@ function pickupArmor(inventory, item, time) {
   if (armorType) {
     const armorInfo = ARMOR_INFO[armorType];
     if (!inventory.armor || inventory.armor.armorType !== armorType) {
-      inventory.armor = { armorType, armorCount: item.amount };
+      let take = true;
+      if (inventory.armor) {
+        const oldInfo = ARMOR_INFO[inventory.armor.armorType];
+        if (oldInfo.normalProtection > armorInfo.normalProtection) {
+          take = false;
+        }
+      }
+      if (take) {
+        inventory.armor = { armorType, armorCount: item.amount };
+        setPickup(inventory, icon, time);
+        return true;
+      } else {
+        return false;
+      }
     } else {
       inventory.armor.armorCount += item.amount;
       if (inventory.armor.armorCount > armorInfo.maxCount) {
         inventory.armor.armorCount = armorInfo.maxCount;
       }
+      setPickup(inventory, icon, time);
+      return true;
     }
-    setPickup(inventory, icon, time);
-    return true;
   }
   if (item.id === "item_armor_shard") {
     if (!inventory.armor) {
-      return false;
-    }
-    inventory.armor.armorCount += item.amount;
-    const armorInfo = ARMOR_INFO[inventory.armor.armorType];
-    if (inventory.armor.armorCount > armorInfo.maxCount) {
-      inventory.armor.armorCount = armorInfo.maxCount;
+      inventory.armor = { armorType: "jacket" /* JACKET */, armorCount: item.amount };
+    } else {
+      inventory.armor.armorCount += item.amount;
+      const armorInfo = ARMOR_INFO[inventory.armor.armorType];
+      if (inventory.armor.armorCount > armorInfo.maxCount) {
+        inventory.armor.armorCount = armorInfo.maxCount;
+      }
     }
     return true;
   }