From 4d1f1547bca8935be5352600db15c2cf18ccf9b6 Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Fri, 1 Jul 2022 18:48:33 +0100
Subject: [PATCH] Redo PathFrom name change

---
 src/Dodge/Data/Room.hs     |  6 +++---
 src/Dodge/PlacementSpot.hs | 16 ++++++++--------
 src/Dodge/Room/Pillar.hs   |  6 +++---
 src/Dodge/Room/Tanks.hs    |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Dodge/Data/Room.hs b/src/Dodge/Data/Room.hs
index 3eb0c3da3..fa0296f62 100644
--- a/src/Dodge/Data/Room.hs
+++ b/src/Dodge/Data/Room.hs
@@ -61,12 +61,12 @@ data RPLinkStatus
     | UnusedLink  { _rplsType :: S.Set RoomLinkType }
     | NotLink
   deriving (Eq,Ord,Show)
-data PathEdge = PathFromEdge CardinalPoint Int
+data PathFromEdge = PathFromEdge CardinalPoint Int
   deriving (Eq,Ord,Show)
 
 data RoomPosType 
-    = RoomPosOnPath {_onPathEdges :: S.Set PathEdge}
-    | RoomPosOffPath {_offPathEdges :: S.Set PathEdge}
+    = RoomPosOnPath {_onPathFromEdges :: S.Set PathFromEdge}
+    | RoomPosOffPath {_offPathFromEdges :: S.Set PathFromEdge}
     | RoomPosExLink
     | RoomPosLab Int
   deriving (Eq,Ord,Show)
diff --git a/src/Dodge/PlacementSpot.hs b/src/Dodge/PlacementSpot.hs
index f6ecd3d19..3446d9194 100644
--- a/src/Dodge/PlacementSpot.hs
+++ b/src/Dodge/PlacementSpot.hs
@@ -3,8 +3,8 @@ module Dodge.PlacementSpot
     ( atFstLnkOut
     , rpIsOnPath
     , rpIsOffPath
-    , rpOffPathEdge
-    , rpOnPathEdge
+    , rpOffPathFromEdge
+    , rpOnPathFromEdge
     , useUnusedLnk
     , psRandRanges
     , useRoomPosCond
@@ -82,16 +82,16 @@ rpIsOffPath = any f . _rpType
   where
     f RoomPosOffPath {} = True
     f _ = False
-rpOffPathEdge :: PathEdge -> RoomPos -> Bool
-rpOffPathEdge pe = any f . _rpType
+rpOffPathFromEdge :: PathFromEdge -> RoomPos -> Bool
+rpOffPathFromEdge pe = any f . _rpType
   where
-    f rt = maybe False (pe `elem`) (rt ^? offPathEdges) 
+    f rt = maybe False (pe `elem`) (rt ^? offPathFromEdges) 
 
 -- test whether a roomPos is on the path with a given from edge value
-rpOnPathEdge :: PathEdge -> RoomPos -> Bool
-rpOnPathEdge pe = any f . _rpType
+rpOnPathFromEdge :: PathFromEdge -> RoomPos -> Bool
+rpOnPathFromEdge pe = any f . _rpType
   where
-    f rt = maybe False (pe `elem`) (rt ^? onPathEdges) 
+    f rt = maybe False (pe `elem`) (rt ^? onPathFromEdges) 
 
 resetPLUse :: PlacementSpot -> PlacementSpot
 resetPLUse (PSPos f g fallback) = PSPos f' g fallback
diff --git a/src/Dodge/Room/Pillar.hs b/src/Dodge/Room/Pillar.hs
index dfbaecd44..dc93bb1cb 100644
--- a/src/Dodge/Room/Pillar.hs
+++ b/src/Dodge/Room/Pillar.hs
@@ -24,8 +24,8 @@ blockPillar w' h' = ps0jPushPS (aline tl tr)
     $ ps0jPushPS (aline br bl)
     $ sps0 (aline bl tl)
   where
-    w = w' - 9
-    h = h' - 9
+    w = w' - 10
+    h = h' - 10
     tl = V2 (-w) h
     tr = V2 w h
     br = V2 w (-h)
@@ -70,7 +70,7 @@ roomPillarsSquare = do
   where
     makepill edge = sps (rprBool $ \rp _ -> t edge rp) smallPillar
     t edge rp = any (f edge) (_rpType rp) && _rpPlacementUse rp == 0
-    f edge rpt = maybe False (PathFromEdge edge 0 `S.member`) (rpt ^? offPathEdges)
+    f edge rpt = maybe False (PathFromEdge edge 0 `S.member`) (rpt ^? offPathFromEdges)
 
 roomPillarsPassage :: RandomGen g => State g Room
 roomPillarsPassage = do
diff --git a/src/Dodge/Room/Tanks.hs b/src/Dodge/Room/Tanks.hs
index f5855ab75..864a85bcc 100644
--- a/src/Dodge/Room/Tanks.hs
+++ b/src/Dodge/Room/Tanks.hs
@@ -42,7 +42,7 @@ randEdgeTank = do
                 <>  horPipe 80 0 (70 *.* cardVec edge))))
                     -- 70 is a guess, the true value depends on the distance to the wall
         & plSpot .~ rprBool (\rp _ -> _rpPlacementUse rp == 0
-                && rpOffPathEdge (PathFromEdge edge 0) rp)
+                && rpOffPathFromEdge (PathFromEdge edge 0) rp)
 
 randEdgeTanks :: RandomGen g => Int -> State g [Placement]
 randEdgeTanks i = do
@@ -54,7 +54,7 @@ randEdgeTanks i = do
                 <>  horPipe 80 0 (70 *.* cardVec edge))))
                     -- 70 is a guess, the true value depends on the distance to the wall
         & plSpot .~ rprBool (\rp _ -> _rpPlacementUse rp == 0
-                && rpOffPathEdge (PathFromEdge edge 0) rp)
+                && rpOffPathFromEdge (PathFromEdge edge 0) rp)
 
 tanksPipesRoom :: RandomGen g => State g Room
 tanksPipesRoom = do