justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix button not updating bug

Browse Source
This commit is contained in:
justin
2022-06-14 18:47:11 +01:00
parent dafbd8a2da
commit 0957c79e58
10 changed files with 51 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Room/Airlock.hs
+3 -3
View File
@@ -28,6 +28,7 @@ airlock0 = defaultRoom
[pContID (PS (V2 (-35) 50) (negate $ pi/2)) (PutButton $ makeSwitch col red id id)
$ \btid -> Just $ putDoubleDoorThen False col (not . cond' btid) 1 (V2 0 20) (V2 40 20) 2
$ \_ _ -> Just $ putDoubleDoor False col (cond' btid) (V2 0 80) (V2 40 80) 2
, invisibleWall $ rectNSWE 60 40 (-40) (-30)
,spanLightI (V2 (-2) 30) (V2 (-2) 70)
,sps0 $ PutShape $ thinHighBar 75 (V2 40 50) (V2 (-1) 50)
]
@@ -111,10 +112,9 @@ airlock90 = defaultRoom
,(V2 40 0,V2 0 40)
]
, _rmPmnts =
[pContID (PS (V2 120 120) (3 * pi/4)) (PutButton $ makeSwitch col red id id)
[ pContID (PS (V2 120 120) (3 * pi/4)) (PutButton $ makeSwitch col red id id)
$ \btid -> jsps (V2 5 5) 0 $ PutDoor col (cond btid) pss
--,mntLS vShape (V2 20 20) (V3 70 70 50)
,mntLS vShape (V2 35 35) (V3 70 70 50)
, mntLS vShape (V2 35 35) (V3 70 70 50)
]
, _rmBound =
[map toV2 [ (10,10)
src/Dodge/Room/Start.hs
+3 -3
View File
@@ -56,12 +56,12 @@ powerFakeout = do
,cleatOnward door]
startRoom :: RandomGen g => Int -> State g (MetaTree Room String)
startRoom i = join (takeOne
startRoom i = join $ takeOne
[ attachOnward "startThenWeaponRoom" <$> preCritStart <*> weaponRoom i
, rezBoxesWpCrit >>= rToOnward "rezBoxesWpCrit"
, runPastStart i >>= rToOnward ("runPastStart " ++ show i)
, attachOnward "startThenCraft" <$> preCritStart <*> (startCrafts >>= roomsContaining [])
])
]
randomChallenges :: RandomGen g => State g (MetaTree Room String)
randomChallenges = shootingRange
-- join (takeOne
@@ -84,7 +84,7 @@ rezBoxStart = do
preCritStart :: RandomGen g => State g (MetaTree Room String)
preCritStart = join $ takeOneWeighted
[10,10,1::Float]
[100,100,1::Float]
[rezBoxes
,rezBox'
,attachOnward "rezBoxPowerFakeout" <$> rezBox' <*> powerFakeout'