Improve machines, tweak wall ids

src/Dodge/Item/Weapon/BatteryGuns.hs

@@ -9,6 +9,7 @@ import Dodge.SoundLogic.LoadSound
 import Dodge.Creature.State.Data
 import Dodge.Data.DamageType
 import Dodge.WorldEvent
+import Dodge.WorldEvent.DamageBlock
 import Dodge.Default
 import Dodge.Item.Draw
 import Dodge.Item.Data
@@ -221,13 +222,13 @@ moveLaser phaseV pos dir w pt
     h' ws (_,Right wl) = not $ any (\w' -> _wlID w' == _wlID wl) ws
     h' _ _ = True
     (thHit, ps) = f [] pos xp
-    hitEffect
-      = case thHit of
-          Just (p,Left cr) 
-              -> over (creatures . ix (_crID cr) . crState . crDamage) ((:) $ Lasering 19 pos p xp)
-          Just (p,Right wl) -> colSpark 8 (V4 20 (-5) 0 1) (p +.+ safeNormalizeV (pos -.- p))
-                                                      (reflectDir wl)
-          _   -> id
+    hitEffect = case thHit of
+        Just (p,Left cr) 
+            -> creatures . ix (_crID cr) . crState . crDamage %~ (Lasering 19 pos p xp :)
+        Just (p,Right wl) -> colSpark 8 (V4 20 (-5) 0 1) (p +.+ safeNormalizeV (pos -.- p))
+                                                    (reflectDir wl)
+            . damageWall (Lasering 19 pos p xp) wl
+        _   -> id
     pic = setLayer 1 $ pictures
         [ setDepth 19   . color (brightX 0 0.5 yellow) $ lineOfThickness 20 (pos:ps)
         , setDepth 19.5 . color (brightX 10 1 yellow)  $ lineOfThickness 3  (pos:ps)