From 872e60438e6905ee2d27283358c7d2324fffba30 Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 21 Jun 2024 13:37:51 +0100 Subject: [PATCH] Add loading cycles to magazines --- ghcidOutput | 216 +++++------ graph/itemCombinations.gv | 2 +- src/Dodge/Combine/Combinations.hs | 3 +- src/Dodge/Data/Item/Combine.hs | 3 +- src/Dodge/Item/Ammo.hs | 15 +- src/Dodge/Item/Draw/SPic.hs | 2 +- src/Dodge/Item/Weapon/FractionLoaded.hs | 6 +- tags | 490 ++++++++++++------------ 8 files changed, 367 insertions(+), 370 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index 16284f32e..de3b7e3fb 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1,40 +1,3 @@ -/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:11:1-26: warning: [-Wunused-imports] - The import of ‘Control.Applicative’ is redundant - | -11 | import Control.Applicative - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:12:1-20: warning: [-Wunused-imports] - The import of ‘Control.Monad’ is redundant - | -12 | import Control.Monad - | ^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:15:1-22: warning: [-Wunused-imports] - The import of ‘Dodge.Item.Info’ is redundant - | -15 | import Dodge.Item.Info - | ^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:87:16-17: warning: [-Wname-shadowing] - This binding for ‘at’ shadows the existing binding - imported from ‘LensHelp’ at /home/justin/Haskell/loop/src/Dodge/Item/Display.hs:18:1-15 - (and originally defined in ‘Control.Lens.At’) - | -87 | showAttachItem at = case at of - | ^^ -/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:132:21-22: warning: [-Wunused-matches] - Defined but not used: ‘cr’ - | -132 | showEquipmentNumber cr itm = case _eeUse ee of - | ^^ -/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:155:20-21: warning: [-Wunused-matches] - Defined but not used: ‘cr’ - | -155 | showReloadProgress cr itm = fromMaybe [] $ do - | ^^ -/home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:10:1-39: warning: [-Wunused-imports] - The import of ‘Dodge.Item.Weapon.FractionLoaded’ is redundant - | -10 | import Dodge.Item.Weapon.FractionLoaded - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ /home/justin/Haskell/loop/src/Dodge/Item/Draw/SPic.hs:68:1-12: warning: [-Wunused-top-binds] Defined but not used: ‘ammoPosition’ | @@ -90,91 +53,21 @@ | 448 | lasGunPic it = | ^^ -/home/justin/Haskell/loop/src/Dodge/Item/Weapon/FractionLoaded.hs:6:1-19: warning: [-Wunused-imports] - The import of ‘Control.Lens’ is redundant - | -6 | import Control.Lens - | ^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Weapon/FractionLoaded.hs:7:1-17: warning: [-Wunused-imports] - The import of ‘Data.Maybe’ is redundant - | -7 | import Data.Maybe - | ^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Weapon/FractionLoaded.hs:8:1-22: warning: [-Wunused-imports] - The import of ‘Dodge.Data.Item’ is redundant - | -8 | import Dodge.Data.Item - | ^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Euse.hs:4:1-20: warning: [-Wunused-imports] - The import of ‘Control.Monad’ is redundant - | -4 | import Control.Monad - | ^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Euse.hs:47:15-17: warning: [-Wunused-matches] - Defined but not used: ‘itm’ - | -47 | trySiphonFuel itm cr = id - | ^^^ -/home/justin/Haskell/loop/src/Dodge/Euse.hs:47:19-20: warning: [-Wunused-matches] - Defined but not used: ‘cr’ - | -47 | trySiphonFuel itm cr = id - | ^^ -/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:488:22-23: warning: [-Wunused-matches] - Defined but not used: ‘it’ - | -488 | caneStickSoundChoice it = tap3S - | ^^ -/home/justin/Haskell/loop/src/Dodge/Item/Weapon/TriggerType.hs:657:55: warning: [-Wtype-defaults] - • Defaulting the following constraints to type ‘Integer’ - (Num a0) - arising from the literal ‘1’ - at /home/justin/Haskell/loop/src/Dodge/Item/Weapon/TriggerType.hs:657:55 - (Enum a0) - arising from the arithmetic sequence ‘1 .. ’ - at /home/justin/Haskell/loop/src/Dodge/Item/Weapon/TriggerType.hs:657:54-60 - • In the expression: 1 - In the second argument of ‘take’, namely ‘[1 .. ]’ - In the third argument of ‘foldr’, namely ‘(take numbul [1 .. ])’ - | -657 | duplicateLoaded eff it cr w = foldr f w (take numbul [1 .. ]) - | ^ -/home/justin/Haskell/loop/src/Dodge/Item/Held/BatteryGuns.hs:10:1-29: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading.Action’ is redundant - | -10 | import Dodge.Reloading.Action - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Held/Cone.hs:6:1-29: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading.Action’ is redundant - | -6 | import Dodge.Reloading.Action - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Held/Launcher.hs:4:1-29: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading.Action’ is redundant - | -4 | import Dodge.Reloading.Action - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ /home/justin/Haskell/loop/src/Dodge/Item/Held/SprayGuns.hs:12:1-29: warning: [-Wunused-imports] The import of ‘Dodge.Reloading.Action’ is redundant | 12 | import Dodge.Reloading.Action | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Held/Rod.hs:13:1-29: warning: [-Wunused-imports] +/home/justin/Haskell/loop/src/Dodge/Item/Held/Launcher.hs:4:1-29: warning: [-Wunused-imports] The import of ‘Dodge.Reloading.Action’ is redundant - | -13 | import Dodge.Reloading.Action - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Info.hs:(62,16)-(107,62): warning: [-Wincomplete-patterns] - Pattern match(es) are non-exhaustive - In a case alternative: Patterns not matched: MULTIGUN _ - | -62 | heldInfo hit = case hit of - | ^^^^^^^^^^^... -/home/justin/Haskell/loop/src/Dodge/Item/Held/Cane.hs:14:1-29: warning: [-Wunused-imports] + | +4 | import Dodge.Reloading.Action + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item/Held/Cone.hs:6:1-29: warning: [-Wunused-imports] The import of ‘Dodge.Reloading.Action’ is redundant - | -14 | import Dodge.Reloading.Action - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | +6 | import Dodge.Reloading.Action + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ /home/justin/Haskell/loop/src/Dodge/Base/You.hs:45:19-20: warning: [-Wunused-matches] Defined but not used: ‘cr’ | @@ -195,6 +88,99 @@ | 12 | import Dodge.Reloading.Action | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item/Held/BatteryGuns.hs:10:1-29: warning: [-Wunused-imports] + The import of ‘Dodge.Reloading.Action’ is redundant + | +10 | import Dodge.Reloading.Action + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item/Weapon/TriggerType.hs:657:55: warning: [-Wtype-defaults] + • Defaulting the following constraints to type ‘Integer’ + (Num a0) + arising from the literal ‘1’ + at /home/justin/Haskell/loop/src/Dodge/Item/Weapon/TriggerType.hs:657:55 + (Enum a0) + arising from the arithmetic sequence ‘1 .. ’ + at /home/justin/Haskell/loop/src/Dodge/Item/Weapon/TriggerType.hs:657:54-60 + • In the expression: 1 + In the second argument of ‘take’, namely ‘[1 .. ]’ + In the third argument of ‘foldr’, namely ‘(take numbul [1 .. ])’ + | +657 | duplicateLoaded eff it cr w = foldr f w (take numbul [1 .. ]) + | ^ +/home/justin/Haskell/loop/src/Dodge/Euse.hs:4:1-20: warning: [-Wunused-imports] + The import of ‘Control.Monad’ is redundant + | +4 | import Control.Monad + | ^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Euse.hs:47:15-17: warning: [-Wunused-matches] + Defined but not used: ‘itm’ + | +47 | trySiphonFuel itm cr = id + | ^^^ +/home/justin/Haskell/loop/src/Dodge/Euse.hs:47:19-20: warning: [-Wunused-matches] + Defined but not used: ‘cr’ + | +47 | trySiphonFuel itm cr = id + | ^^ +/home/justin/Haskell/loop/src/Dodge/Item/Held/Rod.hs:13:1-29: warning: [-Wunused-imports] + The import of ‘Dodge.Reloading.Action’ is redundant + | +13 | import Dodge.Reloading.Action + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item/Held/Cane.hs:14:1-29: warning: [-Wunused-imports] + The import of ‘Dodge.Reloading.Action’ is redundant + | +14 | import Dodge.Reloading.Action + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item.hs:(29,25)-(34,40): warning: [-Wincomplete-patterns] + Pattern match(es) are non-exhaustive + In a case alternative: Patterns not matched: AMMOATTACH REVOLVEMAG + | +29 | itemFromAttachType at = case at of + | ^^^^^^^^^^... +/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:488:22-23: warning: [-Wunused-matches] + Defined but not used: ‘it’ + | +488 | caneStickSoundChoice it = tap3S + | ^^ +/home/justin/Haskell/loop/src/Dodge/Item/Info.hs:(62,16)-(107,62): warning: [-Wincomplete-patterns] + Pattern match(es) are non-exhaustive + In a case alternative: Patterns not matched: MULTIGUN _ + | +62 | heldInfo hit = case hit of + | ^^^^^^^^^^^... +/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:11:1-26: warning: [-Wunused-imports] + The import of ‘Control.Applicative’ is redundant + | +11 | import Control.Applicative + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:12:1-20: warning: [-Wunused-imports] + The import of ‘Control.Monad’ is redundant + | +12 | import Control.Monad + | ^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:15:1-22: warning: [-Wunused-imports] + The import of ‘Dodge.Item.Info’ is redundant + | +15 | import Dodge.Item.Info + | ^^^^^^^^^^^^^^^^^^^^^^ +/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:87:16-17: warning: [-Wname-shadowing] + This binding for ‘at’ shadows the existing binding + imported from ‘LensHelp’ at /home/justin/Haskell/loop/src/Dodge/Item/Display.hs:18:1-15 + (and originally defined in ‘Control.Lens.At’) + | +87 | showAttachItem at = case at of + | ^^ +/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:132:21-22: warning: [-Wunused-matches] + Defined but not used: ‘cr’ + | +132 | showEquipmentNumber cr itm = case _eeUse ee of + | ^^ +/home/justin/Haskell/loop/src/Dodge/Item/Display.hs:155:20-21: warning: [-Wunused-matches] + Defined but not used: ‘cr’ + | +155 | showReloadProgress cr itm = fromMaybe [] $ do + | ^^ /home/justin/Haskell/loop/src/Dodge/Default/Item/Use/Consumption.hs:6:1-29: warning: [-Wunused-imports] The import of ‘Dodge.Reloading.Action’ is redundant | diff --git a/graph/itemCombinations.gv b/graph/itemCombinations.gv index 66d8e434c..fd7438c3c 100644 --- a/graph/itemCombinations.gv +++ b/graph/itemCombinations.gv @@ -22,7 +22,7 @@ digraph { 28 [shape=box ,label="EQUIP {_ibtEquip = TARGETINGHAT TargetCursor}"]; 31 [shape=box - ,label="ATTACH {_ibtAttach = AMMOATTACH TINMAG}"]; + ,label="ATTACH {_ibtAttach = AMMOATTACH REVOLVEMAG}"]; 35 [shape=box ,label="HELD {_ibtHeld = BANGSTICK {_xNum = 1}}"]; 39 [shape=box diff --git a/src/Dodge/Combine/Combinations.hs b/src/Dodge/Combine/Combinations.hs index 725f5b63e..f4c4ff3d3 100644 --- a/src/Dodge/Combine/Combinations.hs +++ b/src/Dodge/Combine/Combinations.hs @@ -38,7 +38,8 @@ hatCombinations = magazineCombinations :: [([(ItAmount,ItemBaseType)],Item)] magazineCombinations = - [ po [CRAFT TIN, CRAFT SPRING] tinMag ] + [ po [CRAFT TIN, CRAFT SPRING] tinMag + ] where po xs it = (map o xs, it) o = (1,) diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs index 56acee7dd..04e55ba8b 100644 --- a/src/Dodge/Data/Item/Combine.hs +++ b/src/Dodge/Data/Item/Combine.hs @@ -107,7 +107,8 @@ data ScrollAttachType deriving (Eq, Ord, Show, Read) data AmmoAttachType - = TINMAG + = REVOLVEMAG + | TINMAG | DRUMMAG | BULLETBELT deriving (Eq, Ord, Show, Read) diff --git a/src/Dodge/Item/Ammo.hs b/src/Dodge/Item/Ammo.hs index e8012aa4e..bb9beadd9 100644 --- a/src/Dodge/Item/Ammo.hs +++ b/src/Dodge/Item/Ammo.hs @@ -1,16 +1,29 @@ module Dodge.Item.Ammo where +import Dodge.Reloading.Action import Control.Lens import Dodge.Data.World import Dodge.Default.Item +revolveMag :: Item +revolveMag = defaultHeldItem & itType . iyBase .~ ATTACH (AMMOATTACH REVOLVEMAG) + & itUse .~ AttachUse {_attachParams = AmmoAttachParams {_ammoAttachParams = InternalAmmo + { _iaMax = 6 + , _iaLoaded = 6 + , _iaPrimed = True + , _iaCycle = [loadPartialInsert 10 1] + , _iaProgress = Nothing + } + } + } + tinMag :: Item tinMag = defaultHeldItem & itType . iyBase .~ ATTACH (AMMOATTACH TINMAG) & itUse .~ AttachUse {_attachParams = AmmoAttachParams {_ammoAttachParams = InternalAmmo { _iaMax = 15 , _iaLoaded = 15 , _iaPrimed = True - , _iaCycle = [] + , _iaCycle = [loadEject 10, loadInsert 10, loadPrime 10] , _iaProgress = Nothing } } diff --git a/src/Dodge/Item/Draw/SPic.hs b/src/Dodge/Item/Draw/SPic.hs index 700dfe684..3f2ede4bc 100644 --- a/src/Dodge/Item/Draw/SPic.hs +++ b/src/Dodge/Item/Draw/SPic.hs @@ -7,7 +7,7 @@ import qualified Data.Map.Strict as M import Data.Maybe import Dodge.Data.Item import Dodge.Item.AmmoPosition -import Dodge.Item.Weapon.FractionLoaded +--import Dodge.Item.Weapon.FractionLoaded import Geometry import LensHelp import qualified Linear.Quaternion as Q diff --git a/src/Dodge/Item/Weapon/FractionLoaded.hs b/src/Dodge/Item/Weapon/FractionLoaded.hs index afa1c3cb3..0c5b5f36c 100644 --- a/src/Dodge/Item/Weapon/FractionLoaded.hs +++ b/src/Dodge/Item/Weapon/FractionLoaded.hs @@ -3,9 +3,9 @@ module Dodge.Item.Weapon.FractionLoaded ( -- fractionLoadedAmmo2, ) where -import Control.Lens -import Data.Maybe -import Dodge.Data.Item +--import Control.Lens +--import Data.Maybe +--import Dodge.Data.Item -- ---- this shouldn't really be used -- loadedAmmo :: Item -> Int diff --git a/tags b/tags index a34a04ae7..25f951bb3 100644 --- a/tags +++ b/tags @@ -25,22 +25,22 @@ AIUNIT src/Dodge/Combine/Data.hs 48;" C AIUNIT src/Dodge/Data/Item/Combine.hs 54;" C AMMOATTACH src/Dodge/Data/Item/Combine.hs 99;" C AMR src/Dodge/Combine/Data.hs 157;" C -AMR src/Dodge/Data/Item/Combine.hs 175;" C +AMR src/Dodge/Data/Item/Combine.hs 176;" C ANTIMATTER src/Dodge/Combine/Data.hs 44;" C ANTIMATTER src/Dodge/Data/Item/Combine.hs 48;" C AQUAMARINE src/Color/Data.hs 24;" C ATTACH src/Dodge/Data/Item/Combine.hs 92;" C ATTACHTORCH src/Dodge/Combine/Data.hs 219;" C -ATTACHTORCH src/Dodge/Data/Item/Combine.hs 216;" C +ATTACHTORCH src/Dodge/Data/Item/Combine.hs 217;" C AUTOAMR src/Dodge/Combine/Data.hs 158;" C -AUTOAMR src/Dodge/Data/Item/Combine.hs 176;" C +AUTOAMR src/Dodge/Data/Item/Combine.hs 177;" C AUTODETECTOR src/Dodge/Combine/Data.hs 117;" C -AUTODETECTOR src/Dodge/Data/Item/Combine.hs 141;" C +AUTODETECTOR src/Dodge/Data/Item/Combine.hs 142;" C AUTOEFFGUN src/Dodge/Combine/Data.hs 84;" C AUTOPISTOL src/Dodge/Combine/Data.hs 139;" C -AUTOPISTOL src/Dodge/Data/Item/Combine.hs 161;" C +AUTOPISTOL src/Dodge/Data/Item/Combine.hs 162;" C AUTORIFLE src/Dodge/Combine/Data.hs 151;" C -AUTORIFLE src/Dodge/Data/Item/Combine.hs 171;" C +AUTORIFLE src/Dodge/Data/Item/Combine.hs 172;" C AZURE src/Color/Data.hs 23;" C AboveSource src/Dodge/Data/Item/Use/Consumption.hs 30;" C AccessTerminal src/Dodge/Data/WorldEffect.hs 26;" C @@ -163,44 +163,44 @@ Awareness src/Dodge/Creature/Picture/Awareness.hs 1;" m AwarenessInt src/Dodge/Creature/AlertLevel/Data.hs 26;" C AwarenessLevel src/Dodge/Creature/AlertLevel/Data.hs 25;" t BANGCONE src/Dodge/Combine/Data.hs 141;" C -BANGCONE src/Dodge/Data/Item/Combine.hs 163;" C +BANGCONE src/Dodge/Data/Item/Combine.hs 164;" C BANGROD src/Dodge/Combine/Data.hs 155;" C -BANGROD src/Dodge/Data/Item/Combine.hs 173;" C +BANGROD src/Dodge/Data/Item/Combine.hs 174;" C BANGSTICK src/Dodge/Combine/Data.hs 134;" C -BANGSTICK src/Dodge/Data/Item/Combine.hs 158;" C +BANGSTICK src/Dodge/Data/Item/Combine.hs 159;" C BATTERY src/Dodge/Combine/Data.hs 59;" C BATTERY src/Dodge/Data/Item/Combine.hs 67;" C -BATTERYPACK src/Dodge/Data/Item/Combine.hs 140;" C +BATTERYPACK src/Dodge/Data/Item/Combine.hs 141;" C BELTMAG src/Dodge/Combine/Data.hs 200;" C BEZIERTRAJ src/Dodge/Combine/Data.hs 212;" C BLACK src/Color/Data.hs 28;" C BLINKER src/Dodge/Combine/Data.hs 125;" C -BLINKER src/Dodge/Data/Item/Combine.hs 151;" C +BLINKER src/Dodge/Data/Item/Combine.hs 152;" C BLINKERUNSAFE src/Dodge/Combine/Data.hs 126;" C -BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 152;" C +BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 153;" C BLOWTORCH src/Dodge/Combine/Data.hs 165;" C -BLOWTORCH src/Dodge/Data/Item/Combine.hs 183;" C +BLOWTORCH src/Dodge/Data/Item/Combine.hs 184;" C BLUE src/Color/Data.hs 17;" C BLUNDERBUSS src/Dodge/Combine/Data.hs 142;" C -BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 164;" C +BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 165;" C BLUNT src/Dodge/Data/Damage/Type.hs 13;" C BLUNT src/Dodge/Data/DamageType.hs 12;" C BOOSTER src/Dodge/Combine/Data.hs 123;" C -BOOSTER src/Dodge/Data/Item/Combine.hs 147;" C +BOOSTER src/Dodge/Data/Item/Combine.hs 148;" C BOUNCEBUL src/Dodge/Combine/Data.hs 203;" C BOUNCEMODULE src/Dodge/Combine/Data.hs 69;" C BQuad src/Geometry/Bezier.hs 9;" t BRAINHAT src/Dodge/Combine/Data.hs 109;" C -BRAINHAT src/Dodge/Data/Item/Combine.hs 129;" C -BULBODY src/Dodge/Data/Item/Combine.hs 208;" C +BRAINHAT src/Dodge/Data/Item/Combine.hs 130;" C +BULBODY src/Dodge/Data/Item/Combine.hs 209;" C BULBODYCRAFT src/Dodge/Data/Item/Combine.hs 76;" C -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 207;" C -BULTRAJ src/Dodge/Data/Item/Combine.hs 209;" C +BULLETBELT src/Dodge/Data/Item/Combine.hs 113;" C +BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 140;" C +BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 139;" C +BULPAY src/Dodge/Data/Item/Combine.hs 208;" C +BULTRAJ src/Dodge/Data/Item/Combine.hs 210;" C BURSTRIFLE src/Dodge/Combine/Data.hs 152;" C -BURSTRIFLE src/Dodge/Data/Item/Combine.hs 172;" C +BURSTRIFLE src/Dodge/Data/Item/Combine.hs 173;" C BackgroundSound src/Dodge/Data/SoundOrigin.hs 14;" C Ball src/Dodge/Tesla/Ball.hs 1;" m BangCaneMod src/Dodge/Data/Item/HeldUse.hs 85;" C @@ -351,7 +351,7 @@ CONSUMABLE src/Dodge/Data/Item/Combine.hs 90;" C CRAFT src/Dodge/Combine/Data.hs 97;" C CRAFT src/Dodge/Data/Item/Combine.hs 91;" C CREATUREDETECTOR src/Dodge/Combine/Data.hs 226;" C -CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 221;" C +CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 222;" C CREATURESENSOR src/Dodge/Combine/Data.hs 57;" C CREATURESENSOR src/Dodge/Data/Item/Combine.hs 65;" C CRUSHING src/Dodge/Data/Damage/Type.hs 16;" C @@ -474,7 +474,7 @@ Connectors src/Dodge/Render/Connectors.hs 1;" m ConstantIntensity src/Dodge/Data/LightSource.hs 17;" C Consumable src/Dodge/Item/Consumable.hs 1;" m ConsumableFamily src/Dodge/Item/Family.hs 7;" C -ConsumableItemType src/Dodge/Data/Item/Combine.hs 116;" t +ConsumableItemType src/Dodge/Data/Item/Combine.hs 117;" t ConsumeUse src/Dodge/Data/Item/Use.hs 45;" C ConsumeUse' src/Dodge/Data/Item/Use.hs 84;" t Consumption src/Dodge/Data/Item/Consumption.hs 5;" m @@ -590,13 +590,13 @@ Cuse src/Dodge/Cuse.hs 1;" m Cylinder src/Shape/Data.hs 19;" C DPoint2 src/Geometry/Data.hs 34;" t DRONELAUNCHER src/Dodge/Combine/Data.hs 184;" C -DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 195;" C +DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 196;" C DRUM src/Dodge/Combine/Data.hs 34;" C DRUMMAG src/Dodge/Combine/Data.hs 199;" C -DRUMMAG src/Dodge/Data/Item/Combine.hs 111;" C +DRUMMAG src/Dodge/Data/Item/Combine.hs 112;" C DS src/DoubleStack.hs 3;" t DUALBEAM src/Dodge/Combine/Data.hs 171;" C -DUALBEAM src/Dodge/Data/Item/Combine.hs 188;" C +DUALBEAM src/Dodge/Data/Item/Combine.hs 189;" C DUCTTAPE src/Dodge/Combine/Data.hs 31;" C Damage src/Dodge/Data/Damage.hs 32;" t Damage src/Dodge/Data/DamageType.hs 38;" t @@ -687,7 +687,7 @@ DestroyDamage src/Dodge/Particle/Bullet/DestroyDamage.hs 1;" m DestroyItem src/Dodge/Data/Scenario.hs 7;" C DestroyTLS src/Dodge/Data/LightSource.hs 22;" C Detector src/Dodge/Combine/Data.hs 224;" t -Detector src/Dodge/Data/Item/Combine.hs 219;" t +Detector src/Dodge/Data/Item/Combine.hs 220;" t Dirt src/Dodge/Data/Material.hs 11;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t Display src/Dodge/Item/Display.hs 1;" m @@ -802,9 +802,9 @@ EHeadLamp src/Dodge/Data/Item/HeldUse.hs 43;" C ELECTRICAL src/Dodge/Data/Damage/Type.hs 20;" C ELECTRICAL src/Dodge/Data/DamageType.hs 19;" C ELEPHANTGUN src/Dodge/Combine/Data.hs 156;" C -ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 174;" C +ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 175;" C EMPTYMODULE src/Dodge/Combine/Data.hs 198;" C -EMPTYMODULE src/Dodge/Data/Item/Combine.hs 205;" C +EMPTYMODULE src/Dodge/Data/Item/Combine.hs 206;" C EMagShield src/Dodge/Data/Item/HeldUse.hs 41;" C ENERGYBALLCRAFT src/Dodge/Data/Item/Combine.hs 75;" C ENTERREMENT src/Dodge/Data/Damage/Type.hs 24;" C @@ -814,7 +814,7 @@ EQUIP src/Dodge/Data/Item/Combine.hs 89;" C EWristShield src/Dodge/Data/Item/HeldUse.hs 42;" C EXPLOSIVE src/Dodge/Data/Damage/Type.hs 21;" C EXPLOSIVE src/Dodge/Data/DamageType.hs 20;" C -EXPLOSIVES src/Dodge/Data/Item/Combine.hs 118;" C +EXPLOSIVES src/Dodge/Data/Item/Combine.hs 119;" C EXTRABATTERY src/Dodge/Combine/Data.hs 218;" C Ears src/Dodge/Creature/Perception/Data.hs 48;" C Ears src/Dodge/Data/Creature/Perception.hs 47;" C @@ -850,7 +850,7 @@ EquipCounter src/Dodge/Data/Item/Use/Equipment.hs 31;" C EquipEffect src/Dodge/Data/Item/Use/Equipment.hs 17;" t EquipID src/Dodge/Data/Item/Use/Equipment.hs 30;" C EquipItemType src/Dodge/Combine/Data.hs 103;" t -EquipItemType src/Dodge/Data/Item/Combine.hs 123;" t +EquipItemType src/Dodge/Data/Item/Combine.hs 124;" t EquipOptions src/Dodge/Data/RightButtonOptions.hs 15;" C EquipParams src/Dodge/Data/Item/Use/Equipment.hs 28;" t EquipPosition src/Dodge/Data/Equipment/Misc.hs 20;" t @@ -892,34 +892,34 @@ FBranch src/TreeExtra.hs 8;" C FBranches src/TreeExtra.hs 9;" C FLAKCRAFT src/Dodge/Data/Item/Combine.hs 73;" C FLAMESHIELD src/Dodge/Combine/Data.hs 105;" C -FLAMESHIELD src/Dodge/Data/Item/Combine.hs 125;" C +FLAMESHIELD src/Dodge/Data/Item/Combine.hs 126;" C FLAMESPITTER src/Dodge/Combine/Data.hs 161;" C -FLAMESPITTER src/Dodge/Data/Item/Combine.hs 179;" C +FLAMESPITTER src/Dodge/Data/Item/Combine.hs 180;" C FLAMETHROWER src/Dodge/Combine/Data.hs 162;" C -FLAMETHROWER src/Dodge/Data/Item/Combine.hs 180;" C +FLAMETHROWER src/Dodge/Data/Item/Combine.hs 181;" C FLAMETORRENT src/Dodge/Combine/Data.hs 163;" C -FLAMETORRENT src/Dodge/Data/Item/Combine.hs 181;" C +FLAMETORRENT src/Dodge/Data/Item/Combine.hs 182;" C FLAMEWALL src/Dodge/Combine/Data.hs 164;" C -FLAMEWALL src/Dodge/Data/Item/Combine.hs 182;" C +FLAMEWALL src/Dodge/Data/Item/Combine.hs 183;" C FLAMING src/Dodge/Data/Damage/Type.hs 18;" C FLAMING src/Dodge/Data/DamageType.hs 17;" C FLASHMODULE src/Dodge/Combine/Data.hs 68;" C FLASHMODULE src/Dodge/Data/Item/Combine.hs 71;" C FLATSHIELD src/Dodge/Combine/Data.hs 192;" C -FLATSHIELD src/Dodge/Data/Item/Combine.hs 200;" C +FLATSHIELD src/Dodge/Data/Item/Combine.hs 201;" C FLECHETRAJ src/Dodge/Combine/Data.hs 211;" C FLeaf src/TreeExtra.hs 10;" C FORCEFIELDGUN src/Dodge/Combine/Data.hs 188;" C -FORCEFIELDGUN src/Dodge/Data/Item/Combine.hs 197;" C +FORCEFIELDGUN src/Dodge/Data/Item/Combine.hs 198;" C FRAGCRAFT src/Dodge/Data/Item/Combine.hs 74;" C FRAGMODULE src/Dodge/Combine/Data.hs 67;" C FRAGMODULE src/Dodge/Data/Item/Combine.hs 70;" C FRONTARMOUR src/Dodge/Combine/Data.hs 106;" C -FRONTARMOUR src/Dodge/Data/Item/Combine.hs 126;" C +FRONTARMOUR src/Dodge/Data/Item/Combine.hs 127;" C FTree src/TreeExtra.hs 7;" t FUELCELL src/Dodge/Combine/Data.hs 60;" C FUELCELL src/Dodge/Data/Item/Combine.hs 68;" C -FUELPACK src/Dodge/Data/Item/Combine.hs 137;" C +FUELPACK src/Dodge/Data/Item/Combine.hs 138;" C FacilityType src/Dodge/Data/Scenario.hs 55;" t Faction src/Dodge/Creature/State/Data.hs 29;" t Faction src/Dodge/Data/Creature/State.hs 34;" t @@ -1014,7 +1014,7 @@ GEqC src/SameConstr.hs 20;" c GLASSSHARD src/Dodge/Data/Item/Combine.hs 40;" C GLHelp src/GLHelp.hs 1;" m GRAPECANNON src/Dodge/Combine/Data.hs 143;" C -GRAPECANNON src/Dodge/Data/Item/Combine.hs 165;" C +GRAPECANNON src/Dodge/Data/Item/Combine.hs 166;" C GRAVITYMODULE src/Dodge/Combine/Data.hs 75;" C GRAVITYMODULE src/Dodge/Data/Item/Combine.hs 80;" C GREEN src/Color/Data.hs 16;" C @@ -1081,16 +1081,16 @@ HARDDRIVE src/Dodge/Data/Item/Combine.hs 52;" C HARDWARE src/Dodge/Combine/Data.hs 29;" C HARDWARE src/Dodge/Data/Item/Combine.hs 32;" C HAT src/Dodge/Combine/Data.hs 110;" C -HAT src/Dodge/Data/Item/Combine.hs 130;" C +HAT src/Dodge/Data/Item/Combine.hs 131;" C HEADLAMP src/Dodge/Combine/Data.hs 111;" C -HEADLAMP src/Dodge/Data/Item/Combine.hs 132;" C +HEADLAMP src/Dodge/Data/Item/Combine.hs 133;" C HEADLAMP1 src/Dodge/Combine/Data.hs 112;" C HEATSENSOR src/Dodge/Combine/Data.hs 56;" C HEATSENSOR src/Dodge/Data/Item/Combine.hs 62;" C HELD src/Dodge/Combine/Data.hs 86;" C HELD src/Dodge/Data/Item/Combine.hs 87;" C HELDDETECTOR src/Dodge/Combine/Data.hs 190;" C -HELDDETECTOR src/Dodge/Data/Item/Combine.hs 198;" C +HELDDETECTOR src/Dodge/Data/Item/Combine.hs 199;" C HOSE src/Dodge/Data/Item/Combine.hs 34;" C HPtLayer src/Dodge/Picture/Layer/Data.hs 17;" C HUD src/Dodge/Data/HUD.hs 35;" t @@ -1124,7 +1124,7 @@ HeldFamily src/Dodge/Item/Family.hs 3;" C HeldFireRemoteShell src/Dodge/Data/Item/HeldUse.hs 21;" C HeldForceField src/Dodge/Data/Item/HeldUse.hs 29;" C HeldItemType src/Dodge/Combine/Data.hs 133;" t -HeldItemType src/Dodge/Data/Item/Combine.hs 157;" t +HeldItemType src/Dodge/Data/Item/Combine.hs 158;" t HeldLaser src/Dodge/Data/Item/HeldUse.hs 25;" C HeldMod src/Dodge/Data/Item/HeldUse.hs 68;" t HeldModNothing src/Dodge/Data/Item/HeldUse.hs 69;" C @@ -1179,13 +1179,13 @@ Huse src/Dodge/Data/Item/HeldUse.hs 15;" t INCENDBUL src/Dodge/Combine/Data.hs 202;" C INCENDIARYMODULE src/Dodge/Combine/Data.hs 64;" C INCENDLAS src/Dodge/Combine/Data.hs 213;" C -INCENDLAS src/Dodge/Data/Item/Combine.hs 211;" C +INCENDLAS src/Dodge/Data/Item/Combine.hs 212;" C INVISIBILITYEQUIPMENT src/Dodge/Combine/Data.hs 108;" C -INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 128;" C +INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 129;" C IRONBAR src/Dodge/Combine/Data.hs 53;" C IRONBAR src/Dodge/Data/Item/Combine.hs 59;" C ITEMDETECTOR src/Dodge/Combine/Data.hs 225;" C -ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 220;" C +ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 221;" C IcAmount src/Dodge/Data/ItemAmount.hs 9;" t ImmediateEffect src/Loop/Data.hs 8;" C Importance src/Shape/Data.hs 34;" t @@ -1311,7 +1311,7 @@ ItemFamily src/Dodge/Item/Family.hs 3;" t ItemHeld src/Dodge/Data/Item/Use.hs 77;" C ItemLocation src/Dodge/Data/Item/Location.hs 11;" t ItemModuleType src/Dodge/Combine/Data.hs 197;" t -ItemModuleType src/Dodge/Data/Item/Combine.hs 204;" t +ItemModuleType src/Dodge/Data/Item/Combine.hs 205;" t ItemParams src/Dodge/Data/Item/Params.hs 16;" t ItemParams src/Dodge/Tesla/ItemParams.hs 1;" m ItemScrollTimeFlow src/Dodge/Data/World.hs 61;" C @@ -1323,35 +1323,35 @@ ItemUnlocker src/Dodge/Lock/Data.hs 13;" C ItemUse src/Dodge/Data/Item/Use.hs 28;" t ItemUse' src/Dodge/Data/Item/Use.hs 76;" t JETPACK src/Dodge/Combine/Data.hs 116;" C -JETPACK src/Dodge/Data/Item/Combine.hs 136;" C +JETPACK src/Dodge/Data/Item/Combine.hs 137;" C JGK src/Control/Foldl/JGK.hs 1;" m JUMPLEGS src/Dodge/Combine/Data.hs 115;" C -JUMPLEGS src/Dodge/Data/Item/Combine.hs 135;" C +JUMPLEGS src/Dodge/Data/Item/Combine.hs 136;" C JoinClust src/Dodge/Combine/Graph.hs 19;" C Just' src/MaybeHelp.hs 13;" C JustStartedPlaying src/Sound/Data.hs 25;" C Justify src/Justify.hs 1;" m KEYCARD src/Dodge/Combine/Data.hs 94;" C -KEYCARD src/Dodge/Data/Item/Combine.hs 201;" C +KEYCARD src/Dodge/Data/Item/Combine.hs 202;" C Key src/Dodge/Layout/Tree/Annotate.hs 16;" C KeyConfig src/Dodge/Config/KeyConfig.hs 3;" m KeyConfigSDL src/Dodge/Config/KeyConfig.hs 17;" t Keyboard src/Dodge/Event/Keyboard.hs 2;" m Kill src/Dodge/Data/ActionPlan.hs 198;" C LASCIRCLE src/Dodge/Combine/Data.hs 169;" C -LASCIRCLE src/Dodge/Data/Item/Combine.hs 187;" C +LASCIRCLE src/Dodge/Data/Item/Combine.hs 188;" C LASERING src/Dodge/Data/Damage/Type.hs 19;" C LASERING src/Dodge/Data/DamageType.hs 18;" C LASGUN src/Dodge/Combine/Data.hs 168;" C -LASGUN src/Dodge/Data/Item/Combine.hs 186;" C +LASGUN src/Dodge/Data/Item/Combine.hs 187;" C LASWIDE src/Dodge/Combine/Data.hs 175;" C -LASWIDE src/Dodge/Data/Item/Combine.hs 189;" C +LASWIDE src/Dodge/Data/Item/Combine.hs 190;" C LAUNCHER src/Dodge/Combine/Data.hs 179;" C -LAUNCHER src/Dodge/Data/Item/Combine.hs 191;" C +LAUNCHER src/Dodge/Data/Item/Combine.hs 192;" C LAUNCHERX src/Dodge/Combine/Data.hs 180;" C -LAUNCHERX src/Dodge/Data/Item/Combine.hs 192;" C +LAUNCHERX src/Dodge/Data/Item/Combine.hs 193;" C LAUNCHHOME src/Dodge/Combine/Data.hs 217;" C -LAUNCHHOME src/Dodge/Data/Item/Combine.hs 215;" C +LAUNCHHOME src/Dodge/Data/Item/Combine.hs 216;" C LBlink src/Dodge/Data/Item/HeldUse.hs 63;" C LBoost src/Dodge/Data/Item/HeldUse.hs 65;" C LBranches src/TreeExtra.hs 24;" C @@ -1421,7 +1421,7 @@ LeftConsumption src/Dodge/Data/Item/Use/Consumption.hs 49;" t LeftForward src/Dodge/Creature/Stance/Data.hs 34;" C LeftForward src/Dodge/Data/Creature/Stance.hs 32;" C LeftItemType src/Dodge/Combine/Data.hs 122;" t -LeftItemType src/Dodge/Data/Item/Combine.hs 146;" t +LeftItemType src/Dodge/Data/Item/Combine.hs 147;" t LeftUse src/Dodge/Data/Item/Use.hs 38;" C LensHelp src/LensHelp.hs 1;" m Lethargic src/Dodge/Creature/AlertLevel/Data.hs 17;" C @@ -1504,29 +1504,29 @@ Lure src/Dodge/Data/ActionPlan.hs 179;" C Luse src/Dodge/Data/Item/HeldUse.hs 57;" t Luse src/Dodge/Luse.hs 1;" m MACHINEGUN src/Dodge/Combine/Data.hs 160;" C -MACHINEGUN src/Dodge/Data/Item/Combine.hs 178;" C +MACHINEGUN src/Dodge/Data/Item/Combine.hs 179;" C MACHINEPISTOL src/Dodge/Combine/Data.hs 138;" C -MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 160;" C +MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 161;" C MAGENTA src/Color/Data.hs 20;" C MAGNET src/Dodge/Combine/Data.hs 43;" C MAGNET src/Dodge/Data/Item/Combine.hs 47;" C MAGNETMAG src/Dodge/Combine/Data.hs 201;" C -MAGNETMAG src/Dodge/Data/Item/Combine.hs 206;" C +MAGNETMAG src/Dodge/Data/Item/Combine.hs 207;" C MAGNETTRAJ src/Dodge/Combine/Data.hs 210;" C MAGSHIELD src/Dodge/Combine/Data.hs 104;" C -MAGSHIELD src/Dodge/Data/Item/Combine.hs 124;" C +MAGSHIELD src/Dodge/Data/Item/Combine.hs 125;" C MBranch src/Dodge/Tree/Compose/Data.hs 10;" C MCrAc src/Dodge/Data/CreatureEffect.hs 46;" t MCrNoAction src/Dodge/Data/CreatureEffect.hs 46;" C MEDKIT src/Dodge/Combine/Data.hs 96;" C -MEDKIT src/Dodge/Data/Item/Combine.hs 117;" C +MEDKIT src/Dodge/Data/Item/Combine.hs 118;" C MICROCHIP src/Dodge/Combine/Data.hs 47;" C MICROCHIP src/Dodge/Data/Item/Combine.hs 51;" C MICROPHONE src/Dodge/Data/Item/Combine.hs 63;" C MINIDISPLAY src/Dodge/Combine/Data.hs 50;" C MINIDISPLAY src/Dodge/Data/Item/Combine.hs 56;" C MINIGUNX src/Dodge/Combine/Data.hs 147;" C -MINIGUNX src/Dodge/Data/Item/Combine.hs 166;" C +MINIGUNX src/Dodge/Data/Item/Combine.hs 167;" C MODBlockedString src/Dodge/Data/Universe.hs 96;" C MODString src/Dodge/Data/Universe.hs 95;" C MODStringOption src/Dodge/Data/Universe.hs 97;" C @@ -1536,7 +1536,7 @@ MP2Ac src/Dodge/Data/CreatureEffect.hs 57;" t MP2NoAction src/Dodge/Data/CreatureEffect.hs 57;" C MTRS src/Dodge/Annotation/Data.hs 11;" t MTree src/Dodge/Tree/Compose/Data.hs 8;" C -MULTIGUN src/Dodge/Data/Item/Combine.hs 168;" C +MULTIGUN src/Dodge/Data/Item/Combine.hs 169;" C Machine src/Dodge/Data/Machine.hs 31;" t Machine src/Dodge/Data/Machine.hs 6;" m Machine src/Dodge/Machine.hs 1;" m @@ -1615,29 +1615,29 @@ Misc src/Dodge/Data/Creature/Misc.hs 6;" m Misc src/Dodge/Data/Equipment/Misc.hs 6;" m Misc src/Dodge/Data/Item/Misc.hs 6;" m ModAutoMag src/Dodge/Combine/Data.hs 236;" C -ModAutoMag src/Dodge/Data/Item/Combine.hs 229;" C +ModAutoMag src/Dodge/Data/Item/Combine.hs 230;" C ModBattery src/Dodge/Combine/Data.hs 240;" C -ModBattery src/Dodge/Data/Item/Combine.hs 233;" C +ModBattery src/Dodge/Data/Item/Combine.hs 234;" C ModBullet src/Dodge/Combine/Data.hs 233;" C -ModBulletCollision src/Dodge/Data/Item/Combine.hs 226;" C -ModBulletPayload src/Dodge/Data/Item/Combine.hs 227;" C +ModBulletCollision src/Dodge/Data/Item/Combine.hs 227;" C +ModBulletPayload src/Dodge/Data/Item/Combine.hs 228;" C ModBulletSpawn src/Dodge/Combine/Data.hs 234;" C ModBulletTrajectory src/Dodge/Combine/Data.hs 238;" C -ModBulletTrajectory src/Dodge/Data/Item/Combine.hs 231;" C +ModBulletTrajectory src/Dodge/Data/Item/Combine.hs 232;" C ModDualBeam src/Dodge/Combine/Data.hs 242;" C -ModDualBeam src/Dodge/Data/Item/Combine.hs 235;" C +ModDualBeam src/Dodge/Data/Item/Combine.hs 236;" C ModHeldAttach src/Dodge/Combine/Data.hs 243;" C -ModHeldAttach src/Dodge/Data/Item/Combine.hs 236;" C +ModHeldAttach src/Dodge/Data/Item/Combine.hs 237;" C ModIDID src/Dodge/Data/Modification.hs 23;" C ModIDTimerPoint3Bool src/Dodge/Data/Modification.hs 15;" C ModLauncherHoming src/Dodge/Combine/Data.hs 239;" C -ModLauncherHoming src/Dodge/Data/Item/Combine.hs 232;" C +ModLauncherHoming src/Dodge/Data/Item/Combine.hs 233;" C ModRifleMag src/Dodge/Combine/Data.hs 235;" C -ModRifleMag src/Dodge/Data/Item/Combine.hs 228;" C +ModRifleMag src/Dodge/Data/Item/Combine.hs 229;" C ModTarget src/Dodge/Combine/Data.hs 237;" C -ModTarget src/Dodge/Data/Item/Combine.hs 230;" C +ModTarget src/Dodge/Data/Item/Combine.hs 231;" C ModTeleport src/Dodge/Combine/Data.hs 241;" C -ModTeleport src/Dodge/Data/Item/Combine.hs 234;" C +ModTeleport src/Dodge/Data/Item/Combine.hs 235;" C ModWithDirectedTeleport src/Dodge/Data/Item/HeldUse.hs 93;" C Modification src/Dodge/Data/Modification.hs 14;" t Modification src/Dodge/Data/Modification.hs 6;" m @@ -1648,7 +1648,7 @@ Module src/Dodge/Combine/Module.hs 1;" m Module src/Dodge/Item/Module.hs 1;" m Module src/Dodge/Module.hs 1;" m ModuleSlot src/Dodge/Combine/Data.hs 232;" t -ModuleSlot src/Dodge/Data/Item/Combine.hs 225;" t +ModuleSlot src/Dodge/Data/Item/Combine.hs 226;" t MonadHelp src/MonadHelp.hs 1;" m MountedLS src/Dodge/Data/MountedObject.hs 12;" C MountedObject src/Dodge/Data/MountedObject.hs 11;" t @@ -1869,7 +1869,7 @@ PIERCING src/Dodge/Data/DamageType.hs 11;" C PIPE src/Dodge/Combine/Data.hs 27;" C PIPE src/Dodge/Data/Item/Combine.hs 30;" C PISTOL src/Dodge/Combine/Data.hs 135;" C -PISTOL src/Dodge/Data/Item/Combine.hs 159;" C +PISTOL src/Dodge/Data/Item/Combine.hs 160;" C PJDecTimMvVel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 32;" C PJReduceSpin src/Dodge/Data/Ammo.hs 24;" C PJReduceSpin src/Dodge/Data/Item/Use/Consumption/Ammo.hs 28;" C @@ -1895,11 +1895,11 @@ PLUS src/Dodge/Data/GenParams.hs 20;" C POISONDAM src/Dodge/Data/Damage/Type.hs 23;" C POISONDAM src/Dodge/Data/DamageType.hs 24;" C POISONSPRAYER src/Dodge/Combine/Data.hs 183;" C -POISONSPRAYER src/Dodge/Data/Item/Combine.hs 194;" C +POISONSPRAYER src/Dodge/Data/Item/Combine.hs 195;" C PORTABLEFUSION src/Dodge/Combine/Data.hs 61;" C PORTABLEFUSION src/Dodge/Data/Item/Combine.hs 69;" C POWERLEGS src/Dodge/Combine/Data.hs 113;" C -POWERLEGS src/Dodge/Data/Item/Combine.hs 133;" C +POWERLEGS src/Dodge/Data/Item/Combine.hs 134;" C PPLevelReset src/Dodge/Data/PressPlate.hs 16;" C PRISM src/Dodge/Combine/Data.hs 40;" C PRISM src/Dodge/Data/Item/Combine.hs 45;" C @@ -2102,16 +2102,17 @@ RBList src/Dodge/Inventory/RBList.hs 1;" m RBranches src/TreeExtra.hs 48;" C RED src/Color/Data.hs 15;" C REMOTELAUNCHER src/Dodge/Combine/Data.hs 182;" C -REMOTELAUNCHER src/Dodge/Data/Item/Combine.hs 193;" C +REMOTELAUNCHER src/Dodge/Data/Item/Combine.hs 194;" C REPEATER src/Dodge/Combine/Data.hs 150;" C -REPEATER src/Dodge/Data/Item/Combine.hs 170;" C +REPEATER src/Dodge/Data/Item/Combine.hs 171;" C +REVOLVEMAG src/Dodge/Data/Item/Combine.hs 110;" C REVOLVER src/Dodge/Combine/Data.hs 136;" C REVOLVERX src/Dodge/Combine/Data.hs 137;" C REWINDER src/Dodge/Combine/Data.hs 124;" C -REWINDWATCH src/Dodge/Data/Item/Combine.hs 149;" C +REWINDWATCH src/Dodge/Data/Item/Combine.hs 150;" C RGBA src/Color/Data.hs 31;" t RIFLE src/Dodge/Combine/Data.hs 149;" C -RIFLE src/Dodge/Data/Item/Combine.hs 169;" C +RIFLE src/Dodge/Data/Item/Combine.hs 170;" C RLeaf src/TreeExtra.hs 49;" C ROSE src/Color/Data.hs 21;" C RPLinkStatus src/Dodge/Data/Room.hs 55;" t @@ -2230,32 +2231,32 @@ RunPast src/Dodge/Room/RunPast.hs 1;" m RunningSideEffect src/Dodge/Data/Universe.hs 65;" C SCRAPMETAL src/Dodge/Data/Item/Combine.hs 41;" C SCROLLATTACH src/Dodge/Data/Item/Combine.hs 98;" C -SCROLLWATCH src/Dodge/Data/Item/Combine.hs 150;" C +SCROLLWATCH src/Dodge/Data/Item/Combine.hs 151;" C SHARDGLASS src/Dodge/Combine/Data.hs 36;" C SHATTERGUN src/Dodge/Combine/Data.hs 186;" C -SHATTERGUN src/Dodge/Data/Item/Combine.hs 196;" C +SHATTERGUN src/Dodge/Data/Item/Combine.hs 197;" C SHATTERING src/Dodge/Data/Damage/Type.hs 17;" C SHATTERING src/Dodge/Data/DamageType.hs 16;" C SHRINKER src/Dodge/Combine/Data.hs 127;" C -SHRINKER src/Dodge/Data/Item/Combine.hs 153;" C +SHRINKER src/Dodge/Data/Item/Combine.hs 154;" C SIZEMODULE src/Dodge/Combine/Data.hs 74;" C SIZEMODULE src/Dodge/Data/Item/Combine.hs 79;" C SMG src/Dodge/Combine/Data.hs 140;" C -SMG src/Dodge/Data/Item/Combine.hs 162;" C +SMG src/Dodge/Data/Item/Combine.hs 163;" C SNIPERRIFLE src/Dodge/Combine/Data.hs 159;" C -SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 177;" C +SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 178;" C SOUNDSENSOR src/Dodge/Combine/Data.hs 55;" C SOUNDSENSOR src/Dodge/Data/Item/Combine.hs 61;" C SPARKGUN src/Dodge/Combine/Data.hs 166;" C -SPARKGUN src/Dodge/Data/Item/Combine.hs 184;" C +SPARKGUN src/Dodge/Data/Item/Combine.hs 185;" C SPARKING src/Dodge/Data/Damage/Type.hs 15;" C SPARKING src/Dodge/Data/DamageType.hs 14;" C SPAWNER src/Dodge/Combine/Data.hs 128;" C -SPAWNER src/Dodge/Data/Item/Combine.hs 154;" C +SPAWNER src/Dodge/Data/Item/Combine.hs 155;" C SPEEDLEGS src/Dodge/Combine/Data.hs 114;" C -SPEEDLEGS src/Dodge/Data/Item/Combine.hs 134;" C +SPEEDLEGS src/Dodge/Data/Item/Combine.hs 135;" C SPLITLAS src/Dodge/Combine/Data.hs 214;" C -SPLITLAS src/Dodge/Data/Item/Combine.hs 212;" C +SPLITLAS src/Dodge/Data/Item/Combine.hs 213;" C SPRING src/Dodge/Combine/Data.hs 30;" C SPRING src/Dodge/Data/Item/Combine.hs 33;" C SPic src/ShapePicture/Data.hs 4;" t @@ -2265,10 +2266,10 @@ SSSExtra src/Dodge/Data/SelectionList.hs 44;" t ST src/Dodge/Tree/Compose/Data.hs 12;" C STATICBUL src/Dodge/Combine/Data.hs 205;" C STATICLAS src/Dodge/Combine/Data.hs 215;" C -STATICLAS src/Dodge/Data/Item/Combine.hs 213;" C +STATICLAS src/Dodge/Data/Item/Combine.hs 214;" C STATICMODULE src/Dodge/Combine/Data.hs 65;" C STEELDRUM src/Dodge/Data/Item/Combine.hs 38;" C -STOPWATCH src/Dodge/Data/Item/Combine.hs 148;" C +STOPWATCH src/Dodge/Data/Item/Combine.hs 149;" C SameConstr src/SameConstr.hs 5;" m Save src/Dodge/Save.hs 1;" m SaveSlot src/Dodge/Data/SaveSlot.hs 9;" t @@ -2506,9 +2507,9 @@ SwitchToItem src/Dodge/Data/ActionPlan.hs 38;" C Synonyms src/Dodge/SoundLogic/Synonyms.hs 1;" m TAPE src/Dodge/Data/Item/Combine.hs 35;" C TARGCR src/Dodge/Combine/Data.hs 207;" C -TARGET src/Dodge/Data/Item/Combine.hs 210;" C +TARGET src/Dodge/Data/Item/Combine.hs 211;" C TARGETATTACH src/Dodge/Data/Item/Combine.hs 100;" C -TARGETINGHAT src/Dodge/Data/Item/Combine.hs 131;" C +TARGETINGHAT src/Dodge/Data/Item/Combine.hs 132;" C TARGETLASER src/Dodge/Data/Item/Targeting.hs 12;" C TARGETMODULE src/Dodge/Data/Item/Combine.hs 81;" C TARGLAS src/Dodge/Combine/Data.hs 208;" C @@ -2516,7 +2517,7 @@ TARGPOS src/Dodge/Combine/Data.hs 209;" C TELEPORTMODULE src/Dodge/Combine/Data.hs 72;" C TELEPORTMODULE src/Dodge/Data/Item/Combine.hs 77;" C TESLAGUN src/Dodge/Combine/Data.hs 167;" C -TESLAGUN src/Dodge/Data/Item/Combine.hs 185;" C +TESLAGUN src/Dodge/Data/Item/Combine.hs 186;" C THERMOMETER src/Dodge/Combine/Data.hs 41;" C THERMOMETER src/Dodge/Data/Item/Combine.hs 64;" C THREELINES src/Dodge/Data/GenParams.hs 20;" C @@ -2524,17 +2525,17 @@ TIMEMODULE src/Dodge/Combine/Data.hs 73;" C TIMEMODULE src/Dodge/Data/Item/Combine.hs 78;" C TIN src/Dodge/Combine/Data.hs 33;" C TIN src/Dodge/Data/Item/Combine.hs 37;" C -TINMAG src/Dodge/Data/Item/Combine.hs 110;" C +TINMAG src/Dodge/Data/Item/Combine.hs 111;" C TLS src/Dodge/Data/LightSource.hs 42;" C TLSFade src/Dodge/Data/LightSource.hs 18;" C TLSIntensity src/Dodge/Data/LightSource.hs 16;" t TLSUpdate src/Dodge/Data/LightSource.hs 21;" t TO src/Shader/Data.hs 59;" t TORCH src/Dodge/Combine/Data.hs 191;" C -TORCH src/Dodge/Data/Item/Combine.hs 199;" C +TORCH src/Dodge/Data/Item/Combine.hs 200;" C TORQUEDAM src/Dodge/Data/DamageType.hs 22;" C TRACTORGUN src/Dodge/Combine/Data.hs 178;" C -TRACTORGUN src/Dodge/Data/Item/Combine.hs 190;" C +TRACTORGUN src/Dodge/Data/Item/Combine.hs 191;" C TRANSFORMER src/Dodge/Combine/Data.hs 39;" C TRANSFORMER src/Dodge/Data/Item/Combine.hs 44;" C TRANSMITTER src/Dodge/Combine/Data.hs 46;" C @@ -2789,7 +2790,7 @@ VBO src/Shader/Data.hs 81;" t VF src/Polyhedra/Data.hs 21;" t VIOLET src/Color/Data.hs 22;" C VOLLEYGUN src/Dodge/Combine/Data.hs 148;" C -VOLLEYGUN src/Dodge/Data/Item/Combine.hs 167;" C +VOLLEYGUN src/Dodge/Data/Item/Combine.hs 168;" C VariableRate src/Dodge/Data/Item/HeldDelay.hs 18;" C VariableRate src/Dodge/Data/Item/Use/Delay.hs 16;" C VariableRate src/Dodge/Data/Item/UseDelay.hs 16;" C @@ -2816,15 +2817,15 @@ Vocalization src/Dodge/Creature/Vocalization.hs 1;" m Volition src/Dodge/Creature/Volition.hs 2;" m VolleyGunMod src/Dodge/Data/Item/HeldUse.hs 86;" C WALLDETECTOR src/Dodge/Combine/Data.hs 227;" C -WALLDETECTOR src/Dodge/Data/Item/Combine.hs 222;" C +WALLDETECTOR src/Dodge/Data/Item/Combine.hs 223;" C WASD src/Dodge/WASD.hs 1;" m WEPTELE src/Dodge/Combine/Data.hs 216;" C -WEPTELE src/Dodge/Data/Item/Combine.hs 214;" C +WEPTELE src/Dodge/Data/Item/Combine.hs 215;" C WHITE src/Color/Data.hs 27;" C WIRE src/Dodge/Combine/Data.hs 58;" C WIRE src/Dodge/Data/Item/Combine.hs 66;" C WRISTARMOUR src/Dodge/Combine/Data.hs 107;" C -WRISTARMOUR src/Dodge/Data/Item/Combine.hs 127;" C +WRISTARMOUR src/Dodge/Data/Item/Combine.hs 128;" C WaitMessage src/Dodge/Data/Menu.hs 5;" C WaitThen src/Dodge/Data/ActionPlan.hs 103;" C WalkCycle src/Dodge/Creature/State/WalkCycle.hs 1;" m @@ -3498,8 +3499,8 @@ _impulseUseAheadPos src/Dodge/Data/ActionPlan.hs 56;" f _impulseUseTarget src/Dodge/Data/ActionPlan.hs 53;" f _impulseUseTargetCID src/Dodge/Data/ActionPlan.hs 50;" f _impulsesListList src/Dodge/Data/ActionPlan.hs 98;" f -_imtBulletTrajectoryType src/Dodge/Data/Item/Combine.hs 209;" f -_imtTargetType src/Dodge/Data/Item/Combine.hs 210;" f +_imtBulletTrajectoryType src/Dodge/Data/Item/Combine.hs 210;" f +_imtTargetType src/Dodge/Data/Item/Combine.hs 211;" f _inInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 28;" f _inNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 30;" f _input src/Dodge/Data/World.hs 43;" f @@ -4306,11 +4307,11 @@ _xNum src/Dodge/Combine/Data.hs 143;" f _xNum src/Dodge/Combine/Data.hs 147;" f _xNum src/Dodge/Combine/Data.hs 175;" f _xNum src/Dodge/Combine/Data.hs 180;" f -_xNum src/Dodge/Data/Item/Combine.hs 158;" f -_xNum src/Dodge/Data/Item/Combine.hs 165;" f -_xNum src/Dodge/Data/Item/Combine.hs 168;" f -_xNum src/Dodge/Data/Item/Combine.hs 189;" f -_xNum src/Dodge/Data/Item/Combine.hs 192;" f +_xNum src/Dodge/Data/Item/Combine.hs 159;" f +_xNum src/Dodge/Data/Item/Combine.hs 166;" f +_xNum src/Dodge/Data/Item/Combine.hs 169;" f +_xNum src/Dodge/Data/Item/Combine.hs 190;" f +_xNum src/Dodge/Data/Item/Combine.hs 193;" f _znBounds src/Dodge/Base/Zone.hs 24;" f _znFunc src/Dodge/Data/Zoning.hs 15;" f _znObjects src/Dodge/Base/Zone.hs 22;" f @@ -4345,7 +4346,6 @@ addBoostShockwave src/Dodge/Item/Weapon/Booster.hs 56;" f addBoostShockwave src/Dodge/Luse.hs 119;" f addBranchAt src/Dodge/Layout/Tree/GenerateStructure.hs 18;" f addBranchAt src/Dodge/Tree/GenerateStructure.hs 17;" f -addBullets src/Dodge/Item/Draw/SPic.hs 254;" f addButtonSlowDoor src/Dodge/Room/LongDoor.hs 95;" f addCrGibs src/Dodge/Prop/Gib.hs 31;" f addDepth src/Picture/Base.hs 133;" f @@ -4382,7 +4382,7 @@ addSideEffect src/Dodge/Concurrent.hs 32;" f addSouthPillars src/Dodge/Room/LongDoor.hs 87;" f addTermSignal src/Dodge/Event/Input.hs 34;" f addTile src/Dodge/Room/AddTile.hs 11;" f -addTinClip src/Dodge/Item/Draw/SPic.hs 295;" f +addTinClip src/Dodge/Item/Draw/SPic.hs 291;" f addToTrunk src/Dodge/Layout/Tree/Polymorphic.hs 116;" f addToTrunk src/Dodge/Tree/Polymorphic.hs 129;" f addToTrunk src/TreeHelp.hs 156;" f @@ -4393,7 +4393,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 299;" f +afterRecoil src/Dodge/Item/Weapon/TriggerType.hs 287;" f aimDelaySweep src/Dodge/Render/ShapePicture.hs 44;" f aimStanceInfo src/Dodge/Item/Info.hs 229;" f aimTurn src/Dodge/Creature/YourControl.hs 188;" f @@ -4521,31 +4521,31 @@ backpackCombinations src/Dodge/Combine/Combinations.hs 23;" f backpackShape src/Dodge/Item/Draw/SPic.hs 59;" f backspaceInputted src/Dodge/Update/Input/Text.hs 26;" f bangCone src/Dodge/Item/Held/Cone.hs 10;" f -bangConeShape src/Dodge/Item/Draw/SPic.hs 225;" f +bangConeShape src/Dodge/Item/Draw/SPic.hs 221;" f bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 370;" f bangRod src/Dodge/Item/Held/Rod.hs 17;" f bangRod src/Dodge/Item/Weapon/BulletGun/Rod.hs 18;" f bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 478;" f bangStick src/Dodge/Item/Held/Stick.hs 16;" f bangStick src/Dodge/Item/Weapon/BulletGun/Stick.hs 17;" f -bangStickAmmoPos src/Dodge/Item/Draw/SPic.hs 120;" f +bangStickAmmoPos src/Dodge/Item/Draw/SPic.hs 118;" f bangStickSoundChoice src/Dodge/HeldUse.hs 492;" f bangStickSoundChoice src/Dodge/HeldUse/BulletWeapon.hs 226;" f barPP src/Dodge/Room/Foreground.hs 236;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f -baseAMRShape src/Dodge/Item/Draw/SPic.hs 435;" f +baseAMRShape src/Dodge/Item/Draw/SPic.hs 434;" 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 -baseCaneShape src/Dodge/Item/Draw/SPic.hs 245;" f +baseCaneShape src/Dodge/Item/Draw/SPic.hs 241;" f baseDebris src/Dodge/Block/Debris.hs 122;" f baseFloorTileSize src/Tile.hs 38;" f -baseRifleShape src/Dodge/Item/Draw/SPic.hs 248;" f -baseRodShape src/Dodge/Item/Draw/SPic.hs 432;" f -baseSMGShape src/Dodge/Item/Draw/SPic.hs 405;" f +baseRifleShape src/Dodge/Item/Draw/SPic.hs 244;" f +baseRodShape src/Dodge/Item/Draw/SPic.hs 431;" f +baseSMGShape src/Dodge/Item/Draw/SPic.hs 403;" f baseShoulder src/Dodge/Creature/Picture.hs 158;" f -baseStickShape src/Dodge/Item/Draw/SPic.hs 222;" f -baseStickShapeX src/Dodge/Item/Draw/SPic.hs 217;" f +baseStickShape src/Dodge/Item/Draw/SPic.hs 218;" f +baseStickShapeX src/Dodge/Item/Draw/SPic.hs 213;" f baseStickSpread src/Dodge/Item/Held/Stick.hs 36;" f baseStickSpread src/Dodge/Item/Weapon/BulletGun/Stick.hs 46;" f baseWindowPane src/Dodge/Placements/Wall.hs 73;" f @@ -4567,16 +4567,16 @@ 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 -batteryGuns src/Dodge/Combine/Combinations.hs 228;" f +batteryGuns src/Dodge/Combine/Combinations.hs 221;" f batteryModules src/Dodge/Item/Held/BatteryGuns.hs 116;" f batteryPack src/Dodge/Item/Equipment.hs 58;" f -belowNumX src/Dodge/Combine/Graph.hs 78;" f -beltMag src/Dodge/Item/Ammo.hs 23;" f +belowNumX src/Dodge/Combine/Graph.hs 77;" f +beltMag src/Dodge/Item/Ammo.hs 36;" 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 402;" f +blCheck src/Dodge/Item/Weapon/TriggerType.hs 379;" f black src/Color.hs 27;" f blank src/Picture/Base.hs 59;" f blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f @@ -4646,12 +4646,12 @@ bulletBeltBracer src/Dodge/Item/Equipment.hs 82;" f bulletBeltPack src/Dodge/Item/Equipment.hs 74;" f bulletBodyCraft src/Dodge/Item/Craftable.hs 24;" f bulletCombinations src/Dodge/Combine/Graph.hs 35;" f -bulletEffectColor src/Dodge/Item/Draw/SPic.hs 338;" f -bulletPayloadColor src/Dodge/Item/Draw/SPic.hs 351;" f +bulletEffectColor src/Dodge/Item/Draw/SPic.hs 336;" f +bulletPayloadColor src/Dodge/Item/Draw/SPic.hs 349;" f bulletSpawn src/Dodge/Bullet.hs 91;" f -bulletTrajColor src/Dodge/Item/Draw/SPic.hs 344;" f +bulletTrajColor src/Dodge/Item/Draw/SPic.hs 342;" f bulletTypes src/Dodge/TweakBullet.hs 26;" f -bulletWeapons src/Dodge/Combine/Combinations.hs 240;" f +bulletWeapons src/Dodge/Combine/Combinations.hs 233;" f burstRifle src/Dodge/Item/Held/Cane.hs 87;" f burstRifle src/Dodge/Item/Weapon/BulletGun/Cane.hs 105;" f buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f @@ -4761,8 +4761,8 @@ clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f clsNearRect src/Dodge/Zoning/Cloud.hs 15;" f clsNearSeg src/Dodge/Zoning/Cloud.hs 12;" f -clusterFormatting src/Dodge/Combine/Graph.hs 114;" f -clusterFunc src/Dodge/Combine/Graph.hs 108;" f +clusterFormatting src/Dodge/Combine/Graph.hs 113;" f +clusterFunc src/Dodge/Combine/Graph.hs 107;" f cmm src/Dodge/Combine.hs 73;" f cogRaised src/Dodge/Creature/Perception.hs 101;" f colCrWall src/Dodge/WallCreatureCollisions.hs 26;" f @@ -4783,8 +4783,8 @@ color2d src/PolyPic.hs 24;" f colorLamp src/Dodge/Creature/Lamp.hs 10;" f colorLightAt src/Dodge/LightSources/Lamp.hs 22;" f colorSH src/Shape.hs 233;" f -combinationsDotGraph src/Dodge/Combine/Graph.hs 87;" f -combinationsGraph src/Dodge/Combine/Graph.hs 68;" f +combinationsDotGraph src/Dodge/Combine/Graph.hs 86;" f +combinationsGraph src/Dodge/Combine/Graph.hs 67;" f combinationsOf src/Multiset.hs 40;" f combinationsTrie src/Dodge/Combine/Trie.hs 10;" f combineAwareness src/Dodge/Creature/AlertLevel.hs 33;" f @@ -4893,14 +4893,14 @@ createBarrelSpark src/Dodge/Spark.hs 44;" f createFlIt src/Dodge/Placement/PlaceSpot.hs 176;" f createForceField src/Dodge/ForceField.hs 7;" f createGas src/Dodge/Gas.hs 8;" f -createHeadLamp src/Dodge/Euse.hs 157;" f +createHeadLamp src/Dodge/Euse.hs 159;" f createHeldLight src/Dodge/ItEffect.hs 70;" f createLightMap src/Render.hs 26;" f createNewArc src/Dodge/Tesla/Arc.hs 76;" f createPathGrid src/Dodge/Room/Path.hs 21;" f createProjectile src/Dodge/Projectile/Create.hs 8;" f createPutItem src/Dodge/Inventory/Add.hs 52;" f -createShieldWall src/Dodge/Euse.hs 132;" f +createShieldWall src/Dodge/Euse.hs 134;" f createTorchLightOffset src/Dodge/LightSource/Torch.hs 9;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f createWall src/Dodge/Wall/Create.hs 8;" f @@ -5026,7 +5026,7 @@ dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 448;" f dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 316;" f defDamageMaterial src/Dodge/Material/Damage.hs 17;" f defLSPic src/Dodge/LightSource/Draw.hs 11;" f -defSPic src/Dodge/Item/Draw/SPic.hs 231;" f +defSPic src/Dodge/Item/Draw/SPic.hs 227;" f defaultAimMvType src/Dodge/Default/Creature.hs 122;" f defaultAimParams src/Dodge/Default/Item/Held/AimParams.hs 4;" f defaultAimParams src/Dodge/Default/Item/Use/AimParams.hs 6;" f @@ -5149,7 +5149,7 @@ destroyMcType src/Dodge/Machine/Destroy.hs 21;" f destroyMount src/Dodge/Block.hs 98;" f destroyMounts src/Dodge/Block.hs 95;" f detV src/Geometry/Vector.hs 93;" f -detectorColor src/Dodge/Item/Draw/SPic.hs 492;" f +detectorColor src/Dodge/Item/Draw/SPic.hs 493;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 19;" f detectorInfo src/Dodge/Item/Info.hs 209;" f determineInvSelCursorWidth src/Dodge/ListDisplayParams.hs 54;" f @@ -5290,7 +5290,7 @@ drawBoostShockwave src/Dodge/Item/Weapon/Booster.hs 83;" f drawBoundingBox src/Dodge/Debug/Picture.hs 299;" f drawBul src/Dodge/Bullet/Draw.hs 9;" f drawBul src/Dodge/Particle/Bullet/Draw.hs 9;" f -drawBullet src/Dodge/Item/Draw/SPic.hs 262;" f +drawBullet src/Dodge/Item/Draw/SPic.hs 258;" f drawButton src/Dodge/Button/Draw.hs 9;" f drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f drawCarte src/Dodge/Render/HUD/Carte.hs 14;" f @@ -5397,19 +5397,19 @@ 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 19;" f +drumMag src/Dodge/Item/Ammo.hs 32;" f dualBeam src/Dodge/Item/Held/BatteryGuns.hs 141;" f dualBeamPic src/Dodge/Item/Draw/SPic.hs 460;" 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 723;" f -duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 679;" f -duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 699;" f -duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 685;" f -duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 704;" f -duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 728;" f +duplicateItem src/Dodge/Item/Weapon/TriggerType.hs 705;" f +duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 656;" f +duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 678;" f +duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 664;" f +duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 686;" f +duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 710;" f ebFlicker src/Dodge/EnergyBall.hs 94;" f -edgeFormatting src/Dodge/Combine/Graph.hs 120;" f +edgeFormatting src/Dodge/Combine/Graph.hs 119;" f edgeToPic src/Dodge/Debug/Picture.hs 392;" f ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 470;" f elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 362;" f @@ -5422,7 +5422,7 @@ encircle src/Dodge/Creature/Boid.hs 115;" f encircleCloseP src/Dodge/Creature/Boid.hs 35;" f encircleDistP src/Dodge/Creature/Boid.hs 21;" f encircleP src/Dodge/Creature/Boid.hs 27;" f -energyBallColor src/Dodge/Item/Draw/SPic.hs 359;" f +energyBallColor src/Dodge/Item/Draw/SPic.hs 357;" f energyBallCraft src/Dodge/Item/Craftable.hs 18;" f enterCombineInv src/Dodge/DisplayInventory.hs 264;" f eqConstr src/SameConstr.hs 17;" f @@ -5515,10 +5515,10 @@ flameTorrent src/Dodge/Item/Held/SprayGuns.hs 36;" f flameTorrent src/Dodge/Item/Weapon/SprayGuns.hs 38;" f flameWall src/Dodge/Item/Held/SprayGuns.hs 52;" f flameWall src/Dodge/Item/Weapon/SprayGuns.hs 54;" f -flamerPic src/Dodge/Item/Draw/SPic.hs 408;" f +flamerPic src/Dodge/Item/Draw/SPic.hs 406;" f flareCircleAt src/Dodge/WorldEvent/Flash.hs 46;" f flatShield src/Dodge/Item/Held/Utility.hs 9;" f -flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 476;" f +flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 477;" f flatV2 src/Picture/Data.hs 65;" f flatV3 src/Picture/Data.hs 68;" f flatV4 src/Picture/Data.hs 71;" f @@ -5568,9 +5568,7 @@ forceSpine src/StrictHelp.hs 4;" f fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 29;" f fpsText src/Dodge/Render/Picture.hs 37;" f fractionLoadedAmmo src/Dodge/Item/Weapon/AmmoParams.hs 53;" f -fractionLoadedAmmo src/Dodge/Item/Weapon/FractionLoaded.hs 17;" f fractionLoadedAmmo2 src/Dodge/Item/Weapon/AmmoParams.hs 58;" f -fractionLoadedAmmo2 src/Dodge/Item/Weapon/FractionLoaded.hs 22;" f frag src/Shader/Data.hs 102;" f freeShaderPointers' src/Shader.hs 37;" f fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 358;" f @@ -5683,7 +5681,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 410;" f +hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 387;" f handleEvent src/Dodge/Event.hs 27;" f handleHotkeys src/Dodge/Creature/YourControl.hs 42;" f handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f @@ -5707,7 +5705,7 @@ hat src/Dodge/Item/Equipment.hs 103;" f hatCombinations src/Dodge/Combine/Combinations.hs 31;" f head src/DoubleStack.hs 14;" f headLamp src/Dodge/Item/Equipment.hs 116;" f -headLampShape src/Dodge/Item/Draw/SPic.hs 482;" f +headLampShape src/Dodge/Item/Draw/SPic.hs 483;" f heal src/Dodge/Item/Consumable.hs 17;" f heal25 src/Dodge/Item/Consumable.hs 14;" f healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 354;" f @@ -5720,7 +5718,7 @@ heldAimEffects src/Dodge/Creature/State.hs 69;" f heldBounds src/Dodge/Item/Module.hs 27;" f heldInfo src/Dodge/Item/Info.hs 61;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 24;" f -heldItemSPic src/Dodge/Item/Draw/SPic.hs 148;" f +heldItemSPic src/Dodge/Item/Draw/SPic.hs 146;" f heldPositionInfo src/Dodge/Item/Info.hs 226;" f helpCommand src/Dodge/Terminal.hs 64;" f helpPoly3D src/Polyhedra.hs 124;" f @@ -5736,7 +5734,7 @@ hitSound src/Dodge/SoundLogic/Synonyms.hs 4;" f holdForm src/Dodge/Creature/Boid.hs 136;" f holsterWeapon src/Dodge/Creature/Volition.hs 14;" f holsterWeaponSound src/Dodge/SoundLogic/Synonyms.hs 4;" f -homingLaunchers src/Dodge/Combine/Combinations.hs 225;" f +homingLaunchers src/Dodge/Combine/Combinations.hs 218;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 55;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 35;" f @@ -5850,7 +5848,7 @@ isCognizant src/Dodge/Creature/Perception.hs 105;" f isElectrical src/Dodge/Data/Damage.hs 42;" f isElectrical src/Dodge/Data/DamageType.hs 44;" f isFrictionless src/Dodge/Creature/State.hs 315;" f -isGas src/Dodge/Euse.hs 62;" f +isGas src/Dodge/Euse.hs 64;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f isLHS src/Geometry/LHS.hs 8;" f @@ -5876,13 +5874,12 @@ 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 168;" f -itUseCharge src/Dodge/Item/Weapon/TriggerType.hs 165;" f +itUseCharge src/Dodge/Item/Weapon/TriggerType.hs 153;" 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 -itemCombinations src/Dodge/Combine/Combinations.hs 46;" f -itemCombinationsEdges src/Dodge/Combine/Graph.hs 56;" f +itemCombinations src/Dodge/Combine/Combinations.hs 48;" f +itemCombinationsEdges src/Dodge/Combine/Graph.hs 55;" f itemDisplay src/Dodge/Item/Display.hs 47;" f itemDisplayOffset src/Dodge/Item/Display.hs 21;" f itemDisplayPad src/Dodge/Item/Display.hs 59;" f @@ -5898,7 +5895,7 @@ itemFromLeftType src/Dodge/Item.hs 64;" f itemInfo src/Dodge/Item/Info.hs 10;" f itemInvColor src/Dodge/Item/InventoryColor.hs 7;" f itemInvSideEffect src/Dodge/Creature/State.hs 246;" f -itemNumberDisplay src/Dodge/Item/Display.hs 112;" f +itemNumberDisplay src/Dodge/Item/Display.hs 118;" f itemRooms src/Dodge/LockAndKey.hs 41;" f itemSPic src/Dodge/Item/Draw/SPic.hs 18;" f itemString src/Dodge/Item/Display.hs 72;" f @@ -5935,7 +5932,7 @@ keyCard src/Dodge/Item/PassKey.hs 8;" f keyCardAnalyserByDoor src/Dodge/Room/LasTurret.hs 69;" f keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 57;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 38;" f -keyPic src/Dodge/Item/Draw/SPic.hs 498;" f +keyPic src/Dodge/Item/Draw/SPic.hs 499;" f keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f killBulletUpdate src/Dodge/WorldEvent/HitEffect.hs 30;" f killParticleUpdate src/Dodge/Particle/Update.hs 9;" f @@ -5955,7 +5952,7 @@ lasCenSensEdge src/Dodge/Room/LasTurret.hs 112;" f lasCircle src/Dodge/Item/Held/BatteryGuns.hs 128;" f lasDronesPic src/Dodge/Item/Weapon/Drone.hs 22;" f lasGun src/Dodge/Item/Held/BatteryGuns.hs 36;" f -lasGunPic src/Dodge/Item/Draw/SPic.hs 448;" f +lasGunPic src/Dodge/Item/Draw/SPic.hs 447;" f lasGunTweak src/Dodge/Item/Held/BatteryGuns.hs 67;" f lasRayAt src/Dodge/Beam.hs 62;" f lasSensorTurretTest src/Dodge/Room/LasTurret.hs 105;" f @@ -5969,7 +5966,7 @@ latchkey src/Dodge/Item/Held/Utility.hs 23;" f latchkey src/Dodge/Item/PassKey.hs 14;" f launcher src/Dodge/Item/Held/Launcher.hs 10;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f -launcherPic src/Dodge/Item/Draw/SPic.hs 422;" f +launcherPic src/Dodge/Item/Draw/SPic.hs 421;" f launcherSound src/Dodge/SoundLogic/Synonyms.hs 4;" f launcherX src/Dodge/Item/Held/Launcher.hs 45;" f layerNum src/Picture/Data.hs 31;" f @@ -5979,7 +5976,7 @@ left src/DoubleStack.hs 16;" f leftInfo src/Dodge/Item/Info.hs 109;" f leftItemSPic src/Dodge/Item/Draw/SPic.hs 62;" f leftPad src/Padding.hs 14;" f -legsSPic src/Dodge/Item/Draw/SPic.hs 516;" f +legsSPic src/Dodge/Item/Draw/SPic.hs 517;" f liShape src/Dodge/Placement/Instance/LightSource.hs 99;" f liShape src/Dodge/Placements/LightSource.hs 55;" f light src/Color.hs 100;" f @@ -6029,7 +6026,6 @@ loadSeed src/Dodge/LoadSeed.hs 7;" f loadSound src/Dodge/SoundLogic/LoadSound.hs 11;" f loadSounds src/Dodge/SoundLogic/LoadSound.hs 16;" f loadedAmmo src/Dodge/Item/Weapon/AmmoParams.hs 48;" f -loadedAmmo src/Dodge/Item/Weapon/FractionLoaded.hs 11;" f loadingScreen src/Dodge/Menu/Loading.hs 7;" f loadme src/Dodge/Debug/Terminal.hs 135;" f lockAndKeyRoomList src/Dodge/Room/LockAndKeyList.hs 11;" f @@ -6139,7 +6135,6 @@ makeTeslaExplosionAt src/Dodge/WorldEvent/Explosion.hs 46;" f makeThickSmokeAt src/Dodge/WorldEvent/Cloud.hs 54;" f makeThinSmokeAt src/Dodge/WorldEvent/Cloud.hs 57;" f makeTileFromPoly src/Tile.hs 28;" f -makeTinClip src/Dodge/Item/Draw/SPic.hs 303;" f makeTlsTimeRadColPos src/Dodge/LightSource.hs 88;" f makeTypeCraft src/Dodge/Item/Craftable.hs 15;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 7;" f @@ -6160,11 +6155,11 @@ maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f maybeExitCombine src/Dodge/Update/Input/InGame.hs 259;" f maybeOpenTerminal src/Dodge/Update.hs 113;" f -maybeRateStatus src/Dodge/Item/Display.hs 186;" f +maybeRateStatus src/Dodge/Item/Display.hs 192;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/Dodge/RandomHelp.hs 96;" f maybeTakeOne src/RandomHelp.hs 107;" f -maybeWarmupStatus src/Dodge/Item/Display.hs 176;" f +maybeWarmupStatus src/Dodge/Item/Display.hs 182;" f mcApplyDamage src/Dodge/Machine/Update.hs 90;" f mcKillBut src/Dodge/Machine/Destroy.hs 34;" f mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f @@ -6222,8 +6217,8 @@ miniGunUse src/Dodge/Item/Held/Cane.hs 95;" f miniGunUse src/Dodge/Item/Weapon/BulletGun/Cane.hs 113;" f miniGunX src/Dodge/Item/Held/Cane.hs 106;" f miniGunX src/Dodge/Item/Weapon/BulletGun/Cane.hs 120;" f -miniGunXPict src/Dodge/Item/Draw/SPic.hs 384;" f -miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 378;" f +miniGunXPict src/Dodge/Item/Draw/SPic.hs 382;" f +miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 376;" f miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f miniTree2 src/Dodge/Room/Room.hs 108;" f minimumOn src/FoldlHelp.hs 12;" f @@ -6250,18 +6245,18 @@ 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 469;" f +modClock src/Dodge/Item/Weapon/TriggerType.hs 446;" f modTo src/Geometry/Zone.hs 10;" f modifierKey src/Dodge/Config/KeyConfig.hs 34;" f moduleAttachPosition src/Dodge/Item/Module.hs 6;" f -moduleCombinations src/Dodge/Combine/Combinations.hs 130;" f +moduleCombinations src/Dodge/Combine/Combinations.hs 129;" f moduleInfo src/Dodge/Item/Info.hs 272;" f moduleModification src/Dodge/Combine/Module.hs 10;" f moduleName src/Dodge/Module.hs 22;" f moduleSize src/Dodge/Module.hs 14;" f moduleSizes src/Dodge/Module.hs 11;" f moduleStrings src/Dodge/Module.hs 19;" f -modulesSPic src/Dodge/Item/Draw/SPic.hs 212;" f +modulesSPic src/Dodge/Item/Draw/SPic.hs 208;" f mountColLightI src/Dodge/LightSources/Fitting.hs 56;" f mountLightA src/Dodge/LightSources/Fitting.hs 49;" f mountLightL src/Dodge/LightSources/Fitting.hs 15;" f @@ -6311,7 +6306,7 @@ multiArrow src/Picture/Composite.hs 11;" f multiGun src/Dodge/Item/Held/Cane.hs 50;" f multiLookupTrie src/SimpleTrie.hs 28;" f multiLookupTrieI src/SimpleTrie.hs 36;" f -multigunAmmoPos src/Dodge/Item/Draw/SPic.hs 133;" f +multigunAmmoPos src/Dodge/Item/Draw/SPic.hs 131;" f muout src/Dodge/RoomLink.hs 129;" f muzFlareAt src/Dodge/WorldEvent/Flash.hs 26;" f mvBullet src/Dodge/Bullet.hs 31;" f @@ -6339,7 +6334,7 @@ mvPt' src/Dodge/Particle/Update.hs 5;" f mvSpark src/Dodge/Particle/Bullet/Update.hs 46;" f myIntersectLineLine src/Geometry/Intersect.hs 177;" f myIntersectSegSeg src/Geometry/Intersect.hs 155;" f -myParams src/Dodge/Combine/Graph.hs 93;" f +myParams src/Dodge/Combine/Graph.hs 92;" f nRays src/Geometry.hs 170;" f nRaysRad src/Geometry.hs 174;" f nearCollinear src/Dodge/LevelGen/StaticWalls/Deprecated.hs 19;" f @@ -6358,7 +6353,7 @@ newTextureFramebuffer src/Framebuffer/Setup.hs 16;" f noPic src/ShapePicture.hs 25;" f noShape src/ShapePicture.hs 29;" f noclipCheck src/Dodge/WallCreatureCollisions.hs 20;" f -nodeFormatting src/Dodge/Combine/Graph.hs 135;" f +nodeFormatting src/Dodge/Combine/Graph.hs 134;" f normalGait src/Dodge/Creature/State/WalkCycle.hs 19;" f normalizeAngle src/Geometry/Vector.hs 127;" f normalizeAnglePi src/Dodge/Base.hs 132;" f @@ -6380,10 +6375,10 @@ numTraversable src/TreeHelp.hs 183;" f obstacleColor src/Dodge/Debug/Picture.hs 225;" f obstructPathsCrossing src/Dodge/Path.hs 138;" f oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 498;" f -onEquipWristShield src/Dodge/Euse.hs 81;" f +onEquipWristShield src/Dodge/Euse.hs 83;" f onLayerL src/Dodge/Picture/Layer.hs 16;" f onOffEff src/Dodge/ItEffect.hs 24;" f -onRemoveWristShield src/Dodge/Euse.hs 90;" f +onRemoveWristShield src/Dodge/Euse.hs 92;" f onXY src/Geometry/Vector3D.hs 130;" f oneH src/Dodge/Creature/Test.hs 97;" f openCursorAt src/Dodge/Render/HUD/Carte.hs 54;" f @@ -6408,7 +6403,7 @@ orthogonalPointOnSeg src/Geometry/Intersect.hs 291;" f outLink src/Dodge/RoomLink.hs 105;" f outsideScreenPolygon src/Dodge/Debug/Picture.hs 44;" f outwardIntegers src/Dodge/Base.hs 159;" f -overCID src/Dodge/Euse.hs 166;" f +overCID src/Dodge/Euse.hs 168;" f overCol src/Picture/Base.hs 307;" f overColObj src/Shape.hs 269;" f overColSH src/Shape.hs 237;" f @@ -6783,7 +6778,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 175;" f +rateIncAB src/Dodge/Item/Weapon/TriggerType.hs 163;" f readSaveSlot src/Dodge/Save.hs 45;" f rectNESW src/Geometry/Polygon.hs 13;" f rectNSWE src/Geometry/Polygon.hs 19;" f @@ -6824,7 +6819,7 @@ removeEither src/Dodge/Layout/Tree/Either.hs 41;" f removeHotkey src/Dodge/Hotkey.hs 41;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removePathsCrossing src/Dodge/LevelGen/Pathing.hs 24;" f -removeShieldWall src/Dodge/Euse.hs 150;" f +removeShieldWall src/Dodge/Euse.hs 152;" f removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f renderDataResizeUpdate src/Preload/Update.hs 26;" f renderFlatLighting src/Render.hs 104;" f @@ -6834,7 +6829,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 667;" f +repeatOnFrames src/Dodge/Item/Weapon/TriggerType.hs 644;" f repeatTransformed src/Dodge/Item/Weapon/TriggerType.hs 93;" f repeater src/Dodge/Item/Held/Cane.hs 73;" f repeater src/Dodge/Item/Weapon/BulletGun/Cane.hs 89;" f @@ -6860,8 +6855,8 @@ retreatFireLauncher src/Dodge/Humanoid.hs 272;" f retreatPointForFrom src/Dodge/Creature/Action/Flee.hs 7;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f reversePair src/Dodge/LevelGen.hs 82;" f +revolveMag src/Dodge/Item/Ammo.hs 8;" f revolver src/Dodge/Item/Weapon/BulletGun/Stick.hs 49;" f -revolverAmmoPos src/Dodge/Item/Draw/SPic.hs 140;" f revolverX src/Dodge/Item/Weapon/BulletGun/Stick.hs 104;" f rewindWatch src/Dodge/Item/Weapon/Utility.hs 37;" f rezBox src/Dodge/Room/RezBox.hs 22;" f @@ -7031,7 +7026,7 @@ sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 84;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f setChannelPos src/Sound.hs 149;" f setClickWorldPos src/Dodge/Update.hs 97;" f -setClusterID src/Dodge/Combine/Graph.hs 105;" f +setClusterID src/Dodge/Combine/Graph.hs 104;" f setDepth src/Picture/Base.hs 128;" f setDirPS src/Dodge/PlacementSpot.hs 49;" f setFallback src/Dodge/PlacementSpot.hs 127;" f @@ -7071,7 +7066,7 @@ setViewDistance src/Dodge/Update/Camera.hs 242;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 62;" f setViewport src/Dodge/Render.hs 385;" f setVol src/Dodge/Config/Update.hs 30;" f -setWristShieldPos src/Dodge/Euse.hs 98;" f +setWristShieldPos src/Dodge/Euse.hs 100;" f setZoomScopeChange src/Dodge/Item/Weapon/ZoomScope.hs 7;" f setupConLoop src/Loop.hs 102;" f setupConLoop' src/Loop.hs 192;" f @@ -7099,12 +7094,12 @@ shapeVerxAttributes src/Shape/Parameters.hs 13;" f shapeVerxSize src/Shape/Parameters.hs 10;" f shardShape src/Dodge/Block/Debris.hs 181;" f shatterGun src/Dodge/Item/Held/Weapons.hs 7;" f -shatterGunSPic src/Dodge/Item/Draw/SPic.hs 234;" f +shatterGunSPic src/Dodge/Item/Draw/SPic.hs 230;" f shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f shellCollisionCheck src/Dodge/Projectile/Update.hs 32;" f shellShape src/Dodge/Projectile/Draw.hs 24;" f shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f -shieldWall src/Dodge/Euse.hs 112;" f +shieldWall src/Dodge/Euse.hs 114;" f shiftByV2 src/Dodge/PlacementSpot.hs 239;" f shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDec src/Dodge/Placement/PlaceSpot.hs 134;" f @@ -7138,7 +7133,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 424;" f +shootL src/Dodge/Item/Weapon/TriggerType.hs 401;" 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 @@ -7164,16 +7159,17 @@ shotgunSound src/Dodge/SoundLogic/Synonyms.hs 4;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 60;" f shoulderSH src/Dodge/Creature/Picture.hs 170;" f shoulderSP src/Dodge/Creature/HandPos.hs 196;" f -showAutoRechargeProgress src/Dodge/Item/Display.hs 91;" f -showEquipItem src/Dodge/Item/Display.hs 86;" f -showEquipmentNumber src/Dodge/Item/Display.hs 125;" f +showAttachItem src/Dodge/Item/Display.hs 86;" f +showAutoRechargeProgress src/Dodge/Item/Display.hs 97;" f +showEquipItem src/Dodge/Item/Display.hs 92;" f +showEquipmentNumber src/Dodge/Item/Display.hs 131;" f showInt src/Dodge/Item/Info.hs 30;" f showIntKMG src/Dodge/Item/Info.hs 47;" f showIntKMG' src/Dodge/Item/Info.hs 54;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f -showLoadActionType src/Dodge/Item/Display.hs 167;" f +showLoadActionType src/Dodge/Item/Display.hs 173;" f showPhaseV src/Dodge/Tweak/Show.hs 16;" f -showReloadProgress src/Dodge/Item/Display.hs 148;" f +showReloadProgress src/Dodge/Item/Display.hs 154;" f showTerminalError src/Dodge/Debug/Terminal.hs 75;" f showTimeFlow src/Dodge/TestString.hs 56;" f showTractionPower src/Dodge/Tweak/Show.hs 22;" f @@ -7187,7 +7183,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 647;" f +sideEffectOnFrame src/Dodge/Item/Weapon/TriggerType.hs 624;" f sideEffectUpdatePreload src/Dodge/PreloadData.hs 7;" f sigmoid src/Dodge/Base.hs 129;" f simpleCrSprings src/Dodge/Update.hs 639;" f @@ -7411,7 +7407,7 @@ telRoomLev src/Dodge/Room/Teleport.hs 14;" f teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 378;" f teleSound src/Dodge/SoundLogic/Synonyms.hs 4;" f teleportModule src/Dodge/Item/Craftable.hs 32;" f -teleportableWeapons src/Dodge/Combine/Combinations.hs 237;" f +teleportableWeapons src/Dodge/Combine/Combinations.hs 230;" f termButton src/Dodge/Placement/Instance/Terminal.hs 51;" f termSoundLine src/Dodge/Terminal.hs 109;" f termTextColor src/Dodge/Terminal.hs 112;" f @@ -7422,7 +7418,7 @@ terminalShape src/Dodge/Machine/Draw.hs 27;" f terminalWheelEvent src/Dodge/Update/Scroll.hs 72;" f teslaBeamCombine src/Dodge/Beam.hs 48;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 21;" f -teslaGunPic src/Dodge/Item/Draw/SPic.hs 438;" f +teslaGunPic src/Dodge/Item/Draw/SPic.hs 437;" 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 @@ -7463,7 +7459,7 @@ tilesToLine src/Shader/AuxAddition.hs 66;" f timeFlowUpdate src/Dodge/Update.hs 158;" f timeModule src/Dodge/Item/Craftable.hs 35;" f timerTLS src/Dodge/LightSource/Update.hs 22;" f -tinMag src/Dodge/Item/Ammo.hs 7;" f +tinMag src/Dodge/Item/Ammo.hs 20;" f tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f titleOptionsMenu src/Dodge/Menu.hs 99;" f titleOptionsNoWrite src/Dodge/Menu.hs 102;" f @@ -7473,7 +7469,7 @@ tmUpdate src/Dodge/Update.hs 329;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 144;" f -toCombNodeLabel src/Dodge/Combine/Graph.hs 83;" f +toCombNodeLabel src/Dodge/Combine/Graph.hs 82;" f toCrUpdate' src/Dodge/RemoveCreatureEndo.hs 10;" f toFloatVAs src/Shader/Compile.hs 257;" f toLabel src/Dodge/Cleat.hs 16;" f @@ -7500,17 +7496,17 @@ topInvW src/Dodge/ListDisplayParams.hs 51;" f 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 198;" f -torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 577;" f -torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 600;" f +torchShape src/Dodge/Item/Draw/SPic.hs 194;" f +torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 554;" f +torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 577;" f torqueCr src/Dodge/WorldEffect.hs 64;" f -torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 655;" f +torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 632;" 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 tractorBeamAt src/Dodge/Item/Weapon/BatteryGuns.hs 210;" f tractorGun src/Dodge/Item/Held/BatteryGuns.hs 75;" f -tractorGunPic src/Dodge/Item/Draw/SPic.hs 473;" f +tractorGunPic src/Dodge/Item/Draw/SPic.hs 474;" f tractorGunTweak src/Dodge/Item/Held/BatteryGuns.hs 94;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 32;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f @@ -7585,8 +7581,8 @@ trunkDepth src/Dodge/Layout/Tree/Polymorphic.hs 123;" f trunkDepth src/Dodge/Tree/Polymorphic.hs 134;" f trunkDepth src/TreeHelp.hs 161;" f tryAssignHotkey src/Dodge/Creature/YourControl.hs 86;" f -tryAttachBulletBelt src/Dodge/Euse.hs 39;" f -tryChargeBattery src/Dodge/Euse.hs 42;" f +tryAttachBulletBelt src/Dodge/Euse.hs 40;" f +tryChargeBattery src/Dodge/Euse.hs 43;" f tryCombine src/Dodge/Update/Input/InGame.hs 252;" f tryGetChannel src/Sound.hs 96;" f tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 37;" f @@ -7594,7 +7590,7 @@ tryNextLoadAction src/Dodge/Reloading.hs 35;" f tryPlay src/Sound.hs 83;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 27;" f trySeedFromClipboard src/Dodge/Menu.hs 88;" f -trySiphonFuel src/Dodge/Euse.hs 45;" f +trySiphonFuel src/Dodge/Euse.hs 46;" f trySpinByCID src/Dodge/Projectile/Update.hs 124;" f tryStartLoading src/Dodge/Reloading.hs 49;" f tryUseItem src/Dodge/Creature/Action/UseItem.hs 20;" f @@ -7774,12 +7770,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 350;" f -useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 365;" f -useAmmoAmount' src/Dodge/Item/Weapon/TriggerType.hs 372;" f +useAllAmmo src/Dodge/Item/Weapon/TriggerType.hs 338;" f +useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 353;" f +useAmmoAmount' src/Dodge/Item/Weapon/TriggerType.hs 360;" f useAmmoParams src/Dodge/Bullet.hs 59;" f useAmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 17;" f -useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 357;" f +useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 345;" f useC src/Dodge/Cuse.hs 6;" f useE src/Dodge/Euse.hs 24;" f useEquipment src/Dodge/Creature/State.hs 219;" f @@ -7794,7 +7790,7 @@ useItemRightClick src/Dodge/Creature/Impulse/UseItem.hs 23;" f useL src/Dodge/Luse.hs 13;" f useLeftItem src/Dodge/Creature/Action/UseItem.hs 38;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f -useMagShield src/Dodge/Euse.hs 67;" f +useMagShield src/Dodge/Euse.hs 69;" f useMod src/Dodge/HeldUse.hs 28;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 7;" f @@ -7806,7 +7802,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 391;" f +useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 368;" f useTimeScrollGun src/Dodge/Luse.hs 32;" f useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f useUpdate src/Dodge/Creature/State.hs 211;" f @@ -7842,8 +7838,8 @@ visionCheck src/Dodge/Creature/Perception.hs 152;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 8;" f volleyGun src/Dodge/Item/Held/Cane.hs 38;" f volleyGun src/Dodge/Item/Weapon/BulletGun/Cane.hs 43;" f -volleyGunShape src/Dodge/Item/Draw/SPic.hs 366;" f -volleygunAmmoPos src/Dodge/Item/Draw/SPic.hs 126;" f +volleyGunShape src/Dodge/Item/Draw/SPic.hs 364;" f +volleygunAmmoPos src/Dodge/Item/Draw/SPic.hs 124;" f waistSP src/Dodge/Creature/HandPos.hs 199;" f walkableNodeNear src/Dodge/Path.hs 48;" f wallBlips src/Dodge/Item/Weapon/UseEffect.hs 43;" f @@ -7904,35 +7900,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 507;" f -withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 510;" f -withFlare src/Dodge/Item/Weapon/TriggerType.hs 474;" f -withItem src/Dodge/Item/Weapon/TriggerType.hs 447;" f -withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 456;" f -withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 451;" f -withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 486;" f -withOldDir src/Dodge/Item/Weapon/TriggerType.hs 524;" f -withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 559;" f -withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 543;" f -withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 550;" f -withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 516;" f -withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 538;" f -withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 531;" f -withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 569;" 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 +withCrPos src/Dodge/Item/Weapon/TriggerType.hs 484;" f +withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 487;" f +withFlare src/Dodge/Item/Weapon/TriggerType.hs 451;" f +withItem src/Dodge/Item/Weapon/TriggerType.hs 424;" f +withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 433;" f +withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 428;" f +withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 463;" f +withOldDir src/Dodge/Item/Weapon/TriggerType.hs 501;" f +withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 536;" f +withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 520;" f +withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 527;" f +withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 493;" f +withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 515;" f +withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 508;" f +withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 546;" f +withRecoil src/Dodge/Item/Weapon/TriggerType.hs 296;" f +withSidePushAfterI src/Dodge/Item/Weapon/TriggerType.hs 325;" f +withSidePushI src/Dodge/Item/Weapon/TriggerType.hs 306;" f withSmoke src/Dodge/Item/Weapon/TriggerType.hs 113;" 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 461;" f +withSoundContinue src/Dodge/Item/Weapon/TriggerType.hs 249;" f +withSoundForI src/Dodge/Item/Weapon/TriggerType.hs 262;" f +withSoundForVol src/Dodge/Item/Weapon/TriggerType.hs 275;" f +withSoundItemChoiceStart src/Dodge/Item/Weapon/TriggerType.hs 220;" f +withSoundStart src/Dodge/Item/Weapon/TriggerType.hs 236;" f +withTempLight src/Dodge/Item/Weapon/TriggerType.hs 438;" 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 626;" f -withWarmUp src/Dodge/Item/Weapon/TriggerType.hs 212;" f +withTorqueAfter src/Dodge/Item/Weapon/TriggerType.hs 603;" f +withWarmUp src/Dodge/Item/Weapon/TriggerType.hs 200;" 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