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

Auto create tree structure for held item ammo, add derive instances

Browse Source
This commit is contained in:
justin
2024-09-13 17:34:29 +01:00
parent fb104a1719
commit 338d9e8422
10 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tags
+34 -31
View File
@@ -72,13 +72,14 @@ Ambush src/Dodge/Data/ActionPlan.hs 178;" C
Ammo src/Dodge/Data/Ammo.hs 4;" m
Ammo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 6;" m
Ammo src/Dodge/Item/Ammo.hs 1;" m
AmmoCI src/Dodge/Data/ComposedItem.hs 20;" C
AmmoCheckMod src/Dodge/Data/Item/HeldUse.hs 82;" C
AmmoHammerTimeUseOneMod src/Dodge/Data/Item/HeldUse.hs 84;" C
AmmoInLink src/Dodge/Data/ComposedItem.hs 12;" C
AmmoInLink src/Dodge/Data/ComposedItem.hs 14;" C
AmmoMagType src/Dodge/Data/Item/Combine.hs 109;" t
AmmoMagUse src/Dodge/Data/Item/Use.hs 58;" C
AmmoModLink src/Dodge/Data/ComposedItem.hs 13;" C
AmmoModifierCI src/Dodge/Data/ComposedItem.hs 17;" C
AmmoModLink src/Dodge/Data/ComposedItem.hs 15;" C
AmmoModifierCI src/Dodge/Data/ComposedItem.hs 19;" C
AmmoParams src/Dodge/Data/Item/Use.hs 82;" t
AmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 1;" m
AmmoPosition src/Dodge/Item/AmmoPosition.hs 8;" t
@@ -233,6 +234,7 @@ BeamDrawColor src/Dodge/Data/Beam.hs 35;" C
BeamSimple src/Dodge/Data/Beam.hs 50;" C
BeamType src/Dodge/Data/Beam.hs 46;" t
BecomePowerful src/Dodge/Data/Scenario.hs 9;" C
BeltBulletAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 40;" C
Bezier src/Dodge/Item/Weapon/Bezier.hs 1;" m
Bezier src/Geometry/Bezier.hs 1;" m
BezierTrajectory src/Dodge/Data/Bullet.hs 52;" C
@@ -305,7 +307,6 @@ Bullet src/Dodge/Data/Bullet.hs 6;" m
Bullet src/Dodge/Item/Weapon/Bullet.hs 1;" m
BulletAmmo src/Dodge/Data/Ammo.hs 37;" C
BulletAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 39;" C
BulletAmmoCI src/Dodge/Data/ComposedItem.hs 18;" C
BulletBeltAttachment src/Dodge/Data/Item.hs 52;" C
BulletClipAttachment src/Dodge/Data/Item.hs 51;" C
BulletEffect src/Dodge/Data/Bullet.hs 36;" t
@@ -454,8 +455,8 @@ CombineInventoryChange src/Dodge/Data/World.hs 33;" C
Common src/Dodge/Zoning/Common.hs 1;" m
Compile src/Shader/Compile.hs 1;" m
Compose src/Dodge/Tree/Compose.hs 4;" m
ComposeLinkType src/Dodge/Data/ComposedItem.hs 12;" t
ComposedItem src/Dodge/Data/ComposedItem.hs 15;" t
ComposeLinkType src/Dodge/Data/ComposedItem.hs 13;" t
ComposedItem src/Dodge/Data/ComposedItem.hs 17;" t
ComposedItem src/Dodge/Data/ComposedItem.hs 6;" m
ComposedItemStructure src/Dodge/Item/Grammar.hs 17;" t
Composite src/Picture/Composite.hs 1;" m
@@ -544,11 +545,11 @@ Create src/Dodge/Projectile/Create.hs 1;" m
Create src/Dodge/Prop/Create.hs 1;" m
Create src/Dodge/Wall/Create.hs 1;" m
CreateFlame src/Dodge/Data/Gas.hs 6;" C
CreateFlame src/Dodge/Data/Item/Use/Consumption/Ammo.hs 48;" C
CreateFlame src/Dodge/Data/Item/Use/Consumption/Ammo.hs 49;" C
CreateHeldLight src/Dodge/Data/ItEffect.hs 41;" C
CreateHeldLight src/Dodge/Data/Item/Effect.hs 26;" C
CreatePoisonGas src/Dodge/Data/Gas.hs 6;" C
CreatePoisonGas src/Dodge/Data/Item/Use/Consumption/Ammo.hs 48;" C
CreatePoisonGas src/Dodge/Data/Item/Use/Consumption/Ammo.hs 49;" C
CreateShell src/Dodge/Data/Ammo.hs 17;" C
CreateShell src/Dodge/Data/Item/Use/Consumption/Ammo.hs 21;" C
CreateShieldWall src/Dodge/Data/ItEffect.hs 42;" C
@@ -676,7 +677,7 @@ DefaultArcStep src/Dodge/Data/ArcStep.hs 23;" C
DefaultCrGroupUpdate src/Dodge/Data/CrGroupParams.hs 22;" C
DefaultDrawButton src/Dodge/Data/Button.hs 17;" C
DefaultDrawSwitch src/Dodge/Data/Button.hs 18;" C
DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 45;" C
DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 46;" C
DefaultHeldParams src/Dodge/Data/Item/Use.hs 66;" C
DefaultLightSourceDraw src/Dodge/Data/LightSource.hs 13;" C
DefaultRoomType src/Dodge/Data/Room.hs 31;" C
@@ -784,7 +785,7 @@ DrawShell src/Dodge/Data/Item/Use/Consumption/Ammo.hs 18;" C
DrawnWall src/Dodge/Data/Wall.hs 41;" C
Drone src/Dodge/Item/Weapon/Drone.hs 1;" m
DroneAmmo src/Dodge/Data/Ammo.hs 41;" C
DroneAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 41;" C
DroneAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 42;" C
DropAll src/Dodge/Creature/State/Data.hs 15;" C
DropAll src/Dodge/Data/Creature/State.hs 24;" C
DropAmount src/Dodge/Creature/State/Data.hs 16;" C
@@ -835,7 +836,7 @@ EffectWhileHeld src/Dodge/Data/Item/Effect.hs 29;" C
EighthRes src/Dodge/Data/Config.hs 95;" C
Either src/Dodge/Layout/Tree/Either.hs 4;" m
Eldritch src/Dodge/Data/Scenario.hs 34;" C
ElectricalAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 40;" C
ElectricalAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 41;" C
Electronics src/Dodge/Data/Material.hs 11;" C
ElephantGunMod src/Dodge/Data/Item/HeldUse.hs 90;" C
EllShad src/Picture/Data.hs 41;" C
@@ -998,7 +999,7 @@ FootstepSound src/Dodge/Data/SoundOrigin.hs 27;" C
ForceField src/Dodge/ForceField.hs 1;" m
ForceField src/Dodge/Wall/ForceField.hs 1;" m
ForceFieldAmmo src/Dodge/Data/Ammo.hs 47;" C
ForceFieldType src/Dodge/Data/Item/Use/Consumption/Ammo.hs 45;" t
ForceFieldType src/Dodge/Data/Item/Use/Consumption/Ammo.hs 46;" t
Foreground src/Dodge/Default/Foreground.hs 1;" m
Foreground src/Dodge/Room/Foreground.hs 1;" m
ForegroundShape src/Dodge/Data/ForegroundShape.hs 14;" t
@@ -1028,10 +1029,10 @@ GameRoom src/Dodge/GameRoom.hs 8;" m
Gas src/Dodge/Data/Gas.hs 3;" m
Gas src/Dodge/Gas.hs 1;" m
GasAmmo src/Dodge/Data/Ammo.hs 43;" C
GasAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 42;" C
GasAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 43;" C
GasCloud src/Dodge/Data/Cloud.hs 31;" C
GasCreate src/Dodge/Data/Gas.hs 6;" t
GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 48;" t
GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 49;" t
GasParams src/Dodge/Data/Item/Use.hs 88;" C
GasSprayParams src/Dodge/Data/Item/Use.hs 67;" C
GenCr src/Dodge/Creature/State/Data.hs 24;" C
@@ -1354,12 +1355,12 @@ LBoost src/Dodge/Data/Item/HeldUse.hs 65;" C
LBranches src/TreeExtra.hs 24;" C
LDT src/Dodge/Data/DoubleTree.hs 38;" C
LDTBottomNode src/Dodge/Data/DoubleTree.hs 26;" C
LDTComb src/Dodge/Item/Grammar.hs 46;" t
LDTCombine src/Dodge/Item/Grammar.hs 44;" t
LDTComb src/Dodge/Item/Grammar.hs 56;" t
LDTCombine src/Dodge/Item/Grammar.hs 54;" t
LDTMidAboveNode src/Dodge/Data/DoubleTree.hs 24;" C
LDTMidBelowNode src/Dodge/Data/DoubleTree.hs 25;" C
LDTRootNode src/Dodge/Data/DoubleTree.hs 22;" C
LDTTest src/Dodge/Item/Grammar.hs 43;" t
LDTTest src/Dodge/Item/Grammar.hs 53;" t
LDTTopNode src/Dodge/Data/DoubleTree.hs 23;" C
LDoNothing src/Dodge/Data/Item/HeldUse.hs 58;" C
LED src/Dodge/Combine/Data.hs 51;" C
@@ -2731,7 +2732,7 @@ TwoHandUnder src/Dodge/Data/Item/Use.hs 121;" C
Type src/Dodge/Data/Damage/Type.hs 6;" m
Typical src/Shape/Data.hs 36;" C
UPtLayer src/Dodge/Picture/Layer/Data.hs 16;" C
UncomposableCI src/Dodge/Data/ComposedItem.hs 19;" C
UncomposableCI src/Dodge/Data/ComposedItem.hs 21;" C
Uncursed src/Dodge/Data/Item/CurseStatus.hs 12;" C
Uncursed src/Dodge/Item/Data.hs 8;" C
UnderGround src/Dodge/Data/Scenario.hs 78;" C
@@ -2893,8 +2894,8 @@ WdWdNegateTrig src/Dodge/Data/WorldEffect.hs 31;" C
WdYouPos src/Dodge/Data/WorldEffect.hs 39;" C
Weapon src/Dodge/Default/Weapon.hs 1;" m
Weapon src/Dodge/Item/Weapon.hs 2;" m
WeaponCI src/Dodge/Data/ComposedItem.hs 15;" C
WeaponScopeCI src/Dodge/Data/ComposedItem.hs 16;" C
WeaponCI src/Dodge/Data/ComposedItem.hs 17;" C
WeaponScopeCI src/Dodge/Data/ComposedItem.hs 18;" C
Weapons src/Dodge/Item/Held/Weapons.hs 1;" m
West src/Dodge/Data/CardinalPoint.hs 7;" C
WinScale src/Dodge/Base/WinScale.hs 1;" m
@@ -4405,6 +4406,7 @@ allHotkeys src/Dodge/Creature/YourControl.hs 52;" f
allVisibleWalls src/Dodge/Base/Collide.hs 131;" f
alongSegBy src/Geometry.hs 43;" f
ammoCheckI src/Dodge/Item/Weapon/TriggerType.hs 143;" f
ammoComposedItem src/Dodge/Item/Grammar.hs 44;" f
ammoTweakStrings src/Dodge/Render/HUD.hs 284;" f
amr src/Dodge/Item/Held/Rod.hs 50;" f
amr src/Dodge/Item/Weapon/BulletGun/Rod.hs 56;" f
@@ -4526,9 +4528,9 @@ baseAMRShape src/Dodge/Item/Draw/SPic.hs 445;" f
baseBlockPane src/Dodge/Placement/Instance/Wall.hs 86;" f
baseBlockPane src/Dodge/Placements/Wall.hs 63;" f
baseBlockPane src/Dodge/Room/Placement.hs 93;" f
baseCIS src/Dodge/Item/Grammar.hs 39;" f
baseCIS src/Dodge/Item/Grammar.hs 49;" f
baseCaneShape src/Dodge/Item/Draw/SPic.hs 251;" f
baseComposedItem' src/Dodge/Item/Grammar.hs 31;" f
baseComposedItem src/Dodge/Item/Grammar.hs 31;" f
baseDebris src/Dodge/Block/Debris.hs 122;" f
baseFloorTileSize src/Tile.hs 38;" f
baseRifleShape src/Dodge/Item/Draw/SPic.hs 254;" f
@@ -5711,6 +5713,7 @@ heavyBulDams src/Dodge/Item/Weapon/Bullet.hs 38;" f
heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f
heldAimEffects src/Dodge/Creature/State.hs 68;" f
heldBounds src/Dodge/Item/Module.hs 27;" f
heldComposedItem src/Dodge/Item/Grammar.hs 38;" f
heldInfo src/Dodge/Item/Info.hs 61;" f
heldItemOffset src/Dodge/Item/HeldOffset.hs 24;" f
heldItemSPic src/Dodge/Item/Draw/SPic.hs 156;" f
@@ -5823,13 +5826,13 @@ intersectSegsSeg src/Geometry/Intersect.hs 232;" f
intervalList src/Geometry.hs 315;" f
interweave src/Justify.hs 17;" f
intsToPos src/Dodge/Room/Modify/Girder.hs 160;" f
invAdj src/Dodge/Item/Grammar.hs 87;" f
invAdj src/Dodge/Item/Grammar.hs 97;" f
invDimColor src/Dodge/DisplayInventory.hs 140;" f
invDimColor src/Dodge/Inventory/Color.hs 4;" f
invDisplayParams src/Dodge/ListDisplayParams.hs 29;" f
invHead src/Dodge/Render/HUD.hs 292;" f
invIndentIM src/Dodge/Item/Grammar.hs 93;" f
invLDT src/Dodge/Item/Grammar.hs 83;" f
invIndentIM src/Dodge/Item/Grammar.hs 103;" f
invLDT src/Dodge/Item/Grammar.hs 93;" f
invSelectionItem src/Dodge/Inventory/SelectionList.hs 35;" f
invSelectionItem' src/Dodge/Inventory/SelectionList.hs 17;" f
invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f
@@ -5914,7 +5917,7 @@ jShape src/Dodge/Placement/Instance/LightSource.hs 86;" f
jShape src/Dodge/Placements/LightSource.hs 43;" f
jaggedShape src/Dodge/Block/Debris.hs 191;" f
jetPack src/Dodge/Item/Equipment.hs 92;" f
joinItemsInList src/Dodge/Item/Grammar.hs 74;" f
joinItemsInList src/Dodge/Item/Grammar.hs 84;" f
jps0' src/Dodge/LevelGen/Data.hs 60;" f
jps0' src/Dodge/LevelGen/PlacementHelper.hs 60;" f
jps0PushPS src/Dodge/LevelGen/Data.hs 63;" f
@@ -5981,10 +5984,10 @@ ldtToDT src/Dodge/DoubleTree.hs 6;" f
ldtToIndentList src/Dodge/DoubleTree.hs 34;" f
left src/DoubleStack.hs 16;" f
leftInfo src/Dodge/Item/Info.hs 110;" f
leftIsParentCombine src/Dodge/Item/Grammar.hs 49;" f
leftIsParentCombine src/Dodge/Item/Grammar.hs 59;" f
leftItemSPic src/Dodge/Item/Draw/SPic.hs 72;" f
leftPad src/Padding.hs 14;" f
leftRightCombine src/Dodge/Item/Grammar.hs 63;" f
leftRightCombine src/Dodge/Item/Grammar.hs 73;" f
legsSPic src/Dodge/Item/Draw/SPic.hs 529;" f
liShape src/Dodge/Placement/Instance/LightSource.hs 99;" f
liShape src/Dodge/Placements/LightSource.hs 55;" f
@@ -6882,7 +6885,7 @@ rhombus src/Polyhedra.hs 71;" f
rifle src/Dodge/Item/Held/Cane.hs 61;" f
rifle src/Dodge/Item/Weapon/BulletGun/Cane.hs 77;" f
right src/DoubleStack.hs 16;" f
rightIsParentCombine src/Dodge/Item/Grammar.hs 56;" f
rightIsParentCombine src/Dodge/Item/Grammar.hs 66;" f
rightPad src/Padding.hs 22;" f
rightPadNoSquash src/Padding.hs 26;" f
rlPosDir src/Dodge/RoomLink.hs 94;" f
@@ -7010,9 +7013,9 @@ secondColumnParams src/Dodge/ListDisplayParams.hs 42;" f
seedStartMenu src/Dodge/Menu.hs 79;" f
seedStartOptions src/Dodge/Menu.hs 82;" f
segOnCirc src/Geometry.hs 116;" f
selNumPos src/Dodge/Render/HUD.hs 356;" f
selNumPos src/Dodge/Render/HUD.hs 357;" f
selSecDrawCursor src/Dodge/Render/List.hs 87;" f
selSecSelCol src/Dodge/Render/HUD.hs 373;" f
selSecSelCol src/Dodge/Render/HUD.hs 376;" f
selSecSelSize src/Dodge/SelectionSections.hs 124;" f
selSecYint src/Dodge/SelectionSections.hs 127;" f
selectCreatureDebugItem src/Dodge/Debug.hs 38;" f