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

Move towards using item structural function when using items

Browse Source
This commit is contained in:
justin
2024-10-05 20:53:50 +01:00
parent 7c324a03f6
commit 3b54f00cc7
16 changed files with 142 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tags
+46 -45
View File
@@ -930,10 +930,11 @@ ItCrWdWd src/Dodge/Data/WorldEffect.hs 18;" t
ItDropEffect src/Dodge/Data/Item/Effect.hs 31;" t
ItEffect src/Dodge/Data/Item/Effect.hs 12;" t
ItEffect src/Dodge/ItEffect.hs 1;" m
ItID src/Dodge/Data/Item.hs 30;" t
ItID src/Dodge/Data/Item.hs 31;" t
ItInvEffect src/Dodge/Data/Item/Effect.hs 19;" t
ItTargeting src/Dodge/Data/Item.hs 47;" C
ItZoom src/Dodge/Data/Item/Use.hs 181;" t
Item src/Dodge/Data/Item.hs 32;" t
Item src/Dodge/Data/Item.hs 33;" t
Item src/Dodge/Data/Item.hs 4;" m
Item src/Dodge/Default/Item.hs 1;" m
Item src/Dodge/Item.hs 3;" m
@@ -945,6 +946,7 @@ ItemParams src/Dodge/Data/Item/Params.hs 13;" t
ItemParams src/Dodge/Tesla/ItemParams.hs 1;" m
ItemScrollTimeFlow src/Dodge/Data/World.hs 62;" C
ItemStructuralFunction src/Dodge/Data/ComposedItem.hs 28;" t
ItemTargeting src/Dodge/Data/Item.hs 47;" t
ItemType src/Dodge/Data/Item/Combine.hs 15;" t
ItemUse src/Dodge/Data/Item/Use.hs 35;" t
ItmInt src/Dodge/Data/Item/Location.hs 24;" t
@@ -2009,7 +2011,6 @@ UseMvTargetPos src/Dodge/Data/ActionPlan.hs 163;" C
UseScope src/Dodge/Data/Item/Use.hs 60;" C
UseSelf src/Dodge/Data/ActionPlan.hs 157;" C
UseTarget src/Dodge/Data/ActionPlan.hs 154;" C
UseTargeting src/Dodge/Data/Item/Use.hs 61;" C
UsedInLink src/Dodge/Data/Room.hs 61;" C
UsedOutLink src/Dodge/Data/Room.hs 56;" C
Utility src/Dodge/Item/Held/Utility.hs 1;" m
@@ -2609,16 +2610,20 @@ _ipPlacement src/Dodge/Data/GenWorld.hs 134;" f
_ipPlacementID src/Dodge/Data/GenWorld.hs 135;" f
_isLooping src/Sound/Data.hs 19;" f
_ispCloseObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 30;" f
_itAmmoSlots src/Dodge/Data/Item.hs 38;" f
_itCurseStatus src/Dodge/Data/Item.hs 41;" f
_itDimension src/Dodge/Data/Item.hs 40;" f
_itEffect src/Dodge/Data/Item.hs 37;" f
_itID src/Dodge/Data/Item.hs 35;" f
_itInvSize src/Dodge/Data/Item.hs 39;" f
_itLocation src/Dodge/Data/Item.hs 36;" f
_itParams src/Dodge/Data/Item.hs 42;" f
_itType src/Dodge/Data/Item.hs 34;" f
_itUse src/Dodge/Data/Item.hs 33;" f
_itAmmoSlots src/Dodge/Data/Item.hs 40;" f
_itCurseStatus src/Dodge/Data/Item.hs 43;" f
_itDimension src/Dodge/Data/Item.hs 42;" f
_itEffect src/Dodge/Data/Item.hs 38;" f
_itID src/Dodge/Data/Item.hs 36;" f
_itInvSize src/Dodge/Data/Item.hs 41;" f
_itLocation src/Dodge/Data/Item.hs 37;" f
_itParams src/Dodge/Data/Item.hs 44;" f
_itTargeting src/Dodge/Data/Item.hs 39;" f
_itTgActive src/Dodge/Data/Item.hs 50;" f
_itTgID src/Dodge/Data/Item.hs 49;" f
_itTgPos src/Dodge/Data/Item.hs 48;" f
_itType src/Dodge/Data/Item.hs 35;" f
_itUse src/Dodge/Data/Item.hs 34;" f
_itemLocations src/Dodge/Data/LWorld.hs 99;" f
_izFac src/Dodge/Data/Item/Use.hs 184;" f
_izMax src/Dodge/Data/Item/Use.hs 182;" f
@@ -3083,9 +3088,6 @@ _teslaArcs src/Dodge/Data/LWorld.hs 113;" f
_testFloat src/Dodge/Data/World.hs 45;" f
_textInput src/Dodge/Data/Input.hs 30;" f
_textureObject src/Shader/Data.hs 95;" f
_tgActive src/Dodge/Data/Item/Use.hs 64;" f
_tgID src/Dodge/Data/Item/Use.hs 63;" f
_tgPos src/Dodge/Data/Item/Use.hs 62;" f
_tiFocus src/Dodge/Data/Terminal.hs 21;" f
_tiSel src/Dodge/Data/Terminal.hs 22;" f
_tiText src/Dodge/Data/Terminal.hs 20;" f
@@ -3394,7 +3396,7 @@ attachOnward' src/Dodge/Tree/Compose.hs 98;" f
attachTree src/Dodge/Tree/Compose.hs 38;" f
attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 66;" f
attribSize src/Shader/Compile.hs 306;" f
augmentedHUD src/Dodge/Item/Scope.hs 56;" f
augmentedHUD src/Dodge/Item/Scope.hs 58;" f
autoAmr src/Dodge/Item/Held/Rod.hs 51;" f
autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 350;" f
autoCrit src/Dodge/Creature/AutoCrit.hs 13;" f
@@ -3505,10 +3507,10 @@ bufferShaderLayers src/Shader/Bind.hs 36;" f
bulletBeltBracer src/Dodge/Item/Equipment.hs 80;" f
bulletBeltPack src/Dodge/Item/Equipment.hs 72;" f
bulletCombinations src/Dodge/Combine/Graph.hs 34;" f
bulletModule src/Dodge/Item/Scope.hs 44;" f
bulletPayloadModule src/Dodge/Item/Scope.hs 53;" f
bulletModule src/Dodge/Item/Scope.hs 46;" f
bulletPayloadModule src/Dodge/Item/Scope.hs 55;" f
bulletSynthesizer src/Dodge/Item/Ammo.hs 102;" f
bulletTargetingModule src/Dodge/Item/Scope.hs 50;" f
bulletTargetingModule src/Dodge/Item/Scope.hs 52;" f
bulletWeapons src/Dodge/Combine/Combinations.hs 246;" f
burstRifle src/Dodge/Item/Held/Cane.hs 74;" f
buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f
@@ -3527,7 +3529,7 @@ centerVaultRoom src/Dodge/Room/Procedural.hs 288;" f
centroid src/Geometry/Polygon.hs 122;" f
centroidNum src/Geometry/Polygon.hs 125;" f
chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f
chainLinkOrientation src/Dodge/Creature/State.hs 184;" f
chainLinkOrientation src/Dodge/Creature/State.hs 182;" f
chainPairs src/Geometry.hs 363;" f
changeSwapClose src/Dodge/Inventory.hs 149;" f
changeSwapInv src/Dodge/Inventory.hs 165;" f
@@ -3830,7 +3832,7 @@ defaultBangCane src/Dodge/Item/Held/Cane.hs 19;" f
defaultBlock src/Dodge/Default/Block.hs 5;" f
defaultBounds src/Dodge/Data/Bounds.hs 20;" f
defaultBullet src/Dodge/Item/Weapon/Bullet.hs 10;" f
defaultBulletWeapon src/Dodge/Default/Item.hs 47;" f
defaultBulletWeapon src/Dodge/Default/Item.hs 48;" f
defaultButton src/Dodge/Default.hs 51;" f
defaultCOSection src/Dodge/Default/World.hs 204;" f
defaultCWCam src/Dodge/Default/World.hs 65;" f
@@ -3839,9 +3841,9 @@ defaultCWorld src/Dodge/Default/World.hs 80;" f
defaultChaseMvType src/Dodge/Default/Creature.hs 113;" f
defaultClusterStatus src/Dodge/Default/Room.hs 38;" f
defaultConfig src/Dodge/Data/Config.hs 125;" f
defaultConsumable src/Dodge/Default/Item.hs 52;" f
defaultConsumable src/Dodge/Default/Item.hs 53;" f
defaultCorpse src/Dodge/Corpse/Make.hs 29;" f
defaultCraftItem src/Dodge/Default/Item.hs 41;" f
defaultCraftItem src/Dodge/Default/Item.hs 42;" f
defaultCreature src/Dodge/Default/Creature.hs 12;" f
defaultCreatureMemory src/Dodge/Default/Creature.hs 72;" f
defaultCreatureSkin src/Dodge/Default/Creature.hs 66;" f
@@ -3869,13 +3871,13 @@ defaultIntention src/Dodge/Default/Creature.hs 105;" f
defaultInvSection src/Dodge/Default/World.hs 217;" f
defaultInvSections src/Dodge/Default/World.hs 175;" f
defaultInvSize src/Dodge/Default/Creature.hs 79;" f
defaultItEffect src/Dodge/Default/Item.hs 55;" f
defaultItEffect src/Dodge/Default/Item.hs 56;" f
defaultItEffect src/Dodge/Default/Item/Effect.hs 5;" f
defaultItZoom src/Dodge/Default/Item/Use/AimParams.hs 30;" f
defaultItemDimension src/Dodge/Default/Item.hs 17;" f
defaultLS src/Dodge/Default/LightSource.hs 6;" f
defaultLWorld src/Dodge/Default/World.hs 92;" f
defaultLeftItem src/Dodge/Default/Item.hs 38;" f
defaultLeftItem src/Dodge/Default/Item.hs 39;" f
defaultLeftLoadable src/Dodge/Default/Item/Use/Consumption.hs 8;" f
defaultLeftUse src/Dodge/Default/Item/Use.hs 14;" f
defaultListDisplayParams src/Dodge/ListDisplayParams.hs 18;" f
@@ -4040,7 +4042,7 @@ doublePairSet src/Geometry.hs 153;" f
doubleTreeToIndentList src/Dodge/DoubleTree.hs 72;" f
doubleV2 src/Geometry.hs 156;" f
drawAllShadows src/Dodge/Shadows.hs 5;" f
drawAugmentedHUD src/Dodge/Creature/State.hs 209;" f
drawAugmentedHUD src/Dodge/Creature/State.hs 208;" f
drawBaseMachine src/Dodge/Machine/Draw.hs 52;" f
drawBeam src/Dodge/Beam/Draw.hs 6;" f
drawBlip src/Dodge/RadarBlip.hs 13;" f
@@ -4448,7 +4450,7 @@ hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 382;" f
holdForm src/Dodge/Creature/Boid.hs 136;" f
holsterWeapon src/Dodge/Creature/Volition.hs 14;" f
homingDrawType src/Dodge/Projectile/Create.hs 12;" f
homingModule src/Dodge/Item/Scope.hs 41;" f
homingModule src/Dodge/Item/Scope.hs 43;" f
horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f
hotkeyToScancode src/Dodge/Creature/YourControl.hs 54;" f
hotkeyToString src/Dodge/Inventory/SelectionList.hs 50;" f
@@ -4556,7 +4558,7 @@ isAmmoIntLink src/Dodge/HeldUse.hs 203;" f
isAnimate src/Dodge/Creature/Test.hs 138;" f
isCognizant src/Dodge/Creature/Perception.hs 105;" f
isElectrical src/Dodge/Data/Damage.hs 42;" f
isFrictionless src/Dodge/Creature/State.hs 342;" f
isFrictionless src/Dodge/Creature/State.hs 338;" f
isGas src/Dodge/Euse.hs 64;" f
isInLnk src/Dodge/PlacementSpot.hs 160;" f
isJust' src/MaybeHelp.hs 29;" f
@@ -4594,7 +4596,6 @@ itemFromHeldType src/Dodge/Item/Held.hs 25;" f
itemFromLeftType src/Dodge/Item.hs 76;" f
itemInfo src/Dodge/Item/Info.hs 12;" f
itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f
itemInvSideEffect src/Dodge/Creature/State.hs 261;" f
itemNumberDisplay src/Dodge/Item/Display.hs 92;" f
itemRooms src/Dodge/LockAndKey.hs 39;" f
itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f
@@ -4603,7 +4604,7 @@ itemString src/Dodge/Item/Display.hs 38;" f
itemToBreakLists src/Dodge/Item/Grammar.hs 41;" f
itemToFunction src/Dodge/Item/Grammar.hs 67;" f
itemTreeSPic src/Dodge/Item/Draw/SPic.hs 22;" f
itemUpdate src/Dodge/Creature/State.hs 314;" f
itemUpdate src/Dodge/Creature/State.hs 310;" f
itemUseEffect src/Dodge/Creature/Impulse/UseItem.hs 34;" f
iterateUntil src/MonadHelp.hs 23;" f
iterateWhile src/MonadHelp.hs 30;" f
@@ -4802,7 +4803,6 @@ makeStaticBall src/Dodge/WorldEvent/SpawnParticle.hs 22;" f
makeSubmenuOption src/Dodge/Menu/OptionType.hs 19;" f
makeSwitch src/Dodge/LevelGen/Switch.hs 52;" f
makeSwitchSPic src/Dodge/LevelGen/Switch.hs 40;" f
makeTargetLaser src/Dodge/Creature/State.hs 214;" f
makeTermLine src/Dodge/Terminal.hs 118;" f
makeTermPara src/Dodge/Terminal.hs 121;" f
makeTeslaArc src/Dodge/Tesla/Arc.hs 57;" f
@@ -5347,7 +5347,7 @@ reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 428;" f
reloadLevelStart src/Dodge/Save.hs 71;" f
reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 426;" f
rememberSounds src/Dodge/Creature/Perception.hs 177;" f
remoteScreen src/Dodge/Item/Scope.hs 59;" f
remoteScreen src/Dodge/Item/Scope.hs 61;" f
remoteShellShape src/Dodge/Projectile/Draw.hs 42;" f
removeAmmoFromMag src/Dodge/HeldUse.hs 305;" f
removeDot src/ShortShow.hs 30;" f
@@ -5556,7 +5556,7 @@ setOldPos src/Dodge/Update.hs 349;" f
setOutLinks src/Dodge/RoomLink.hs 48;" f
setOutLinksByType src/Dodge/RoomLink.hs 57;" f
setOutLinksPD src/Dodge/RoomLink.hs 77;" f
setRBCreatureTargeting src/Dodge/Creature/State.hs 293;" f
setRBCreatureTargeting src/Dodge/Creature/State.hs 289;" f
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 121;" f
setShaderSource src/Shader/Compile.hs 290;" f
setShadowLimits src/Dodge/Shadows.hs 11;" f
@@ -5620,7 +5620,8 @@ shiftRoomBy src/Dodge/Room/Link.hs 37;" f
shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f
shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f
shiftedGrid src/Grid.hs 25;" f
shineTorch src/Dodge/Creature/State.hs 243;" f
shineTargetLaser src/Dodge/Creature/State.hs 213;" f
shineTorch src/Dodge/Creature/State.hs 244;" f
shootBullet src/Dodge/HeldUse.hs 363;" f
shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f
shootL src/Dodge/Item/Weapon/TriggerType.hs 165;" f
@@ -5663,7 +5664,7 @@ simplePCI src/Dodge/Item/Grammar.hs 83;" f
simpleTermMessage src/Dodge/Terminal.hs 249;" f
sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 486;" f
sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 340;" f
singleAmmo src/Dodge/Default/Item.hs 44;" f
singleAmmo src/Dodge/Default/Item.hs 45;" f
singleBlock src/Dodge/Placement/Instance/Wall.hs 30;" f
singleDT src/Dodge/DoubleTree.hs 9;" f
singleLDT src/Dodge/DoubleTree.hs 12;" f
@@ -5757,7 +5758,7 @@ ssfold src/FoldableHelp.hs 105;" f
stackPicturesAt src/Dodge/Render/List.hs 81;" f
stackPicturesAtOff src/Dodge/Render/List.hs 84;" f
stackText src/Picture/Base.hs 188;" f
stackedInventory src/Dodge/Creature.hs 281;" f
stackedInventory src/Dodge/Creature.hs 282;" f
startCr src/Dodge/Creature.hs 91;" f
startCrafts src/Dodge/Room/Start.hs 102;" f
startInvList src/Dodge/Creature.hs 109;" f
@@ -5839,7 +5840,7 @@ teslaGunPic src/Dodge/Item/Draw/SPic.hs 348;" f
teslaParams src/Dodge/Tesla/ItemParams.hs 6;" f
testCrossWalls src/Dodge/Room/Path.hs 47;" f
testEvent src/Dodge/Event/Test.hs 10;" f
testInventory src/Dodge/Creature.hs 257;" f
testInventory src/Dodge/Creature.hs 258;" f
testPic src/Dodge/Render/ShapePicture.hs 145;" f
testStringInit src/Dodge/TestString.hs 22;" f
text src/Picture/Base.hs 193;" f
@@ -6010,8 +6011,8 @@ upHammer src/Dodge/Default.hs 77;" f
upProjectile src/Dodge/Projectile/Update.hs 25;" f
updateAllNodes src/TreeHelp.hs 85;" f
updateArc src/Dodge/Tesla/Arc.hs 86;" f
updateAttachedItems src/Dodge/Creature/State.hs 174;" f
updateAutoRecharge src/Dodge/Creature/State.hs 325;" f
updateAttachedItems src/Dodge/Creature/State.hs 172;" f
updateAutoRecharge src/Dodge/Creature/State.hs 321;" f
updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 159;" f
updateBarrel src/Dodge/Barreloid.hs 45;" f
updateBarreloid src/Dodge/Barreloid.hs 13;" f
@@ -6044,7 +6045,7 @@ updateFlames src/Dodge/Update.hs 438;" f
updateFlare src/Dodge/Flare.hs 7;" f
updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f
updateGusts src/Dodge/Update.hs 590;" f
updateHeldRootItem src/Dodge/Creature/State.hs 168;" f
updateHeldRootItem src/Dodge/Creature/State.hs 166;" f
updateHumanoid src/Dodge/Humanoid.hs 12;" f
updateIMl src/Dodge/Update.hs 385;" f
updateIMl' src/Dodge/Update.hs 389;" f
@@ -6054,8 +6055,8 @@ updateInstantBullets src/Dodge/Update.hs 530;" f
updateInv src/Dodge/Creature/State.hs 151;" f
updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f
updateInventorySectionItems src/Dodge/DisplayInventory.hs 143;" f
updateItemTargeting src/Dodge/Creature/State.hs 268;" f
updateItemWithOrientation src/Dodge/Creature/State.hs 195;" f
updateItemTargeting src/Dodge/Creature/State.hs 264;" f
updateItemWithOrientation src/Dodge/Creature/State.hs 193;" f
updateKeyInGame src/Dodge/Update/Input/InGame.hs 102;" f
updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 91;" f
updateLampoid src/Dodge/Lampoid.hs 12;" f
@@ -6066,7 +6067,7 @@ updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f
updateLongPressInGame src/Dodge/Update/Input/InGame.hs 128;" f
updateMIM src/Dodge/Update.hs 543;" f
updateMachine src/Dodge/Machine/Update.hs 16;" f
updateMovement src/Dodge/Creature/State.hs 332;" f
updateMovement src/Dodge/Creature/State.hs 328;" f
updateObjCatMaybes src/Dodge/Update.hs 405;" f
updateObjMapMaybe src/Dodge/Update.hs 398;" f
updatePastWorlds src/Dodge/Update.hs 303;" f
@@ -6161,7 +6162,7 @@ useStopWatch src/Dodge/Luse.hs 24;" f
useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 127;" f
useTimeScrollGun src/Dodge/Luse.hs 32;" f
useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f
useUpdate src/Dodge/Creature/State.hs 317;" f
useUpdate src/Dodge/Creature/State.hs 313;" f
usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 196;" f
usedRoomLinkPoss src/Dodge/PlacementSpot.hs 203;" f
v2z src/Geometry/Vector3D.hs 93;" f