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

Correct in placement ordering (was using room id)

Browse Source
This commit is contained in:
justin
2025-09-24 23:09:28 +01:00
parent f51868c84c
commit 1f14f3d0c3
8 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
log/aGeneratedRoomLayout
+1 -1
View File
@@ -1,4 +1,4 @@
Seed: 7114951007332849727
Seed: 1077410572580550018
Room layout (compact):
0,1,2,3
|
log/attemptedSeeds
+2 -2
View File
@@ -1,4 +1,4 @@
Generating level with seed 7114951007332849727
Generating level with seed 1077410572580550018
After 1 attempt(s), Successful generation of level with seed 7114951007332849727
After 1 attempt(s), Successful generation of level with seed 1077410572580550018
22 rooms in total
log/treeCluster
+1 -1
View File
@@ -1,4 +1,4 @@
Seed: 7114951007332849727
Seed: 1077410572580550018
0:TutStartRez
|
1:corDoor
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
saveSlot/seed
+1 -1
View File
@@ -1 +1 @@
7114951007332849727
1077410572580550018
src/Dodge/Layout.hs
+1 -1
View File
@@ -81,7 +81,7 @@ shuffleRoomPos rm = do
doInPlacements :: GenWorld -> GenWorld
doInPlacements w = foldl' (\gw (i,(_,f)) -> placeSpot' i gw (f gw)) w
. sortOn fst
. sortOn (fst.snd)
$ foldMap g $ w ^. genRooms
where
g rm = (rm^?! rmMID . _Just,) <$> (rm ^. rmInPmnt)
src/Dodge/Room/Tutorial.hs
+1 -1
View File
@@ -125,7 +125,7 @@ tutRooms is = do
[ treeFromPost [triggerDoorRoom i] r1
, treeFromPost [triggerDoorRoom j] r2
, bcor
, treeFromPost [triggerDoorRoom k] r2
, treeFromPost [triggerDoorRoom k & rmInPmnt . ix 0 . _1 .~ 1] r2
]
where
ss =
tags
+15 -16
View File
@@ -3267,8 +3267,8 @@ doFloatFloat src/Dodge/FloatFunction.hs 5;" f
doGenFloat src/Dodge/HeldUse.hs 1184;" f
doGravityPU src/Dodge/Projectile/Update.hs 36;" f
doHeldUseEffect src/Dodge/HeldUse.hs 343;" f
doInPlacements src/Dodge/Layout.hs 81;" f
doIndividualPlacements src/Dodge/Layout.hs 91;" f
doInPlacements src/Dodge/Layout.hs 82;" f
doIndividualPlacements src/Dodge/Layout.hs 96;" f
doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 28;" f
doIntImp src/Dodge/CreatureEffect.hs 24;" f
doItemTimeScroll src/Dodge/Update.hs 191;" f
@@ -3287,8 +3287,7 @@ doQuickload src/Dodge/Save.hs 82;" f
doQuicksave src/Dodge/Save.hs 77;" f
doRandImpulse src/Dodge/RandImpulse.hs 7;" f
doRegexInput src/Dodge/Update/Input/InGame.hs 447;" f
doRoomInPlacements src/Dodge/Layout.hs 86;" f
doRoomPlacements src/Dodge/Layout.hs 94;" f
doRoomPlacements src/Dodge/Layout.hs 99;" f
doRoomShift src/Dodge/Room/Link.hs 33;" f
doScopeZoom src/Dodge/Update/Scroll.hs 91;" f
doSectionSize src/Dodge/DisplayInventory.hs 211;" f
@@ -3642,16 +3641,16 @@ gLauncher src/Dodge/Item/Held/Launcher.hs 24;" f
gRandify src/Dodge/Randify.hs 11;" f
gadgetEffect src/Dodge/HeldUse.hs 46;" f
gameOverMenu src/Dodge/Menu.hs 189;" f
gameRoomFromRoom src/Dodge/Layout.hs 141;" f
gameRoomFromRoom src/Dodge/Layout.hs 146;" f
gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f
gameRoomsFromRooms src/Dodge/Layout.hs 138;" f
gameRoomsFromRooms src/Dodge/Layout.hs 143;" f
gameplayMenu src/Dodge/Menu.hs 136;" f
gameplayMenuOptions src/Dodge/Menu.hs 139;" f
gasType src/Dodge/HeldUse.hs 1141;" f
generateGenParams src/Dodge/LevelGen/LevelStructure.hs 23;" f
generateGraphs src/Dodge/LevelGen.hs 41;" f
generateLayout src/Dodge/Layout/Generate.hs 10;" f
generateLevelFromRoomList src/Dodge/Layout.hs 33;" f
generateLevelFromRoomList src/Dodge/Layout.hs 34;" f
generateWorldFromSeed src/Dodge/LevelGen.hs 19;" f
geom src/Shader/Data.hs 102;" f
geometryQuickCheckTests test/Spec.hs 55;" f
@@ -3688,7 +3687,7 @@ getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f
getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f
getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f
getSplitString src/Dodge/Debug/Terminal.hs 128;" f
getTiles src/Dodge/Layout.hs 188;" f
getTiles src/Dodge/Layout.hs 193;" f
getViewpoints src/Dodge/Viewpoints.hs 29;" f
getVolleyBurst src/Dodge/HeldUse.hs 125;" f
getWallSPic src/Dodge/Render/Walls.hs 51;" f
@@ -4459,7 +4458,7 @@ plTurret src/Dodge/Placement/PlaceSpot.hs 173;" f
placeMachineWalls src/Dodge/Placement/PlaceSpot.hs 211;" f
placePlainPSSpot src/Dodge/Placement/PlaceSpot.hs 40;" f
placeSpot src/Dodge/Placement/PlaceSpot.hs 31;" f
placeSpot' src/Dodge/Layout.hs 100;" f
placeSpot' src/Dodge/Layout.hs 105;" f
placeSpotID src/Dodge/Placement/PlaceSpot.hs 87;" f
placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 74;" f
placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 55;" f
@@ -4678,7 +4677,7 @@ randSpark src/Dodge/Spark.hs 69;" f
randSparkExtraVel src/Dodge/Spark.hs 92;" f
randWallReflect src/Dodge/Update.hs 626;" f
randomChallenges src/Dodge/Room/Start.hs 63;" f
randomCompass src/Dodge/Layout.hs 57;" f
randomCompass src/Dodge/Layout.hs 58;" f
randomFourCornerRoom src/Dodge/Room/Procedural.hs 265;" f
randomFourCornerRoomCrsIts src/Dodge/Room/Procedural.hs 277;" f
randomLightPositions src/Dodge/Room/Modify/Girder.hs 152;" f
@@ -4943,8 +4942,8 @@ setShaderSource src/Shader/Compile.hs 290;" f
setShadowLimits src/Dodge/Shadows.hs 11;" f
setSoundVolume src/Sound.hs 157;" f
setTargetMv src/Dodge/Creature/ReaderUpdate.hs 76;" f
setTile src/Dodge/Layout.hs 66;" f
setTiles src/Dodge/Layout.hs 63;" f
setTile src/Dodge/Layout.hs 67;" f
setTiles src/Dodge/Layout.hs 64;" f
setToggle src/Dodge/Prop/Update.hs 44;" f
setTreeInts src/Dodge/Room/Tutorial.hs 68;" f
setViewDistance src/Dodge/Update/Camera.hs 236;" f
@@ -4968,7 +4967,7 @@ setupVBOStatic src/Shader/Compile.hs 116;" f
setupVBOVAO src/Shader/Compile.hs 200;" f
setupVertexAttribPointer src/Shader/Compile.hs 224;" f
setupVertexAttribs src/Shader/Compile.hs 218;" f
setupWorldBounds src/Dodge/Layout.hs 105;" f
setupWorldBounds src/Dodge/Layout.hs 110;" f
sfInvColor src/Dodge/Item/InventoryColor.hs 12;" f
shadVBOptr src/Shader.hs 40;" f
shaderTypeExt src/Shader/Compile.hs 172;" f
@@ -5041,7 +5040,7 @@ shrinkPolyOnEdges src/Geometry/Polygon.hs 142;" f
shrinkVert src/Geometry/Polygon.hs 146;" f
shuffle src/RandomHelp.hs 49;" f
shuffleLinks src/Dodge/Room/Link.hs 30;" f
shuffleRoomPos src/Dodge/Layout.hs 76;" f
shuffleRoomPos src/Dodge/Layout.hs 77;" f
shuffleTail src/RandomHelp.hs 59;" f
sigmoid src/Dodge/Base.hs 151;" f
simpleCrSprings src/Dodge/Update.hs 847;" f
@@ -5265,7 +5264,7 @@ thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 92;" f
threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f
throwItem src/Dodge/Creature/Action.hs 211;" f
tileTexCoords src/Tile.hs 11;" f
tilesFromRooms src/Dodge/Layout.hs 185;" f
tilesFromRooms src/Dodge/Layout.hs 190;" f
tilesToLine src/Shader/AuxAddition.hs 66;" f
timeFlowUpdate src/Dodge/Update.hs 167;" f
timeScroller src/Dodge/Item/Held/Utility.hs 42;" f
@@ -5609,7 +5608,7 @@ wallBuffer src/Dodge/WallCreatureCollisions.hs 52;" f
wallIsZeroLength src/Dodge/LevelGen/StaticWalls.hs 179;" f
wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f
wallToSurface src/Dodge/Base/Collide.hs 172;" f
wallsFromRooms src/Dodge/Layout.hs 126;" f
wallsFromRooms src/Dodge/Layout.hs 131;" f
wallsToDraw src/Dodge/Render/Walls.hs 17;" f
warmupSound src/Dodge/HeldUse.hs 1421;" f
warningRooms src/Dodge/Room/Warning.hs 26;" f