Start refactor storing items in single intmap, done turrets

More checks required
2025-08-24 11:53:21 +01:00
parent 7336177edf
commit c38d03165f
22 changed files with 644 additions and 271 deletions
@@ -2,40 +2,160 @@ 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
 |
-+- 9,10
-|
-11,12,13,14
+69,70,71

 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
-|
-+- triggerDoorRoom-9
+|  autoDoor-8
 |  |
-|  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-8gon-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
+|  |  |
+|  |  rect-46
+|  |  |
+|  |  +- autoDoor-47
+|  |  |  |
+|  |  |  autoDoor-48
+|  |  |  |
+|  |  |  Corridor-49
+|  |  |  |
+|  |  |  autoRect-50
+|  |  |  |
+|  |  |  defaultRoom-51
+|  |  |  |
+|  |  |  autoRect-52
+|  |  |  |
+|  |  |  defaultRoom-53
+|  |  |  |
+|  |  |  autoRect-54
+|  |  |  |
+|  |  |  autoDoor-55
+|  |  |  |
+|  |  |  Corridor-56
+|  |  |  |
+|  |  |  autoDoor-57
+|  |  |  |
+|  |  |  8gon-58
+|  |  |  |
+|  |  |  triggerDoorRoom-59
+|  |  |  |
+|  |  |  autoDoor-60
+|  |  |  |
+|  |  |  autoDoor-61
+|  |  |  |
+|  |  |  Corridor-62
+|  |  |  |
+|  |  |  defaultRoom-63
+|  |  |
+|  |  Corridor-64
+|  |  |
+|  |  autoDoor-65
+|  |
+|  autoDoor-66
+|  |
+|  Corridor-67
+|  |
+|  autoRect-68
 |
-Corridor-11
+autoDoor-69
 |
-6gon-12
+Corridor-70
 |
-defaultRoom-13
-|
-autoRect-14
+autoRect-71

@@ -1,4 +1,4 @@
 Generating level with seed 7114951007332849727

 After 1 attempt(s), Successful generation of level with seed 7114951007332849727
-15 rooms in total
+72 rooms in total
@@ -1,49 +1,267 @@
 Seed: 7114951007332849727
-0:teststart
+0:startThenWeaponRoom
 |
-1:TutDrop
+1:corDoor
 |
-2:corDoor
+2:PassthroughLockKeyLists-HELD {_ibtHeld = SPARKGUN}
 |
-3:DoorTest
+3:corDoor
 |
-4:TutDrop
-
-0:0:teststart
-
-0:0:0:Corridor
-
-1:0:TutDrop
-
-1:0:0:6gon
+4:lasSensorTurretTest
 |
-1:0:1:defaultRoom
+5:corDoor
 |
-1:0:2:autoRect
-
-2:0:corDoor
-
-2:0:0:autoDoor
+6:anRoom
 |
-2:0:1:Corridor
-
-3:0:DoorTest
-
-3:0:0:doorToggle-6gon
+7:corDoor
 |
-+- 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-HELD {_ibtHeld = SNIPERRIFLE}
+|
+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 chaseCritchaseCritTRANSFORMERCANCAN
+
+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:autoRect
+
+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 chaseCritchaseCritchaseCritKEYCARD 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
-|
-4:1:defaultRoom
-|
-4:2:autoRect
+8:0:1:0:autoRect
+
+9:0:corDoor
+
+9:0:0:autoDoor
+|
+9:0:1:Corridor
+
+10:0:warningRooms
+
+10:0:0:autoDoor
+|
+10:0:1:doorToggle-8gon
+|
+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-HELD {_ibtHeld = SNIPERRIFLE}
+
+18:0:0:RassThroughLockKeyLists
+|
+18:0:1:roomsContaining chaseCritchaseCritSNIPERRIFLE
+
+18:0:0:0:longRoomRunPast
+
+18:0:0:0:0:autoDoor
+|
+18:0:0:0:1:rect
+|
+- 18:0:0:0:2:autoDoor
+|
+18:0:0:0:3:Corridor
+|
+18:0:0:0:4:autoDoor
+
+18:0:1:0:rectPillars
+
+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

@@ -33,6 +33,7 @@ data PSType
        { _putMachinePoly :: [Point2]
        , _putMachineMachine :: Machine
        , _putMachineWall :: Wall
+        , _putMachineMaybeItem :: Maybe Item
        }
    | PutLS LightSource
    | PutButton {_putButton :: Button}
@@ -100,6 +100,7 @@ data LWorld = LWorld
    { _creatures :: IM.IntMap Creature
    , _creatureGroups :: IM.IntMap CrGroupParams
    , _itemLocations :: IM.IntMap ItemLocation
+    , _items :: IM.IntMap Item
    , _clouds :: [Cloud]
    , _dusts :: [Dust]
    , _gusts :: IM.IntMap Gust
@@ -55,7 +55,7 @@ data MachineType
    --hderiving (Eq, Show, Read) --Generic, Flat)

 data Turret = Turret
-    { _tuWeapon :: Item
+    { _tuWeapon :: Int
    , _tuTurnSpeed :: Float
    , _tuFireTime :: Int
    , _tuDir :: Float
@@ -103,6 +103,7 @@ defaultLWorld =
        , _dusts = mempty
        , _gusts = IM.empty
        , _itemLocations = IM.empty
+        , _items = mempty
        , _props = IM.empty
        , _debris = mempty
        , _projectiles = IM.empty
@@ -5,7 +5,7 @@ module Dodge.Floor (
 ) where

 import Dodge.Annotation.Data
-import Dodge.Room.Tutorial
+--import Dodge.Room.Tutorial
 import Data.List (intersperse)
 import Dodge.Annotation
 import Dodge.Cleat
@@ -24,7 +24,8 @@ initialRoomTree = annoToRoomTree initialAnoTree
 --initialRoomTree = annoToRoomTree startWorldTreeTest

 tutRoomTree :: State LayoutVars (MetaTree Room String)
-tutRoomTree = annoToRoomTree tutAnoTree
+--tutRoomTree = annoToRoomTree tutAnoTree
+tutRoomTree = annoToRoomTree initialAnoTree

 --startWorldTreeTest :: Annotation
 --startWorldTreeTest  =
@@ -1208,11 +1208,11 @@ mcShootLaser _ mc =

 mcShootAuto :: Item -> Machine -> World -> World
 mcShootAuto itm mc w
-    | Just (AutoTrigger rate) <- baseItemTriggerType <$> mc ^? mcType . mctTurret . tuWeapon
+    | Just i <- mc ^? mcType . mctTurret . tuWeapon
+      , Just (AutoTrigger rate) <- baseItemTriggerType <$> w ^? cWorld . lWorld . items . ix i
      , w ^. cWorld . lWorld . lClock - rate > lastused =
        w
-            & cWorld . lWorld . machines . ix (_mcID mc) . mcType . mctTurret . tuWeapon
-                . itTimeLastUsed
+            & cWorld . lWorld . items . ix i . itTimeLastUsed
                .~ w ^. cWorld . lWorld . lClock
            & makeBullet defaultBullet itm pos dir
    | otherwise = w
@@ -39,7 +39,7 @@ tryPutItemInInv cid flit w = do
        ( i
        , w
            & cWorld . lWorld . floorItems %~ IM.delete (flit ^. flIt . itID . unNInt)
-            & cWorld . lWorld . creatures . ix cid . crInv %~ IM.insert i it
+            & cWorld . lWorld . creatures . ix cid . crInv . at i ?~ it
            & updateItLocation i
            -- I forget whether using "at" rather than "IM.insert" here caused problems
            -- & cWorld . lWorld . creatures . ix cid . crInv . at i ?~ it
@@ -37,7 +37,7 @@ pointerYourRootItem f w = fromMaybe (pure w) $ do
 pointerToItem :: Applicative f => Item -> (Item -> f Item) -> World -> f World
 pointerToItem x = case x ^. itLocation of
    OnFloor -> cWorld . lWorld . floorItems . ix (x ^. itID . unNInt) . flIt
-    OnTurret tid -> cWorld . lWorld . machines . ix tid . mcType . mctTurret . tuWeapon
+    OnTurret _ -> cWorld . lWorld . items . ix (x ^. itID . unNInt)
    InInv cid invid _ _ _ _ -> cWorld . lWorld . creatures . ix cid . crInv . ix invid
    InVoid -> const pure

@@ -46,6 +46,6 @@ pointerToItemID itid f w = fromMaybe (pure w) $ do
    itloc <- w ^? cWorld . lWorld . itemLocations . ix (_unNInt itid)
    return $ (\x -> x f w) $ case itloc of
        OnFloor -> cWorld . lWorld . floorItems . ix (_unNInt itid) . flIt
-        OnTurret tid -> cWorld . lWorld . machines . ix tid . mcType . mctTurret . tuWeapon
+        OnTurret _ -> cWorld . lWorld . items . ix (itid ^. unNInt)
        InInv cid invid _ _ _ _ -> cWorld . lWorld . creatures . ix cid . crInv . ix invid
        InVoid -> const pure
@@ -11,7 +11,7 @@ import Data.Traversable

 initItemLocations :: LWorld -> LWorld
 --initItemLocations = initCrsItemLocations . initFlItemsLocations . initTusItemLocations
-initItemLocations = initCrsItemLocations . initTusItemLocations
+initItemLocations = initCrsItemLocations -- . initTusItemLocations

 initCrsItemLocations :: LWorld -> LWorld
 initCrsItemLocations w = w' & creatures .~ newcreatures
@@ -23,10 +23,10 @@ initCrsItemLocations w = w' & creatures .~ newcreatures
 --  where
 --    (w', newfloorItems) = mapAccumR initFlItemLocation w (w ^. floorItems)

-initTusItemLocations :: LWorld -> LWorld
-initTusItemLocations w = w' & machines .~ newmachines
-  where
-    (w', newmachines) = mapAccumR initTuItemLocation w (w ^. machines)
+--initTusItemLocations :: LWorld -> LWorld
+--initTusItemLocations w = w' & machines .~ newmachines
+--  where
+--    (w', newmachines) = mapAccumR initTuItemLocation w (w ^. machines)

 initSpecificCrItemLocations :: Int -> LWorld -> LWorld
 initSpecificCrItemLocations crid w = w' & creatures . ix crid .~ newcr
@@ -64,13 +64,13 @@ initCrItemLocation cr invid w it = (w & itemLocations . at locid ?~ loc
 --    locid = IM.newKey (w ^. itemLocations )
 --    loc = OnFloor (_flItID flit)

-initTuItemLocation :: LWorld -> Machine -> (LWorld, Machine)
-initTuItemLocation w mc = case mc ^? mcType . _McTurret . tuWeapon of
-    Nothing -> (w, mc)
-    Just _ ->
-        let locid = IM.newKey ( w ^. itemLocations)
-            loc = OnTurret (_mcID mc)
-         in ( w & itemLocations . at locid ?~ loc
-            , mc & mcType . _McTurret . tuWeapon . itID .~ NInt locid
-                & mcType . _McTurret . tuWeapon . itLocation .~ loc
-            )
+--initTuItemLocation :: LWorld -> Machine -> (LWorld, Machine)
+--initTuItemLocation w mc = case mc ^? mcType . _McTurret . tuWeapon of
+--    Nothing -> (w, mc)
+--    Just _ ->
+--        let locid = IM.newKey ( w ^. itemLocations)
+--            loc = OnTurret (_mcID mc)
+--         in ( w & itemLocations . at locid ?~ loc
+--            , mc & mcType . _McTurret . tuWeapon . itID .~ NInt locid
+--                & mcType . _McTurret . tuWeapon . itLocation .~ loc
+--            )
@@ -20,9 +20,11 @@ destroyMachine mc =
        . destroyMcType (mc ^. mcType) mc

 destroyMcType :: MachineType -> Machine -> World -> World
-destroyMcType mt mc = case mt of
-    McTurret tu -> copyItemToFloor (_mcPos mc) (_tuWeapon tu)
-    _ -> id
+destroyMcType mt mc w = case mt of
+    McTurret tu -> fromMaybe w $ do
+        itm <- w ^? cWorld . lWorld . items . ix (tu ^. tuWeapon)
+        return $ copyItemToFloor (_mcPos mc) itm w
+    _ -> w

 mcKillTerm :: Machine -> World -> World
 mcKillTerm mc w = fromMaybe w $ do
@@ -1,6 +1,4 @@
-module Dodge.Machine.Draw (
-    drawMachine,
-) where
+module Dodge.Machine.Draw ( drawMachine) where

 import Dodge.Terminal.Color
 import Control.Lens
@@ -18,7 +16,7 @@ drawMachine :: LWorld -> Machine -> SPic
 drawMachine lw mc = case _mcType mc of
    McStatic -> mempty
    McTerminal -> terminalSPic lw mc
-    McTurret tu -> drawBaseMachine 20 mc <> drawTurret tu mc
+    McTurret tu -> drawBaseMachine 20 mc <> drawTurret lw tu mc
    McSensor se -> drawBaseMachine 25 mc <> drawSensor se mc

 drawSensor :: Sensor -> Machine -> SPic
@@ -62,10 +60,10 @@ drawBaseMachine h mc =
        . square
        $ _mcWidth mc

-drawTurret :: Turret -> Machine -> SPic
-drawTurret tu mc = overPosSP (turretItemOffset itm tu mc) (itemSPic itm)
-  where
-    itm = _tuWeapon tu
+drawTurret :: LWorld -> Turret -> Machine -> SPic
+drawTurret lw tu mc = fold $ do
+    itm <- lw ^? items . ix (tu ^. tuWeapon)
+    return $ overPosSP (turretItemOffset itm tu mc) (itemSPic itm)

 sensorSPic :: (PaletteColor, DecorationShape) -> Machine -> SPic
 sensorSPic (pc, ds) mc =
@@ -83,12 +83,13 @@ isElectrical dm = case dm of
    _ -> False

 mcUseItem :: Machine -> World -> World
-mcUseItem mc = fromMaybe id $ do
+mcUseItem mc w = fromMaybe w $ do
    tu <- mc ^? mcType . _McTurret
-    let it = tu ^. tuWeapon
+    let i = tu ^. tuWeapon
+    it <- w ^? cWorld . lWorld . items . ix i
    hit <- it ^? itType
    guard (_tuFireTime tu > 0)
-    return $ mcUseHeld hit it mc
+    return $ mcUseHeld hit it mc w

 mcSensorTriggerUpdate :: Sensor -> Machine -> World -> World
 mcSensorTriggerUpdate se mc = fromMaybe id $ do
@@ -35,6 +35,7 @@ damageSensor dt wdth mtrid ps = pContID ps (PutLS $ lsPosCol (V3 0 0 30) 0.1) $
                            )
                )
                defaultSensorWall
+                Nothing
            )

 damageTypeThreshold :: SensorType -> Int
@@ -34,6 +34,7 @@ putTerminalFull f col mc tm =
                                & mcCloseSound ?~ fridgeHumS
                            )
                            defaultSensorWall
+                            Nothing
                        )
                        $ \mcpl -> Just $ pt0 (PutWorldUpdate $ const (setids tmpl btpl mcpl)) (\_ -> f tmpl btpl mcpl)
  where
@@ -19,6 +19,7 @@ putTurret itm rotSpeed =
                & mcHP .~ 50000
            )
            defaultMachineWall
+            (Just itm)

 putLasTurret :: Float -> Placement
 putLasTurret rotSpeed =
@@ -31,14 +32,15 @@ putLasTurret rotSpeed =
                & mcHP .~ 50000
            )
            defaultMachineWall
+            (Just laser)

 turret :: Item -> MachineType
-turret wp = lasTurret & mctTurret . tuWeapon .~ wp
+turret _ = lasTurret

 lasTurret :: MachineType
 lasTurret = McTurret $
    Turret
-        { _tuWeapon = laser
+        { _tuWeapon = 0
        , _tuTurnSpeed = 0.1
        , _tuFireTime = 0
        , _tuDir = 0
@@ -121,7 +121,7 @@ placeSpotID' ps pt w = case pt of
 --            w
    PutCrit cr -> plNewUpID (cWorld . lWorld . creatures) crID (mvCr p rot cr) w
    PutForeground fs -> plNewUpID (cWorld . lWorld . foregroundShapes) fsID (mvFS p rot fs) w
-    PutMachine pps mc wl -> plMachine (map doShift pps) mc wl p rot w
+    PutMachine pps mc wl mitm -> plMachine (map doShift pps) mc wl mitm p rot w
    PutLS ls -> plNewUpID (cWorld . lWorld . lightSources) lsID (mvLS p' rot ls) w
    PutPPlate pp -> plNewUpID (cWorld . lWorld . pressPlates) ppID (mvPP p rot pp) w
    RandPS rgn -> evaluateRandPS rgn ps w
@@ -193,8 +193,32 @@ mvCr p rot cr = cr{_crPos = p, _crOldPos = p, _crDir = rot}
 mvFS :: Point2 -> Float -> ForegroundShape -> ForegroundShape
 mvFS p a = (fsDir +~ a) . (fsPos %~ ((p +.+) . rotateV a))

-plMachine :: [Point2] -> Machine -> Wall -> Point2 -> Float -> World -> (Int, World)
-plMachine wallpoly mc wl p rot gw =
+plMachine :: [Point2] -> Machine -> Wall -> Maybe Item -> Point2 -> Float -> World -> (Int, World)
+plMachine wallpoly mc wl mitm = case mitm of
+    Nothing -> plMachine' wallpoly mc wl
+    Just itm -> plTurret wallpoly mc wl itm
+
+plTurret :: [Point2] -> Machine -> Wall -> Item -> Point2 -> Float -> World -> (Int, World)
+plTurret wallpoly mc wl itm p rot gw =
+    ( mcid
+    , gw & cWorld . lWorld . machines %~ addMc
+        & cWorld . lWorld . walls %~ placeMachineWalls wl col wallpoly mcid wlid
+        & cWorld . lWorld . items . at itid ?~ itm'
+        & cWorld . lWorld . itemLocations . at itid ?~ OnTurret mcid
+    )
+  where
+    itm' = itm & itID .~ NInt itid
+        & itLocation .~ OnTurret mcid
+    itid = IM.newKey $ gw ^. cWorld . lWorld . itemLocations
+    col = _mcColor mc
+    mcid = IM.newKey $ gw ^. cWorld . lWorld . machines
+    wlid = IM.newKey $ gw ^. cWorld . lWorld . walls
+    wlids = IS.fromList [wlid .. wlid + length wallpoly - 1]
+    addMc = IM.insert mcid (mc{_mcPos = p, _mcDir = rot, _mcID = mcid, _mcWallIDs = wlids}
+        & mcType . mctTurret . tuWeapon .~ itid)
+
+plMachine' :: [Point2] -> Machine -> Wall -> Point2 -> Float -> World -> (Int, World)
+plMachine' wallpoly mc wl p rot gw =
    ( mcid
    , gw & cWorld . lWorld . machines %~ addMc
        & cWorld . lWorld . walls %~ placeMachineWalls wl col wallpoly mcid wlid
@@ -1,4 +1,4 @@
-module Dodge.Room.Tutorial (tutAnoTree) where
+module Dodge.Room.Tutorial (tutAnoTree,tutRezBox) where

 import Dodge.Room.Corridor
 import Dodge.Room.Airlock
@@ -16,7 +16,7 @@
 <$>	src/Dodge/Data/CWorld.hs	47;"	o
 <$>	src/Dodge/Data/Camera.hs	39;"	o
 <$>	src/Dodge/Data/Creature.hs	80;"	o
-<$>	src/Dodge/Data/LWorld.hs	184;"	o
+<$>	src/Dodge/Data/LWorld.hs	185;"	o
 <$>	src/Dodge/Data/Terminal.hs	71;"	o
 ABSOLUTE	src/Dodge/Data/Item/Combine.hs	40;"	C
 AIUNIT	src/Dodge/Data/Item/Combine.hs	75;"	C
@@ -64,7 +64,7 @@ ArbitraryAction	src/Dodge/Data/ActionPlan.hs	166;"	C
 ArbitraryImpulse	src/Dodge/Data/ActionPlan.hs	47;"	C
 ArbitraryImpulseEffect	src/Dodge/Data/ActionPlan.hs	48;"	C
 ArbitraryImpulseFunction	src/Dodge/Data/ActionPlan.hs	46;"	C
-ArcNodeType	src/Dodge/Data/LWorld.hs	164;"	t
+ArcNodeType	src/Dodge/Data/LWorld.hs	165;"	t
 ArcShad	src/Picture/Data.hs	38;"	C
 ArcStep	src/Dodge/Data/ArcStep.hs	14;"	t
 Arcing	src/Dodge/Data/Item/Params.hs	17;"	C
@@ -258,7 +258,7 @@ Corpse	src/Dodge/Data/Corpse.hs	17;"	t
 CorpseResurrection	src/Dodge/Data/Corpse.hs	14;"	t
 Cosmic	src/Dodge/Data/Scenario.hs	74;"	C
 CrAc	src/Dodge/Data/CreatureEffect.hs	48;"	t
-CrArcNode	src/Dodge/Data/LWorld.hs	169;"	C
+CrArcNode	src/Dodge/Data/LWorld.hs	170;"	C
 CrBl	src/Dodge/Data/CreatureEffect.hs	39;"	t
 CrCanShoot	src/Dodge/Data/CreatureEffect.hs	40;"	C
 CrChasm	src/Dodge/Data/SoundOrigin.hs	19;"	C
@@ -590,7 +590,7 @@ InDream	src/Dodge/Data/Scenario.hs	19;"	C
 InInv	src/Dodge/Data/Item/Location.hs	28;"	C
 InLink	src/Dodge/Data/Room.hs	44;"	C
 InParallelUniverse	src/Dodge/Data/Scenario.hs	21;"	C
-InPlacement	src/Dodge/Data/GenWorld.hs	134;"	t
+InPlacement	src/Dodge/Data/GenWorld.hs	135;"	t
 InRealWorld	src/Dodge/Data/Scenario.hs	18;"	C
 InSimulation	src/Dodge/Data/Scenario.hs	20;"	C
 InVoid	src/Dodge/Data/Item/Location.hs	38;"	C
@@ -982,10 +982,10 @@ PORTABLEFUSION	src/Dodge/Data/Item/Combine.hs	89;"	C
 POWERLEGS	src/Dodge/Data/Item/Combine.hs	130;"	C
 PPLevelReset	src/Dodge/Data/PressPlate.hs	16;"	C
 PRISM	src/Dodge/Data/Item/Combine.hs	66;"	C
-PS	src/Dodge/Data/GenWorld.hs	67;"	C
-PSNoShiftCont	src/Dodge/Data/GenWorld.hs	68;"	C
-PSPos	src/Dodge/Data/GenWorld.hs	69;"	C
-PSRoomRand	src/Dodge/Data/GenWorld.hs	74;"	C
+PS	src/Dodge/Data/GenWorld.hs	68;"	C
+PSNoShiftCont	src/Dodge/Data/GenWorld.hs	69;"	C
+PSPos	src/Dodge/Data/GenWorld.hs	70;"	C
+PSRoomRand	src/Dodge/Data/GenWorld.hs	75;"	C
 PSType	src/Dodge/Data/GenWorld.hs	30;"	t
 PUMP	src/Dodge/Data/Item/Combine.hs	63;"	C
 PaletteColor	src/Color/Data.hs	14;"	t
@@ -1002,13 +1002,13 @@ PenetrateBullet	src/Dodge/Data/Bullet.hs	31;"	C
 Perception	src/Dodge/Data/Creature/Perception.hs	32;"	t
 PhysicalDamage	src/Dodge/Data/Damage/Type.hs	4;"	C
 PhysicalSensor	src/Dodge/Data/Machine/Sensor/Type.hs	15;"	C
-PickOnePlacement	src/Dodge/Data/GenWorld.hs	90;"	C
+PickOnePlacement	src/Dodge/Data/GenWorld.hs	91;"	C
 Picture	src/Picture/Data.hs	46;"	t
 Piercing	src/Dodge/Data/Damage.hs	20;"	C
 PistolAI	src/Dodge/Data/Creature/Misc.hs	43;"	C
-Placement	src/Dodge/Data/GenWorld.hs	80;"	t
-PlacementSpot	src/Dodge/Data/GenWorld.hs	66;"	t
-PlacementUsingPos	src/Dodge/Data/GenWorld.hs	88;"	C
+Placement	src/Dodge/Data/GenWorld.hs	81;"	t
+PlacementSpot	src/Dodge/Data/GenWorld.hs	67;"	t
+PlacementUsingPos	src/Dodge/Data/GenWorld.hs	89;"	C
 PlainBarrel	src/Dodge/Data/Creature/Misc.hs	88;"	C
 PlantNurserySS	src/Dodge/Data/Scenario.hs	96;"	C
 PlayStatus	src/Sound/Data.hs	23;"	t
@@ -1073,29 +1073,29 @@ PulseStatus	src/Dodge/Data/Creature/Misc.hs	54;"	C
 PushSource	src/Dodge/Data/Door.hs	27;"	t
 PushedBy	src/Dodge/Data/Door.hs	29;"	C
 PushesItself	src/Dodge/Data/Door.hs	28;"	C
-PutBlock	src/Dodge/Data/GenWorld.hs	43;"	C
-PutButton	src/Dodge/Data/GenWorld.hs	38;"	C
-PutChasm	src/Dodge/Data/GenWorld.hs	62;"	C
-PutCoord	src/Dodge/Data/GenWorld.hs	44;"	C
+PutBlock	src/Dodge/Data/GenWorld.hs	44;"	C
+PutButton	src/Dodge/Data/GenWorld.hs	39;"	C
+PutChasm	src/Dodge/Data/GenWorld.hs	63;"	C
+PutCoord	src/Dodge/Data/GenWorld.hs	45;"	C
 PutCrit	src/Dodge/Data/GenWorld.hs	31;"	C
-PutDoor	src/Dodge/Data/GenWorld.hs	55;"	C
-PutFlIt	src/Dodge/Data/GenWorld.hs	41;"	C
-PutForeground	src/Dodge/Data/GenWorld.hs	57;"	C
-PutID	src/Dodge/Data/GenWorld.hs	61;"	C
-PutLS	src/Dodge/Data/GenWorld.hs	37;"	C
-PutLineBlock	src/Dodge/Data/GenWorld.hs	47;"	C
+PutDoor	src/Dodge/Data/GenWorld.hs	56;"	C
+PutFlIt	src/Dodge/Data/GenWorld.hs	42;"	C
+PutForeground	src/Dodge/Data/GenWorld.hs	58;"	C
+PutID	src/Dodge/Data/GenWorld.hs	62;"	C
+PutLS	src/Dodge/Data/GenWorld.hs	38;"	C
+PutLineBlock	src/Dodge/Data/GenWorld.hs	48;"	C
 PutMachine	src/Dodge/Data/GenWorld.hs	32;"	C
-PutMod	src/Dodge/Data/GenWorld.hs	45;"	C
-PutNothing	src/Dodge/Data/GenWorld.hs	59;"	C
+PutMod	src/Dodge/Data/GenWorld.hs	46;"	C
+PutNothing	src/Dodge/Data/GenWorld.hs	60;"	C
 PutOnEquipment	src/Dodge/Data/RightButtonOptions.hs	20;"	C
-PutPPlate	src/Dodge/Data/GenWorld.hs	42;"	C
-PutProp	src/Dodge/Data/GenWorld.hs	39;"	C
-PutSlideDr	src/Dodge/Data/GenWorld.hs	54;"	C
-PutTerminal	src/Dodge/Data/GenWorld.hs	40;"	C
-PutTrigger	src/Dodge/Data/GenWorld.hs	46;"	C
-PutUsingGenParams	src/Dodge/Data/GenWorld.hs	60;"	C
-PutWall	src/Dodge/Data/GenWorld.hs	53;"	C
-PutWorldUpdate	src/Dodge/Data/GenWorld.hs	58;"	C
+PutPPlate	src/Dodge/Data/GenWorld.hs	43;"	C
+PutProp	src/Dodge/Data/GenWorld.hs	40;"	C
+PutSlideDr	src/Dodge/Data/GenWorld.hs	55;"	C
+PutTerminal	src/Dodge/Data/GenWorld.hs	41;"	C
+PutTrigger	src/Dodge/Data/GenWorld.hs	47;"	C
+PutUsingGenParams	src/Dodge/Data/GenWorld.hs	61;"	C
+PutWall	src/Dodge/Data/GenWorld.hs	54;"	C
+PutWorldUpdate	src/Dodge/Data/GenWorld.hs	59;"	C
 QFloat	src/Geometry/Data.hs	50;"	t
 QuarterRes	src/Dodge/Data/Config.hs	97;"	C
 QuicksaveSlot	src/Dodge/Data/SaveSlot.hs	10;"	C
@@ -1119,9 +1119,9 @@ RadialDistortion	src/Dodge/Data/Distortion.hs	13;"	C
 RandImpulse	src/Dodge/Data/ActionPlan.hs	62;"	t
 RandImpulseCircMove	src/Dodge/Data/ActionPlan.hs	64;"	C
 RandImpulseList	src/Dodge/Data/ActionPlan.hs	63;"	C
-RandPS	src/Dodge/Data/GenWorld.hs	56;"	C
+RandPS	src/Dodge/Data/GenWorld.hs	57;"	C
 RandomImpulse	src/Dodge/Data/ActionPlan.hs	32;"	C
-RandomPlacement	src/Dodge/Data/GenWorld.hs	89;"	C
+RandomPlacement	src/Dodge/Data/GenWorld.hs	90;"	C
 RandomTurn	src/Dodge/Data/ActionPlan.hs	31;"	C
 ReactorSS	src/Dodge/Data/Scenario.hs	111;"	C
 RecRoomSS	src/Dodge/Data/Scenario.hs	103;"	C
@@ -1155,7 +1155,7 @@ Rocket	src/Dodge/Data/Projectile.hs	34;"	C
 RocketHoming	src/Dodge/Data/Projectile.hs	41;"	t
 RocketSmoke	src/Dodge/Data/Projectile.hs	54;"	t
 RocketSmoke	src/Dodge/Data/Cloud.hs	24;"	C
-Room	src/Dodge/Data/GenWorld.hs	99;"	t
+Room	src/Dodge/Data/GenWorld.hs	100;"	t
 RoomClipping	src/Dodge/Data/Config.hs	107;"	t
 RoomInt	src/Dodge/Tree/Shift.hs	26;"	t
 RoomLink	src/Dodge/Data/Room.hs	23;"	t
@@ -1469,7 +1469,7 @@ WRIST_ECG	src/Dodge/Data/Item/Combine.hs	137;"	C
 WaitThen	src/Dodge/Data/ActionPlan.hs	103;"	C
 Walking	src/Dodge/Data/Creature/Stance.hs	21;"	C
 Wall	src/Dodge/Data/Wall.hs	20;"	t
-WallArcNode	src/Dodge/Data/LWorld.hs	165;"	C
+WallArcNode	src/Dodge/Data/LWorld.hs	166;"	C
 WallDraw	src/Dodge/Data/Wall.hs	47;"	t
 WallObstacle	src/Dodge/Data/PathGraph.hs	52;"	C
 WallP	src/Dodge/LevelGen/StaticWalls.hs	23;"	t
@@ -1548,7 +1548,7 @@ _apProjectiles	src/Dodge/Data/Item/Use.hs	46;"	f
 _apStrategy	src/Dodge/Data/ActionPlan.hs	21;"	f
 _aps	src/Dodge/Data/Muzzle.hs	22;"	f
 _arbitraryAction	src/Dodge/Data/ActionPlan.hs	167;"	f
-_arcNode	src/Dodge/Data/LWorld.hs	117;"	f
+_arcNode	src/Dodge/Data/LWorld.hs	118;"	f
 _asDir	src/Dodge/Data/ArcStep.hs	16;"	f
 _asObject	src/Dodge/Data/ArcStep.hs	17;"	f
 _asPos	src/Dodge/Data/ArcStep.hs	15;"	f
@@ -1578,7 +1578,7 @@ _blObstructs	src/Dodge/Data/Block.hs	34;"	f
 _blPos	src/Dodge/Data/Block.hs	29;"	f
 _blShadows	src/Dodge/Data/Block.hs	27;"	f
 _blWallIDs	src/Dodge/Data/Block.hs	25;"	f
-_blocks	src/Dodge/Data/LWorld.hs	131;"	f
+_blocks	src/Dodge/Data/LWorld.hs	132;"	f
 _bloomBlurShader	src/Data/Preload/Render.hs	21;"	f
 _bmColor	src/Dodge/Data/Beam.hs	23;"	f
 _bmDamage	src/Dodge/Data/Beam.hs	22;"	f
@@ -1614,10 +1614,10 @@ _buOldPos	src/Dodge/Data/Bullet.hs	24;"	f
 _buPayload	src/Dodge/Data/Bullet.hs	20;"	f
 _buPos	src/Dodge/Data/Bullet.hs	23;"	f
 _buVel	src/Dodge/Data/Bullet.hs	21;"	f
-_bullets	src/Dodge/Data/LWorld.hs	109;"	f
+_bullets	src/Dodge/Data/LWorld.hs	110;"	f
 _burstFrames	src/Dodge/Data/TriggerType.hs	12;"	f
 _burstRate	src/Dodge/Data/TriggerType.hs	12;"	f
-_buttons	src/Dodge/Data/LWorld.hs	139;"	f
+_buttons	src/Dodge/Data/LWorld.hs	140;"	f
 _cClock	src/Dodge/Data/CWorld.hs	26;"	f
 _cWorld	src/Dodge/Data/World.hs	36;"	f
 _camBoundBox	src/Dodge/Data/Camera.hs	31;"	f
@@ -1630,7 +1630,7 @@ _camRot	src/Dodge/Data/Camera.hs	25;"	f
 _camViewDistance	src/Dodge/Data/Camera.hs	30;"	f
 _camViewFrom	src/Dodge/Data/Camera.hs	29;"	f
 _camZoom	src/Dodge/Data/Camera.hs	26;"	f
-_canID	src/Dodge/Data/LWorld.hs	170;"	f
+_canID	src/Dodge/Data/LWorld.hs	171;"	f
 _carriage	src/Dodge/Data/Creature/Stance.hs	14;"	f
 _carteCenter	src/Dodge/Data/HUD.hs	44;"	f
 _carteRot	src/Dodge/Data/HUD.hs	46;"	f
@@ -1680,13 +1680,13 @@ _closeItems	src/Dodge/Data/HUD.hs	47;"	f
 _cloudEBO	src/Data/Preload/Render.hs	51;"	f
 _cloudShader	src/Data/Preload/Render.hs	50;"	f
 _cloudVBO	src/Data/Preload/Render.hs	49;"	f
-_clouds	src/Dodge/Data/LWorld.hs	103;"	f
+_clouds	src/Dodge/Data/LWorld.hs	104;"	f
 _colorBlurShader	src/Data/Preload/Render.hs	22;"	f
 _coolEnd	src/Dodge/Data/TriggerType.hs	17;"	f
 _coolSound	src/Dodge/Data/Item/Params.hs	24;"	f
 _coolStart	src/Dodge/Data/TriggerType.hs	16;"	f
-_coordinates	src/Dodge/Data/LWorld.hs	132;"	f
-_corpses	src/Dodge/Data/LWorld.hs	141;"	f
+_coordinates	src/Dodge/Data/LWorld.hs	133;"	f
+_corpses	src/Dodge/Data/LWorld.hs	142;"	f
 _cpAttention	src/Dodge/Data/Creature/Perception.hs	34;"	f
 _cpAudition	src/Dodge/Data/Creature/Perception.hs	37;"	f
 _cpAwareness	src/Dodge/Data/Creature/Perception.hs	35;"	f
@@ -1750,7 +1750,7 @@ _dbRot	src/Dodge/Data/Prop.hs	52;"	f
 _dbSpin	src/Dodge/Data/Prop.hs	53;"	f
 _dbType	src/Dodge/Data/Prop.hs	50;"	f
 _dbVel	src/Dodge/Data/Prop.hs	51;"	f
-_debris	src/Dodge/Data/LWorld.hs	107;"	f
+_debris	src/Dodge/Data/LWorld.hs	108;"	f
 _debugInfo	src/Dodge/Data/Universe.hs	54;"	f
 _debugInt	src/Dodge/Data/Universe.hs	62;"	f
 _debugMInt	src/Dodge/Data/Universe.hs	61;"	f
@@ -1760,7 +1760,7 @@ _debugV2	src/Dodge/Data/Universe.hs	60;"	f
 _debugV3	src/Dodge/Data/Universe.hs	59;"	f
 _debug_booleans	src/Dodge/Data/Config.hs	57;"	f
 _debug_view_clip_bounds	src/Dodge/Data/Config.hs	56;"	f
-_delayedEvents	src/Dodge/Data/LWorld.hs	137;"	f
+_delayedEvents	src/Dodge/Data/LWorld.hs	138;"	f
 _diCloseFilter	src/Dodge/Data/HUD.hs	24;"	f
 _diInvFilter	src/Dodge/Data/HUD.hs	23;"	f
 _diSections	src/Dodge/Data/HUD.hs	21;"	f
@@ -1768,7 +1768,7 @@ _diSelection	src/Dodge/Data/HUD.hs	22;"	f
 _dimAttachPos	src/Dodge/Data/Item/Misc.hs	16;"	f
 _dimCenter	src/Dodge/Data/Item/Misc.hs	15;"	f
 _dimRad	src/Dodge/Data/Item/Misc.hs	14;"	f
-_distortions	src/Dodge/Data/LWorld.hs	146;"	f
+_distortions	src/Dodge/Data/LWorld.hs	147;"	f
 _dmAmount	src/Dodge/Data/Damage.hs	20;"	f
 _dmAmount	src/Dodge/Data/Damage.hs	23;"	f
 _dmAmount	src/Dodge/Data/Damage.hs	26;"	f
@@ -1801,7 +1801,7 @@ _doReplicateAction	src/Dodge/Data/ActionPlan.hs	142;"	f
 _doReplicateAction	src/Dodge/Data/ActionPlan.hs	147;"	f
 _doReplicateTimes	src/Dodge/Data/ActionPlan.hs	141;"	f
 _doReplicateTimes	src/Dodge/Data/ActionPlan.hs	146;"	f
-_doors	src/Dodge/Data/LWorld.hs	126;"	f
+_doors	src/Dodge/Data/LWorld.hs	127;"	f
 _drClosePos	src/Dodge/Data/Door.hs	42;"	f
 _drDeath	src/Dodge/Data/Door.hs	44;"	f
 _drHP	src/Dodge/Data/Door.hs	43;"	f
@@ -1826,7 +1826,7 @@ _dsZoning	src/Dodge/Data/World.hs	49;"	f
 _dtLeft	src/Dodge/Data/DoubleTree.hs	31;"	f
 _dtRight	src/Dodge/Data/DoubleTree.hs	31;"	f
 _dtValue	src/Dodge/Data/DoubleTree.hs	31;"	f
-_dusts	src/Dodge/Data/LWorld.hs	104;"	f
+_dusts	src/Dodge/Data/LWorld.hs	105;"	f
 _ebID	src/Dodge/Data/EnergyBall/Type.hs	15;"	f
 _ebPos	src/Dodge/Data/EnergyBall.hs	19;"	f
 _ebTimer	src/Dodge/Data/EnergyBall.hs	20;"	f
@@ -1835,7 +1835,7 @@ _ebVel	src/Dodge/Data/EnergyBall.hs	18;"	f
 _eboName	src/Shader/Data.hs	89;"	f
 _eboPtr	src/Shader/Data.hs	90;"	f
 _emoMenuOption	src/Dodge/Data/Universe.hs	77;"	f
-_energyBalls	src/Dodge/Data/LWorld.hs	111;"	f
+_energyBalls	src/Dodge/Data/LWorld.hs	112;"	f
 _fbSize	src/Dodge/Data/EnergyBall/Type.hs	14;"	f
 _fbo2	src/Data/Preload/Render.hs	29;"	f
 _fbo3	src/Data/Preload/Render.hs	30;"	f
@@ -1852,14 +1852,14 @@ _flItRot	src/Dodge/Data/FloorItem.hs	15;"	f
 _flPos	src/Dodge/Data/Flame.hs	15;"	f
 _flTimer	src/Dodge/Data/Flame.hs	14;"	f
 _flVel	src/Dodge/Data/Flame.hs	16;"	f
-_flames	src/Dodge/Data/LWorld.hs	112;"	f
+_flames	src/Dodge/Data/LWorld.hs	113;"	f
 _flankTarget	src/Dodge/Data/ActionPlan.hs	177;"	f
-_flares	src/Dodge/Data/LWorld.hs	115;"	f
+_flares	src/Dodge/Data/LWorld.hs	116;"	f
 _flatShieldWlMIX	src/Dodge/Data/Item/Params.hs	16;"	f
-_floorItems	src/Dodge/Data/LWorld.hs	134;"	f
+_floorItems	src/Dodge/Data/LWorld.hs	135;"	f
 _floorShader	src/Data/Preload/Render.hs	44;"	f
 _floorVBO	src/Data/Preload/Render.hs	43;"	f
-_foregroundShapes	src/Dodge/Data/LWorld.hs	140;"	f
+_foregroundShapes	src/Dodge/Data/LWorld.hs	141;"	f
 _fsDir	src/Dodge/Data/ForegroundShape.hs	17;"	f
 _fsID	src/Dodge/Data/ForegroundShape.hs	15;"	f
 _fsPos	src/Dodge/Data/ForegroundShape.hs	16;"	f
@@ -1902,11 +1902,11 @@ _guID	src/Dodge/Data/Gust.hs	14;"	f
 _guPos	src/Dodge/Data/Gust.hs	15;"	f
 _guTime	src/Dodge/Data/Gust.hs	17;"	f
 _guVel	src/Dodge/Data/Gust.hs	16;"	f
-_gusts	src/Dodge/Data/LWorld.hs	105;"	f
+_gusts	src/Dodge/Data/LWorld.hs	106;"	f
 _gwWorld	src/Dodge/Data/GenWorld.hs	24;"	f
 _heldPos	src/Dodge/Data/Input.hs	47;"	f
 _heldWorldPos	src/Dodge/Data/Input.hs	49;"	f
-_hotkeys	src/Dodge/Data/LWorld.hs	150;"	f
+_hotkeys	src/Dodge/Data/LWorld.hs	151;"	f
 _hud	src/Dodge/Data/World.hs	45;"	f
 _hudElement	src/Dodge/Data/HUD.hs	43;"	f
 _humanoidAI	src/Dodge/Data/Creature/Misc.hs	81;"	f
@@ -1928,7 +1928,7 @@ _ilIsRoot	src/Dodge/Data/Item/Location.hs	31;"	f
 _ilIsSelected	src/Dodge/Data/Item/Location.hs	32;"	f
 _ilTuID	src/Dodge/Data/Item/Location.hs	36;"	f
 _imAttachedItems	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	25;"	f
-_imHotkeys	src/Dodge/Data/LWorld.hs	151;"	f
+_imHotkeys	src/Dodge/Data/LWorld.hs	152;"	f
 _imRootSelectedItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	24;"	f
 _imSelectedItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	23;"	f
 _immediateEffect	src/Loop/Data.hs	9;"	f
@@ -1938,8 +1938,8 @@ _impulseUseTarget	src/Dodge/Data/ActionPlan.hs	53;"	f
 _impulseUseTargetCID	src/Dodge/Data/ActionPlan.hs	50;"	f
 _impulsesListList	src/Dodge/Data/ActionPlan.hs	98;"	f
 _input	src/Dodge/Data/World.hs	42;"	f
-_ipPlacement	src/Dodge/Data/GenWorld.hs	135;"	f
-_ipPlacementID	src/Dodge/Data/GenWorld.hs	136;"	f
+_ipPlacement	src/Dodge/Data/GenWorld.hs	136;"	f
+_ipPlacementID	src/Dodge/Data/GenWorld.hs	137;"	f
 _isWarming	src/Dodge/Data/Item/Params.hs	23;"	f
 _ispCloseButton	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	31;"	f
 _ispCloseItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	29;"	f
@@ -1957,22 +1957,23 @@ _itTimeLastUsed	src/Dodge/Data/Item.hs	48;"	f
 _itType	src/Dodge/Data/Item.hs	42;"	f
 _itUse	src/Dodge/Data/Item.hs	40;"	f
 _itemLocations	src/Dodge/Data/LWorld.hs	102;"	f
+_items	src/Dodge/Data/LWorld.hs	103;"	f
 _itsInt	src/Dodge/Data/Item.hs	53;"	f
 _itsMax	src/Dodge/Data/Item.hs	54;"	f
 _itsRangeInt	src/Dodge/Data/Item.hs	54;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
-_lAimPos	src/Dodge/Data/LWorld.hs	152;"	f
-_lClock	src/Dodge/Data/LWorld.hs	147;"	f
-_lInvLock	src/Dodge/Data/LWorld.hs	153;"	f
-_lTestInt	src/Dodge/Data/LWorld.hs	149;"	f
-_lTestString	src/Dodge/Data/LWorld.hs	148;"	f
+_lAimPos	src/Dodge/Data/LWorld.hs	153;"	f
+_lClock	src/Dodge/Data/LWorld.hs	148;"	f
+_lInvLock	src/Dodge/Data/LWorld.hs	154;"	f
+_lTestInt	src/Dodge/Data/LWorld.hs	150;"	f
+_lTestString	src/Dodge/Data/LWorld.hs	149;"	f
 _lWorld	src/Dodge/Data/CWorld.hs	24;"	f
 _lampColor	src/Dodge/Data/Creature/Misc.hs	74;"	f
 _lampHeight	src/Dodge/Data/Creature/Misc.hs	74;"	f
 _lampLSID	src/Dodge/Data/Creature/Misc.hs	74;"	f
 _laserEmmiter	src/Dodge/Data/Laser.hs	18;"	f
 _laserTypeDamage	src/Dodge/Data/Laser.hs	17;"	f
-_lasers	src/Dodge/Data/LWorld.hs	119;"	f
+_lasers	src/Dodge/Data/LWorld.hs	120;"	f
 _ldpPos	src/Dodge/Data/SelectionList.hs	14;"	f
 _ldpScale	src/Dodge/Data/SelectionList.hs	15;"	f
 _ldpVerticalGap	src/Dodge/Data/SelectionList.hs	16;"	f
@@ -1980,14 +1981,14 @@ _ldtLeft	src/Dodge/Data/DoubleTree.hs	36;"	f
 _ldtRight	src/Dodge/Data/DoubleTree.hs	37;"	f
 _ldtValue	src/Dodge/Data/DoubleTree.hs	35;"	f
 _leadTargetBy	src/Dodge/Data/ActionPlan.hs	150;"	f
-_lightSources	src/Dodge/Data/LWorld.hs	142;"	f
+_lightSources	src/Dodge/Data/LWorld.hs	143;"	f
 _lightingCapShader	src/Data/Preload/Render.hs	16;"	f
 _lightingLineShadowShader	src/Data/Preload/Render.hs	15;"	f
 _lightingTextureShader	src/Data/Preload/Render.hs	17;"	f
 _lightingWallShadShader	src/Data/Preload/Render.hs	14;"	f
-_lights	src/Dodge/Data/LWorld.hs	143;"	f
+_lights	src/Dodge/Data/LWorld.hs	144;"	f
 _lightsUBO	src/Data/Preload/Render.hs	40;"	f
-_linearShockwaves	src/Dodge/Data/LWorld.hs	122;"	f
+_linearShockwaves	src/Dodge/Data/LWorld.hs	123;"	f
 _linkGapEW	src/Dodge/Data/Room.hs	35;"	f
 _linkGapNS	src/Dodge/Data/Room.hs	36;"	f
 _locDT	src/Dodge/Data/DoubleTree.hs	103;"	f
@@ -2010,9 +2011,9 @@ _lwPos	src/Dodge/Data/LinearShockwave.hs	14;"	f
 _lwTimer	src/Dodge/Data/LinearShockwave.hs	17;"	f
 _lyCounter	src/Dodge/Annotation/Data.hs	16;"	f
 _lyGen	src/Dodge/Annotation/Data.hs	15;"	f
-_machines	src/Dodge/Data/LWorld.hs	127;"	f
+_machines	src/Dodge/Data/LWorld.hs	128;"	f
 _magBelowID	src/Dodge/Data/Muzzle.hs	22;"	f
-_magnets	src/Dodge/Data/LWorld.hs	130;"	f
+_magnets	src/Dodge/Data/LWorld.hs	131;"	f
 _mainAction	src/Dodge/Data/ActionPlan.hs	171;"	f
 _manObject	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	15;"	f
 _mapInvItmID	src/Dodge/Data/HUD.hs	33;"	f
@@ -2069,7 +2070,7 @@ _moString	src/Dodge/Data/Universe.hs	105;"	f
 _moString	src/Dodge/Data/Universe.hs	110;"	f
 _modOption	src/Dodge/Data/Universe.hs	100;"	f
 _modString	src/Dodge/Data/Universe.hs	98;"	f
-_modifications	src/Dodge/Data/LWorld.hs	135;"	f
+_modifications	src/Dodge/Data/LWorld.hs	136;"	f
 _mouseButtons	src/Dodge/Data/Input.hs	42;"	f
 _mouseButtonsReleased	src/Dodge/Data/Input.hs	43;"	f
 _mouseContext	src/Dodge/Data/Input.hs	39;"	f
@@ -2103,7 +2104,7 @@ _nzMaxWalkAngle	src/Dodge/Data/Muzzle.hs	49;"	f
 _nzPressure	src/Dodge/Data/Muzzle.hs	48;"	f
 _nzWalkSpeed	src/Dodge/Data/Muzzle.hs	50;"	f
 _offPathFromEdges	src/Dodge/Data/Room.hs	74;"	f
-_oldMagnets	src/Dodge/Data/LWorld.hs	129;"	f
+_oldMagnets	src/Dodge/Data/LWorld.hs	130;"	f
 _onPathFromEdges	src/Dodge/Data/Room.hs	73;"	f
 _opDraw	src/Dodge/Data/Wall.hs	43;"	f
 _opSel	src/Dodge/Data/RightButtonOptions.hs	15;"	f
@@ -2144,11 +2145,11 @@ _pjSpin	src/Dodge/Data/Projectile.hs	21;"	f
 _pjTimer	src/Dodge/Data/Projectile.hs	24;"	f
 _pjType	src/Dodge/Data/Projectile.hs	26;"	f
 _pjVel	src/Dodge/Data/Projectile.hs	19;"	f
-_plIDCont	src/Dodge/Data/GenWorld.hs	86;"	f
-_plMID	src/Dodge/Data/GenWorld.hs	85;"	f
-_plOrder	src/Dodge/Data/GenWorld.hs	82;"	f
-_plSpot	src/Dodge/Data/GenWorld.hs	83;"	f
-_plType	src/Dodge/Data/GenWorld.hs	84;"	f
+_plIDCont	src/Dodge/Data/GenWorld.hs	87;"	f
+_plMID	src/Dodge/Data/GenWorld.hs	86;"	f
+_plOrder	src/Dodge/Data/GenWorld.hs	83;"	f
+_plSpot	src/Dodge/Data/GenWorld.hs	84;"	f
+_plType	src/Dodge/Data/GenWorld.hs	85;"	f
 _playStatus	src/Sound/Data.hs	17;"	f
 _playingSounds	src/Dodge/Data/World.hs	41;"	f
 _pnZoning	src/Dodge/Data/World.hs	51;"	f
@@ -2179,50 +2180,51 @@ _prUpdate	src/Dodge/Data/Prop.hs	35;"	f
 _prVel	src/Dodge/Data/Prop.hs	24;"	f
 _prVelZ	src/Dodge/Data/Prop.hs	27;"	f
 _preloadData	src/Dodge/Data/Universe.hs	33;"	f
-_pressPlates	src/Dodge/Data/LWorld.hs	138;"	f
+_pressPlates	src/Dodge/Data/LWorld.hs	139;"	f
 _pressedKeys	src/Dodge/Data/Input.hs	41;"	f
-_projectiles	src/Dodge/Data/LWorld.hs	108;"	f
-_props	src/Dodge/Data/LWorld.hs	106;"	f
+_projectiles	src/Dodge/Data/LWorld.hs	109;"	f
+_props	src/Dodge/Data/LWorld.hs	107;"	f
 _proxDist	src/Dodge/Data/Machine/Sensor.hs	29;"	f
 _proxReqEquipment	src/Dodge/Data/Machine/Sensor.hs	38;"	f
 _proxReqMinHealth	src/Dodge/Data/Machine/Sensor.hs	37;"	f
 _proxRequirement	src/Dodge/Data/Machine/Sensor.hs	30;"	f
 _proxStatus	src/Dodge/Data/Machine/Sensor.hs	28;"	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
-_psRoomEff	src/Dodge/Data/GenWorld.hs	71;"	f
-_psRoomRandPointNum	src/Dodge/Data/GenWorld.hs	75;"	f
-_psRot	src/Dodge/Data/GenWorld.hs	67;"	f
-_psSelect	src/Dodge/Data/GenWorld.hs	70;"	f
-_pulseBalls	src/Dodge/Data/LWorld.hs	121;"	f
-_pulseLasers	src/Dodge/Data/LWorld.hs	120;"	f
+_psFallback	src/Dodge/Data/GenWorld.hs	73;"	f
+_psPos	src/Dodge/Data/GenWorld.hs	68;"	f
+_psRandShift	src/Dodge/Data/GenWorld.hs	77;"	f
+_psRoomEff	src/Dodge/Data/GenWorld.hs	72;"	f
+_psRoomRandPointNum	src/Dodge/Data/GenWorld.hs	76;"	f
+_psRot	src/Dodge/Data/GenWorld.hs	68;"	f
+_psSelect	src/Dodge/Data/GenWorld.hs	71;"	f
+_pulseBalls	src/Dodge/Data/LWorld.hs	122;"	f
+_pulseLasers	src/Dodge/Data/LWorld.hs	121;"	f
 _pulseProgress	src/Dodge/Data/Creature/Misc.hs	56;"	f
 _pulseRate	src/Dodge/Data/Creature/Misc.hs	55;"	f
-_putBlock	src/Dodge/Data/GenWorld.hs	43;"	f
-_putButton	src/Dodge/Data/GenWorld.hs	38;"	f
-_putChasmPoly	src/Dodge/Data/GenWorld.hs	62;"	f
-_putEndPoint	src/Dodge/Data/GenWorld.hs	51;"	f
-_putID	src/Dodge/Data/GenWorld.hs	61;"	f
-_putItem	src/Dodge/Data/GenWorld.hs	41;"	f
+_putBlock	src/Dodge/Data/GenWorld.hs	44;"	f
+_putButton	src/Dodge/Data/GenWorld.hs	39;"	f
+_putChasmPoly	src/Dodge/Data/GenWorld.hs	63;"	f
+_putEndPoint	src/Dodge/Data/GenWorld.hs	52;"	f
+_putID	src/Dodge/Data/GenWorld.hs	62;"	f
+_putItem	src/Dodge/Data/GenWorld.hs	42;"	f
 _putMachineMachine	src/Dodge/Data/GenWorld.hs	34;"	f
+_putMachineMaybeItem	src/Dodge/Data/GenWorld.hs	36;"	f
 _putMachinePoly	src/Dodge/Data/GenWorld.hs	33;"	f
 _putMachineWall	src/Dodge/Data/GenWorld.hs	35;"	f
-_putPoly	src/Dodge/Data/GenWorld.hs	43;"	f
-_putStartPoint	src/Dodge/Data/GenWorld.hs	50;"	f
-_putWall	src/Dodge/Data/GenWorld.hs	43;"	f
-_putWall	src/Dodge/Data/GenWorld.hs	48;"	f
-_putWidth	src/Dodge/Data/GenWorld.hs	49;"	f
-_pwPoly	src/Dodge/Data/GenWorld.hs	53;"	f
-_pwWall	src/Dodge/Data/GenWorld.hs	53;"	f
+_putPoly	src/Dodge/Data/GenWorld.hs	44;"	f
+_putStartPoint	src/Dodge/Data/GenWorld.hs	51;"	f
+_putWall	src/Dodge/Data/GenWorld.hs	44;"	f
+_putWall	src/Dodge/Data/GenWorld.hs	49;"	f
+_putWidth	src/Dodge/Data/GenWorld.hs	50;"	f
+_pwPoly	src/Dodge/Data/GenWorld.hs	54;"	f
+_pwWall	src/Dodge/Data/GenWorld.hs	54;"	f
 _pyFaces	src/Polyhedra/Data.hs	14;"	f
 _pzDamage	src/Dodge/Data/PulseLaser.hs	15;"	f
 _pzDir	src/Dodge/Data/PulseLaser.hs	14;"	f
 _pzPhaseV	src/Dodge/Data/PulseLaser.hs	12;"	f
 _pzPos	src/Dodge/Data/PulseLaser.hs	13;"	f
 _pzTimer	src/Dodge/Data/PulseLaser.hs	16;"	f
-_radarBlips	src/Dodge/Data/LWorld.hs	114;"	f
-_radarSweeps	src/Dodge/Data/LWorld.hs	110;"	f
+_radarBlips	src/Dodge/Data/LWorld.hs	115;"	f
+_radarSweeps	src/Dodge/Data/LWorld.hs	111;"	f
 _randGen	src/Dodge/Data/World.hs	39;"	f
 _rbColor	src/Dodge/Data/RadarBlip.hs	15;"	f
 _rbMaxTime	src/Dodge/Data/RadarBlip.hs	17;"	f
@@ -2233,7 +2235,7 @@ _rbTime	src/Dodge/Data/RadarBlip.hs	16;"	f
 _rboBaseBloom	src/Data/Preload/Render.hs	38;"	f
 _renderData	src/Data/Preload.hs	11;"	f
 _respawnDelay	src/Dodge/Data/World.hs	60;"	f
-_respawnPos	src/Dodge/Data/LWorld.hs	154;"	f
+_respawnPos	src/Dodge/Data/LWorld.hs	155;"	f
 _reverseAmount	src/Dodge/Data/World.hs	64;"	f
 _reverseAmount	src/Dodge/Data/World.hs	70;"	f
 _reverseAmount	src/Dodge/Data/World.hs	74;"	f
@@ -2242,29 +2244,29 @@ _rkSmoke	src/Dodge/Data/Projectile.hs	36;"	f
 _rlDir	src/Dodge/Data/Room.hs	26;"	f
 _rlPos	src/Dodge/Data/Room.hs	25;"	f
 _rlType	src/Dodge/Data/Room.hs	24;"	f
-_rmBound	src/Dodge/Data/GenWorld.hs	116;"	f
-_rmChildren	src/Dodge/Data/GenWorld.hs	127;"	f
-_rmClusterStatus	src/Dodge/Data/GenWorld.hs	129;"	f
-_rmConnectsTo	src/Dodge/Data/GenWorld.hs	124;"	f
-_rmEndWires	src/Dodge/Data/GenWorld.hs	123;"	f
-_rmFloor	src/Dodge/Data/GenWorld.hs	117;"	f
+_rmBound	src/Dodge/Data/GenWorld.hs	117;"	f
+_rmChildren	src/Dodge/Data/GenWorld.hs	128;"	f
+_rmClusterStatus	src/Dodge/Data/GenWorld.hs	130;"	f
+_rmConnectsTo	src/Dodge/Data/GenWorld.hs	125;"	f
+_rmEndWires	src/Dodge/Data/GenWorld.hs	124;"	f
+_rmFloor	src/Dodge/Data/GenWorld.hs	118;"	f
 _rmHeight	src/Dodge/Data/Room.hs	38;"	f
-_rmInPmnt	src/Dodge/Data/GenWorld.hs	113;"	f
-_rmLinkEff	src/Dodge/Data/GenWorld.hs	103;"	f
-_rmLinks	src/Dodge/Data/GenWorld.hs	101;"	f
-_rmMID	src/Dodge/Data/GenWorld.hs	125;"	f
-_rmMParent	src/Dodge/Data/GenWorld.hs	126;"	f
-_rmName	src/Dodge/Data/GenWorld.hs	118;"	f
-_rmOutPmnt	src/Dodge/Data/GenWorld.hs	115;"	f
-_rmPath	src/Dodge/Data/GenWorld.hs	111;"	f
-_rmPmnts	src/Dodge/Data/GenWorld.hs	112;"	f
-_rmPolys	src/Dodge/Data/GenWorld.hs	100;"	f
-_rmPos	src/Dodge/Data/GenWorld.hs	110;"	f
-_rmRandPSs	src/Dodge/Data/GenWorld.hs	121;"	f
-_rmShift	src/Dodge/Data/GenWorld.hs	119;"	f
-_rmStartWires	src/Dodge/Data/GenWorld.hs	122;"	f
-_rmType	src/Dodge/Data/GenWorld.hs	128;"	f
-_rmViewpoints	src/Dodge/Data/GenWorld.hs	120;"	f
+_rmInPmnt	src/Dodge/Data/GenWorld.hs	114;"	f
+_rmLinkEff	src/Dodge/Data/GenWorld.hs	104;"	f
+_rmLinks	src/Dodge/Data/GenWorld.hs	102;"	f
+_rmMID	src/Dodge/Data/GenWorld.hs	126;"	f
+_rmMParent	src/Dodge/Data/GenWorld.hs	127;"	f
+_rmName	src/Dodge/Data/GenWorld.hs	119;"	f
+_rmOutPmnt	src/Dodge/Data/GenWorld.hs	116;"	f
+_rmPath	src/Dodge/Data/GenWorld.hs	112;"	f
+_rmPmnts	src/Dodge/Data/GenWorld.hs	113;"	f
+_rmPolys	src/Dodge/Data/GenWorld.hs	101;"	f
+_rmPos	src/Dodge/Data/GenWorld.hs	111;"	f
+_rmRandPSs	src/Dodge/Data/GenWorld.hs	122;"	f
+_rmShift	src/Dodge/Data/GenWorld.hs	120;"	f
+_rmStartWires	src/Dodge/Data/GenWorld.hs	123;"	f
+_rmType	src/Dodge/Data/GenWorld.hs	129;"	f
+_rmViewpoints	src/Dodge/Data/GenWorld.hs	121;"	f
 _rmWidth	src/Dodge/Data/Room.hs	37;"	f
 _rpDir	src/Dodge/Data/Room.hs	16;"	f
 _rpLinkStatus	src/Dodge/Data/Room.hs	18;"	f
@@ -2306,8 +2308,8 @@ _scrollTestInt	src/Dodge/Data/Input.hs	52;"	f
 _scurColor	src/Dodge/Data/SelectionList.hs	26;"	f
 _scurPos	src/Dodge/Data/SelectionList.hs	24;"	f
 _scurSize	src/Dodge/Data/SelectionList.hs	25;"	f
-_seenLocations	src/Dodge/Data/LWorld.hs	144;"	f
-_selLocation	src/Dodge/Data/LWorld.hs	145;"	f
+_seenLocations	src/Dodge/Data/LWorld.hs	145;"	f
+_selLocation	src/Dodge/Data/LWorld.hs	146;"	f
 _sensAmount	src/Dodge/Data/Machine/Sensor.hs	22;"	f
 _sensDraw	src/Dodge/Data/Machine/Sensor.hs	24;"	f
 _sensThreshold	src/Dodge/Data/Machine/Sensor.hs	25;"	f
@@ -2329,7 +2331,7 @@ _shapeEBO	src/Data/Preload/Render.hs	26;"	f
 _shapeHalfSize	src/Shape/Data.hs	18;"	f
 _shapeShader	src/Data/Preload/Render.hs	25;"	f
 _shellPayload	src/Dodge/Data/Item/Combine.hs	103;"	f
-_shockwaves	src/Dodge/Data/LWorld.hs	118;"	f
+_shockwaves	src/Dodge/Data/LWorld.hs	119;"	f
 _siColor	src/Dodge/Data/SelectionList.hs	49;"	f
 _siHeight	src/Dodge/Data/SelectionList.hs	46;"	f
 _siIsSelectable	src/Dodge/Data/SelectionList.hs	48;"	f
@@ -2361,7 +2363,7 @@ _soundVolumeFraction	src/Sound/Data.hs	52;"	f
 _soundsToInvestigate	src/Dodge/Data/Creature/Memory.hs	14;"	f
 _spPixelOff	src/Dodge/Data/ScreenPos.hs	14;"	f
 _spScreenOff	src/Dodge/Data/ScreenPos.hs	13;"	f
-_sparks	src/Dodge/Data/LWorld.hs	113;"	f
+_sparks	src/Dodge/Data/LWorld.hs	114;"	f
 _spawnEBT	src/Dodge/Data/Bullet.hs	35;"	f
 _ssIndent	src/Dodge/Data/SelectionList.hs	34;"	f
 _ssItems	src/Dodge/Data/SelectionList.hs	30;"	f
@@ -2396,8 +2398,8 @@ _tbStartPos	src/Dodge/Data/TractorBeam.hs	15;"	f
 _tbTime	src/Dodge/Data/TractorBeam.hs	17;"	f
 _tbVel	src/Dodge/Data/TractorBeam.hs	16;"	f
 _termID	src/Dodge/Data/HUD.hs	40;"	f
-_terminals	src/Dodge/Data/LWorld.hs	128;"	f
-_teslaArcs	src/Dodge/Data/LWorld.hs	116;"	f
+_terminals	src/Dodge/Data/LWorld.hs	129;"	f
+_teslaArcs	src/Dodge/Data/LWorld.hs	117;"	f
 _testFloat	src/Dodge/Data/World.hs	43;"	f
 _textInput	src/Dodge/Data/Input.hs	50;"	f
 _textureObject	src/Shader/Data.hs	95;"	f
@@ -2433,10 +2435,10 @@ _toPlaySoundVolumeFraction	src/Sound/Data.hs	40;"	f
 _toPlaySounds	src/Dodge/Data/World.hs	40;"	f
 _topBoxSize	src/Shape/Data.hs	17;"	f
 _tptString	src/Dodge/Data/Terminal/Status.hs	15;"	f
-_tractorBeams	src/Dodge/Data/LWorld.hs	123;"	f
+_tractorBeams	src/Dodge/Data/LWorld.hs	124;"	f
 _trieChildren	src/SimpleTrie.hs	12;"	f
 _trieMVal	src/SimpleTrie.hs	11;"	f
-_triggers	src/Dodge/Data/LWorld.hs	133;"	f
+_triggers	src/Dodge/Data/LWorld.hs	134;"	f
 _ttDeathEffect	src/Dodge/Data/Terminal.hs	46;"	f
 _ttTriggerID	src/Dodge/Data/Terminal.hs	45;"	f
 _tuDir	src/Dodge/Data/Machine.hs	61;"	f
@@ -2456,12 +2458,12 @@ _unNInt	src/NewInt.hs	15;"	f
 _unNIntMap	src/NewInt.hs	18;"	f
 _unPrimitiveMode	src/Shader/Data.hs	99;"	f
 _unPutCrit	src/Dodge/Data/GenWorld.hs	31;"	f
-_unRandomPlacement	src/Dodge/Data/GenWorld.hs	89;"	f
+_unRandomPlacement	src/Dodge/Data/GenWorld.hs	90;"	f
 _unST	src/Dodge/Data/MetaTree.hs	18;"	f
 _unTO	src/Shader/Data.hs	59;"	f
 _unfiredBarrels	src/Dodge/Data/Item/Params.hs	19;"	f
 _unpauseClock	src/Dodge/Data/World.hs	55;"	f
-_unputTerminal	src/Dodge/Data/GenWorld.hs	40;"	f
+_unputTerminal	src/Dodge/Data/GenWorld.hs	41;"	f
 _useAheadPos	src/Dodge/Data/ActionPlan.hs	161;"	f
 _useExactly	src/Dodge/Data/Muzzle.hs	62;"	f
 _useMapperLines	src/Dodge/Data/Item/Use.hs	40;"	f
@@ -2517,12 +2519,12 @@ _wCam	src/Dodge/Data/World.hs	54;"	f
 _wTime	src/Dodge/Data/Item/Params.hs	22;"	f
 _waitThenAction	src/Dodge/Data/ActionPlan.hs	105;"	f
 _waitThenTimer	src/Dodge/Data/ActionPlan.hs	104;"	f
-_wallDamages	src/Dodge/Data/LWorld.hs	125;"	f
+_wallDamages	src/Dodge/Data/LWorld.hs	126;"	f
 _wallShader	src/Data/Preload/Render.hs	48;"	f
 _wallVBO	src/Data/Preload/Render.hs	47;"	f
-_walls	src/Dodge/Data/LWorld.hs	124;"	f
-_wanID	src/Dodge/Data/LWorld.hs	167;"	f
-_wanPos	src/Dodge/Data/LWorld.hs	166;"	f
+_walls	src/Dodge/Data/LWorld.hs	125;"	f
+_wanID	src/Dodge/Data/LWorld.hs	168;"	f
+_wanPos	src/Dodge/Data/LWorld.hs	167;"	f
 _warmMax	src/Dodge/Data/TriggerType.hs	19;"	f
 _warmStart	src/Dodge/Data/TriggerType.hs	15;"	f
 _windowPosX	src/Dodge/Data/Config.hs	53;"	f
@@ -2549,7 +2551,7 @@ _wlUnshadowed	src/Dodge/Data/Wall.hs	32;"	f
 _wlWalkable	src/Dodge/Data/Wall.hs	28;"	f
 _wlZoning	src/Dodge/Data/World.hs	50;"	f
 _worldEventFlags	src/Dodge/Data/World.hs	46;"	f
-_worldEvents	src/Dodge/Data/LWorld.hs	136;"	f
+_worldEvents	src/Dodge/Data/LWorld.hs	137;"	f
 _wsBlock	src/Dodge/Data/Wall/Structure.hs	16;"	f
 _wsDoor	src/Dodge/Data/Wall/Structure.hs	14;"	f
 _wsMachine	src/Dodge/Data/Wall/Structure.hs	15;"	f
@@ -2589,7 +2591,7 @@ addHighGirder	src/Dodge/Room/Modify/Girder.hs	132;"	f
 addHighGirder'	src/Dodge/Room/Modify/Girder.hs	142;"	f
 addIndefiniteArticle	src/StringHelp.hs	17;"	f
 addNodes	src/Dodge/Path.hs	115;"	f
-addPane	src/Dodge/Placement/PlaceSpot.hs	170;"	f
+addPane	src/Dodge/Placement/PlaceSpot.hs	172;"	f
 addPlmnt	src/Dodge/LevelGen/PlacementHelper.hs	87;"	f
 addPointPolygon	src/Geometry/Polygon.hs	102;"	f
 addPolyWall	src/Dodge/LevelGen/StaticWalls.hs	141;"	f
@@ -2624,7 +2626,7 @@ alteRifle	src/Dodge/Item/Held/Cane.hs	22;"	f
 ammoMagInfo	src/Dodge/Item/Info.hs	49;"	f
 ammoMagSPic	src/Dodge/Item/Draw/SPic.hs	145;"	f
 amr	src/Dodge/Item/Held/Rod.hs	34;"	f
-anRoom	src/Dodge/Floor.hs	130;"	f
+anRoom	src/Dodge/Floor.hs	131;"	f
 analyser	src/Dodge/Placement/Instance/Analyser.hs	10;"	f
 analyserByDoor	src/Dodge/Room/LasTurret.hs	93;"	f
 analyserByNthLink	src/Dodge/Room/LasTurret.hs	78;"	f
@@ -3035,7 +3037,7 @@ crZoneSize	src/Dodge/Zoning/Creature.hs	41;"	f
 craftInfo	src/Dodge/Item/Info.hs	169;"	f
 craftItemSPic	src/Dodge/Item/Draw/SPic.hs	56;"	f
 crankSlowS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	590;"	f
-createFlIt	src/Dodge/Placement/PlaceSpot.hs	182;"	f
+createFlIt	src/Dodge/Placement/PlaceSpot.hs	184;"	f
 createForceField	src/Dodge/ForceField.hs	7;"	f
 createGas	src/Dodge/Gas.hs	8;"	f
 createHeadLamp	src/Dodge/Euse.hs	55;"	f
@@ -3171,14 +3173,14 @@ defaultCreatureMemory	src/Dodge/Default/Creature.hs	65;"	f
 defaultCrystalWall	src/Dodge/Default/Wall.hs	47;"	f
 defaultDirtBlock	src/Dodge/Default/Block.hs	19;"	f
 defaultDirtWall	src/Dodge/Default/Wall.hs	68;"	f
-defaultDisplayInventory	src/Dodge/Default/World.hs	169;"	f
+defaultDisplayInventory	src/Dodge/Default/World.hs	170;"	f
 defaultDoor	src/Dodge/Default/Door.hs	29;"	f
 defaultDoorWall	src/Dodge/Default/Wall.hs	39;"	f
 defaultDrawButton	src/Dodge/Button/Draw.hs	29;"	f
 defaultEquipment	src/Dodge/Default.hs	24;"	f
 defaultFlIt	src/Dodge/Default.hs	27;"	f
 defaultForeground	src/Dodge/Default/ForegroundShape.hs	5;"	f
-defaultHUD	src/Dodge/Default/World.hs	158;"	f
+defaultHUD	src/Dodge/Default/World.hs	159;"	f
 defaultHeldItem	src/Dodge/Default/Item.hs	9;"	f
 defaultInanimate	src/Dodge/Default/Creature.hs	62;"	f
 defaultInput	src/Dodge/Default/World.hs	11;"	f
@@ -3548,7 +3550,7 @@ errorHead	src/ListHelp.hs	76;"	f
 errorIsLHS	src/Geometry.hs	66;"	f
 errorNormalizeV	src/Geometry.hs	55;"	f
 errorPointInPolygon	src/Geometry.hs	47;"	f
-evaluateRandPS	src/Dodge/Placement/PlaceSpot.hs	151;"	f
+evaluateRandPS	src/Dodge/Placement/PlaceSpot.hs	153;"	f
 evenOddSplit	src/Dodge/Base.hs	160;"	f
 exitTerminalSubInv	src/Dodge/WorldEffect.hs	107;"	f
 expandLine	src/Dodge/Picture.hs	30;"	f
@@ -3846,7 +3848,7 @@ initTexture2DArraySquare	src/Shader/AuxAddition.hs	16;"	f
 initTuItemLocation	src/Dodge/Item/Location/Initialize.hs	67;"	f
 initTusItemLocations	src/Dodge/Item/Location/Initialize.hs	26;"	f
 initWallZoning	src/Dodge/Wall/Zone.hs	12;"	f
-initialAnoTree	src/Dodge/Floor.hs	35;"	f
+initialAnoTree	src/Dodge/Floor.hs	36;"	f
 initialRoomTree	src/Dodge/Floor.hs	22;"	f
 initialWorld	src/Dodge/Initialisation.hs	15;"	f
 initialisePlaying	src/Sound.hs	77;"	f
@@ -3867,7 +3869,7 @@ insertWall	src/Dodge/Placement/PlaceSpot/Block.hs	122;"	f
 insertWallInZones	src/Dodge/Wall/Zone.hs	20;"	f
 insertWalls	src/Dodge/Placement/PlaceSpot/Block.hs	117;"	f
 insertWithNewKeys	src/IntMapHelp.hs	70;"	f
-intAnno	src/Dodge/Floor.hs	124;"	f
+intAnno	src/Dodge/Floor.hs	125;"	f
 interactWithCloseObj	src/Dodge/SelectedClose.hs	9;"	f
 interpWith	src/Dodge/Creature/Boid.hs	11;"	f
 intersectCircSeg	src/Geometry/Intersect.hs	335;"	f
@@ -4322,18 +4324,18 @@ multiLookupTrie	src/SimpleTrie.hs	57;"	f
 multiLookupTrieI	src/SimpleTrie.hs	66;"	f
 muout	src/Dodge/RoomLink.hs	129;"	f
 muzFlareAt	src/Dodge/HeldUse.hs	676;"	f
-mvButton	src/Dodge/Placement/PlaceSpot.hs	178;"	f
-mvCr	src/Dodge/Placement/PlaceSpot.hs	188;"	f
-mvFS	src/Dodge/Placement/PlaceSpot.hs	191;"	f
+mvButton	src/Dodge/Placement/PlaceSpot.hs	180;"	f
+mvCr	src/Dodge/Placement/PlaceSpot.hs	190;"	f
+mvFS	src/Dodge/Placement/PlaceSpot.hs	193;"	f
 mvGust	src/Dodge/Update.hs	806;"	f
-mvLS	src/Dodge/Placement/PlaceSpot.hs	219;"	f
+mvLS	src/Dodge/Placement/PlaceSpot.hs	221;"	f
 mvP	src/Dodge/Wall/Move.hs	54;"	f
-mvPP	src/Dodge/Placement/PlaceSpot.hs	185;"	f
+mvPP	src/Dodge/Placement/PlaceSpot.hs	187;"	f
 mvPointAlongAtSpeed	src/Dodge/Base.hs	121;"	f
 mvPointMeleeTarg	src/Dodge/Creature/Boid.hs	314;"	f
 mvPointToward	src/Dodge/Base.hs	136;"	f
 mvPointTowardAtSpeed	src/Dodge/Base.hs	105;"	f
-mvProp	src/Dodge/Placement/PlaceSpot.hs	175;"	f
+mvProp	src/Dodge/Placement/PlaceSpot.hs	177;"	f
 mvPs	src/Dodge/Wall/Move.hs	58;"	f
 myIntersectLineLine	src/Geometry/Intersect.hs	207;"	f
 myIntersectSegSeg	src/Geometry/Intersect.hs	185;"	f
@@ -4473,24 +4475,24 @@ pjRemoteSetDirection	src/Dodge/Projectile/Update.hs	227;"	f
 plBlock	src/Dodge/Placement/PlaceSpot/Block.hs	18;"	f
 plDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	22;"	f
 plLineBlock	src/Dodge/Placement/PlaceSpot/Block.hs	50;"	f
-plMachine	src/Dodge/Placement/PlaceSpot.hs	194;"	f
+plMachine	src/Dodge/Placement/PlaceSpot.hs	196;"	f
 plNew	src/Dodge/Base/NewID.hs	19;"	f
 plNewID	src/Dodge/Base/NewID.hs	7;"	f
 plNewUpID	src/Dodge/Base/NewID.hs	13;"	f
 plNewUsing	src/Dodge/Base/NewID.hs	27;"	f
 plRRpt	src/Dodge/LevelGen/PlacementHelper.hs	33;"	f
 plSlideDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	78;"	f
-placeMachineWalls	src/Dodge/Placement/PlaceSpot.hs	209;"	f
-placePickOne	src/Dodge/Placement/PlaceSpot.hs	40;"	f
-placePlainPSSpot	src/Dodge/Placement/PlaceSpot.hs	52;"	f
-placeRandomPlacement	src/Dodge/Placement/PlaceSpot.hs	43;"	f
-placeSpot	src/Dodge/Placement/PlaceSpot.hs	28;"	f
-placeSpotID	src/Dodge/Placement/PlaceSpot.hs	98;"	f
-placeSpotID'	src/Dodge/Placement/PlaceSpot.hs	104;"	f
-placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	87;"	f
-placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	68;"	f
+placeMachineWalls	src/Dodge/Placement/PlaceSpot.hs	211;"	f
+placePickOne	src/Dodge/Placement/PlaceSpot.hs	41;"	f
+placePlainPSSpot	src/Dodge/Placement/PlaceSpot.hs	53;"	f
+placeRandomPlacement	src/Dodge/Placement/PlaceSpot.hs	44;"	f
+placeSpot	src/Dodge/Placement/PlaceSpot.hs	29;"	f
+placeSpotID	src/Dodge/Placement/PlaceSpot.hs	99;"	f
+placeSpotID'	src/Dodge/Placement/PlaceSpot.hs	105;"	f
+placeSpotRoomRand	src/Dodge/Placement/PlaceSpot.hs	88;"	f
+placeSpotUsingLink	src/Dodge/Placement/PlaceSpot.hs	69;"	f
 placeString	src/Dodge/Render/MenuScreen.hs	61;"	f
-placeWallPoly	src/Dodge/Placement/PlaceSpot.hs	164;"	f
+placeWallPoly	src/Dodge/Placement/PlaceSpot.hs	166;"	f
 plainRegex	src/Dodge/DisplayInventory.hs	197;"	f
 playIfFree	src/Sound.hs	137;"	f
 playPositionalSoundQueue	src/Sound.hs	145;"	f
@@ -5058,9 +5060,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	65;"	f
+showManObj	src/Dodge/TestString.hs	67;"	f
 showTerminalError	src/Dodge/Debug/Terminal.hs	78;"	f
-showTimeFlow	src/Dodge/TestString.hs	88;"	f
+showTimeFlow	src/Dodge/TestString.hs	90;"	f
 shrinkPolyOnEdges	src/Geometry/Polygon.hs	142;"	f
 shrinkVert	src/Geometry/Polygon.hs	146;"	f
 shuffle	src/RandomHelp.hs	49;"	f
@@ -5260,7 +5262,7 @@ teslaParams	src/Dodge/Item/Held/BatteryGuns.hs	25;"	f
 testCrossWalls	src/Dodge/Room/Path.hs	47;"	f
 testEvent	src/Dodge/Event/Test.hs	9;"	f
 testInventory	src/Dodge/Creature.hs	292;"	f
-testStringInit	src/Dodge/TestString.hs	30;"	f
+testStringInit	src/Dodge/TestString.hs	31;"	f
 text	src/Picture/Base.hs	193;"	f
 textGrad	src/Picture/Text.hs	5;"	f
 textInputFocus	src/Dodge/InputFocus.hs	14;"	f
@@ -5331,7 +5333,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	61;"	f
+topTestPart	src/Dodge/TestString.hs	63;"	f
 torch	src/Dodge/Item/Held/Utility.hs	23;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	290;"	f
 torqueAmount	src/Dodge/HeldUse.hs	579;"	f