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

Commit before changes to item usage using attachment tree

Browse Source
This commit is contained in:
justin
2024-09-13 22:50:00 +01:00
parent 338d9e8422
commit 51e133ebc1
3 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ghcidOutput
+1 -1
View File
@@ -1 +1 @@
All good (615 modules, at 17:26:48)
All good (615 modules, at 22:49:00)
src/Dodge/DoubleTree.hs
+3
View File
@@ -34,6 +34,9 @@ dtToUpDownAdj f (DT x l r) = IM.insert (f x) (map g l , map g r)
ldtToIndentList :: LabelDoubleTree b a -> [(a,Int,LabelDoubleTreeNodeType b)]
ldtToIndentList = ldtIL LDTRootNode
ldtToIM :: (a -> Int) -> LabelDoubleTree b a -> IM.IntMap (LabelDoubleTree b a)
ldtToIM f t@(LDT x l r) = IM.insert (f x) t $ IM.unions $ map (ldtToIM f . snd) $ l <> r
ldtIL :: LabelDoubleTreeNodeType b -> LabelDoubleTree b a -> [(a,Int,LabelDoubleTreeNodeType b)]
ldtIL nt (LDT x l r) = map doindent
(concat
tags
+45 -45
View File
@@ -54,11 +54,11 @@ AddGoal src/Dodge/Data/ActionPlan.hs 45;" C
AddTile src/Dodge/Room/AddTile.hs 1;" m
AesonHelp src/AesonHelp.hs 1;" m
AimAt src/Dodge/Data/ActionPlan.hs 84;" C
AimParams src/Dodge/Data/Item/Use.hs 102;" t
AimParams src/Dodge/Data/Item/Use.hs 106;" t
AimParams src/Dodge/Default/AimParams.hs 1;" m
AimParams src/Dodge/Default/Item/Held/AimParams.hs 1;" m
AimParams src/Dodge/Default/Item/Use/AimParams.hs 1;" m
AimStance src/Dodge/Data/Item/Use.hs 120;" t
AimStance src/Dodge/Data/Item/Use.hs 125;" t
Aiming src/Dodge/Creature/Stance/Data.hs 42;" C
Aiming src/Dodge/Data/Creature/Stance.hs 39;" C
AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C
@@ -80,7 +80,7 @@ AmmoMagType src/Dodge/Data/Item/Combine.hs 109;" t
AmmoMagUse src/Dodge/Data/Item/Use.hs 58;" 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/Data/Item/Use.hs 84;" t
AmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 1;" m
AmmoPosition src/Dodge/Item/AmmoPosition.hs 8;" t
AmmoPosition src/Dodge/Item/AmmoPosition.hs 2;" m
@@ -129,7 +129,7 @@ AttachInt src/Dodge/Item/Attachment/Data.hs 16;" C
AttachMInt src/Dodge/Data/Item/Attachment.hs 15;" C
AttachMInt src/Dodge/Item/Attachment/Data.hs 17;" C
AttachMode src/Dodge/Item/Attachment/Data.hs 13;" C
AttachParams src/Dodge/Data/Item/Use.hs 77;" t
AttachParams src/Dodge/Data/Item/Use.hs 78;" t
AttachTargetPos src/Dodge/Data/Item/Attachment.hs 13;" C
AttachTargetPos src/Dodge/Item/Attachment/Data.hs 15;" C
AttachType src/Dodge/Data/Item/Combine.hs 97;" t
@@ -312,7 +312,7 @@ BulletClipAttachment src/Dodge/Data/Item.hs 51;" C
BulletEffect src/Dodge/Data/Bullet.hs 36;" t
BulletGun src/Dodge/Item/Held/BulletGun.hs 1;" m
BulletGuns src/Dodge/Item/Weapon/BulletGuns.hs 1;" m
BulletParams src/Dodge/Data/Item/Use.hs 82;" C
BulletParams src/Dodge/Data/Item/Use.hs 84;" C
BulletShooterParams src/Dodge/Data/Item/Use.hs 69;" C
BulletSpawn src/Dodge/Data/Bullet.hs 42;" t
BulletTrajectory src/Dodge/Data/Bullet.hs 50;" t
@@ -388,7 +388,7 @@ ChainEffect src/Dodge/ChainEffect.hs 1;" m
ChainUpdates src/Dodge/Creature/ChainUpdates.hs 1;" m
ChangePosture src/Dodge/Data/ActionPlan.hs 42;" C
ChangeStrategy src/Dodge/Data/ActionPlan.hs 44;" C
CharScrollParams src/Dodge/Data/Item/Use.hs 99;" C
CharScrollParams src/Dodge/Data/Item/Use.hs 102;" C
ChargeIfEquipped src/Dodge/Data/Item/Effect.hs 22;" C
ChargeIfInInventory src/Dodge/Data/Item/Effect.hs 23;" C
ChargeableAmmo src/Dodge/Data/Item/Consumption.hs 29;" C
@@ -1033,7 +1033,7 @@ 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 49;" t
GasParams src/Dodge/Data/Item/Use.hs 88;" C
GasParams src/Dodge/Data/Item/Use.hs 90;" C
GasSprayParams src/Dodge/Data/Item/Use.hs 67;" C
GenCr src/Dodge/Creature/State/Data.hs 24;" C
GenCr src/Dodge/Data/Creature/State.hs 31;" C
@@ -1294,7 +1294,7 @@ ItInvEffect src/Dodge/Data/ItEffect.hs 13;" C
ItInvEffectDrop src/Dodge/Data/ItEffect.hs 29;" C
ItInvEffectID src/Dodge/Data/ItEffect.hs 25;" C
ItRewindEffect src/Dodge/Data/ItEffect.hs 17;" C
ItZoom src/Dodge/Data/Item/Use.hs 129;" t
ItZoom src/Dodge/Data/Item/Use.hs 134;" t
Item src/Dodge/Data/Item.hs 33;" t
Item src/Dodge/Base/Item.hs 1;" m
Item src/Dodge/Data/Item.hs 6;" m
@@ -1675,7 +1675,7 @@ Music src/Music.hs 1;" m
MusicData src/Music.hs 7;" t
Mute src/Dodge/Data/Creature/Misc.hs 28;" C
MuzFlare src/Dodge/Data/Flare.hs 15;" C
Muzzle src/Dodge/Data/Item/Use.hs 113;" t
Muzzle src/Dodge/Data/Item/Use.hs 117;" t
MvForward src/Dodge/Data/ActionPlan.hs 35;" C
MvPt src/Dodge/MvPt.hs 1;" m
MvTurnToward src/Dodge/Data/ActionPlan.hs 34;" C
@@ -1699,7 +1699,7 @@ Ngon src/Dodge/Room/Ngon.hs 1;" m
NoAction src/Dodge/Data/ActionPlan.hs 152;" C
NoAmmoPosition src/Dodge/Item/AmmoPosition.hs 11;" C
NoArguments src/Dodge/Data/Terminal.hs 93;" C
NoAttachParams src/Dodge/Data/Item/Use.hs 80;" C
NoAttachParams src/Dodge/Data/Item/Use.hs 81;" C
NoBeamCombine src/Dodge/Data/Beam.hs 43;" C
NoConcurrentEffect src/Loop/Data.hs 7;" C
NoConsumption src/Dodge/Data/Item/Consumption.hs 33;" C
@@ -1839,7 +1839,7 @@ OnSpecial src/Dodge/Equipment/Data.hs 24;" C
OnTurret src/Dodge/Data/Item/Location.hs 13;" C
OnceSound src/Dodge/Data/SoundOrigin.hs 15;" C
OneArgument src/Dodge/Data/Terminal.hs 94;" C
OneHand src/Dodge/Data/Item/Use.hs 124;" C
OneHand src/Dodge/Data/Item/Use.hs 129;" C
OnwardCluster src/Dodge/Data/RoomCluster.hs 14;" C
OnwardCluster src/Dodge/RoomCluster/Data.hs 12;" C
OnwardList src/Dodge/Annotation/Data.hs 15;" C
@@ -2028,7 +2028,7 @@ ProjectileCreate src/Dodge/Data/Ammo.hs 17;" t
ProjectileCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 21;" t
ProjectileDraw src/Dodge/Data/Ammo.hs 14;" t
ProjectileDraw src/Dodge/Data/Item/Use/Consumption/Ammo.hs 18;" t
ProjectileParams src/Dodge/Data/Item/Use.hs 83;" C
ProjectileParams src/Dodge/Data/Item/Use.hs 85;" C
ProjectileUpdate src/Dodge/Data/Ammo.hs 20;" t
ProjectileUpdate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 24;" t
Prop src/Dodge/Data/Prop.hs 18;" t
@@ -2292,8 +2292,8 @@ ScreenPos src/Dodge/Data/ScreenPos.hs 9;" t
ScreenPos src/Dodge/Data/ScreenPos.hs 3;" m
ScreenPos src/Dodge/ScreenPos.hs 1;" m
Scroll src/Dodge/Update/Scroll.hs 1;" m
ScrollAttachParams src/Dodge/Data/Item/Use.hs 90;" t
ScrollAttachParams src/Dodge/Data/Item/Use.hs 78;" C
ScrollAttachParams src/Dodge/Data/Item/Use.hs 93;" t
ScrollAttachParams src/Dodge/Data/Item/Use.hs 79;" C
ScrollAttachType src/Dodge/Data/Item/Combine.hs 105;" t
ScrollValue src/Dodge/ScrollValue.hs 1;" m
SecretCabal src/Dodge/Data/Scenario.hs 44;" C
@@ -2565,7 +2565,7 @@ TUBE src/Dodge/Data/Item/Combine.hs 31;" C
Tank src/Dodge/Placement/Instance/Tank.hs 1;" m
Tanks src/Dodge/Room/Tanks.hs 1;" m
Tap src/Dodge/Data/SoundOrigin.hs 36;" C
TargetAttachParams src/Dodge/Data/Item/Use.hs 79;" C
TargetAttachParams src/Dodge/Data/Item/Use.hs 80;" C
TargetCursor src/Dodge/Data/Item/Targeting.hs 16;" C
TargetCursorUpdate src/Dodge/Data/Targeting.hs 26;" C
TargetDistanceDraw src/Dodge/Data/Targeting.hs 32;" C
@@ -2726,9 +2726,9 @@ TweakTractionPower src/Dodge/Data/Item/Tweak.hs 22;" C
TweakType src/Dodge/Data/Item/Tweak.hs 20;" t
Tweakable src/Dodge/Data/Item/Tweak.hs 15;" C
TwistGoal src/Dodge/Data/Scenario.hs 15;" C
TwoHandFlat src/Dodge/Data/Item/Use.hs 123;" C
TwoHandOver src/Dodge/Data/Item/Use.hs 122;" C
TwoHandUnder src/Dodge/Data/Item/Use.hs 121;" C
TwoHandFlat src/Dodge/Data/Item/Use.hs 128;" C
TwoHandOver src/Dodge/Data/Item/Use.hs 127;" C
TwoHandUnder src/Dodge/Data/Item/Use.hs 126;" 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
@@ -2943,7 +2943,7 @@ Zoning src/Dodge/Zoning.hs 1;" m
ZoomScope src/Dodge/Data/Item/Attachment.hs 30;" C
ZoomScope src/Dodge/Item/Attachment/Data.hs 31;" C
ZoomScope src/Dodge/Item/Weapon/ZoomScope.hs 1;" m
ZoomScrollParams src/Dodge/Data/Item/Use.hs 91;" C
ZoomScrollParams src/Dodge/Data/Item/Use.hs 94;" C
__Just' src/MaybeHelp.hs 13;" f
_actAction src/Dodge/Data/ActionPlan.hs 81;" f
_actLabel src/Dodge/Data/ActionPlan.hs 80;" f
@@ -2953,13 +2953,13 @@ _actionSound src/Dodge/Data/LoadAction.hs 11;" f
_actionSound src/Dodge/Data/LoadAction.hs 14;" f
_actionTime src/Dodge/Data/LoadAction.hs 11;" f
_actionTime src/Dodge/Data/LoadAction.hs 14;" f
_aimHandlePos src/Dodge/Data/Item/Use.hs 108;" f
_aimMuzzles src/Dodge/Data/Item/Use.hs 109;" f
_aimRange src/Dodge/Data/Item/Use.hs 105;" f
_aimStance src/Dodge/Data/Item/Use.hs 107;" f
_aimTurnSpeed src/Dodge/Data/Item/Use.hs 104;" f
_aimWeight src/Dodge/Data/Item/Use.hs 103;" f
_aimZoom src/Dodge/Data/Item/Use.hs 106;" f
_aimHandlePos src/Dodge/Data/Item/Use.hs 112;" f
_aimMuzzles src/Dodge/Data/Item/Use.hs 113;" f
_aimRange src/Dodge/Data/Item/Use.hs 109;" f
_aimStance src/Dodge/Data/Item/Use.hs 111;" f
_aimTurnSpeed src/Dodge/Data/Item/Use.hs 108;" f
_aimWeight src/Dodge/Data/Item/Use.hs 107;" f
_aimZoom src/Dodge/Data/Item/Use.hs 110;" f
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 21;" f
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 24;" f
_allocNewPos src/Dodge/Data/RightButtonOptions.hs 28;" f
@@ -2984,11 +2984,11 @@ _amagLoadStatus src/Dodge/Data/Item/Use.hs 59;" f
_amagParams src/Dodge/Data/Item/Use.hs 60;" f
_amagType src/Dodge/Data/Item/Use.hs 61;" f
_ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f
_ampBullet src/Dodge/Data/Item/Use.hs 82;" f
_ampCreateGas src/Dodge/Data/Item/Use.hs 88;" f
_ampPayload src/Dodge/Data/Item/Use.hs 84;" f
_ampPjCreation src/Dodge/Data/Item/Use.hs 86;" f
_ampPjDraw src/Dodge/Data/Item/Use.hs 85;" f
_ampBullet src/Dodge/Data/Item/Use.hs 84;" f
_ampCreateGas src/Dodge/Data/Item/Use.hs 90;" f
_ampPayload src/Dodge/Data/Item/Use.hs 86;" f
_ampPjCreation src/Dodge/Data/Item/Use.hs 88;" f
_ampPjDraw src/Dodge/Data/Item/Use.hs 87;" 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
@@ -3543,9 +3543,9 @@ _iyBase src/Dodge/Data/Item/Combine.hs 17;" f
_iyModules src/Dodge/Combine/Data.hs 14;" f
_iyModules src/Dodge/Data/Item/Combine.hs 18;" f
_iyStack src/Dodge/Combine/Data.hs 15;" f
_izFac src/Dodge/Data/Item/Use.hs 132;" f
_izMax src/Dodge/Data/Item/Use.hs 130;" f
_izMin src/Dodge/Data/Item/Use.hs 131;" f
_izFac src/Dodge/Data/Item/Use.hs 137;" f
_izMax src/Dodge/Data/Item/Use.hs 135;" f
_izMin src/Dodge/Data/Item/Use.hs 136;" f
_killTarget src/Dodge/Data/ActionPlan.hs 198;" f
_lClock src/Dodge/Data/LWorld.hs 145;" f
_lWorld src/Dodge/Data/CWorld.hs 26;" f
@@ -3673,9 +3673,9 @@ _mvSpeed src/Dodge/Data/Creature/Misc.hs 39;" f
_mvToPoint src/Dodge/Data/Creature.hs 98;" f
_mvTurnJit src/Dodge/Data/Creature/Misc.hs 43;" f
_mvTurnRad src/Dodge/Data/Creature/Misc.hs 42;" f
_mzInaccuracy src/Dodge/Data/Item/Use.hs 116;" f
_mzPos src/Dodge/Data/Item/Use.hs 114;" f
_mzRot src/Dodge/Data/Item/Use.hs 115;" f
_mzInaccuracy src/Dodge/Data/Item/Use.hs 120;" f
_mzPos src/Dodge/Data/Item/Use.hs 118;" f
_mzRot src/Dodge/Data/Item/Use.hs 119;" f
_newArcStep src/Dodge/Data/Item/Params.hs 57;" f
_newBeams src/Dodge/Data/LWorld.hs 114;" f
_noClip src/Dodge/Debug/Flag/Data.hs 7;" f
@@ -3699,9 +3699,9 @@ _opPlacement src/Dodge/Data/GenWorld.hs 129;" f
_opPlacementID src/Dodge/Data/GenWorld.hs 130;" f
_opSel src/Dodge/Data/RightButtonOptions.hs 15;" f
_opTexture src/Dodge/Data/Wall.hs 42;" f
_opticDefaultZoom src/Dodge/Data/Item/Use.hs 97;" f
_opticPos src/Dodge/Data/Item/Use.hs 93;" f
_opticZoom src/Dodge/Data/Item/Use.hs 96;" f
_opticDefaultZoom src/Dodge/Data/Item/Use.hs 100;" f
_opticPos src/Dodge/Data/Item/Use.hs 96;" f
_opticZoom src/Dodge/Data/Item/Use.hs 99;" f
_paramMID src/Dodge/Data/Item/Params.hs 60;" f
_partialAction src/Dodge/Data/ActionPlan.hs 145;" f
_pastWorlds src/Dodge/Data/World.hs 38;" f
@@ -3972,8 +3972,8 @@ _scopeZoomChange src/Dodge/Data/Item/Attachment.hs 33;" f
_scopeZoomChange src/Dodge/Item/Attachment/Data.hs 33;" f
_screenTextureVAO src/Data/Preload/Render.hs 50;" f
_scrollAmount src/Dodge/Data/Input.hs 24;" f
_scrollAttachParams src/Dodge/Data/Item/Use.hs 78;" f
_scrollChar src/Dodge/Data/Item/Use.hs 100;" f
_scrollAttachParams src/Dodge/Data/Item/Use.hs 79;" f
_scrollChar src/Dodge/Data/Item/Use.hs 103;" f
_scrollItemLocation src/Dodge/Data/World.hs 65;" f
_scrollItemLocation src/Dodge/Data/World.hs 74;" f
_scrollItemLocation src/Dodge/Data/World.hs 78;" f
@@ -4559,7 +4559,7 @@ basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f
basicMachineUpdate src/Dodge/Machine.hs 13;" f
basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f
basicTerminal src/Dodge/Terminal.hs 32;" f
battery src/Dodge/Item/Ammo.hs 61;" f
battery src/Dodge/Item/Ammo.hs 62;" f
batteryGuns src/Dodge/Combine/Combinations.hs 227;" f
batteryModules src/Dodge/Item/Held/BatteryGuns.hs 111;" f
batteryPack src/Dodge/Item/Equipment.hs 58;" f
@@ -4641,7 +4641,7 @@ bulletBodyCraft src/Dodge/Item/Craftable.hs 24;" f
bulletCombinations src/Dodge/Combine/Graph.hs 35;" f
bulletMagazines src/Dodge/Combine/Combinations.hs 239;" f
bulletSpawn src/Dodge/Bullet.hs 91;" f
bulletSynthesizer src/Dodge/Item/Ammo.hs 75;" f
bulletSynthesizer src/Dodge/Item/Ammo.hs 76;" f
bulletTypes src/Dodge/TweakBullet.hs 26;" f
bulletWeapons src/Dodge/Combine/Combinations.hs 247;" f
burstRifle src/Dodge/Item/Held/Cane.hs 86;" f
@@ -7110,7 +7110,7 @@ shatterGun src/Dodge/Item/Held/Weapons.hs 7;" f
shatterGunSPic src/Dodge/Item/Draw/SPic.hs 240;" f
shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f
shellCollisionCheck src/Dodge/Projectile/Update.hs 30;" f
shellMag src/Dodge/Item/Ammo.hs 43;" f
shellMag src/Dodge/Item/Ammo.hs 44;" f
shellShape src/Dodge/Projectile/Draw.hs 24;" f
shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f
shieldWall src/Dodge/Euse.hs 114;" f