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

Commit before trying to deal with leak in main inventory display

Browse Source
This commit is contained in:
justin
2025-01-04 12:58:36 +00:00
parent 3b452b9002
commit 89eed0d059
11 changed files with 180155 additions and 504877 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 39.96 X_RANGE 12.02
Y_RANGE 90187200.00 Y_RANGE 39952416.00
ORDER OTHER 1 ORDER OTHER 1
ORDER (156395)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/updateExpBarrel/updateBarreloid/updateCrea... 2 ORDER (157382)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 2
ORDER (140933)updateDisplaySections.invitems'/updateDisplaySections/#..\/#./updateInventoryPositioning/updateW... 3 ORDER (160588)zoneCloud/#..\/#./zoneClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 3
ORDER (173853)updateDisplaySections.invitems'.\/updateDisplaySections.invitems'/updateDisplaySections/#..\/#./... 4 ORDER (157538)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 4
ORDER (148935)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 5 ORDER (159377)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 5
ORDER (155817)updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/update... 6 ORDER (155119)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 6
ORDER (154933)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 7 ORDER (159446)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 7
ORDER (154052)ix/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/th... 8 ORDER (178549)ix.go/ix/invSelectionItem/updateDisplaySections.invitems.\/updateDisplaySections.invitems/update... 8
ORDER (148615)generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/startNewGameInSl... 9 ORDER (158013)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 9
ORDER (156459)#..\/#./colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRende... 10 ORDER (158879)updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse... 10
ORDER (157430)zoneCloud/zoneClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 11 ORDER (152352)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 11
ORDER (162282)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./f... 12 ORDER (165493)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 12
ORDER (140830)#..\/#./updateInventoryPositioning/updateWorldEventFlags/updateUniverseLast/updateUniverse/updat... 13 ORDER (165445)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 13
ORDER (154478)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 14 ORDER (159456)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 14
ORDER (140911)updateSection.shownitems/updateSection/updateSectionsPositioning.ss/updateSectionsPositioning/#.... 15 ORDER (178578)#..\/#./updateSection.tweaklast/updateSection/updateSectionsPositioning.\/updateSectionsPosition... 15
ORDER (153983)#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/theUp... 16 ORDER (165460)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 16
ORDER (160542)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/ti... 17 ORDER (157227)#..\/#./zoneCreatures/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 17
ORDER (153999)zoneCreatures/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 18 ORDER (157590)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 18
ORDER (159838)listSelectionColorPicture.f.g/listSelectionColorPicture.f/listSelectionColorPicture/updateSectio... 19 ORDER (161122)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 19
ORDER (159837)updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSection/updateSectionsPo... 20 ORDER (160671)updateSection.listSelectionColorPicture.g/updateSection.listSelectionColorPicture/updateSection.... 20
SHADE OTHER 0.00 SHADE OTHER 0.00
SHADE (156395)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/updateExpBarrel/updateBarreloid/updateCrea... 0.00 SHADE (157382)updateHumanoid/updateCreature/dimap/dimap/_Wrapped'/updateIMl'/functionalUpdate/timeFlowUpdate/u... 0.00
SHADE (140933)updateDisplaySections.invitems'/updateDisplaySections/#..\/#./updateInventoryPositioning/updateW... 0.00 SHADE (160588)zoneCloud/#..\/#./zoneClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 0.00
SHADE (173853)updateDisplaySections.invitems'.\/updateDisplaySections.invitems'/updateDisplaySections/#..\/#./... 0.00 SHADE (157538)chaseCritAwarenessUpdate/chaseCritPerceptionUpdate/chainCreatureUpdates.unf/chainCreatureUpdates... 0.00
SHADE (148935)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.10 SHADE (159377)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/#..\/#./updateExpBarrel/updateBarreloid/up... 0.10
SHADE (155817)updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/update... 0.10 SHADE (155119)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 0.10
SHADE (154933)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 0.10 SHADE (159446)ix/crCrSpring/crSpring/simpleCrSprings/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateU... 0.10
SHADE (154052)ix/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/th... 0.10 SHADE (178549)ix.go/ix/invSelectionItem/updateDisplaySections.invitems.\/updateDisplaySections.invitems/update... 0.10
SHADE (148615)generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/startNewGameInSl... 0.00 SHADE (158013)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 0.00
SHADE (156459)#..\/#./colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRende... 0.00 SHADE (158879)updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse... 0.00
SHADE (157430)zoneCloud/zoneClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 0.00 SHADE (152352)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.00
SHADE (162282)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./f... 0.00 SHADE (165493)updateCloud.finalPos/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.00
SHADE (140830)#..\/#./updateInventoryPositioning/updateWorldEventFlags/updateUniverseLast/updateUniverse/updat... 0.05 SHADE (165445)updateCloud.finalVel/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functi... 0.05
SHADE (154478)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 0.05 SHADE (159456)colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/t... 0.05
SHADE (140911)updateSection.shownitems/updateSection/updateSectionsPositioning.ss/updateSectionsPositioning/#.... 0.05 SHADE (178578)#..\/#./updateSection.tweaklast/updateSection/updateSectionsPositioning.\/updateSectionsPosition... 0.05
SHADE (153983)#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/theUp... 0.05 SHADE (165460)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functiona... 0.05
SHADE (160542)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/ti... 0.10 SHADE (157227)#..\/#./zoneCreatures/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 0.10
SHADE (153999)zoneCreatures/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 0.10 SHADE (157590)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 0.10
SHADE (159838)listSelectionColorPicture.f.g/listSelectionColorPicture.f/listSelectionColorPicture/updateSectio... 0.10 SHADE (161122)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/functionalUpdate/timeFlowUp... 0.10
SHADE (159837)updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSection/updateSectionsPo... 0.10 SHADE (160671)updateSection.listSelectionColorPicture.g/updateSection.listSelectionColorPicture/updateSection.... 0.10
dodge.hp
+179638 -504402
View File
File diff suppressed because it is too large Load Diff
dodge.pdf
BIN
View File
Binary file not shown.
src/Dodge/Data/Item/Combine.hs
+3
View File
@@ -25,6 +25,9 @@ data ItemType
| MAPPER | MAPPER
| DROPPER InventoryPathing | DROPPER InventoryPathing
| CLICKER InventoryPathing | CLICKER InventoryPathing
| COPIER InventoryPathing
| UGATE
| BGATE
| INTROSCAN {_ibtIntroScanType :: IntroScanType} | INTROSCAN {_ibtIntroScanType :: IntroScanType}
| DETECTOR {_ibtDetector :: Detector} | DETECTOR {_ibtDetector :: Detector}
| ARHUD | ARHUD
src/Dodge/DisplayInventory.hs
+15 -17
View File
@@ -2,9 +2,9 @@
--{-# LANGUAGE TupleSections #-} --{-# LANGUAGE TupleSections #-}
module Dodge.DisplayInventory ( module Dodge.DisplayInventory (
toggleCombineInv,
updateInventoryPositioning, updateInventoryPositioning,
updateCombinePositioning, updateCombinePositioning,
toggleCombineInv,
) where ) where
import Control.Applicative import Control.Applicative
@@ -32,12 +32,6 @@ import Dodge.SelectionSections
import qualified ListHelp as List import qualified ListHelp as List
import Picture.Base import Picture.Base
toggleCombineInv :: Universe -> Universe
toggleCombineInv uv =
uv & case uv ^? uvWorld . hud . hudElement . subInventory of
Just CombineInventory{} -> uvWorld . hud . hudElement . subInventory .~ NoSubInventory
_ -> uvWorld %~ enterCombineInv (uv ^. uvConfig)
updateCombinePositioning :: Universe -> Universe updateCombinePositioning :: Universe -> Universe
updateCombinePositioning u = updateCombinePositioning u =
u u
@@ -341,16 +335,23 @@ updateSection indent mcsel sis availablelines oldoffset =
.~ color moredowncolor (text . replicate 15 $ toEnum 31) .~ color moredowncolor (text . replicate 15 $ toEnum 31)
| otherwise = id | otherwise = id
moredowncolor = fromMaybe white $ allstrings ^? ix (offset + availablelines - 1) . _1 moredowncolor = fromMaybe white $ allstrings ^? ix (offset + availablelines - 1) . _1
allstrings = listSelectionColorPicture sis allstrings = foldMap listSelectionColorPicture sis
shownstrings = drop offset allstrings shownstrings = drop offset allstrings
listSelectionColorPicture :: Foldable t => t (SelectionItem a) -> [(Color, Picture)] listSelectionColorPicture :: SelectionItem a -> [(Color, Picture)]
listSelectionColorPicture = foldMap f listSelectionColorPicture si = g <$> _siPictures si
where where
f si = map g (_siPictures si) g str = (_siColor si, translate lindent 0 . color (_siColor si) $ text str)
where lindent = 100 * fromIntegral (_siOffX si)
indent = 100 * fromIntegral (_siOffX si)
g str = (_siColor si, translate indent 0 . color (_siColor si) $ text str) regexList :: String -> [String] -> Bool
regexList x = any (List.isInfixOf x)
toggleCombineInv :: Universe -> Universe
toggleCombineInv uv =
uv & case uv ^? uvWorld . hud . hudElement . subInventory of
Just CombineInventory{} -> uvWorld . hud . hudElement . subInventory .~ NoSubInventory
_ -> uvWorld %~ enterCombineInv (uv ^. uvConfig)
enterCombineInv :: Configuration -> World -> World enterCombineInv :: Configuration -> World -> World
enterCombineInv cfig w = enterCombineInv cfig w =
@@ -387,6 +388,3 @@ enterCombineInv cfig w =
availablelines availablelines
0 0
availablelines = getAvailableListLines secondColumnParams cfig availablelines = getAvailableListLines secondColumnParams cfig
regexList :: String -> [String] -> Bool
regexList x = any (List.isInfixOf x)
src/Dodge/Item.hs
+3
View File
@@ -32,6 +32,9 @@ itemFromBase = \case
ARHUD -> arHUD ARHUD -> arHUD
DROPPER x -> dropper x DROPPER x -> dropper x
CLICKER x -> clicker x CLICKER x -> clicker x
COPIER x -> copier x
BGATE -> bgate
UGATE -> ugate
itemFromAmmoMag :: AmmoMagType -> Item itemFromAmmoMag :: AmmoMagType -> Item
itemFromAmmoMag at = case at of itemFromAmmoMag at = case at of
src/Dodge/Item/Display.hs
+3
View File
@@ -73,6 +73,9 @@ itemBaseName = \case
ARHUD -> "AR-HUD" ARHUD -> "AR-HUD"
DROPPER x -> "DROPPER-" ++ showInventoryPathing x DROPPER x -> "DROPPER-" ++ showInventoryPathing x
CLICKER x -> "CLICKER-" ++ showInventoryPathing x CLICKER x -> "CLICKER-" ++ showInventoryPathing x
COPIER x -> "COPIER-" ++ showInventoryPathing x
BGATE -> "BGATE"
UGATE -> "UGATE"
showInventoryPathing :: InventoryPathing -> String showInventoryPathing :: InventoryPathing -> String
showInventoryPathing = \case showInventoryPathing = \case
src/Dodge/Item/Draw/SPic.hs
+3
View File
@@ -48,6 +48,9 @@ itemSPic it = case it ^. itType of
DETECTOR dt -> noPic (colorSH (detectorColor dt) $ upperPrismPolySU 3 $ rectWH 2 2) DETECTOR dt -> noPic (colorSH (detectorColor dt) $ upperPrismPolySU 3 $ rectWH 2 2)
DROPPER{} -> defSPic DROPPER{} -> defSPic
CLICKER{} -> defSPic CLICKER{} -> defSPic
COPIER{} -> defSPic
BGATE -> defSPic
UGATE -> defSPic
craftItemSPic :: CraftType -> Shape craftItemSPic :: CraftType -> Shape
craftItemSPic = \case craftItemSPic = \case
src/Dodge/Item/Scope.hs
+21
View File
@@ -19,6 +19,9 @@ module Dodge.Item.Scope (
mapper, mapper,
dropper, dropper,
clicker, clicker,
copier,
bgate,
ugate,
) where ) where
import Dodge.Item.Attach import Dodge.Item.Attach
@@ -81,6 +84,24 @@ clicker x =
& itType .~ CLICKER x & itType .~ CLICKER x
& itUse .~ UseInt 0 & itUse .~ UseInt 0
copier :: InventoryPathing -> Item
copier x =
defaultHeldItem
& itType .~ COPIER x
& itUse .~ UseInt 0
bgate :: Item
bgate =
defaultHeldItem
& itType .~ BGATE
& itUse .~ UseInt 0
ugate :: Item
ugate =
defaultHeldItem
& itType .~ UGATE
& itUse .~ UseInt 0
bulletModule :: BulletMod -> Item bulletModule :: BulletMod -> Item
bulletModule bm = bulletModule bm =
defaultHeldItem defaultHeldItem
src/Dodge/Update/Input/InGame.hs
+2 -1
View File
@@ -5,7 +5,6 @@ module Dodge.Update.Input.InGame (
updateMouseInGame, updateMouseInGame,
) where ) where
import Dodge.SelectedClose
import Control.Applicative import Control.Applicative
import Control.Monad import Control.Monad
import Data.Foldable import Data.Foldable
@@ -27,6 +26,7 @@ import Dodge.Item.InvSize
import Dodge.ListDisplayParams import Dodge.ListDisplayParams
import Dodge.Menu import Dodge.Menu
import Dodge.Save import Dodge.Save
import Dodge.SelectedClose
import Dodge.SelectionSections import Dodge.SelectionSections
import Dodge.SoundLogic import Dodge.SoundLogic
import Dodge.Terminal import Dodge.Terminal
@@ -445,6 +445,7 @@ updateInitialPressInGame uv sc = case sc of
ScancodeBackspace -> uv & uvWorld %~ updateBackspaceRegex ScancodeBackspace -> uv & uvWorld %~ updateBackspaceRegex
_ -> uv _ -> uv
updateLongPressInGame :: Universe -> Scancode -> Universe updateLongPressInGame :: Universe -> Scancode -> Universe
updateLongPressInGame uv sc = case sc of updateLongPressInGame uv sc = case sc of
ScancodeF -> over uvWorld youDropItem uv ScancodeF -> over uvWorld youDropItem uv
tags
+427 -417
View File
File diff suppressed because it is too large Load Diff