Work on machine pistol

2025-06-26 01:09:09 +01:00
parent 5b35b4c6c8
commit 7830b0e2c1
14 changed files with 432 additions and 394 deletions
@@ -155,9 +155,20 @@ invItemLocUpdate cr loc w = doAnyEquipmentEffect loc cr $ case itm ^. itType of
    EQUIP WRIST_ECG | haspulse -> tryUseParent loc w
    COPIER _ -> copierItemUpdate itm cr w
    HELD FLATSHIELD -> rootNotrootEff createShieldWall removeShieldWall itm cr w
-    HELD MINIGUNX{} ->
-        w & pointerToItem itm . itParams . wTime
-            %~ (max 0 . subtract 1)
+    HELD MINIGUNX{}
+        | itm ^? itParams . isWarming == Just True ->
+            w
+                & pointerToItem itm . itParams . isWarming .~ False
+        | otherwise ->
+            w & pointerToItem itm . itParams . wTime
+                %~ (max 0 . subtract 1)
+    HELD MACHINEPISTOL{}
+        | itm ^? itParams . isWarming == Just True ->
+            w
+                & pointerToItem itm . itParams . isWarming .~ False
+        | otherwise ->
+            w & pointerToItem itm . itParams . wTime
+                .~ 0
    _ -> w
  where
    haspulse =