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

Make weapon fail sound distinct

Browse Source
This commit is contained in:
justin
2024-10-08 20:55:59 +01:00
parent d1ee0f997a
commit e745238b8f
8 changed files with 504364 additions and 335770 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 24.74
Y_RANGE 50384824.00
X_RANGE 39.96
Y_RANGE 90187200.00
ORDER OTHER 1
ORDER (153007)fastInsEdge.addS'/fastInsEdge.g1/fastInsEdge/addEdges.f/addEdges/pairsToGraph/generateLevelFromR... 2
ORDER (69921)PINNED 3
ORDER (155902)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 4
ORDER (147714)#..\/#./itemCombinations/CAF:n28_roGVR 5
ORDER (158618)ix/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/th... 6
ORDER (160173)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/updateExpBarrel/updateBarreloid/updateCrea... 7
ORDER (160911)ix/clearTargeting/updateTargeting/invSideEff/stateUpdate/defaultImpulsive/updateHumanoid/updateC... 8
ORDER (159585)updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/update... 9
ORDER (153010)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 10
ORDER (162537)zoneCloud/zoneClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 11
ORDER (152690)generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/startNewGameInSl... 12
ORDER (160250)#..\/#./colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRende... 13
ORDER (166078)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./f... 14
ORDER (158550)#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/theUp... 15
ORDER (158734)setOldPos/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderS... 16
ORDER (164223)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/ti... 17
ORDER (158568)zoneCreatures/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 18
ORDER (164235)drawText.f/drawText/updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSect... 19
ORDER (164228)updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSection/updateSectionsPo... 20
ORDER (156395)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/updateExpBarrel/updateBarreloid/updateCrea... 2
ORDER (140933)updateDisplaySections.invitems'/updateDisplaySections/#..\/#./updateInventoryPositioning/updateW... 3
ORDER (173853)updateDisplaySections.invitems'.\/updateDisplaySections.invitems'/updateDisplaySections/#..\/#./... 4
ORDER (148935)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 5
ORDER (155817)updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/update... 6
ORDER (154933)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 7
ORDER (154052)ix/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/th... 8
ORDER (148615)generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/startNewGameInSl... 9
ORDER (156459)#..\/#./colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRende... 10
ORDER (157430)zoneCloud/zoneClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 11
ORDER (162282)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./f... 12
ORDER (140830)#..\/#./updateInventoryPositioning/updateWorldEventFlags/updateUniverseLast/updateUniverse/updat... 13
ORDER (154478)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 14
ORDER (140911)updateSection.shownitems/updateSection/updateSectionsPositioning.ss/updateSectionsPositioning/#.... 15
ORDER (153983)#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/theUp... 16
ORDER (160542)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/ti... 17
ORDER (153999)zoneCreatures/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 18
ORDER (159838)listSelectionColorPicture.f.g/listSelectionColorPicture.f/listSelectionColorPicture/updateSectio... 19
ORDER (159837)updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSection/updateSectionsPo... 20
SHADE OTHER 0.00
SHADE (153007)fastInsEdge.addS'/fastInsEdge.g1/fastInsEdge/addEdges.f/addEdges/pairsToGraph/generateLevelFromR... 0.00
SHADE (69921)PINNED 0.00
SHADE (155902)plLineBlock.makePane/plLineBlock.makeWallAt/plLineBlock.insertBlock/plLineBlock.insertBlocks/plL... 0.00
SHADE (147714)#..\/#./itemCombinations/CAF:n28_roGVR 0.10
SHADE (158618)ix/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/th... 0.10
SHADE (160173)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/updateExpBarrel/updateBarreloid/updateCrea... 0.10
SHADE (160911)ix/clearTargeting/updateTargeting/invSideEff/stateUpdate/defaultImpulsive/updateHumanoid/updateC... 0.10
SHADE (159585)updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/update... 0.00
SHADE (153010)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.00
SHADE (162537)zoneCloud/zoneClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 0.00
SHADE (152690)generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/startNewGameInSl... 0.00
SHADE (160250)#..\/#./colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRende... 0.05
SHADE (166078)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./f... 0.05
SHADE (158550)#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/theUp... 0.05
SHADE (158734)setOldPos/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderS... 0.05
SHADE (164223)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/ti... 0.10
SHADE (158568)zoneCreatures/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 0.10
SHADE (164235)drawText.f/drawText/updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSect... 0.10
SHADE (164228)updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSection/updateSectionsPo... 0.10
SHADE (156395)updateExpBarrel.applyFuseDamage/updateExpBarrel.newCr/updateExpBarrel/updateBarreloid/updateCrea... 0.00
SHADE (140933)updateDisplaySections.invitems'/updateDisplaySections/#..\/#./updateInventoryPositioning/updateW... 0.00
SHADE (173853)updateDisplaySections.invitems'.\/updateDisplaySections.invitems'/updateDisplaySections/#..\/#./... 0.00
SHADE (148935)zonePe.f/zonePe/generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/... 0.10
SHADE (155817)updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/update... 0.10
SHADE (154933)ix/updateInv/foldCr.f/foldCr/crUpdate/defaultImpulsive/updateHumanoid/updateCreature/dimap/dimap... 0.10
SHADE (154052)ix/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/th... 0.10
SHADE (148615)generateLevelFromRoomList/generateWorldFromSeed/startSeedGameConc/startSeedGame/startNewGameInSl... 0.00
SHADE (156459)#..\/#./colCrsWalls/functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRende... 0.00
SHADE (157430)zoneCloud/zoneClouds/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/up... 0.00
SHADE (162282)updateCloud.(...)/updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./f... 0.00
SHADE (140830)#..\/#./updateInventoryPositioning/updateWorldEventFlags/updateUniverseLast/updateUniverse/updat... 0.05
SHADE (154478)ix/updateInv/foldCr.f/foldCr/crUpdate/humanoidAIList/updateHumanoid/updateCreature/dimap/dimap/_... 0.05
SHADE (140911)updateSection.shownitems/updateSection/updateSectionsPositioning.ss/updateSectionsPositioning/#.... 0.05
SHADE (153983)#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRenderSplit/theUp... 0.05
SHADE (160542)updateCloud/updateObjCatMaybes.(...)/updateObjCatMaybes/updateClouds/#..\/#./functionalUpdate/ti... 0.10
SHADE (153999)zoneCreatures/#..\/#./functionalUpdate/timeFlowUpdate/updateUniverseMid/updateUniverse/updateRen... 0.10
SHADE (159838)listSelectionColorPicture.f.g/listSelectionColorPicture.f/listSelectionColorPicture/updateSectio... 0.10
SHADE (159837)updateSection.h/updateSection.tweakfirst/updateSection.shownitems/updateSection/updateSectionsPo... 0.10
dodge.hp
+504306 -335723
View File
File diff suppressed because it is too large Load Diff
dodge.pdf
BIN
View File
Binary file not shown.
ghcidOutput
+14 -1
View File
@@ -1 +1,14 @@
All good (597 modules, at 17:30:07)
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:70:31-47: error:
• Data constructor not in scope:
CrWeaponFailSound :: Int -> SoundOrigin
• Perhaps you meant ‘CrWeaponSound’ (imported from Dodge.Data.World)
|
70 | Just 0 -> soundStart (CrWeaponFailSound (_crID cr)) (_crPos cr) click1S Nothing w
| ^^^^^^^^^^^^^^^^^
/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:71:29-45: error:
• Data constructor not in scope:
CrWeaponFailSound :: Int -> SoundOrigin
• Perhaps you meant ‘CrWeaponSound’ (imported from Dodge.Data.World)
|
71 | _ -> soundContinue (CrWeaponFailSound (_crID cr)) (_crPos cr) click1S Nothing w
| ^^^^^^^^^^^^^^^^^
src/Dodge/Data/SoundOrigin.hs
+1
View File
@@ -16,6 +16,7 @@ data SoundOrigin
| CrSound Int
| CrMouth Int
| CrWeaponSound Int Int
| CrWeaponFailSound Int
| MachineSound Int
| MachineAltSound Int
| TerminalSound
src/Dodge/HeldUse.hs
+2 -2
View File
@@ -67,8 +67,8 @@ applyCME itm cr cme
where
spush = fromMaybe 0 $ itm ^? itUse . heldParams . sidePush
failsound w = case w ^? input . mouseButtons . ix SDL.ButtonLeft of
Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w
_ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w
Just 0 -> soundStart (CrWeaponFailSound (_crID cr)) (_crPos cr) click1S Nothing w
_ -> soundContinue (CrWeaponFailSound (_crID cr)) (_crPos cr) click1S Nothing w
applyInvLock :: Item -> Creature -> World -> World
applyInvLock itm cr = case itm ^? itUse . heldParams . weaponInvLock of
src/Dodge/Item/Display.hs
-3
View File
@@ -60,7 +60,6 @@ itemBaseName itm = case _itType itm of
showAttachItem :: AttachType -> Item -> String
showAttachItem t itm = case t of
ZOOMSCOPE -> "ZOOMSCOPE"
-- TARGETATTACH x -> show x
BULLETSYNTHESIZER -> "BSYNTH"
REMOTESCREEN -> "REMOTE SCREEN " ++ show (itm ^? itUse . uaParams . apLinkedProjectile . _Just)
HOMINGMODULE -> "HOMING MOD"
@@ -94,8 +93,6 @@ showAutoRechargeProgress lc = case lc of
itemNumberDisplay :: Creature -> ComposedItem -> [String]
itemNumberDisplay cr ci = case (ci ^. cItemFunction,iu) of
-- UseTargeting {_tgPos = mp} -> [maybe "" shortShow mp]
-- this could be cleaner here...
(WeaponTargetingSF,_) -> [maybe "" (const "!TARG!") (itm ^? itTargeting . itTgPos . _Just)]
(_,UseHeld{}) -> []
(_,UseHotkey{}) -> [showAutoRechargeProgress (_leftConsumption iu)]
src/Dodge/Item/Grammar.hs
+1 -1
View File
@@ -103,7 +103,7 @@ llleft itm pci = _tryLeftLink (uncurry useBreakL $ itemToBreakLists (CItem itm W
llright :: Item -> PartiallyComposedItem -> Maybe LinkUpdate
llright itm pci = case pci ^. _1 . itType of
CRAFT TRANSFORMER -> Just (toLasgunUpdate itm)
_ -> _tryRightLink (uncurry useBreakL $ itemToBreakLists (CItem itm WeaponPlatformSF)) pci
_ -> _tryRightLink (uncurry useBreakL $ itemToBreakLists (CItem itm WeaponTargetingSF)) pci
toLasgunUpdate :: Item -> LinkUpdate
toLasgunUpdate itm = LUpdate (ILink FunctionChangeLink orientAttachment)