Fix bug where corridors blocked passage on 60 degree links
This commit is contained in:
+22
-26
@@ -252,32 +252,28 @@ startCr = defaultCreature
|
|||||||
, _crHP = 10000
|
, _crHP = 10000
|
||||||
, _crMaxHP = 1500
|
, _crMaxHP = 1500
|
||||||
, _crInv = IM.fromList (zip [0..20]
|
, _crInv = IM.fromList (zip [0..20]
|
||||||
(
|
(
|
||||||
[pistol,flameGrenade, teslaGrenade, autoGun,launcher,flameLauncher, poisonLauncher, teslaLauncher, lasGun,grenade
|
[pistol
|
||||||
,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
|
,blinkGun
|
||||||
,longGun
|
,flameGrenade
|
||||||
,hvAutoGun
|
,teslaGrenade
|
||||||
,teslaGun
|
,autoGun
|
||||||
,latchkey 0
|
,launcher
|
||||||
,miniGun
|
,flameLauncher
|
||||||
,medkit 50
|
,poisonLauncher
|
||||||
,bezierGun
|
,teslaLauncher
|
||||||
,poisonSprayer
|
,lasGun
|
||||||
,blinkGun
|
,grenade
|
||||||
]
|
,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
|
||||||
-- [pistol,autoGun,launcher,lasGun,grenade
|
,longGun
|
||||||
-- ,ltAutoGun,flamer,multGun,spreadGun,remoteLauncher
|
,hvAutoGun
|
||||||
-- ,longGun
|
,teslaGun
|
||||||
-- ,hvAutoGun
|
,latchkey 0
|
||||||
-- ,teslaGun
|
,miniGun
|
||||||
-- ,latchkey 0
|
,medkit 50
|
||||||
-- ,miniGun
|
,bezierGun
|
||||||
-- ,medkit 50
|
,poisonSprayer
|
||||||
-- ,bezierGun
|
]
|
||||||
-- ,poisonSprayer
|
|
||||||
-- ,blinkGun
|
|
||||||
-- ,frontArmour
|
|
||||||
-- ]
|
|
||||||
++ repeat NoItem))
|
++ repeat NoItem))
|
||||||
-- startInv
|
-- startInv
|
||||||
-- ([pistol,flameGrenade, teslaGrenade, autoGun,launcher,flameLauncher, poisonLauncher, teslaLauncher, lasGun,grenade
|
-- ([pistol,flameGrenade, teslaGrenade, autoGun,launcher,flameLauncher, poisonLauncher, teslaLauncher, lasGun,grenade
|
||||||
|
|||||||
+1
-1
@@ -43,7 +43,7 @@ lev1 = do
|
|||||||
++ [roomCCrits]
|
++ [roomCCrits]
|
||||||
++ [return $ connectRoom corridor
|
++ [return $ connectRoom corridor
|
||||||
,return $ connectRoom door]
|
,return $ connectRoom door]
|
||||||
++[roomMiniIntro]
|
++[roomMiniIntro]
|
||||||
++ [longRoom >>= randomiseLinks]
|
++ [longRoom >>= randomiseLinks]
|
||||||
++ [return $ connectRoom corridor
|
++ [return $ connectRoom corridor
|
||||||
,return $ connectRoom door]
|
,return $ connectRoom door]
|
||||||
|
|||||||
+2
-2
@@ -90,8 +90,8 @@ corridor = Room
|
|||||||
, _rmBound = rectNSWE 50 30 0 40
|
, _rmBound = rectNSWE 50 30 0 40
|
||||||
}
|
}
|
||||||
where lnks = [((20,70) ,0)
|
where lnks = [((20,70) ,0)
|
||||||
,((20,80) +.+ rotateV (0-pi/3) (-20,0), pi/6)
|
,((20,80) +.+ rotateV (0-pi/3) (-10,0), pi/6)
|
||||||
,((20,80) +.+ rotateV ( pi/3) ( 20,0),0-pi/6)
|
,((20,80) +.+ rotateV ( pi/3) ( 10,0),0-pi/6)
|
||||||
,((20,10) ,pi)
|
,((20,10) ,pi)
|
||||||
]
|
]
|
||||||
corridorN :: Room
|
corridorN :: Room
|
||||||
|
|||||||
Reference in New Issue
Block a user