From 88dcf7e6f1fccb0e6bd231943bb422dc61e5353a Mon Sep 17 00:00:00 2001
From: jgk <justin.g.kruger@gmail.com>
Date: Sat, 27 Mar 2021 22:55:31 +0100
Subject: [PATCH] Fix bug where corridors blocked passage on 60 degree links

---
 src/Dodge/Creature.hs | 48 ++++++++++++++++++++-----------------------
 src/Dodge/Floor.hs    |  2 +-
 src/Dodge/Rooms.hs    |  4 ++--
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs
index 516414884..9a7ce956b 100644
--- a/src/Dodge/Creature.hs
+++ b/src/Dodge/Creature.hs
@@ -252,32 +252,28 @@ startCr = defaultCreature
     , _crHP = 10000
     , _crMaxHP = 1500
     , _crInv = IM.fromList (zip [0..20] 
-         (
-          [pistol,flameGrenade, teslaGrenade, autoGun,launcher,flameLauncher, poisonLauncher, teslaLauncher, lasGun,grenade
-          ,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
-          ,longGun
-          ,hvAutoGun
-          ,teslaGun
-          ,latchkey 0
-          ,miniGun
-          ,medkit 50
-          ,bezierGun
-          ,poisonSprayer
-          ,blinkGun
-           ] 
---          [pistol,autoGun,launcher,lasGun,grenade
---          ,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
---          ,longGun
---          ,hvAutoGun
---          ,teslaGun
---          ,latchkey 0
---          ,miniGun
---          ,medkit 50
---          ,bezierGun
---          ,poisonSprayer
---          ,blinkGun
---          ,frontArmour
---          ] 
+        (
+        [pistol
+        ,blinkGun
+        ,flameGrenade
+        ,teslaGrenade
+        ,autoGun
+        ,launcher
+        ,flameLauncher
+        ,poisonLauncher
+        ,teslaLauncher
+        ,lasGun
+        ,grenade
+        ,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
+        ,longGun
+        ,hvAutoGun
+        ,teslaGun
+        ,latchkey 0
+        ,miniGun
+        ,medkit 50
+        ,bezierGun
+        ,poisonSprayer
+        ] 
           ++ repeat NoItem)) 
          -- startInv
 --                           ([pistol,flameGrenade, teslaGrenade, autoGun,launcher,flameLauncher, poisonLauncher, teslaLauncher, lasGun,grenade
diff --git a/src/Dodge/Floor.hs b/src/Dodge/Floor.hs
index f71ee3439..17c34ac08 100644
--- a/src/Dodge/Floor.hs
+++ b/src/Dodge/Floor.hs
@@ -43,7 +43,7 @@ lev1 = do
             ++ [roomCCrits]
             ++ [return $ connectRoom corridor
                ,return $ connectRoom door]
-              ++[roomMiniIntro]
+            ++[roomMiniIntro]
             ++ [longRoom >>= randomiseLinks]
             ++ [return $ connectRoom corridor
                ,return $ connectRoom door]
diff --git a/src/Dodge/Rooms.hs b/src/Dodge/Rooms.hs
index 09b46e2a1..d8b8f273e 100644
--- a/src/Dodge/Rooms.hs
+++ b/src/Dodge/Rooms.hs
@@ -90,8 +90,8 @@ corridor = Room
     , _rmBound = rectNSWE 50 30 0 40
     }
     where lnks = [((20,70)  ,0)
-                 ,((20,80) +.+ rotateV (0-pi/3) (-20,0),  pi/6)
-                 ,((20,80) +.+ rotateV (  pi/3) ( 20,0),0-pi/6)
+                 ,((20,80) +.+ rotateV (0-pi/3) (-10,0),  pi/6)
+                 ,((20,80) +.+ rotateV (  pi/3) ( 10,0),0-pi/6)
                  ,((20,10)    ,pi)
                  ]
 corridorN :: Room