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
|
||||
, _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
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ lev1 = do
|
||||
++ [roomCCrits]
|
||||
++ [return $ connectRoom corridor
|
||||
,return $ connectRoom door]
|
||||
++[roomMiniIntro]
|
||||
++[roomMiniIntro]
|
||||
++ [longRoom >>= randomiseLinks]
|
||||
++ [return $ connectRoom corridor
|
||||
,return $ connectRoom door]
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user