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

Cleanup, only allow positive seeds

Browse Source
This commit is contained in:
justin
2022-05-26 13:34:51 +01:00
parent 5c41e2823e
commit 7d5edb4f41
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Combine/Data.hs
+1 -1
View File
@@ -71,7 +71,7 @@ data CombineType
| BOOSTER | BOOSTER
| REWINDER | REWINDER
| BLINKER | BLINKER
| FORCEFIELD | FORCEFIELDGUN
| SHRINKER | SHRINKER
-- Equipment -- Equipment
| RADAR | RADAR
src/Dodge/Item/Weapon/Utility.hs
+2 -2
View File
@@ -129,8 +129,8 @@ autoEffectGun name eff = defaultAutoGun
} }
forceFieldGun :: Item forceFieldGun :: Item
forceFieldGun = defaultGun forceFieldGun = defaultGun
{ _itName = "FORCEFIELD" { _itName = "FORCEFIELDGUN"
, _itType = FORCEFIELD , _itType = FORCEFIELDGUN
, _itConsumption = defaultAmmo , _itConsumption = defaultAmmo
{ _ammoBaseMax = 100 { _ammoBaseMax = 100
, _ammoLoaded = 100 , _ammoLoaded = 100
src/Dodge/LockAndKey.hs
+6 -2
View File
@@ -22,14 +22,14 @@ bossKeyItems =
lockRoomKeyItems :: RandomGen g => [ (Int -> State g (LabSubCompTree Room) , State g CombineType ) ] lockRoomKeyItems :: RandomGen g => [ (Int -> State g (LabSubCompTree Room) , State g CombineType ) ]
lockRoomKeyItems = lockRoomKeyItems =
[(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN,FLATSHIELD] ) [(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN,FLATSHIELD,FORCEFIELDGUN] )
,(sensorRoomRunPast Electrical, takeOne [STATICMODULE,SPARKGUN] ) ,(sensorRoomRunPast Electrical, takeOne [STATICMODULE,SPARKGUN] )
,(sensorRoomRunPast Flaming, takeOne [FLAMESPITTER, INCENDIARYMODULE] ) ,(sensorRoomRunPast Flaming, takeOne [FLAMESPITTER, INCENDIARYMODULE] )
,(sensorRoomRunPast Lasering, return LASGUN ) ,(sensorRoomRunPast Lasering, return LASGUN )
,(const slowDoorRoomRunPast, return MINIGUN) ,(const slowDoorRoomRunPast, return MINIGUN)
,(const longRoomRunPast, takeOne [SNIPERRIFLE,FLATSHIELD]) ,(const longRoomRunPast, takeOne [SNIPERRIFLE,FLATSHIELD])
,(const glassLessonRunPast, takeOne [LASGUN]) ,(const glassLessonRunPast, takeOne [LASGUN])
,(const $ lasTunnelRunPast 400, return FLATSHIELD) ,(const $ lasTunnelRunPast 400, takeOne [FLATSHIELD,FORCEFIELDGUN])
,(keyCardRoomRunPast 0, return (KEYCARD 0)) ,(keyCardRoomRunPast 0, return (KEYCARD 0))
] ]
@@ -65,6 +65,10 @@ itemRooms =
[rc [sniperRifle] [rc [sniperRifle]
] ]
) )
, (FORCEFIELDGUN , join $ takeOne
[rc [forceFieldGun]
]
)
, (KEYCARD 0 , join $ takeOne , (KEYCARD 0 , join $ takeOne
[rc [keyCard 0] [rc [keyCard 0]
] ]
src/Dodge/StartNewGame.hs
+1 -1
View File
@@ -7,7 +7,7 @@ import System.Random
startNewGame :: Universe -> Universe startNewGame :: Universe -> Universe
startNewGame u = startSeedGame i u startNewGame u = startSeedGame i u
where where
i = fst $ random (_randGen (_uvWorld u)) i = fst $ randomR (0,maxBound) (_randGen (_uvWorld u))
startSeedGame :: Int -> Universe -> Universe startSeedGame :: Int -> Universe -> Universe
startSeedGame i u = u startSeedGame i u = u