Remove DamageEffect

2025-06-07 10:28:17 +01:00
parent 500772f2f9
commit 2b39152060
16 changed files with 41 additions and 58 deletions
@@ -56,7 +56,7 @@ updateTurret rotSpeed mc w =
  where
    dodamage =
        cWorld . lWorld . machines . ix mcid
-            %~ ( (mcDamage .~ [Damage ELECTRICAL (min 2500 $ max 0 (elecDam - 10)) 0 0 0 NoDamageEffect])
+            %~ ( (mcDamage .~ [Damage ELECTRICAL (min 2500 $ max 0 (elecDam - 10)) 0 0 0])
                    . (mcHP -~ dam)
               )
    elecDamBranch
@@ -77,6 +77,11 @@ updateTurret rotSpeed mc w =
        | closeFireAngle = cWorld . lWorld . machines . ix mcid . mcType . _McTurret . tuFireTime .~ 20
        | otherwise = cWorld . lWorld . machines . ix mcid . mcType . _McTurret . tuFireTime %~ (max 0 . subtract 1)

+isElectrical :: Damage -> Bool
+isElectrical dm = case _dmType dm of
+    ELECTRICAL -> True
+    _ -> False
+
 mcUseItem :: Machine -> World -> World
 mcUseItem mc = fromMaybe id $ do
    tu <- mc ^? mcType . _McTurret