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

Cleanup

Browse Source
This commit is contained in:
justin
2025-01-04 15:09:20 +00:00
parent 89eed0d059
commit 649fc35e32
4 changed files with 821954 additions and 175897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dodge.aux
+40 -40
View File
@@ -1,42 +1,42 @@
X_RANGE 12.02 X_RANGE 38.64
Y_RANGE 39952416.00 Y_RANGE 9756952.00
ORDER OTHER 1 ORDER OTHER 1
ORDER (157382)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 2 ORDER (157110)zoneWall.f/zoneWall/insertWallInZones/initWallZoning/generateLevelFromRoomList/generateWorldFrom... 2
ORDER (160588)zoneCloud/#..\/#./zoneClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 3 ORDER (161858)#..\/#./mcApplyDamage/updateMachine/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUp... 3
ORDER (157538)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 4 ORDER (157478)ix/#..\/#./checkDeath/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dima... 4
ORDER (159377)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 5 ORDER (157596)#..\/#./targetYouWhenCognizant/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/fu... 5
ORDER (155119)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 6 ORDER (158890)updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse... 6
ORDER (159446)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 7 ORDER (155160)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 7
ORDER (178549)ix.go/ix/invSelectionItem/updateDisplaySections.invitems.\/updateDisplaySections.invitems/update... 8 ORDER (157505)#..\/#./performActions/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functional... 8
ORDER (158013)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 9 ORDER (157421)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 9
ORDER (158879)updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse... 10 ORDER (157577)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 10
ORDER (152352)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 11 ORDER (159401)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 11
ORDER (165493)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 12 ORDER (165498)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 12
ORDER (165445)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 13 ORDER (165546)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 13
ORDER (159456)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 14 ORDER (152407)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 14
ORDER (178578)#..\/#./updateSection.tweaklast/updateSection/updateSectionsPositioning.\/updateSectionsPosition... 15 ORDER (165513)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 15
ORDER (165460)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 16 ORDER (158037)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 16
ORDER (157227)#..\/#./zoneCreatures/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 17 ORDER (159485)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 17
ORDER (157590)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 18 ORDER (159495)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 18
ORDER (161122)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 19 ORDER (163151)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 19
ORDER (160671)updateSection.listSelectionColorPicture.g/updateSection.listSelectionColorPicture/updateSection.... 20 ORDER (157629)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 20
SHADE OTHER 0.00 SHADE OTHER 0.00
SHADE (157382)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 0.00 SHADE (157110)zoneWall.f/zoneWall/insertWallInZones/initWallZoning/generateLevelFromRoomList/generateWorldFrom... 0.00
SHADE (160588)zoneCloud/#..\/#./zoneClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 0.00 SHADE (161858)#..\/#./mcApplyDamage/updateMachine/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUp... 0.00
SHADE (157538)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 0.00 SHADE (157478)ix/#..\/#./checkDeath/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dima... 0.00
SHADE (159377)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 0.10 SHADE (157596)#..\/#./targetYouWhenCognizant/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/fu... 0.10
SHADE (155119)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 0.10 SHADE (158890)updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse... 0.10
SHADE (159446)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 0.10 SHADE (155160)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 0.10
SHADE (178549)ix.go/ix/invSelectionItem/updateDisplaySections.invitems.\/updateDisplaySections.invitems/update... 0.10 SHADE (157505)#..\/#./performActions/updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functional... 0.10
SHADE (158013)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 0.00 SHADE (157421)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 0.00
SHADE (158879)updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse... 0.00 SHADE (157577)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 0.00
SHADE (152352)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.00 SHADE (159401)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 0.00
SHADE (165493)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.00 SHADE (165498)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.00
SHADE (165445)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.05 SHADE (165546)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.05
SHADE (159456)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 0.05 SHADE (152407)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.05
SHADE (178578)#..\/#./updateSection.tweaklast/updateSection/updateSectionsPositioning.\/updateSectionsPosition... 0.05 SHADE (165513)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 0.05
SHADE (165460)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 0.05 SHADE (158037)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 0.05
SHADE (157227)#..\/#./zoneCreatures/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 0.10 SHADE (159485)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 0.10
SHADE (157590)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 0.10 SHADE (159495)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 0.10
SHADE (161122)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 0.10 SHADE (163151)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 0.10
SHADE (160671)updateSection.listSelectionColorPicture.g/updateSection.listSelectionColorPicture/updateSection.... 0.10 SHADE (157629)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 0.10
dodge.hp
+821907 -175848
View File
File diff suppressed because it is too large Load Diff
dodge.pdf
BIN
View File
Binary file not shown.
src/Dodge/DisplayInventory.hs
+7 -9
View File
@@ -37,7 +37,7 @@ updateCombinePositioning u =
u u
& uvWorld . hud . hudElement . subInventory . ciSections & uvWorld . hud . hudElement . subInventory . ciSections
%~ updateCombineSections (_uvWorld u) (_uvConfig u) %~ updateCombineSections (_uvWorld u) (_uvConfig u)
& checkCombineSelectionExists & uvWorld . hud . hudElement . subInventory %~ checkCombineSelectionExists
updateCombineSections :: updateCombineSections ::
World -> World ->
@@ -96,16 +96,14 @@ checkInventorySelectionExists u =
fromMaybe (1, -1, mempty) $ fromMaybe (1, -1, mempty) $
u ^? uvWorld . hud . hudElement . diSelection . _Just u ^? uvWorld . hud . hudElement . diSelection . _Just
checkCombineSelectionExists :: Universe -> Universe checkCombineSelectionExists :: SubInventory -> SubInventory
checkCombineSelectionExists u = fromMaybe u $ do checkCombineSelectionExists u = fromMaybe u $ do
sss <- u ^? uvWorld . hud . hudElement . subInventory . ciSections sss <- u ^? ciSections
(i, j, _) <- (i, j, _) <- u ^? ciSelection . _Just <|> Just (0, 0, mempty)
u ^? uvWorld . hud . hudElement . subInventory . ciSelection . _Just Just $ case u ^? ciSections . ix i . ssItems . ix j of
<|> Just (0, 0, mempty)
Just $ case u ^? uvWorld . hud . hudElement . subInventory . ciSections . ix i . ssItems . ix j of
Nothing -> Nothing ->
u & uvWorld . hud . hudElement . subInventory . ciSelection ?~ (0, -1, mempty) u & ciSelection ?~ (0, -1, mempty)
& uvWorld . hud . hudElement . subInventory . ciSelection & ciSelection
%~ scrollSelectionSections (-1) sss %~ scrollSelectionSections (-1) sss
_ -> u _ -> u