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

Mid implementation of external ammo sources

Browse Source
This commit is contained in:
justin
2024-06-20 22:58:52 +01:00
parent 7162893c4f
commit d41604fcde
16 changed files with 313 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tags
+63 -64
View File
@@ -198,9 +198,7 @@ BULLETBELT src/Dodge/Data/Item/Combine.hs 112;" C
BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 139;" C
BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 138;" C
BULPAY src/Dodge/Data/Item/Combine.hs 208;" C
BULPAYLOADATTACH src/Dodge/Data/Item/Combine.hs 101;" C
BULTRAJ src/Dodge/Data/Item/Combine.hs 210;" C
BULTRAJECTORYATTACH src/Dodge/Data/Item/Combine.hs 102;" C
BURSTRIFLE src/Dodge/Combine/Data.hs 152;" C
BURSTRIFLE src/Dodge/Data/Item/Combine.hs 173;" C
BackgroundSound src/Dodge/Data/SoundOrigin.hs 14;" C
@@ -2992,6 +2990,7 @@ _amString src/Dodge/Data/Item/Use/Consumption/Ammo.hs 47;" f
_amString src/Dodge/Data/Item/Use/Consumption/Ammo.hs 52;" f
_amString src/Dodge/Data/Item/Use/Consumption/Ammo.hs 56;" f
_ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f
_ammoAttachParams src/Dodge/Data/Item/Use.hs 61;" f
_amposDir src/Dodge/Item/AmmoPosition.hs 9;" f
_amposPos src/Dodge/Item/AmmoPosition.hs 9;" f
_apAction src/Dodge/Data/ActionPlan.hs 20;" f
@@ -4396,7 +4395,7 @@ advanceScrollAmount src/Dodge/Update.hs 297;" f
advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f
advanceStepCounter src/Dodge/Creature/Action/Movement.hs 56;" f
advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f
afterRecoil src/Dodge/Item/Weapon/TriggerType.hs 293;" f
afterRecoil src/Dodge/Item/Weapon/TriggerType.hs 299;" f
aimDelaySweep src/Dodge/Render/ShapePicture.hs 44;" f
aimStanceInfo src/Dodge/Item/Info.hs 231;" f
aimTurn src/Dodge/Creature/YourControl.hs 188;" f
@@ -4493,7 +4492,7 @@ attachList' src/Dodge/Tree/Compose.hs 80;" f
attachOnward src/Dodge/Tree/Compose.hs 95;" f
attachOnward' src/Dodge/Tree/Compose.hs 98;" f
attachTree src/Dodge/Tree/Compose.hs 38;" f
attachmentTree src/Dodge/Base/You.hs 40;" f
attachmentTree src/Dodge/Base/You.hs 39;" f
attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 67;" f
attribSize src/Shader/Compile.hs 352;" f
autoAmr src/Dodge/Item/Held/Rod.hs 59;" f
@@ -4574,12 +4573,12 @@ batteryGuns src/Dodge/Combine/Combinations.hs 220;" f
batteryModules src/Dodge/Item/Held/BatteryGuns.hs 122;" f
batteryPack src/Dodge/Item/Equipment.hs 58;" f
belowNumX src/Dodge/Combine/Graph.hs 78;" f
beltMag src/Dodge/Item/Ammo.hs 14;" f
beltMag src/Dodge/Item/Ammo.hs 23;" f
bezierGun src/Dodge/Item/Weapon/Bezier.hs 24;" f
bfsNodePoints src/Dodge/Path.hs 58;" f
bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 233;" f
bindFBO src/Render.hs 244;" f
blCheck src/Dodge/Item/Weapon/TriggerType.hs 397;" f
blCheck src/Dodge/Item/Weapon/TriggerType.hs 403;" f
black src/Color.hs 27;" f
blank src/Picture/Base.hs 59;" f
blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f
@@ -5400,17 +5399,17 @@ dropByState src/Dodge/Creature/State.hs 155;" f
dropExcept src/Dodge/Creature/Action.hs 178;" f
dropItem src/Dodge/Creature/Action.hs 183;" f
dropItemKey src/Dodge/Config/KeyConfig.hs 24;" f
drumMag src/Dodge/Item/Ammo.hs 11;" f
drumMag src/Dodge/Item/Ammo.hs 19;" f
dualBeam src/Dodge/Item/Held/BatteryGuns.hs 148;" f
dualBeamPic src/Dodge/Item/Draw/SPic.hs 451;" f
dualRayAt src/Dodge/Item/Weapon/BatteryGuns.hs 194;" f
dummyMenuOption src/Dodge/Menu/Option.hs 81;" f
duplicateItem src/Dodge/Item/Weapon/TriggerType.hs 718;" f
duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 674;" f
duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 694;" f
duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 680;" f
duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 699;" f
duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 723;" f
duplicateItem src/Dodge/Item/Weapon/TriggerType.hs 724;" f
duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 680;" f
duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 700;" f
duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 686;" f
duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 705;" f
duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 729;" f
ebFlicker src/Dodge/EnergyBall.hs 94;" f
edgeFormatting src/Dodge/Combine/Graph.hs 120;" f
edgeToPic src/Dodge/Debug/Picture.hs 392;" f
@@ -5686,7 +5685,7 @@ hackOutline src/Dodge/Render/Outline.hs 5;" f
halfHeight src/Dodge/Base/Window.hs 48;" f
halfWidth src/Dodge/Base/Window.hs 48;" f
haltSound src/Dodge/SoundLogic.hs 37;" f
hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 405;" f
hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 411;" f
handleEvent src/Dodge/Event.hs 27;" f
handleHotkeys src/Dodge/Creature/YourControl.hs 42;" f
handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f
@@ -5879,8 +5878,8 @@ itBounds src/Dodge/Item/Module.hs 22;" f
itSlotsTaken src/Dodge/Inventory/ItemSpace.hs 9;" f
itSlotsTaken src/Dodge/Item/SlotsTaken.hs 9;" f
itStackAmount src/Dodge/Item/Amount.hs 7;" f
itUseAmmo src/Dodge/Item/Weapon/TriggerType.hs 162;" f
itUseCharge src/Dodge/Item/Weapon/TriggerType.hs 159;" f
itUseAmmo src/Dodge/Item/Weapon/TriggerType.hs 168;" f
itUseCharge src/Dodge/Item/Weapon/TriggerType.hs 165;" f
itemBaseName src/Dodge/Item/Display.hs 75;" f
itemBlips src/Dodge/Item/Weapon/UseEffect.hs 38;" f
itemBlips src/Dodge/RadarSweep.hs 74;" f
@@ -6252,7 +6251,7 @@ mntLight src/Dodge/Placement/Instance/LightSource.hs 154;" f
mntLight src/Dodge/Placements/LightSource.hs 89;" f
mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 159;" f
mntLightLnkCond src/Dodge/Placements/LightSource.hs 94;" f
modClock src/Dodge/Item/Weapon/TriggerType.hs 464;" f
modClock src/Dodge/Item/Weapon/TriggerType.hs 470;" f
modTo src/Geometry/Zone.hs 10;" f
modifierKey src/Dodge/Config/KeyConfig.hs 34;" f
moduleAttachPosition src/Dodge/Item/Module.hs 6;" f
@@ -6783,7 +6782,7 @@ randsOnCirc src/RandomHelp.hs 118;" f
randsSpread src/Dodge/RandomHelp.hs 100;" f
randsSpread src/RandomHelp.hs 111;" f
ratIntersectLineLine src/Geometry/Intersect.hs 195;" f
rateIncAB src/Dodge/Item/Weapon/TriggerType.hs 169;" f
rateIncAB src/Dodge/Item/Weapon/TriggerType.hs 175;" f
readSaveSlot src/Dodge/Save.hs 45;" f
rectNESW src/Geometry/Polygon.hs 13;" f
rectNSWE src/Geometry/Polygon.hs 19;" f
@@ -6834,7 +6833,7 @@ renderLayer src/Render.hs 233;" f
renderLightingNoShadows src/Render.hs 48;" f
renderListAt src/Dodge/Render/List.hs 160;" f
renderShadows src/Render.hs 117;" f
repeatOnFrames src/Dodge/Item/Weapon/TriggerType.hs 662;" f
repeatOnFrames src/Dodge/Item/Weapon/TriggerType.hs 668;" f
repeatTransformed src/Dodge/Item/Weapon/TriggerType.hs 93;" f
repeater src/Dodge/Item/Held/Cane.hs 66;" f
repeater src/Dodge/Item/Weapon/BulletGun/Cane.hs 89;" f
@@ -6939,8 +6938,8 @@ rotateV src/Geometry/Vector.hs 105;" f
rotateVAround src/Geometry/Vector.hs 112;" f
rotateXY src/Polyhedra.hs 30;" f
roundPoint2 src/Geometry/Intersect.hs 216;" f
roundTank src/Dodge/Placement/Instance/Tank.hs 41;" f
roundTankCross src/Dodge/Placement/Instance/Tank.hs 47;" f
roundTank src/Dodge/Placement/Instance/Tank.hs 25;" f
roundTankCross src/Dodge/Placement/Instance/Tank.hs 31;" f
rpIsOffPath src/Dodge/PlacementSpot.hs 80;" f
rpIsOnPath src/Dodge/PlacementSpot.hs 75;" f
rpOffPathFromEdge src/Dodge/PlacementSpot.hs 85;" f
@@ -7140,7 +7139,7 @@ shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f
shootFlameSpitter src/Dodge/HeldUse/SprayWeapon.hs 9;" f
shootFlameSpitterRepeat src/Dodge/HeldUse/SprayWeapon.hs 19;" f
shootFlameThrower src/Dodge/HeldUse/SprayWeapon.hs 26;" f
shootL src/Dodge/Item/Weapon/TriggerType.hs 419;" f
shootL src/Dodge/Item/Weapon/TriggerType.hs 425;" f
shootLaser src/Dodge/Item/Weapon/BatteryGuns.hs 127;" f
shootMachineGun src/Dodge/HeldUse/BulletWeapon.hs 218;" f
shootMachinePistol src/Dodge/HeldUse/BulletWeapon.hs 62;" f
@@ -7190,7 +7189,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f
shuffleRoomPos src/Dodge/Layout.hs 78;" f
shuffleTail src/Dodge/RandomHelp.hs 50;" f
shuffleTail src/RandomHelp.hs 55;" f
sideEffectOnFrame src/Dodge/Item/Weapon/TriggerType.hs 642;" f
sideEffectOnFrame src/Dodge/Item/Weapon/TriggerType.hs 648;" f
sideEffectUpdatePreload src/Dodge/PreloadData.hs 7;" f
sigmoid src/Dodge/Base.hs 129;" f
simpleCrSprings src/Dodge/Update.hs 639;" f
@@ -7504,10 +7503,10 @@ topPrismEdgeIndices src/Shader/Poke.hs 327;" f
topPrismIndices src/Shader/Poke.hs 402;" f
torch src/Dodge/Item/Held/Utility.hs 26;" f
torchShape src/Dodge/Item/Draw/SPic.hs 189;" f
torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 572;" f
torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 595;" f
torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 578;" f
torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 601;" f
torqueCr src/Dodge/WorldEffect.hs 64;" f
torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 650;" f
torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 656;" f
torso src/Dodge/Creature/Picture.hs 132;" f
tractCr src/Dodge/TractorBeam/Update.hs 27;" f
tractFlIt src/Dodge/TractorBeam/Update.hs 22;" f
@@ -7639,7 +7638,7 @@ unusedSpotAwayFromInLink src/Dodge/PlacementSpot.hs 139;" f
unusedSpotAwayFromLink src/Dodge/PlacementSpot.hs 122;" f
unusedSpotNearInLink src/Dodge/PlacementSpot.hs 191;" f
upCT src/Dodge/Targeting.hs 34;" f
upDownAttachments src/Dodge/Base/You.hs 45;" f
upDownAttachments src/Dodge/Base/You.hs 44;" f
upHammer src/Dodge/Default.hs 77;" f
upProjectile src/Dodge/Projectile/Update.hs 56;" f
updateAllNodes src/TreeHelp.hs 85;" f
@@ -7777,12 +7776,12 @@ upperPrismPolySU src/Shape.hs 112;" f
upperPrismPolyTS src/Shape.hs 118;" f
upperRounded src/Shape.hs 181;" f
upsProjectile src/Dodge/Projectile/Update.hs 53;" f
useAllAmmo src/Dodge/Item/Weapon/TriggerType.hs 344;" f
useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 360;" f
useAmmoAmount' src/Dodge/Item/Weapon/TriggerType.hs 367;" f
useAllAmmo src/Dodge/Item/Weapon/TriggerType.hs 350;" f
useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 366;" f
useAmmoAmount' src/Dodge/Item/Weapon/TriggerType.hs 373;" f
useAmmoParams src/Dodge/Bullet.hs 59;" f
useAmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 17;" f
useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 351;" f
useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 357;" f
useC src/Dodge/Cuse.hs 6;" f
useE src/Dodge/Euse.hs 24;" f
useEquipment src/Dodge/Creature/State.hs 219;" f
@@ -7809,7 +7808,7 @@ useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f
useShrinkGun src/Dodge/Luse.hs 59;" f
useStopWatch src/Dodge/Luse.hs 24;" f
useTargetPos src/Dodge/Item/Weapon/Targeting.hs 9;" f
useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 386;" f
useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 392;" f
useTimeScrollGun src/Dodge/Luse.hs 32;" f
useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f
useUpdate src/Dodge/Creature/State.hs 211;" f
@@ -7907,35 +7906,35 @@ windowxsize src/LoadConfig.hs 12;" f
windowysize src/LoadConfig.hs 13;" f
withAlpha src/Color.hs 10;" f
withByteString src/Shader/Compile.hs 370;" f
withCrPos src/Dodge/Item/Weapon/TriggerType.hs 502;" f
withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 505;" f
withFlare src/Dodge/Item/Weapon/TriggerType.hs 469;" f
withItem src/Dodge/Item/Weapon/TriggerType.hs 442;" f
withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 451;" f
withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 446;" f
withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 481;" f
withOldDir src/Dodge/Item/Weapon/TriggerType.hs 519;" f
withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 554;" f
withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 538;" f
withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 545;" f
withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 511;" f
withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 533;" f
withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 526;" f
withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 564;" f
withRecoil src/Dodge/Item/Weapon/TriggerType.hs 302;" f
withSidePushAfterI src/Dodge/Item/Weapon/TriggerType.hs 331;" f
withSidePushI src/Dodge/Item/Weapon/TriggerType.hs 312;" f
withCrPos src/Dodge/Item/Weapon/TriggerType.hs 508;" f
withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 511;" f
withFlare src/Dodge/Item/Weapon/TriggerType.hs 475;" f
withItem src/Dodge/Item/Weapon/TriggerType.hs 448;" f
withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 457;" f
withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 452;" f
withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 487;" f
withOldDir src/Dodge/Item/Weapon/TriggerType.hs 525;" f
withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 560;" f
withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 544;" f
withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 551;" f
withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 517;" f
withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 539;" f
withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 532;" f
withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 570;" f
withRecoil src/Dodge/Item/Weapon/TriggerType.hs 308;" f
withSidePushAfterI src/Dodge/Item/Weapon/TriggerType.hs 337;" f
withSidePushI src/Dodge/Item/Weapon/TriggerType.hs 318;" f
withSmoke src/Dodge/Item/Weapon/TriggerType.hs 113;" f
withSoundContinue src/Dodge/Item/Weapon/TriggerType.hs 255;" f
withSoundForI src/Dodge/Item/Weapon/TriggerType.hs 268;" f
withSoundForVol src/Dodge/Item/Weapon/TriggerType.hs 281;" f
withSoundItemChoiceStart src/Dodge/Item/Weapon/TriggerType.hs 226;" f
withSoundStart src/Dodge/Item/Weapon/TriggerType.hs 242;" f
withTempLight src/Dodge/Item/Weapon/TriggerType.hs 456;" f
withSoundContinue src/Dodge/Item/Weapon/TriggerType.hs 261;" f
withSoundForI src/Dodge/Item/Weapon/TriggerType.hs 274;" f
withSoundForVol src/Dodge/Item/Weapon/TriggerType.hs 287;" f
withSoundItemChoiceStart src/Dodge/Item/Weapon/TriggerType.hs 232;" f
withSoundStart src/Dodge/Item/Weapon/TriggerType.hs 248;" f
withTempLight src/Dodge/Item/Weapon/TriggerType.hs 462;" f
withThickSmokeI src/Dodge/Item/Weapon/TriggerType.hs 131;" f
withThinSmokeI src/Dodge/Item/Weapon/TriggerType.hs 122;" f
withTorqueAfter src/Dodge/Item/Weapon/TriggerType.hs 621;" f
withWarmUp src/Dodge/Item/Weapon/TriggerType.hs 206;" f
withTorqueAfter src/Dodge/Item/Weapon/TriggerType.hs 627;" f
withWarmUp src/Dodge/Item/Weapon/TriggerType.hs 212;" f
wlDustAt src/Dodge/Wall/Dust.hs 10;" f
wlIXsNearCirc src/Dodge/Zoning/Wall.hs 32;" f
wlIXsNearPoint src/Dodge/Zoning/Wall.hs 22;" f
@@ -7974,20 +7973,20 @@ xyzV4 src/Geometry/Vector.hs 207;" f
yIntercepts' src/Dodge/Zoning/Base.hs 74;" f
yV2 src/Geometry/Vector.hs 203;" f
yellow src/Color.hs 17;" f
you src/Dodge/Base/You.hs 12;" f
you src/Dodge/Base/You.hs 11;" f
youBox' src/Dodge/Creature/ShadowBox.hs 8;" f
youDropItem src/Dodge/Creature/Action.hs 192;" f
youSil src/Dodge/Creature/ShadowBox.hs 15;" f
youc src/Dodge/Base/You.hs 15;" f
youc src/Dodge/Base/You.hs 14;" f
yourAugmentedItem src/Dodge/Render/HUD.hs 118;" f
yourControl src/Dodge/Creature/YourControl.hs 22;" f
yourDefaultSpeed src/Dodge/Default/Creature.hs 134;" f
yourDefaultStrideLength src/Dodge/Default/Creature.hs 137;" f
yourInfo src/Dodge/Creature/Info.hs 8;" f
yourInv src/Dodge/Base/You.hs 37;" f
yourItem src/Dodge/Base/You.hs 18;" f
yourScopeInvID src/Dodge/Base/You.hs 31;" f
yourScrollAttachment src/Dodge/Base/You.hs 23;" f
yourInv src/Dodge/Base/You.hs 36;" f
yourItem src/Dodge/Base/You.hs 17;" f
yourScopeInvID src/Dodge/Base/You.hs 30;" f
yourScrollAttachment src/Dodge/Base/You.hs 22;" f
yourStatsInfo src/Dodge/Creature/Info.hs 25;" f
zConnect src/Dodge/Render/Connectors.hs 9;" f
zConnectCol src/Dodge/Render/Connectors.hs 16;" f