Start cleanup of room in-links

src/Dodge/Placement/PlaceSpot.hs

@@ -87,20 +87,20 @@ placeSpotRoomRand rm i f plmnt w =
 -- the Int here is some id that is assigned when the placement is placed
 placeSpotID :: PlacementSpot -> PSType -> GenWorld -> (Int, GenWorld)
 placeSpotID ps pt w = case pt of
-    PutTrigger  cnd         -> placeNewInto triggers cnd w
+    PutTrigger  cnd         -> plNewID   triggers cnd w
     PutMod      mdi         -> plNewUpID modifications mdID mdi w
     PutProp     prp         -> plNewUpID props pjID (mvProp p rot prp) w
     PutButton   bt          -> plNewUpID buttons btID (mvButton p rot bt) w
     PutFlIt     itm         -> plNewUpID floorItems flItID (createFlIt p rot itm) w
     PutCrit     cr          -> plNewUpID creatures crID (mvCr p rot cr) w
-    PutMachine  col pps mc  -> placeMachine col (map doShift pps) mc p rot w
+    PutMachine  col pps mc  -> plMachine col (map doShift pps) mc p rot w
     PutLS       ls          -> plNewUpID lightSources lsID (mvLS p' rot ls) w
     PutPPlate   pp          -> plNewUpID pressPlates ppID (mvPP p rot pp) w
     RandPS      rgn         -> evaluateRandPS rgn ps w
-    PutDoor     col f   pss -> placeDoor col f (map (bimap doShift doShift) pss) w
-    PutCoord    cp          -> placeNewInto coordinates (doShift cp) w
+    PutDoor     col f   pss -> plDoor col f (map (bimap doShift doShift) pss) w
+    PutCoord    cp          -> plNewID   coordinates (doShift cp) w
     PutSlideDr  pth col f  a   b spd 
-                            -> placeSlideDoor pth col f (doShift a) (doShift b) spd w
+                            -> plSlideDoor pth col f (doShift a) (doShift b) spd w
     PutBlock    bm  hp  hps wl  ps' 
                             -> placeBlock (map doShift ps') hp wl hps bm w
     PutLineBlock wl bm wdth dpth a b -> placeLineBlock wl bm wdth dpth (doShift a) (doShift b) w
@@ -142,11 +142,11 @@ addPane wl l wls = IM.insert wlid (wl { _wlLine = l, _wlID = wlid }) wls
 
 -- | generalised way of putting a new item into a lensed intmap, returning the
 -- new index as well
-placeNewInto :: ALens' World (IM.IntMap a)
+plNewID :: ALens' World (IM.IntMap a)
     -> a
     -> GenWorld
     -> (Int,GenWorld)
-placeNewInto l x w = (i,w & gWorld . l #%~ IM.insert i x)
+plNewID l x w = (i,w & gWorld . l #%~ IM.insert i x)
   where
     i = IM.newKey $ _gWorld w ^# l
 
@@ -176,8 +176,8 @@ mvPP p rot pp = pp {_ppPos = p,_ppRot = rot}
 mvCr :: Point2 -> Float -> Creature -> Creature
 mvCr p rot cr = cr {_crPos = p,_crOldPos = p,_crDir = rot}
 
-placeMachine :: Color -> [Point2] -> Machine -> Point2 -> Float -> GenWorld -> (Int,GenWorld)
-placeMachine color wallpoly mc p rot gw = (mcid
+plMachine :: Color -> [Point2] -> Machine -> Point2 -> Float -> GenWorld -> (Int,GenWorld)
+plMachine color wallpoly mc p rot gw = (mcid
     , gw & gWorld . machines  %~ addMc
          & gWorld . walls     %~ placeMachineWalls color wallpoly mcid wlid
     )