Remove parameters from machine damage sensors

log/aGeneratedRoomLayout

@@ -2,40 +2,162 @@ Seed: 7114951007332849727
 Room layout (compact): 
 0,1,2,3,4,5,6
 |
-+- 7,8
++- 7,8,9,10,11,12,13,14,15,16,17,18,19,20,21
+|  |
+|  +- 22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46
+|  |  |
+|  |  +- 47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64
+|  |  |
+|  |  65,66
+|  |
+|  67,68,69
 |
-+- 9,10
+70,71,72
-|
-11,12,13,14
 
 Layout with room names:
-Corridor-0
+rezBox-0
 |
-6gon-1
+autoDoor-1
 |
-defaultRoom-2
+rectPillars-2
 |
-autoRect-3
+autoDoor-3
 |
-autoDoor-4
+Corridor-4
 |
-Corridor-5
+autoDoor-5
 |
-doorToggle-6gon-6
+ElecautoRect-6
 |
 +- triggerDoorRoom-7
 |  |
-|  autoRect-8
+|  autoDoor-8
-|
-+- triggerDoorRoom-9
 |  |
-|  autoRect-10
+|  autoDoor-9
+|  |
+|  Corridor-10
+|  |
+|  autoDoor-11
+|  |
+|  8gon-12
+|  |
+|  triggerDoorRoom-13
+|  |
+|  autoDoor-14
+|  |
+|  autoDoor-15
+|  |
+|  Corridor-16
+|  |
+|  autoRect-17
+|  |
+|  autoDoor-18
+|  |
+|  Corridor-19
+|  |
+|  autoDoor-20
+|  |
+|  6gon-21
+|  |
+|  +- triggerDoorRoom-22
+|  |  |
+|  |  autoDoor-23
+|  |  |
+|  |  autoDoor-24
+|  |  |
+|  |  Corridor-25
+|  |  |
+|  |  autoDoor-26
+|  |  |
+|  |  doorToggle-autoRect-27
+|  |  |
+|  |  triggerDoorRoom-28
+|  |  |
+|  |  autoDoor-29
+|  |  |
+|  |  autoDoor-30
+|  |  |
+|  |  Corridor-31
+|  |  |
+|  |  autoRect-32
+|  |  |
+|  |  autoDoor-33
+|  |  |
+|  |  Corridor-34
+|  |  |
+|  |  autoDoor-35
+|  |  |
+|  |  Corridor-36
+|  |  |
+|  |  8gon-37
+|  |  |
+|  |  triggerDoorRoom-38
+|  |  |
+|  |  autoDoor-39
+|  |  |
+|  |  autoDoor-40
+|  |  |
+|  |  Corridor-41
+|  |  |
+|  |  tanksRoom-42
+|  |  |
+|  |  autoDoor-43
+|  |  |
+|  |  Corridor-44
+|  |  |
+|  |  autoDoor-45
+|  |  |
+|  |  8gon-46
+|  |  |
+|  |  +- triggerDoorRoom-47
+|  |  |  |
+|  |  |  autoDoor-48
+|  |  |  |
+|  |  |  autoDoor-49
+|  |  |  |
+|  |  |  Corridor-50
+|  |  |  |
+|  |  |  autoRect-51
+|  |  |  |
+|  |  |  defaultRoom-52
+|  |  |  |
+|  |  |  autoRect-53
+|  |  |  |
+|  |  |  defaultRoom-54
+|  |  |  |
+|  |  |  autoRect-55
+|  |  |  |
+|  |  |  autoDoor-56
+|  |  |  |
+|  |  |  Corridor-57
+|  |  |  |
+|  |  |  autoDoor-58
+|  |  |  |
+|  |  |  8gon-59
+|  |  |  |
+|  |  |  triggerDoorRoom-60
+|  |  |  |
+|  |  |  autoDoor-61
+|  |  |  |
+|  |  |  autoDoor-62
+|  |  |  |
+|  |  |  Corridor-63
+|  |  |  |
+|  |  |  defaultRoom-64
+|  |  |
+|  |  autoDoor-65
+|  |  |
+|  |  Corridor-66
+|  |
+|  autoDoor-67
+|  |
+|  Corridor-68
+|  |
+|  rect-69
 |
-Corridor-11
+autoDoor-70
 |
-6gon-12
+Corridor-71
 |
-defaultRoom-13
+defaultRoom-72
-|
-autoRect-14
 

log/attemptedSeeds

@@ -1,4 +1,4 @@
 Generating level with seed 7114951007332849727
 
 After 1 attempt(s), Successful generation of level with seed 7114951007332849727
-15 rooms in total
+73 rooms in total

log/treeCluster

@@ -1,49 +1,269 @@
 Seed: 7114951007332849727
-0:teststart
+0:startThenWeaponRoom
 |
-1:TutDrop
+1:corDoor
 |
-2:corDoor
+2:PassthroughLockKeyLists-HELD {_ibtHeld = SPARKGUN}
 |
-3:DoorTest
+3:corDoor
 |
-4:TutDrop
+4:lasSensorTurretTest
-
-0:0:teststart
-
-0:0:0:Corridor
-
-1:0:TutDrop
-
-1:0:0:6gon
 |
-1:0:1:defaultRoom
+5:corDoor
 |
-1:0:2:autoRect
+6:anRoom
-
-2:0:corDoor
-
-2:0:0:autoDoor
 |
-2:0:1:Corridor
+7:corDoor
-
-3:0:DoorTest
-
-3:0:0:doorToggle-6gon
 |
-+- 3:0:1:triggerDoorRoom
+8:PassthroughLockKeyLists-HELD {_ibtHeld = KEYCARD 0}
+|
+9:corDoor
+|
+10:warningRooms
+|
+11:corDoor
+|
+12:chaseCrit+armourChaseCrit rectRoom
+|
+13:corDoor
+|
+14:healthTest
+|
+15:corDoor
+|
+16:empty tanksRoom
+|
+17:corDoor
+|
+18:PassthroughLockKeyLists-LASER
+|
+19:corDoor
+|
+20:shootingRange
+|
+21:corDoor
+|
+22:lasSensorTurretTest
+|
+23:corDoor
+|
+24:randomFourCornerRoom
+
+0:0:startThenWeaponRoom
+|
+0:1:weaponBetweenPillars_BANGSTICK4
+
+0:0:0:rezBox'
+
+0:0:0:0:rezBox
+|
+0:0:0:1:autoDoor
+
+0:1:0:rectPillars
+
+1:0:corDoor
+
+1:0:0:autoDoor
+|
+1:0:1:Corridor
+
+2:0:PassthroughLockKeyLists-HELD {_ibtHeld = SPARKGUN}
+
+2:0:0:RassThroughLockKeyLists
+|
+2:0:1:roomsContaining chaseCritchaseCritchaseCritTRANSFORMERCANCAN
+
+2:0:0:0:sensorRoomRunPast
+
+2:0:0:0:0:autoDoor
+|
+2:0:0:0:1:ElecautoRect
+|
++- 2:0:0:0:2:triggerDoorRoom
 |  |
-|  3:0:2:autoRect
+|  2:0:0:0:3:autoDoor
 |
-+- 3:0:3:triggerDoorRoom
+2:0:0:0:4:autoDoor
+|
+2:0:0:0:5:Corridor
+
+2:0:1:0:defaultRoom
+
+3:0:corDoor
+
+3:0:0:autoDoor
+|
+3:0:1:Corridor
+
+4:0:lasSensorTurretTest
+
+4:0:0:autoDoor
+|
+4:0:1:8gon
+|
+4:0:2:triggerDoorRoom
+|
+4:0:3:autoDoor
+
+5:0:corDoor
+
+5:0:0:autoDoor
+|
+5:0:1:Corridor
+
+6:0:anRoom
+
+6:0:0:autoRect
+
+7:0:corDoor
+
+7:0:0:autoDoor
+|
+7:0:1:Corridor
+
+8:0:PassthroughLockKeyLists-HELD {_ibtHeld = KEYCARD 0}
+
+8:0:0:RassThroughLockKeyLists
+|
+8:0:1:roomsContaining chaseCritKEYCARD 0
+
+8:0:0:0:keyCardRoomRunPast
+
+8:0:0:0:0:autoDoor
+|
+8:0:0:0:1:6gon
+|
++- 8:0:0:0:2:triggerDoorRoom
 |  |
-|  3:0:4:autoRect
+|  8:0:0:0:3:autoDoor
 |
-3:0:5:Corridor
+8:0:0:0:4:autoDoor
+|
+8:0:0:0:5:Corridor
 
-4:0:6gon
+8:0:1:0:rect
+
+9:0:corDoor
+
+9:0:0:autoDoor
 |
-4:1:defaultRoom
+9:0:1:Corridor
+
+10:0:warningRooms
+
+10:0:0:autoDoor
 |
-4:2:autoRect
+10:0:1:doorToggle-autoRect
+|
+10:0:2:triggerDoorRoom
+|
+10:0:3:autoDoor
+
+11:0:corDoor
+
+11:0:0:autoDoor
+|
+11:0:1:Corridor
+
+12:0:chaseCrit+armourChaseCrit rectRoom
+
+12:0:0:autoRect
+
+13:0:corDoor
+
+13:0:0:autoDoor
+|
+13:0:1:Corridor
+
+14:0:healthTest
+
+14:0:0:autoDoor
+|
+14:0:1:Corridor
+|
+14:0:2:8gon
+|
+14:0:3:triggerDoorRoom
+|
+14:0:4:autoDoor
+
+15:0:corDoor
+
+15:0:0:autoDoor
+|
+15:0:1:Corridor
+
+16:0:empty tanksRoom
+
+16:0:0:tanksRoom
+
+17:0:corDoor
+
+17:0:0:autoDoor
+|
+17:0:1:Corridor
+
+18:0:PassthroughLockKeyLists-LASER
+
+18:0:0:RassThroughLockKeyLists
+|
+18:0:1:roomsContaining chaseCritPRISMTRANSFORMERPIPE
+
+18:0:0:0:lasCenSensEdge
+
+18:0:0:0:0:autoDoor
+|
+18:0:0:0:1:8gon
+|
++- 18:0:0:0:2:triggerDoorRoom
+|  |
+|  18:0:0:0:3:autoDoor
+|
+18:0:0:0:4:autoDoor
+|
+18:0:0:0:5:Corridor
+
+18:0:1:0:autoRect
+
+19:0:corDoor
+
+19:0:0:autoDoor
+|
+19:0:1:Corridor
+
+20:0:shootingRange
+
+20:0:0:autoRect
+|
+20:0:1:defaultRoom
+|
+20:0:2:autoRect
+|
+20:0:3:defaultRoom
+|
+20:0:4:autoRect
+
+21:0:corDoor
+
+21:0:0:autoDoor
+|
+21:0:1:Corridor
+
+22:0:lasSensorTurretTest
+
+22:0:0:autoDoor
+|
+22:0:1:8gon
+|
+22:0:2:triggerDoorRoom
+|
+22:0:3:autoDoor
+
+23:0:corDoor
+
+23:0:0:autoDoor
+|
+23:0:1:Corridor
+
+24:0:defaultRoom
 

src/Dodge/Data/Machine.hs

@@ -38,11 +38,8 @@ data Machine = Machine
     , _mcDamage :: [Damage]
     , _mcType :: MachineType
     , _mcMounts :: M.Map ObjectType Int
---    , _mcCloseSound :: Maybe SoundID
     , _mcWidth :: Float
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data MachineType
     = McStatic
@@ -50,8 +47,6 @@ data MachineType
     | McDamSensor DamageSensor
     | McProxSensor ProximitySensor
     | McTurret {_mctTurret :: Turret}
-    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 data Turret = Turret
     { _tuWeapon :: Int
@@ -59,8 +54,6 @@ data Turret = Turret
     , _tuFireTime :: Int
     , _tuDir :: Float
     }
-    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''MachineType
 makeLenses ''Machine

src/Dodge/Data/Machine/Sensor.hs

@@ -8,20 +8,16 @@ module Dodge.Data.Machine.Sensor (
     module Dodge.Data.Machine.Sensor.Type,
 ) where
 
-import Geometry.Data
-import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import Dodge.Data.GenParams
 import Dodge.Data.Item.Combine
 import Dodge.Data.Machine.Sensor.Type
+import Geometry.Data
 
 data DamageSensor = DamSensor
-        { _sensToggle :: Bool
+    { _sensAmount :: Int
-        , _sensAmount :: Int
     , _sensType :: SensorType
-        , _sensDraw :: (PaletteColor, DecorationShape)
     , _sensThreshold :: Int
     }
 
@@ -30,8 +26,6 @@ data ProximitySensor = ProxSensor
     , _proxToggle :: Bool
     }
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data ProximityRequirement
     = RequireHealth {_proxReqMinHealth :: Int}
     | RequireEquipment {_proxReqEquipment :: ItemType}

src/Dodge/Default.hs

@@ -40,7 +40,6 @@ defaultMachine =
         , _mcDamage = []
         , _mcType = McStatic
         , _mcMounts = mempty
---        , _mcCloseSound = Nothing
         , _mcWidth = 10
         }
 

src/Dodge/Machine/Draw.hs

@@ -1,9 +1,9 @@
 module Dodge.Machine.Draw (drawMachine) where
 
+import Dodge.Data.CWorld
 import Dodge.Terminal.Color
 import Control.Lens
 import Data.Maybe
-import Dodge.Data.LWorld
 import Dodge.Item.Draw.SPic
 import Dodge.Item.HeldOffset
 import Dodge.Placement.TopDecoration
@@ -11,18 +11,27 @@ import Geometry
 import Picture
 import Shape
 import ShapePicture
+import qualified Data.Map.Strict as M
 
-drawMachine :: LWorld -> Machine -> SPic
+drawMachine :: CWorld -> Machine -> SPic
-drawMachine lw mc = case _mcType mc of
+drawMachine cw mc = case _mcType mc of
     McStatic -> mempty
     McTerminal -> terminalSPic lw mc
     McTurret tu -> drawBaseMachine 20 mc <> drawTurret lw tu mc
-    McDamSensor se -> drawBaseMachine 25 mc <> drawDamSensor se mc
+    McDamSensor se -> drawBaseMachine 25 mc <> drawDamSensor gp se mc
     McProxSensor se -> drawBaseMachine 25 mc <> drawProxSensor se mc
+  where
+    lw = cw ^. lWorld
+    gp = cw ^. cwGen . cwgParams . sensorCoding
 
-drawDamSensor :: DamageSensor -> Machine -> SPic
+drawDamSensor :: M.Map SensorType (PaletteColor, DecorationShape) 
-drawDamSensor sens = case sens of
+    -> DamageSensor -> Machine -> SPic
-    DamSensor{_sensDraw = pcds} -> sensorSPic pcds
+drawDamSensor gp sens mc = --case sens of
+    --DamSensor{_sensDraw = pcds} -> sensorSPic pcds
+    fold $ do
+        let st = sens ^. sensType
+        x <- gp ^? ix st
+        return $ sensorSPic x mc
 
 drawProxSensor :: ProximitySensor -> Machine -> SPic
 drawProxSensor sens = case sens of
@@ -70,8 +79,7 @@ drawTurret lw tu mc = fold $ do
     return $ overPosSP (turretItemOffset itm tu mc) (itemSPic itm)
 
 sensorSPic :: (PaletteColor, DecorationShape) -> Machine -> SPic
-sensorSPic (pc, ds) mc =
+sensorSPic (pc, ds) mc = noPic $ decorationToShape ds w w 25 col col
-    noPic $ decorationToShape ds w w 25 col col
   where
     col = paletteToColor pc
     w = _mcWidth mc

src/Dodge/Placement/Instance/Sensor.hs

@@ -5,7 +5,6 @@ module Dodge.Placement.Instance.Sensor (
 
 import Color
 import Control.Lens
-import qualified Data.Map.Strict as M
 import Dodge.Data.GenWorld
 import Dodge.Default
 import Dodge.LevelGen.PlacementHelper
@@ -27,10 +26,9 @@ damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $
                     & mcType
                         .~ McDamSensor
                             ( DamSensor
-                                False
                                 0
                                 dt
-                                (_sensorCoding (_cwgParams $ _cwGen (_cWorld gw)) M.! dt)
+--                                (_sensorCoding (_cwgParams $ _cwGen (_cWorld gw)) M.! dt)
                                 (damageTypeThreshold dt)
                             )
                 )

src/Dodge/Render/ShapePicture.hs

@@ -33,7 +33,7 @@ worldSPic cfig u =
                 (filtOn _crPos _creatures)
         <> foldup (Prelude.uncurry floorItemSPic) (IM.intersectionWith (,) (u^.uvWorld.cWorld.lWorld.items) (filtOn _flItPos _floorItems))
         <> foldup btSPic (filtOn _btPos _buttons)
-        <> foldup (mcSPic (u ^. uvWorld . cWorld . lWorld)) (filtOn _mcPos _machines)
+        <> foldup (mcSPic (u ^. uvWorld . cWorld)) (filtOn _mcPos _machines)
         <> foldMap' drawChasm (u ^. uvWorld . cWorld . chasms)
   where
     w = _uvWorld u
@@ -131,7 +131,7 @@ btSPic bt =
     uncurryV translateSPxy (_btPos bt) $
         rotateSP (_btRot bt) (drawButton bt)
 
-mcSPic :: LWorld -> Machine -> SPic
+mcSPic :: CWorld -> Machine -> SPic
-mcSPic lw mc =
+mcSPic cw mc =
     uncurryV translateSPxy (_mcPos mc) $
-        rotateSP (_mcDir mc) (drawMachine lw mc)
+        rotateSP (_mcDir mc) (drawMachine cw mc)

src/Geometry/ConvexPoly.hs

@@ -11,7 +11,6 @@ module Geometry.ConvexPoly (
     --    , centroid
     pointsToPoly,
     convexPolysOverlap,
---    pointInPolyPoints,
 ) where
 
 import Control.Lens
@@ -51,9 +50,6 @@ convexPolysOverlap cp1 cp2 =
     dist (_cpCen cp1) (_cpCen cp2) < _cpRad cp1 + _cpRad cp2
         && polyPointsOverlap (_cpPoints cp1) (_cpPoints cp2)
 
---pointInConvexPoly :: Point2 -> ConvexPoly -> Bool
---pointInConvexPoly p cp = dist p (_cpCen cp) < _cpRad cp
---    && pointInPolyPoints p (_cpPoints cp)
 
 -- | Test whether two polygons intersect or if one is contained in the other.
 polyPointsOverlap :: [Point2] -> [Point2] -> Bool

tags

@@ -222,7 +222,6 @@ ChooseMovementSpreadGun	src/Dodge/Data/CreatureEffect.hs	61;"	C
 Circ_collision_test	src/Dodge/Data/Config.hs	85;"	C
 Climate	src/Dodge/Data/Scenario.hs	32;"	C
 CloseToMelee	src/Dodge/Data/ActionPlan.hs	187;"	C
-CloseToggle	src/Dodge/Data/Machine/Sensor.hs	45;"	t
 Close_shape_culling	src/Dodge/Data/Config.hs	79;"	C
 Cloud	src/Dodge/Data/Cloud.hs	14;"	t
 CloudType	src/Dodge/Data/Cloud.hs	22;"	t
@@ -615,7 +614,6 @@ InventorySound	src/Dodge/Data/SoundOrigin.hs	13;"	C
 Investigate	src/Dodge/Data/ActionPlan.hs	184;"	C
 Invisible	src/Dodge/Data/CamouflageStatus.hs	7;"	C
 InwardShockwave	src/Dodge/Data/Shockwave.hs	14;"	C
-IsClose	src/Dodge/Data/Machine/Sensor.hs	45;"	C
 IsolationUnitSS	src/Dodge/Data/Scenario.hs	101;"	C
 ItCrWdItemHeldEffect	src/Dodge/Data/WorldEffect.hs	18;"	C
 ItCrWdItemHeldEffectNoHammer	src/Dodge/Data/WorldEffect.hs	19;"	C
@@ -731,11 +729,11 @@ MP2NoAction	src/Dodge/Data/CreatureEffect.hs	56;"	C
 MPO	src/Dodge/Base/Collide.hs	88;"	t
 MTRS	src/Dodge/Annotation/Data.hs	12;"	t
 MTree	src/Dodge/Data/MetaTree.hs	9;"	C
-Machine	src/Dodge/Data/Machine.hs	31;"	t
+Machine	src/Dodge/Data/Machine.hs	30;"	t
 MachineAltSound	src/Dodge/Data/SoundOrigin.hs	23;"	C
 MachinePart	src/Dodge/Data/Wall/Structure.hs	15;"	C
 MachineSound	src/Dodge/Data/SoundOrigin.hs	22;"	C
-MachineType	src/Dodge/Data/Machine.hs	49;"	t
+MachineType	src/Dodge/Data/Machine.hs	44;"	t
 MagBelow	src/Dodge/Data/Muzzle.hs	22;"	C
 Magnet	src/Dodge/Data/Magnet.hs	23;"	t
 MagnetAlign	src/Dodge/Data/Magnet.hs	17;"	C
@@ -759,11 +757,11 @@ MapperSF	src/Dodge/Data/ComposedItem.hs	39;"	C
 Material	src/Dodge/Data/Material.hs	11;"	t
 MaterialSound	src/Dodge/Data/SoundOrigin.hs	35;"	C
 Maybe'	src/MaybeHelp.hs	13;"	t
-McDamSensor	src/Dodge/Data/Machine.hs	52;"	C
+McDamSensor	src/Dodge/Data/Machine.hs	47;"	C
-McProxSensor	src/Dodge/Data/Machine.hs	53;"	C
+McProxSensor	src/Dodge/Data/Machine.hs	48;"	C
-McStatic	src/Dodge/Data/Machine.hs	50;"	C
+McStatic	src/Dodge/Data/Machine.hs	45;"	C
-McTerminal	src/Dodge/Data/Machine.hs	51;"	C
+McTerminal	src/Dodge/Data/Machine.hs	46;"	C
-McTurret	src/Dodge/Data/Machine.hs	54;"	C
+McTurret	src/Dodge/Data/Machine.hs	49;"	C
 MdFlickerUpdate	src/Dodge/Data/WorldEffect.hs	49;"	C
 MdSetLSCol	src/Dodge/Data/WorldEffect.hs	48;"	C
 MdTrigIf	src/Dodge/Data/WorldEffect.hs	47;"	C
@@ -843,7 +841,6 @@ NewInt	src/NewInt.hs	17;"	t
 NewIntMap	src/NewInt.hs	23;"	t
 NewIntSet	src/NewInt.hs	20;"	t
 NewSideEffect	src/Dodge/Data/Universe.hs	65;"	C
-NewlyClose	src/Dodge/Data/Machine/Sensor.hs	45;"	C
 NoAction	src/Dodge/Data/ActionPlan.hs	152;"	C
 NoAmmoRequired	src/Dodge/Data/Muzzle.hs	25;"	C
 NoBeamCombine	src/Dodge/Data/Beam.hs	43;"	C
@@ -886,7 +883,6 @@ North	src/Dodge/Data/CardinalPoint.hs	6;"	C
 North8	src/Dodge/Data/CardinalPoint.hs	13;"	C
 NorthEast8	src/Dodge/Data/CardinalPoint.hs	14;"	C
 NorthWest8	src/Dodge/Data/CardinalPoint.hs	20;"	C
-NotClose	src/Dodge/Data/Machine/Sensor.hs	45;"	C
 NotLink	src/Dodge/Data/Room.hs	66;"	C
 NotPushed	src/Dodge/Data/Door.hs	30;"	C
 Nothing'	src/MaybeHelp.hs	13;"	C
@@ -1064,9 +1060,9 @@ PropUpdateWhen	src/Dodge/Data/Prop.hs	78;"	C
 PropUpdates	src/Dodge/Data/Prop.hs	75;"	C
 PropVerticalLampCover	src/Dodge/Data/Prop.hs	64;"	C
 PropZ	src/Dodge/Data/Prop.hs	19;"	C
-ProxSensor	src/Dodge/Data/Machine/Sensor.hs	28;"	C
+ProxSensor	src/Dodge/Data/Machine/Sensor.hs	27;"	C
-ProximityRequirement	src/Dodge/Data/Machine/Sensor.hs	37;"	t
+ProximityRequirement	src/Dodge/Data/Machine/Sensor.hs	32;"	t
-ProximitySensor	src/Dodge/Data/Machine/Sensor.hs	28;"	t
+ProximitySensor	src/Dodge/Data/Machine/Sensor.hs	27;"	t
 Pulse	src/Dodge/Data/Creature/Misc.hs	54;"	t
 PulseBall	src/Dodge/Data/PulseLaser.hs	20;"	t
 PulseBallSF	src/Dodge/Data/ComposedItem.hs	44;"	C
@@ -1138,9 +1134,9 @@ RemoveEquipment	src/Dodge/Data/RightButtonOptions.hs	35;"	C
 Remove_LOS	src/Dodge/Data/Config.hs	77;"	C
 RenderData	src/Data/Preload/Render.hs	13;"	t
 ReplaceEquipment	src/Dodge/Data/RightButtonOptions.hs	31;"	C
-RequireEquipment	src/Dodge/Data/Machine/Sensor.hs	39;"	C
+RequireEquipment	src/Dodge/Data/Machine/Sensor.hs	34;"	C
-RequireHealth	src/Dodge/Data/Machine/Sensor.hs	38;"	C
+RequireHealth	src/Dodge/Data/Machine/Sensor.hs	33;"	C
-RequireNoItems	src/Dodge/Data/Machine/Sensor.hs	40;"	C
+RequireNoItems	src/Dodge/Data/Machine/Sensor.hs	35;"	C
 ResFactor	src/Dodge/Data/Config.hs	97;"	t
 ResearchFacility	src/Dodge/Data/Scenario.hs	62;"	C
 ResourceFailure	src/Dodge/Data/Scenario.hs	29;"	C
@@ -1403,7 +1399,7 @@ TurnTo	src/Dodge/Data/ActionPlan.hs	36;"	C
 TurnToPoint	src/Dodge/Data/ActionPlan.hs	91;"	C
 TurnToward	src/Dodge/Data/ActionPlan.hs	33;"	C
 TurnTowardCr	src/Dodge/Data/CreatureEffect.hs	25;"	C
-Turret	src/Dodge/Data/Machine.hs	58;"	t
+Turret	src/Dodge/Data/Machine.hs	51;"	t
 TurretInt	src/Dodge/Data/Item/Location.hs	19;"	t
 TwistGoal	src/Dodge/Data/Scenario.hs	15;"	C
 TwoHandFlat	src/Dodge/Data/AimStance.hs	14;"	C
@@ -2024,19 +2020,17 @@ _mapInvZoom	src/Dodge/Data/HUD.hs	21;"	f
 _matUBO	src/Data/Preload/Render.hs	39;"	f
 _mbAttach	src/Dodge/Data/MetaTree.hs	16;"	f
 _mbTree	src/Dodge/Data/MetaTree.hs	16;"	f
-_mcCloseSound	src/Dodge/Data/Machine.hs	43;"	f
+_mcColor	src/Dodge/Data/Machine.hs	36;"	f
-_mcColor	src/Dodge/Data/Machine.hs	37;"	f
+_mcDamage	src/Dodge/Data/Machine.hs	38;"	f
-_mcDamage	src/Dodge/Data/Machine.hs	39;"	f
+_mcDir	src/Dodge/Data/Machine.hs	35;"	f
-_mcDir	src/Dodge/Data/Machine.hs	36;"	f
+_mcHP	src/Dodge/Data/Machine.hs	37;"	f
-_mcHP	src/Dodge/Data/Machine.hs	38;"	f
+_mcID	src/Dodge/Data/Machine.hs	31;"	f
-_mcID	src/Dodge/Data/Machine.hs	32;"	f
+_mcMaterial	src/Dodge/Data/Machine.hs	33;"	f
-_mcMaterial	src/Dodge/Data/Machine.hs	34;"	f
+_mcMounts	src/Dodge/Data/Machine.hs	40;"	f
-_mcMounts	src/Dodge/Data/Machine.hs	41;"	f
+_mcPos	src/Dodge/Data/Machine.hs	34;"	f
-_mcName	src/Dodge/Data/Machine.hs	42;"	f
+_mcType	src/Dodge/Data/Machine.hs	39;"	f
-_mcPos	src/Dodge/Data/Machine.hs	35;"	f
+_mcWallIDs	src/Dodge/Data/Machine.hs	32;"	f
-_mcType	src/Dodge/Data/Machine.hs	40;"	f
+_mcWidth	src/Dodge/Data/Machine.hs	41;"	f
-_mcWallIDs	src/Dodge/Data/Machine.hs	33;"	f
-_mcWidth	src/Dodge/Data/Machine.hs	44;"	f
 _mcoCombCombine	src/Dodge/Data/Input.hs	25;"	f
 _mcoCombSelect	src/Dodge/Data/Input.hs	24;"	f
 _mcoDragSection	src/Dodge/Data/Input.hs	20;"	f
@@ -2048,7 +2042,7 @@ _mcoSecSelStart	src/Dodge/Data/Input.hs	21;"	f
 _mcoSelEnd	src/Dodge/Data/Input.hs	21;"	f
 _mcoTermID	src/Dodge/Data/Input.hs	28;"	f
 _mcoTermStatus	src/Dodge/Data/Input.hs	28;"	f
-_mctTurret	src/Dodge/Data/Machine.hs	54;"	f
+_mctTurret	src/Dodge/Data/Machine.hs	49;"	f
 _mdBool	src/Dodge/Data/Modification.hs	21;"	f
 _mdExternalID	src/Dodge/Data/Modification.hs	17;"	f
 _mdExternalID1	src/Dodge/Data/Modification.hs	25;"	f
@@ -2185,13 +2179,11 @@ _pressPlates	src/Dodge/Data/LWorld.hs	137;"	f
 _pressedKeys	src/Dodge/Data/Input.hs	37;"	f
 _projectiles	src/Dodge/Data/LWorld.hs	108;"	f
 _props	src/Dodge/Data/LWorld.hs	106;"	f
-_proxDist	src/Dodge/Data/Machine/Sensor.hs	30;"	f
+_proxNoItems	src/Dodge/Data/Machine/Sensor.hs	35;"	f
-_proxNoItems	src/Dodge/Data/Machine/Sensor.hs	40;"	f
+_proxReqEquipment	src/Dodge/Data/Machine/Sensor.hs	34;"	f
-_proxReqEquipment	src/Dodge/Data/Machine/Sensor.hs	39;"	f
+_proxReqMinHealth	src/Dodge/Data/Machine/Sensor.hs	33;"	f
-_proxReqMinHealth	src/Dodge/Data/Machine/Sensor.hs	38;"	f
+_proxRequirement	src/Dodge/Data/Machine/Sensor.hs	28;"	f
-_proxRequirement	src/Dodge/Data/Machine/Sensor.hs	31;"	f
+_proxToggle	src/Dodge/Data/Machine/Sensor.hs	29;"	f
-_proxStatus	src/Dodge/Data/Machine/Sensor.hs	29;"	f
-_proxToggle	src/Dodge/Data/Machine/Sensor.hs	32;"	f
 _psFallback	src/Dodge/Data/GenWorld.hs	72;"	f
 _psPos	src/Dodge/Data/GenWorld.hs	67;"	f
 _psRandShift	src/Dodge/Data/GenWorld.hs	76;"	f
@@ -2313,11 +2305,10 @@ _scurPos	src/Dodge/Data/SelectionList.hs	24;"	f
 _scurSize	src/Dodge/Data/SelectionList.hs	25;"	f
 _seenLocations	src/Dodge/Data/LWorld.hs	143;"	f
 _selLocation	src/Dodge/Data/LWorld.hs	144;"	f
-_sensAmount	src/Dodge/Data/Machine/Sensor.hs	22;"	f
+_sensAmount	src/Dodge/Data/Machine/Sensor.hs	21;"	f
-_sensDraw	src/Dodge/Data/Machine/Sensor.hs	24;"	f
+_sensDraw	src/Dodge/Data/Machine/Sensor.hs	23;"	f
-_sensThreshold	src/Dodge/Data/Machine/Sensor.hs	25;"	f
+_sensThreshold	src/Dodge/Data/Machine/Sensor.hs	24;"	f
-_sensToggle	src/Dodge/Data/Machine/Sensor.hs	21;"	f
+_sensType	src/Dodge/Data/Machine/Sensor.hs	22;"	f
-_sensType	src/Dodge/Data/Machine/Sensor.hs	23;"	f
 _sensorCoding	src/Dodge/Data/GenParams.hs	16;"	f
 _sentinelDir	src/Dodge/Data/ActionPlan.hs	199;"	f
 _sentinelPos	src/Dodge/Data/ActionPlan.hs	199;"	f
@@ -2446,10 +2437,10 @@ _trieMVal	src/SimpleTrie.hs	11;"	f
 _triggers	src/Dodge/Data/LWorld.hs	132;"	f
 _ttDeathEffect	src/Dodge/Data/Terminal.hs	46;"	f
 _ttTriggerID	src/Dodge/Data/Terminal.hs	45;"	f
-_tuDir	src/Dodge/Data/Machine.hs	62;"	f
+_tuDir	src/Dodge/Data/Machine.hs	55;"	f
-_tuFireTime	src/Dodge/Data/Machine.hs	61;"	f
+_tuFireTime	src/Dodge/Data/Machine.hs	54;"	f
-_tuTurnSpeed	src/Dodge/Data/Machine.hs	60;"	f
+_tuTurnSpeed	src/Dodge/Data/Machine.hs	53;"	f
-_tuWeapon	src/Dodge/Data/Machine.hs	59;"	f
+_tuWeapon	src/Dodge/Data/Machine.hs	52;"	f
 _turnToPoint	src/Dodge/Data/ActionPlan.hs	92;"	f
 _uInt	src/Dodge/Data/Item/Use.hs	33;"	f
 _uScope	src/Dodge/Data/Item/Use.hs	36;"	f
@@ -3107,7 +3098,7 @@ damageMetal	src/Dodge/Material/Damage.hs	55;"	f
 damageSensor	src/Dodge/Placement/Instance/Sensor.hs	15;"	f
 damageStone	src/Dodge/Material/Damage.hs	25;"	f
 damageThingHit	src/Dodge/Bullet.hs	177;"	f
-damageTypeThreshold	src/Dodge/Placement/Instance/Sensor.hs	41;"	f
+damageTypeThreshold	src/Dodge/Placement/Instance/Sensor.hs	40;"	f
 damageWall	src/Dodge/Wall/Damage.hs	15;"	f
 damsToExpBarrel	src/Dodge/Barreloid.hs	46;"	f
 dark	src/Color.hs	108;"	f
@@ -3156,7 +3147,7 @@ defaultAutoWall	src/Dodge/Default/Door.hs	15;"	f
 defaultBlock	src/Dodge/Default/Block.hs	5;"	f
 defaultBounds	src/Dodge/Data/Bounds.hs	20;"	f
 defaultBullet	src/Dodge/Item/Weapon/Bullet.hs	10;"	f
-defaultButton	src/Dodge/Default.hs	48;"	f
+defaultButton	src/Dodge/Default.hs	46;"	f
 defaultCWCam	src/Dodge/Default/World.hs	67;"	f
 defaultCWGen	src/Dodge/Default/World.hs	57;"	f
 defaultCWorld	src/Dodge/Default/World.hs	82;"	f
@@ -3186,10 +3177,10 @@ defaultLWorld	src/Dodge/Default/World.hs	95;"	f
 defaultListDisplayParams	src/Dodge/ListDisplayParams.hs	18;"	f
 defaultMachine	src/Dodge/Default.hs	30;"	f
 defaultMachineWall	src/Dodge/Default/Wall.hs	55;"	f
-defaultPP	src/Dodge/Default.hs	56;"	f
+defaultPP	src/Dodge/Default.hs	54;"	f
 defaultPerceptionState	src/Dodge/Default/Creature.hs	75;"	f
 defaultProp	src/Dodge/Default/Prop.hs	6;"	f
-defaultProximitySensor	src/Dodge/Default.hs	67;"	f
+defaultProximitySensor	src/Dodge/Default.hs	65;"	f
 defaultRoom	src/Dodge/Default/Room.hs	9;"	f
 defaultSensorWall	src/Dodge/Default/Wall.hs	65;"	f
 defaultSwitchWall	src/Dodge/Default/Door.hs	22;"	f
@@ -3349,7 +3340,7 @@ drawARHUD	src/Dodge/Creature/State.hs	192;"	f
 drawAimSweep	src/Dodge/Render/Picture.hs	295;"	f
 drawAllShadows	src/Dodge/Shadows.hs	5;"	f
 drawArrowDown	src/Dodge/Render/Picture.hs	220;"	f
-drawBaseMachine	src/Dodge/Machine/Draw.hs	59;"	f
+drawBaseMachine	src/Dodge/Machine/Draw.hs	67;"	f
 drawBeam	src/Dodge/Beam/Draw.hs	6;"	f
 drawBlip	src/Dodge/RadarBlip.hs	16;"	f
 drawBlock	src/Dodge/Block/Draw.hs	7;"	f
@@ -3374,7 +3365,7 @@ drawCrossCol	src/Dodge/Render/Label.hs	21;"	f
 drawCursorAt	src/Dodge/Render/List.hs	71;"	f
 drawCursorByTerminalStatus	src/Dodge/Render/Picture.hs	125;"	f
 drawDDATest	src/Dodge/Debug/Picture.hs	302;"	f
-drawDamSensor	src/Dodge/Machine/Draw.hs	23;"	f
+drawDamSensor	src/Dodge/Machine/Draw.hs	27;"	f
 drawDoorPaths	src/Dodge/Debug/Picture.hs	252;"	f
 drawDoubleLampCover	src/Dodge/Prop/Draw.hs	95;"	f
 drawDrag	src/Dodge/Render/Picture.hs	199;"	f
@@ -3412,7 +3403,7 @@ drawList	src/Dodge/Render/List.hs	209;"	f
 drawListElement	src/Dodge/Render/List.hs	187;"	f
 drawListYgapScaleYoff	src/Dodge/Render/List.hs	95;"	f
 drawListYoff	src/Dodge/Render/List.hs	92;"	f
-drawMachine	src/Dodge/Machine/Draw.hs	15;"	f
+drawMachine	src/Dodge/Machine/Draw.hs	16;"	f
 drawMapperAR	src/Dodge/Targeting/Draw.hs	12;"	f
 drawMapperInventory	src/Dodge/Render/HUD.hs	172;"	f
 drawMenuClick	src/Dodge/Render/Picture.hs	163;"	f
@@ -3432,7 +3423,7 @@ drawPlus	src/Dodge/Render/Picture.hs	160;"	f
 drawPointLabel	src/Dodge/Render/Label.hs	13;"	f
 drawProjectile	src/Dodge/Projectile/Draw.hs	13;"	f
 drawProp	src/Dodge/Prop/Draw.hs	26;"	f
-drawProxSensor	src/Dodge/Machine/Draw.hs	27;"	f
+drawProxSensor	src/Dodge/Machine/Draw.hs	35;"	f
 drawPulseBall	src/Dodge/Render/ShapePicture.hs	54;"	f
 drawQuitTerminal	src/Dodge/Render/Picture.hs	133;"	f
 drawRBOptions	src/Dodge/Render/HUD.hs	250;"	f
@@ -3463,7 +3454,7 @@ drawText	src/Picture/Base.hs	220;"	f
 drawTitle	src/Dodge/Render/MenuScreen.hs	55;"	f
 drawTitleBackground	src/Dodge/Render/List.hs	44;"	f
 drawTractorBeam	src/Dodge/TractorBeam/Draw.hs	7;"	f
-drawTurret	src/Dodge/Machine/Draw.hs	67;"	f
+drawTurret	src/Dodge/Machine/Draw.hs	75;"	f
 drawVerticalDoubleArrow	src/Dodge/Render/Picture.hs	211;"	f
 drawVerticalLampCover	src/Dodge/Prop/Draw.hs	71;"	f
 drawWall	src/Dodge/Wall/Draw.hs	7;"	f
@@ -4051,7 +4042,7 @@ liShape	src/Dodge/Placement/Instance/LightSource.hs	98;"	f
 light	src/Color.hs	104;"	f
 lightSensByDoor	src/Dodge/Room/LasTurret.hs	48;"	f
 lightSensInsideDoor	src/Dodge/Room/LasTurret.hs	38;"	f
-lightSensor	src/Dodge/Placement/Instance/Sensor.hs	48;"	f
+lightSensor	src/Dodge/Placement/Instance/Sensor.hs	47;"	f
 lightsToRender	src/Dodge/Render/Lights.hs	14;"	f
 lightx4	src/Color.hs	145;"	f
 linGrad	src/Geometry/Intersect.hs	250;"	f
@@ -4210,16 +4201,17 @@ maybeOpenConsole	src/Dodge/Update.hs	131;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	116;"	f
 maybeWarmupStatus	src/Dodge/Item/Display.hs	45;"	f
-mcApplyDamage	src/Dodge/Machine/Update.hs	122;"	f
+mcApplyDamage	src/Dodge/Machine/Update.hs	128;"	f
 mcDamSensorTriggerUpdate	src/Dodge/Machine/Update.hs	97;"	f
-mcDamSensorUpdate	src/Dodge/Machine/Update.hs	133;"	f
+mcDamSensorUpdate	src/Dodge/Machine/Update.hs	135;"	f
 mcKillBut	src/Dodge/Machine/Destroy.hs	37;"	f
 mcKillTerm	src/Dodge/Machine/Destroy.hs	29;"	f
+mcNoItemsTest	src/Dodge/Machine/Update.hs	143;"	f
 mcPlaySound	src/Dodge/Machine/Update.hs	112;"	f
 mcProxSensorTriggerUpdate	src/Dodge/Machine/Update.hs	103;"	f
-mcProxSensorUpdate	src/Dodge/Machine/Update.hs	136;"	f
+mcProxSensorUpdate	src/Dodge/Machine/Update.hs	138;"	f
-mcProxTest	src/Dodge/Machine/Update.hs	170;"	f
+mcProxTest	src/Dodge/Machine/Update.hs	188;"	f
-mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	141;"	f
+mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	161;"	f
 mcSPic	src/Dodge/Render/ShapePicture.hs	134;"	f
 mcShootAuto	src/Dodge/HeldUse.hs	1195;"	f
 mcShootLaser	src/Dodge/HeldUse.hs	1188;"	f
@@ -4647,18 +4639,18 @@ putBlockV	src/Dodge/Placement/Instance/Wall.hs	153;"	f
 putColorLamp	src/Dodge/Placement/Instance/LightSource.hs	203;"	f
 putDoubleDoor	src/Dodge/Placement/Instance/Door.hs	17;"	f
 putDoubleDoorThen	src/Dodge/Placement/Instance/Door.hs	21;"	f
-putImmediateMessageTerminal	src/Dodge/Placement/Instance/Terminal.hs	68;"	f
+putImmediateMessageTerminal	src/Dodge/Placement/Instance/Terminal.hs	66;"	f
 putLamp	src/Dodge/Placement/Instance/LightSource.hs	206;"	f
 putLasTurret	src/Dodge/Placement/Instance/Turret.hs	24;"	f
 putLitButOnPos	src/Dodge/Placement/Instance/Button.hs	65;"	f
 putLitButOnPosExtTrig	src/Dodge/Placement/Instance/Button.hs	103;"	f
 putLitButOnPosExtTrig'	src/Dodge/Placement/Instance/Button.hs	106;"	f
-putMessageTerminal	src/Dodge/Placement/Instance/Terminal.hs	60;"	f
+putMessageTerminal	src/Dodge/Placement/Instance/Terminal.hs	58;"	f
 putShape	src/Dodge/Room/Foreground.hs	134;"	f
 putStrLnAppend	src/Dodge/LevelGen.hs	81;"	f
-putTerminal	src/Dodge/Placement/Instance/Terminal.hs	57;"	f
+putTerminal	src/Dodge/Placement/Instance/Terminal.hs	55;"	f
-putTerminalFull	src/Dodge/Placement/Instance/Terminal.hs	23;"	f
+putTerminalFull	src/Dodge/Placement/Instance/Terminal.hs	22;"	f
-putTerminalImediateAccess	src/Dodge/Placement/Instance/Terminal.hs	18;"	f
+putTerminalImediateAccess	src/Dodge/Placement/Instance/Terminal.hs	17;"	f
 putTurret	src/Dodge/Placement/Instance/Turret.hs	11;"	f
 putWireEnd	src/Dodge/Wire.hs	31;"	f
 putWireStart	src/Dodge/Wire.hs	34;"	f
@@ -4925,12 +4917,12 @@ selectCreatureDebugItem	src/Dodge/Debug.hs	65;"	f
 selectedItemScroll	src/Dodge/Update/Scroll.hs	51;"	f
 sensAboveDoor	src/Dodge/Room/SensorDoor.hs	53;"	f
 sensInsideDoor	src/Dodge/Room/SensorDoor.hs	59;"	f
-senseDamage	src/Dodge/Machine/Update.hs	183;"	f
+senseDamage	src/Dodge/Machine/Update.hs	202;"	f
-sensorReqToString	src/Dodge/Machine/Update.hs	164;"	f
+sensorReqToString	src/Dodge/Machine/Update.hs	182;"	f
 sensorRoom	src/Dodge/Room/SensorDoor.hs	26;"	f
 sensorRoomRunPast	src/Dodge/Room/SensorDoor.hs	46;"	f
-sensorSPic	src/Dodge/Machine/Draw.hs	72;"	f
+sensorSPic	src/Dodge/Machine/Draw.hs	80;"	f
-sensorTypeDamages	src/Dodge/Machine/Update.hs	201;"	f
+sensorTypeDamages	src/Dodge/Machine/Update.hs	220;"	f
 sentinelAI	src/Dodge/Creature/SentinelAI.hs	20;"	f
 sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	83;"	f
 sentinelFireType	src/Dodge/Creature/SentinelAI.hs	50;"	f
@@ -5051,9 +5043,9 @@ showEquipItem	src/Dodge/Item/Display.hs	107;"	f
 showInt	src/Dodge/Item/Info.hs	75;"	f
 showIntsString	src/Dodge/Tree/Compose.hs	129;"	f
 showInventoryPathing	src/Dodge/Item/Display.hs	86;"	f
-showManObj	src/Dodge/TestString.hs	75;"	f
+showManObj	src/Dodge/TestString.hs	45;"	f
 showTerminalError	src/Dodge/Debug/Terminal.hs	80;"	f
-showTimeFlow	src/Dodge/TestString.hs	98;"	f
+showTimeFlow	src/Dodge/TestString.hs	68;"	f
 shrinkPolyOnEdges	src/Geometry/Polygon.hs	142;"	f
 shrinkVert	src/Geometry/Polygon.hs	146;"	f
 shuffle	src/RandomHelp.hs	49;"	f
@@ -5241,11 +5233,11 @@ teleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	528;"	f
 termScreenColor	src/Dodge/Terminal/Color.hs	8;"	f
 termSoundLine	src/Dodge/Terminal.hs	45;"	f
 termTextColor	src/Dodge/Terminal.hs	48;"	f
-terminalColor	src/Dodge/Placement/Instance/Terminal.hs	76;"	f
+terminalColor	src/Dodge/Placement/Instance/Terminal.hs	74;"	f
 terminalReturnEffect	src/Dodge/Terminal.hs	170;"	f
-terminalSPic	src/Dodge/Machine/Draw.hs	31;"	f
+terminalSPic	src/Dodge/Machine/Draw.hs	39;"	f
 terminalScreenGlow	src/Dodge/Machine/Update.hs	37;"	f
-terminalShape	src/Dodge/Machine/Draw.hs	34;"	f
+terminalShape	src/Dodge/Machine/Draw.hs	42;"	f
 terminalWheelEvent	src/Dodge/Update/Scroll.hs	131;"	f
 teslaGun	src/Dodge/Item/Held/BatteryGuns.hs	19;"	f
 teslaGunPic	src/Dodge/Item/Draw/SPic.hs	421;"	f
@@ -5325,7 +5317,7 @@ tone440sawtoothquietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	448;"	f
 topInvW	src/Dodge/ListDisplayParams.hs	51;"	f
 topPrismEdgeIndices	src/Shader/Poke.hs	335;"	f
 topPrismIndices	src/Shader/Poke.hs	410;"	f
-topTestPart	src/Dodge/TestString.hs	71;"	f
+topTestPart	src/Dodge/TestString.hs	41;"	f
 torch	src/Dodge/Item/Held/Utility.hs	23;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	290;"	f
 torqueAmount	src/Dodge/HeldUse.hs	573;"	f