Move TriggerType out of item record

src/Dodge/Data.hs

@@ -20,8 +20,10 @@ module Dodge.Data (
     module Dodge.Data.CreatureEffect,
     module Dodge.Data.MountedObject,
     module Dodge.Data.AimStance,
+    module Dodge.Data.TriggerType,
 ) where
 
+import Dodge.Data.TriggerType
 import Dodge.Data.AimStance
 import Dodge.Data.Config
 import Dodge.Data.Scenario

src/Dodge/Data/Item/Use.hs

@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-
 module Dodge.Data.Item.Use (
     module Dodge.Data.Item.Use,
     module Dodge.Data.Item.Use.Equipment,
@@ -35,7 +34,7 @@ data ItemUse
         { _heldDelay :: UseDelay
         , _heldAim :: AimParams
         , _heldParams :: HeldParams
-        , _heldTriggerType :: TriggerType
+--        , _heldTriggerType :: TriggerType
         , _heldFrame :: Int
         , _heldUseEffect :: HeldUseEffect
         }
@@ -69,9 +68,6 @@ data UseCondition
     | UseableAnytime
     deriving (Eq, Show, Read)
 
-data TriggerType = AutoTrigger | HammerTrigger
-    deriving (Eq, Show, Read)
-
 data AttachParams
     = APProjectiles {_apProjectiles :: [Int]}
     | APInt {_apInt :: Int}
@@ -192,7 +188,6 @@ deriveJSON defaultOptions ''UseFocus
 deriveJSON defaultOptions ''UseCondition
 deriveJSON defaultOptions ''MuzzleEffect
 deriveJSON defaultOptions ''FlareType
-deriveJSON defaultOptions ''TriggerType
 deriveJSON defaultOptions ''AmmoParams
 deriveJSON defaultOptions ''HeldParams
 deriveJSON defaultOptions ''AmmoPerShot

src/Dodge/Default/Item/Use.hs

@@ -39,7 +39,6 @@ defaultHeldUse = UseHeld
         , _weaponInvLock = 0
         , _weaponRepeat = []
         }
-    , _heldTriggerType = HammerTrigger
     , _heldFrame = 0
     , _heldUseEffect = NoHeldUseEffect
     }

src/Dodge/HeldUse.hs

@@ -8,6 +8,7 @@ module Dodge.HeldUse (
     mcUseHeld,
 ) where
 
+import Dodge.BaseTriggerType
 import Sound.Data
 import Color
 import Control.Applicative
@@ -85,7 +86,8 @@ hammerCheck ::
     t2 ->
     t2
 hammerCheck f pt it cr
-    | Just HammerTrigger <- it ^? ldtValue . itUse . heldTriggerType
+    | t <- baseTriggerType (it ^. ldtValue)
+      , t == HammerTrigger || t == AlwaysSingleTrigger
       , isNothing $ lookup MakeAutoLink (it ^. ldtRight)
       , pt /= InitialPress =
         id
@@ -158,7 +160,7 @@ doWeaponRepetitions itm cr = case itm ^? ldtValue . itUse . heldParams . weaponR
     f x = (x, WdWdFromItCrixWdWd (upitm x) (_crID cr) ItCrWdItemHeldEffect)
     upitm x =
         itm & ldtValue . itUse . heldParams . weaponRepeat .~ []
-            & ldtValue . itUse . heldTriggerType .~ AutoTrigger
+--            & ldtValue . itUse . heldTriggerType .~ AutoTrigger
             & ldtValue . itUse . heldFrame .~ x
 
 applyCME :: Item -> Creature -> CumulativeMuzzleEffect -> World -> World

src/Dodge/Item/Grammar.hs

@@ -7,6 +7,8 @@ module Dodge.Item.Grammar (
     allInvLocs,
 ) where
 
+import Dodge.Data.TriggerType
+import Dodge.BaseTriggerType
 import Dodge.Data.AimStance
 import Dodge.Item.AimStance
 import Control.Applicative
@@ -112,8 +114,8 @@ itemToBreakLists itm itmf = case (itm ^. itType, itmf) of
     _ -> ([], [])
 
 getAutoSpringLinks :: Item -> [(ItemStructuralFunction, ComposeLinkType)]
-getAutoSpringLinks itm = case itm ^? itUse . heldTriggerType of
+getAutoSpringLinks itm = case baseTriggerType itm of
-    Just HammerTrigger -> [(MakeAutoSF, MakeAutoLink)]
+    HammerTrigger -> [(MakeAutoSF, MakeAutoLink)]
     _ -> []
 
 extraWeaponLinks :: Item -> [(ItemStructuralFunction, ComposeLinkType)]

src/Dodge/Item/Held/BatteryGuns.hs

@@ -29,7 +29,6 @@ teslaGun =
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTesla
         & itType .~ HELD TESLAGUN
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
-        & itUse . heldTriggerType .~ AutoTrigger
 
 teslaParams :: ItemParams
 teslaParams =
@@ -47,7 +46,6 @@ laser =
         & itUse . heldParams .~ BeamShooterParams-- Nothing
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
         & itUse . heldDelay .~ NoDelay
-        & itUse . heldTriggerType .~ AutoTrigger
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 6 0
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
         & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ LasGunFlare
@@ -67,7 +65,6 @@ tractorGun =
     defaultHeldItem
         & itUse . heldParams .~ BeamShooterParams
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
-        & itUse . heldTriggerType .~ AutoTrigger
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
         & itUse . heldAim . aimWeight .~ 6

src/Dodge/Item/Held/Cane.hs

@@ -72,7 +72,6 @@ autoRifle :: Item
 autoRifle =
     rifle
         & itType .~ HELD AUTORIFLE
-        & itUse . heldTriggerType .~ AutoTrigger
 
 burstRifle :: Item
 burstRifle =

src/Dodge/Item/Held/SprayGuns.hs

@@ -34,7 +34,6 @@ flameSpitter =
         & itUse . heldParams . weaponInvLock .~ 10
         & itUse . heldParams . weaponRepeat .~ [1..9]
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect . nzPressure .~ UniRandFloat 3 4
-        & itUse . heldTriggerType .~ HammerTrigger
 
 flameTorrent :: Item
 flameTorrent =
@@ -97,4 +96,3 @@ flameThrower =
             , _weaponInvLock = 0
             , _weaponRepeat = mempty
             }
-        & itUse . heldTriggerType .~ AutoTrigger

src/Dodge/Item/Held/Stick.hs

@@ -56,11 +56,7 @@ pistol =
         & itType .~ HELD PISTOL
 
 autoPistol :: Item
-autoPistol =
+autoPistol = pistol & itType .~ HELD AUTOPISTOL
-    pistol
-        & itUse . heldTriggerType .~ AutoTrigger
---        & itUse . heldParams . bulGunSound ?~ (tap1S, 0)
-        & itType .~ HELD AUTOPISTOL
 
 machinePistol :: Item
 machinePistol =

tags

@@ -25,9 +25,9 @@ ALTERIFLE	src/Dodge/Data/Item/Combine.hs	152;"	C
 AMMOMAG	src/Dodge/Data/Item/Combine.hs	20;"	C
 AMR	src/Dodge/Data/Item/Combine.hs	157;"	C
 ANTIMATTER	src/Dodge/Data/Item/Combine.hs	67;"	C
-APInt	src/Dodge/Data/Item/Use.hs	77;"	C
+APInt	src/Dodge/Data/Item/Use.hs	73;"	C
-APNothing	src/Dodge/Data/Item/Use.hs	78;"	C
+APNothing	src/Dodge/Data/Item/Use.hs	74;"	C
-APProjectiles	src/Dodge/Data/Item/Use.hs	76;"	C
+APProjectiles	src/Dodge/Data/Item/Use.hs	72;"	C
 AQUAMARINE	src/Color/Data.hs	24;"	C
 ARHUD	src/Dodge/Data/Item/Combine.hs	34;"	C
 ARHUDSF	src/Dodge/Data/ComposedItem.hs	50;"	C
@@ -46,16 +46,17 @@ Add	src/Dodge/Inventory/Add.hs	1;"	m
 AddGoal	src/Dodge/Data/ActionPlan.hs	45;"	C
 AesonHelp	src/AesonHelp.hs	1;"	m
 AimAt	src/Dodge/Data/ActionPlan.hs	84;"	C
-AimParams	src/Dodge/Data/Item/Use.hs	114;"	t
+AimParams	src/Dodge/Data/Item/Use.hs	110;"	t
 AimParams	src/Dodge/Default/Item/Use/AimParams.hs	1;"	m
 AimStance	src/Dodge/Data/AimStance.hs	9;"	t
-AimStance	src/Dodge/Data/AimStance.hs	3;"	m
+AimStance	src/Dodge/Data/AimStance.hs	4;"	m
 AimStance	src/Dodge/Item/AimStance.hs	2;"	m
 Aiming	src/Dodge/Data/Creature/Stance.hs	39;"	C
 AirFiltrationSS	src/Dodge/Data/Scenario.hs	95;"	C
 Airlock	src/Dodge/Room/Airlock.hs	4;"	m
 AlienContact	src/Dodge/Data/Scenario.hs	30;"	C
 AllRoomClipBoundaries	src/Dodge/Data/Config.hs	107;"	C
+AlwaysSingleTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
 Ambush	src/Dodge/Data/ActionPlan.hs	178;"	C
 Ammo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	6;"	m
 Ammo	src/Dodge/Item/Ammo.hs	1;"	m
@@ -67,10 +68,10 @@ AmmoMagSF	src/Dodge/Data/ComposedItem.hs	51;"	C
 AmmoMagType	src/Dodge/Data/Item/Combine.hs	104;"	t
 AmmoModLink	src/Dodge/Data/ComposedItem.hs	19;"	C
 AmmoModifierSF	src/Dodge/Data/ComposedItem.hs	57;"	C
-AmmoParams	src/Dodge/Data/Item/Use.hs	107;"	t
+AmmoParams	src/Dodge/Data/Item/Use.hs	103;"	t
 AmmoPayloadLink	src/Dodge/Data/ComposedItem.hs	21;"	C
 AmmoPayloadSF	src/Dodge/Data/ComposedItem.hs	59;"	C
-AmmoPerShot	src/Dodge/Data/Item/Use.hs	153;"	t
+AmmoPerShot	src/Dodge/Data/Item/Use.hs	149;"	t
 AmmoTargetingLink	src/Dodge/Data/ComposedItem.hs	20;"	C
 AmmoTargetingSF	src/Dodge/Data/ComposedItem.hs	58;"	C
 AmmoType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	24;"	t
@@ -99,7 +100,7 @@ AsteroidStrike	src/Dodge/Data/Scenario.hs	33;"	C
 AtEase	src/Dodge/Data/Creature/Stance.hs	40;"	C
 AtomicWaste	src/Dodge/Data/Scenario.hs	26;"	C
 Attach	src/Dodge/Item/Attach.hs	1;"	m
-AttachParams	src/Dodge/Data/Item/Use.hs	75;"	t
+AttachParams	src/Dodge/Data/Item/Use.hs	71;"	t
 AttachType	src/Dodge/Data/Item/Combine.hs	90;"	t
 Attention	src/Dodge/Data/Creature/Perception.hs	60;"	t
 AttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	C
@@ -108,7 +109,7 @@ AutoAI	src/Dodge/Data/Creature/Misc.hs	56;"	C
 AutoCrit	src/Dodge/Creature/AutoCrit.hs	1;"	m
 AutoDoorObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
 AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	27;"	C
-AutoTrigger	src/Dodge/Data/Item/Use.hs	72;"	C
+AutoTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
 AuxAddition	src/Shader/AuxAddition.hs	1;"	m
 Avatar	src/Dodge/Data/Creature/Misc.hs	70;"	C
 Awareness	src/Dodge/Data/Creature/Perception.hs	65;"	t
@@ -146,10 +147,11 @@ Barreloid	src/Dodge/Barreloid.hs	1;"	m
 Base	src/Dodge/Base.hs	8;"	m
 Base	src/Dodge/Zoning/Base.hs	2;"	m
 Base	src/Picture/Base.hs	4;"	m
+BaseTriggerType	src/Dodge/BaseTriggerType.hs	3;"	m
 BasicBeamDraw	src/Dodge/Data/Beam.hs	34;"	C
 BasicBulletTrajectory	src/Dodge/Data/Bullet.hs	50;"	C
 BasicBulletTrajectoryType	src/Dodge/Data/Bullet.hs	57;"	C
-BasicFlare	src/Dodge/Data/Item/Use.hs	123;"	C
+BasicFlare	src/Dodge/Data/Item/Use.hs	119;"	C
 BatteryGuns	src/Dodge/Item/Held/BatteryGuns.hs	1;"	m
 BatteryGuns	src/Dodge/Item/Weapon/BatteryGuns.hs	1;"	m
 Beam	src/Dodge/Data/Beam.hs	18;"	t
@@ -159,7 +161,7 @@ BeamCombine	src/Dodge/Data/Beam.hs	47;"	C
 BeamCombineType	src/Dodge/Data/Beam.hs	38;"	t
 BeamDraw	src/Dodge/Data/Beam.hs	33;"	t
 BeamDrawColor	src/Dodge/Data/Beam.hs	35;"	C
-BeamShooterParams	src/Dodge/Data/Item/Use.hs	91;"	C
+BeamShooterParams	src/Dodge/Data/Item/Use.hs	87;"	C
 BeamSimple	src/Dodge/Data/Beam.hs	50;"	C
 BeamType	src/Dodge/Data/Beam.hs	46;"	t
 BecomePowerful	src/Dodge/Data/Scenario.hs	9;"	C
@@ -231,9 +233,9 @@ BulletMod	src/Dodge/Data/Item/BulletMod.hs	10;"	t
 BulletMod	src/Dodge/Data/Item/BulletMod.hs	3;"	m
 BulletModEffect	src/Dodge/Data/Item/BulletMod.hs	12;"	C
 BulletModPayload	src/Dodge/Data/Item/BulletMod.hs	11;"	C
-BulletParams	src/Dodge/Data/Item/Use.hs	108;"	C
+BulletParams	src/Dodge/Data/Item/Use.hs	104;"	C
 BulletPayload	src/Dodge/Data/Bullet.hs	41;"	t
-BulletShooterParams	src/Dodge/Data/Item/Use.hs	92;"	C
+BulletShooterParams	src/Dodge/Data/Item/Use.hs	88;"	C
 BulletTrajectory	src/Dodge/Data/Bullet.hs	49;"	t
 BulletTrajectoryType	src/Dodge/Data/Bullet.hs	56;"	t
 Button	src/Dodge/Data/Button.hs	48;"	t
@@ -499,7 +501,7 @@ DefaultCrGroupUpdate	src/Dodge/Data/CrGroupParams.hs	22;"	C
 DefaultDrawButton	src/Dodge/Data/Button.hs	17;"	C
 DefaultDrawSwitch	src/Dodge/Data/Button.hs	18;"	C
 DefaultForceField	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	35;"	C
-DefaultHeldParams	src/Dodge/Data/Item/Use.hs	82;"	C
+DefaultHeldParams	src/Dodge/Data/Item/Use.hs	78;"	C
 DefaultLightSourceDraw	src/Dodge/Data/LightSource.hs	13;"	C
 DefaultRoomType	src/Dodge/Data/Room.hs	31;"	C
 DefaultTerminal	src/Dodge/Data/Terminal.hs	55;"	C
@@ -688,7 +690,7 @@ FlameBeamCombine	src/Dodge/Data/Beam.hs	39;"	C
 FlameSound	src/Dodge/Data/SoundOrigin.hs	27;"	C
 Flamer	src/Dodge/Data/SoundOrigin.hs	25;"	C
 Flank	src/Dodge/Data/ActionPlan.hs	177;"	C
-FlareType	src/Dodge/Data/Item/Use.hs	121;"	t
+FlareType	src/Dodge/Data/Item/Use.hs	117;"	t
 FlashBall	src/Dodge/Data/Bullet.hs	32;"	C
 FlatFaces	src/Shape/Data.hs	17;"	C
 FlatShieldParams	src/Dodge/Data/Item/Params.hs	15;"	C
@@ -758,8 +760,8 @@ GasAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	30;"	C
 GasCloud	src/Dodge/Data/Cloud.hs	31;"	C
 GasCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	41;"	t
 GasFuel	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	38;"	t
-GasParams	src/Dodge/Data/Item/Use.hs	110;"	C
+GasParams	src/Dodge/Data/Item/Use.hs	106;"	C
-GasSprayParams	src/Dodge/Data/Item/Use.hs	83;"	C
+GasSprayParams	src/Dodge/Data/Item/Use.hs	79;"	C
 GenCr	src/Dodge/Data/Creature/State.hs	31;"	C
 GenFloat	src/Dodge/Data/GenFloat.hs	11;"	t
 GenFloat	src/Dodge/Data/GenFloat.hs	5;"	m
@@ -821,23 +823,23 @@ Hammer	src/Dodge/Hammer.hs	1;"	m
 HammerDown	src/Dodge/Data/Hammer.hs	18;"	C
 HammerPosition	src/Dodge/Data/Hammer.hs	17;"	t
 HammerReleased	src/Dodge/Data/Hammer.hs	19;"	C
-HammerTrigger	src/Dodge/Data/Item/Use.hs	72;"	C
+HammerTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
 HammerType	src/Dodge/Data/Hammer.hs	12;"	t
 HammerUp	src/Dodge/Data/Hammer.hs	20;"	C
 HandPos	src/Dodge/Creature/HandPos.hs	1;"	m
 HardQuit	src/Dodge/Data/Universe.hs	70;"	C
 HasHammer	src/Dodge/Data/Hammer.hs	14;"	C
-HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	126;"	C
+HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	122;"	C
 Held	src/Dodge/Item/Held.hs	1;"	m
 HeldDelay	src/Dodge/Data/Item/HeldDelay.hs	6;"	m
 HeldItemType	src/Dodge/Data/Item/Combine.hs	137;"	t
 HeldOffset	src/Dodge/Item/HeldOffset.hs	2;"	m
-HeldParams	src/Dodge/Data/Item/Use.hs	81;"	t
+HeldParams	src/Dodge/Data/Item/Use.hs	77;"	t
 HeldPlatformSF	src/Dodge/Data/ComposedItem.hs	41;"	C
 HeldScroll	src/Dodge/HeldScroll.hs	1;"	m
 HeldUse	src/Dodge/Data/Item/HeldUse.hs	6;"	m
 HeldUse	src/Dodge/HeldUse.hs	4;"	m
-HeldUseEffect	src/Dodge/Data/Item/Use.hs	56;"	t
+HeldUseEffect	src/Dodge/Data/Item/Use.hs	55;"	t
 HelpNum	src/HelpNum.hs	1;"	m
 HiddenGoal	src/Dodge/Data/Scenario.hs	14;"	C
 HomeUsingRemoteScreen	src/Dodge/Data/Projectile.hs	49;"	C
@@ -968,7 +970,7 @@ ItemSetWarmTime	src/Dodge/Data/Item/Effect.hs	34;"	C
 ItemStructuralFunction	src/Dodge/Data/ComposedItem.hs	39;"	t
 ItemTargeting	src/Dodge/Data/Item.hs	60;"	t
 ItemType	src/Dodge/Data/Item/Combine.hs	15;"	t
-ItemUse	src/Dodge/Data/Item/Use.hs	33;"	t
+ItemUse	src/Dodge/Data/Item/Use.hs	32;"	t
 ItemUseToggle	src/Dodge/Data/Item/Effect.hs	30;"	C
 ItmCrWdWd	src/Dodge/Data/Item/Use/Equipment.hs	28;"	t
 ItmCrWdWdDoNothing	src/Dodge/Data/Item/Use/Equipment.hs	29;"	C
@@ -988,7 +990,7 @@ LASER	src/Dodge/Data/Item/Combine.hs	167;"	C
 LASERING	src/Dodge/Data/Damage/Type.hs	19;"	C
 LDT	src/Dodge/Data/DoubleTree.hs	40;"	C
 LDTBottomNode	src/Dodge/Data/DoubleTree.hs	28;"	C
-LDTComb	src/Dodge/Item/Grammar.hs	231;"	t
+LDTComb	src/Dodge/Item/Grammar.hs	232;"	t
 LDTMidAboveNode	src/Dodge/Data/DoubleTree.hs	26;"	C
 LDTMidBelowNode	src/Dodge/Data/DoubleTree.hs	27;"	C
 LDTRootNode	src/Dodge/Data/DoubleTree.hs	24;"	C
@@ -1016,7 +1018,7 @@ Lampoid	src/Dodge/Data/Creature/Misc.hs	83;"	C
 Lampoid	src/Dodge/Lampoid.hs	1;"	m
 Large	src/Shape/Data.hs	29;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
-LasGunFlare	src/Dodge/Data/Item/Use.hs	127;"	C
+LasGunFlare	src/Dodge/Data/Item/Use.hs	123;"	C
 LasSound	src/Dodge/Data/SoundOrigin.hs	28;"	C
 LasTurret	src/Dodge/Room/LasTurret.hs	1;"	m
 Laser	src/Dodge/Data/Laser.hs	21;"	t
@@ -1187,7 +1189,7 @@ Metapysics	src/Dodge/Data/Scenario.hs	17;"	t
 Military	src/Dodge/Data/Scenario.hs	45;"	C
 Mine	src/Dodge/Data/Scenario.hs	64;"	C
 MiniGunAI	src/Dodge/Data/Creature/Misc.hs	58;"	C
-MiniGunFlare	src/Dodge/Data/Item/Use.hs	125;"	C
+MiniGunFlare	src/Dodge/Data/Item/Use.hs	121;"	C
 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
@@ -1221,23 +1223,23 @@ Multiset	src/Multiset.hs	4;"	m
 Music	src/Music.hs	1;"	m
 MusicData	src/Music.hs	7;"	t
 Mute	src/Dodge/Data/Creature/Misc.hs	28;"	C
-Muzzle	src/Dodge/Data/Item/Use.hs	158;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	154;"	t
-MuzzleBlink	src/Dodge/Data/Item/Use.hs	146;"	C
+MuzzleBlink	src/Dodge/Data/Item/Use.hs	142;"	C
-MuzzleDetector	src/Dodge/Data/Item/Use.hs	145;"	C
+MuzzleDetector	src/Dodge/Data/Item/Use.hs	141;"	C
-MuzzleEffect	src/Dodge/Data/Item/Use.hs	131;"	t
+MuzzleEffect	src/Dodge/Data/Item/Use.hs	127;"	t
 MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	5;"	m
-MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	137;"	C
+MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	133;"	C
-MuzzleLaser	src/Dodge/Data/Item/Use.hs	133;"	C
+MuzzleLaser	src/Dodge/Data/Item/Use.hs	129;"	C
-MuzzleNozzle	src/Dodge/Data/Item/Use.hs	138;"	C
+MuzzleNozzle	src/Dodge/Data/Item/Use.hs	134;"	C
-MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	136;"	C
+MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	132;"	C
-MuzzleRewind	src/Dodge/Data/Item/Use.hs	148;"	C
+MuzzleRewind	src/Dodge/Data/Item/Use.hs	144;"	C
-MuzzleScroller	src/Dodge/Data/Item/Use.hs	150;"	C
+MuzzleScroller	src/Dodge/Data/Item/Use.hs	146;"	C
-MuzzleShatter	src/Dodge/Data/Item/Use.hs	144;"	C
+MuzzleShatter	src/Dodge/Data/Item/Use.hs	140;"	C
-MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	132;"	C
+MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	128;"	C
-MuzzleStopper	src/Dodge/Data/Item/Use.hs	149;"	C
+MuzzleStopper	src/Dodge/Data/Item/Use.hs	145;"	C
-MuzzleTesla	src/Dodge/Data/Item/Use.hs	134;"	C
+MuzzleTesla	src/Dodge/Data/Item/Use.hs	130;"	C
-MuzzleTractor	src/Dodge/Data/Item/Use.hs	135;"	C
+MuzzleTractor	src/Dodge/Data/Item/Use.hs	131;"	C
-MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	147;"	C
+MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	143;"	C
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
 MvWalking	src/Dodge/Data/Creature/Misc.hs	39;"	C
@@ -1260,7 +1262,7 @@ NewIntMap	src/NewInt.hs	18;"	t
 NewSideEffect	src/Dodge/Data/Universe.hs	65;"	C
 Ngon	src/Dodge/Room/Ngon.hs	1;"	m
 NoAction	src/Dodge/Data/ActionPlan.hs	152;"	C
-NoAmmoParams	src/Dodge/Data/Item/Use.hs	111;"	C
+NoAmmoParams	src/Dodge/Data/Item/Use.hs	107;"	C
 NoArguments	src/Dodge/Data/Terminal.hs	91;"	C
 NoBeamCombine	src/Dodge/Data/Beam.hs	43;"	C
 NoConcurrentEffect	src/Loop/Data.hs	7;"	C
@@ -1275,15 +1277,15 @@ NoDropEffect	src/Dodge/Data/Item/Effect.hs	37;"	C
 NoEquipParams	src/Dodge/Data/Item/Use/Equipment.hs	36;"	C
 NoEscapeMenuOption	src/Dodge/Data/Universe.hs	79;"	C
 NoFaction	src/Dodge/Data/Creature/State.hs	40;"	C
-NoFlare	src/Dodge/Data/Item/Use.hs	122;"	C
+NoFlare	src/Dodge/Data/Item/Use.hs	118;"	C
 NoHammer	src/Dodge/Data/Hammer.hs	13;"	C
-NoHeldUseEffect	src/Dodge/Data/Item/Use.hs	57;"	C
+NoHeldUseEffect	src/Dodge/Data/Item/Use.hs	56;"	C
 NoHoming	src/Dodge/Data/Projectile.hs	48;"	C
 NoIntImp	src/Dodge/Data/CreatureEffect.hs	20;"	C
 NoInvEffect	src/Dodge/Data/Item/Effect.hs	24;"	C
 NoItTargeting	src/Dodge/Data/Item.hs	60;"	C
 NoItemScroll	src/Dodge/Data/Item.hs	56;"	C
-NoLightFlare	src/Dodge/Data/Item/Use.hs	124;"	C
+NoLightFlare	src/Dodge/Data/Item/Use.hs	120;"	C
 NoLighting	src/Dodge/Data/Config.hs	104;"	C
 NoMouseContext	src/Dodge/Data/Input.hs	22;"	C
 NoMvType	src/Dodge/Data/Creature/Misc.hs	38;"	C
@@ -1297,6 +1299,7 @@ NoSF	src/Dodge/Data/ComposedItem.hs	56;"	C
 NoShadowFidelity	src/Shape/Data.hs	25;"	C
 NoShadows	src/Dodge/Data/Config.hs	103;"	C
 NoSubInventory	src/Dodge/Data/HUD.hs	29;"	C
+NoTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
 NoWorldEffect	src/Dodge/Data/WorldEffect.hs	24;"	C
 Noclip	src/Dodge/Data/Config.hs	70;"	C
 NodeMTree	src/Dodge/Data/MetaTree.hs	14;"	C
@@ -1500,7 +1503,7 @@ Procedural	src/Dodge/Room/Procedural.hs	2;"	m
 Projectile	src/Dodge/Data/Projectile.hs	17;"	t
 Projectile	src/Dodge/Data/Projectile.hs	6;"	m
 Projectile	src/Dodge/Projectile.hs	1;"	m
-ProjectileParams	src/Dodge/Data/Item/Use.hs	109;"	C
+ProjectileParams	src/Dodge/Data/Item/Use.hs	105;"	C
 ProjectileStabiliserLink	src/Dodge/Data/ComposedItem.hs	32;"	C
 ProjectileStabiliserSF	src/Dodge/Data/ComposedItem.hs	63;"	C
 ProjectileType	src/Dodge/Data/Projectile.hs	36;"	t
@@ -1602,7 +1605,7 @@ RandomHelp	src/RandomHelp.hs	3;"	m
 RandomImpulse	src/Dodge/Data/ActionPlan.hs	32;"	C
 RandomPlacement	src/Dodge/Data/GenWorld.hs	84;"	C
 RandomTurn	src/Dodge/Data/ActionPlan.hs	31;"	C
-RandomiseMuzzleFrames	src/Dodge/Data/Item/Use.hs	58;"	C
+RandomiseMuzzleFrames	src/Dodge/Data/Item/Use.hs	57;"	C
 ReactorSS	src/Dodge/Data/Scenario.hs	111;"	C
 ReaderUpdate	src/Dodge/Creature/ReaderUpdate.hs	1;"	m
 RecRoomSS	src/Dodge/Data/Scenario.hs	103;"	C
@@ -1878,7 +1881,7 @@ SwarmAI	src/Dodge/Data/Creature/Misc.hs	55;"	C
 SwarmCrit	src/Dodge/Creature/SwarmCrit.hs	1;"	m
 SwarmPlacement	src/Dodge/LevelGen/SwarmPlacement.hs	1;"	m
 Switch	src/Dodge/LevelGen/Switch.hs	1;"	m
-SwitchAlteRifle	src/Dodge/Data/Item/Use.hs	59;"	C
+SwitchAlteRifle	src/Dodge/Data/Item/Use.hs	58;"	C
 SwitchToItem	src/Dodge/Data/ActionPlan.hs	38;"	C
 TAPE	src/Dodge/Data/Item/Combine.hs	54;"	C
 TARGETING	src/Dodge/Data/Item/Combine.hs	21;"	C
@@ -1958,7 +1961,7 @@ TeslaArc	src/Dodge/Data/TeslaArc.hs	17;"	t
 TeslaArc	src/Dodge/Data/TeslaArc.hs	6;"	m
 TeslaBall	src/Dodge/Data/Bullet.hs	31;"	C
 TeslaBeamCombine	src/Dodge/Data/Beam.hs	41;"	C
-TeslaGunFlare	src/Dodge/Data/Item/Use.hs	128;"	C
+TeslaGunFlare	src/Dodge/Data/Item/Use.hs	124;"	C
 Test	src/Dodge/Creature/Test.hs	8;"	m
 Test	src/Dodge/Event/Test.hs	1;"	m
 Test	src/Picture/Test.hs	1;"	m
@@ -2018,7 +2021,9 @@ Trie	src/SimpleTrie.hs	9;"	t
 TriggerDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	1;"	m
 TriggerLink	src/Dodge/Data/ComposedItem.hs	18;"	C
 TriggerSF	src/Dodge/Data/ComposedItem.hs	49;"	C
-TriggerType	src/Dodge/Data/Item/Use.hs	72;"	t
+TriggerType	src/Dodge/Data/TriggerType.hs	9;"	t
+TriggerType	src/Dodge/Data/TriggerType.hs	4;"	m
+TriggerType	src/Dodge/Item/TriggerType.hs	1;"	m
 TriggerType	src/Dodge/Item/Weapon/TriggerType.hs	6;"	m
 TurbineBaySS	src/Dodge/Data/Scenario.hs	110;"	C
 Turn	src/Dodge/Data/ActionPlan.hs	30;"	C
@@ -2067,35 +2072,35 @@ Update	src/Dodge/TractorBeam/Update.hs	1;"	m
 Update	src/Dodge/Update.hs	8;"	m
 Update	src/Framebuffer/Update.hs	6;"	m
 Update	src/Preload/Update.hs	3;"	m
-Use	src/Dodge/Data/Item/Use.hs	6;"	m
+Use	src/Dodge/Data/Item/Use.hs	5;"	m
 Use	src/Dodge/Default/Item/Use.hs	1;"	m
 UseAheadPos	src/Dodge/Data/ActionPlan.hs	160;"	C
-UseAttach	src/Dodge/Data/Item/Use.hs	43;"	C
+UseAttach	src/Dodge/Data/Item/Use.hs	42;"	C
-UseBulletMod	src/Dodge/Data/Item/Use.hs	48;"	C
+UseBulletMod	src/Dodge/Data/Item/Use.hs	47;"	C
-UseCondition	src/Dodge/Data/Item/Use.hs	67;"	t
+UseCondition	src/Dodge/Data/Item/Use.hs	66;"	t
 UseDelay	src/Dodge/Data/Item/HeldDelay.hs	13;"	t
-UseEquip	src/Dodge/Data/Item/Use.hs	42;"	C
+UseEquip	src/Dodge/Data/Item/Use.hs	41;"	C
-UseExactly	src/Dodge/Data/Item/Use.hs	154;"	C
+UseExactly	src/Dodge/Data/Item/Use.hs	150;"	C
-UseFocus	src/Dodge/Data/Item/Use.hs	62;"	t
+UseFocus	src/Dodge/Data/Item/Use.hs	61;"	t
-UseFromLocation	src/Dodge/Data/Item/Use.hs	64;"	C
+UseFromLocation	src/Dodge/Data/Item/Use.hs	63;"	C
-UseFromRoot	src/Dodge/Data/Item/Use.hs	63;"	C
+UseFromRoot	src/Dodge/Data/Item/Use.hs	62;"	C
-UseHeld	src/Dodge/Data/Item/Use.hs	34;"	C
+UseHeld	src/Dodge/Data/Item/Use.hs	33;"	C
-UseInt	src/Dodge/Data/Item/Use.hs	44;"	C
+UseInt	src/Dodge/Data/Item/Use.hs	43;"	C
 UseInvItem	src/Dodge/Data/WorldEffect.hs	36;"	C
 UseItem	src/Dodge/Data/ActionPlan.hs	37;"	C
 UseItem	src/Dodge/Creature/Impulse/UseItem.hs	3;"	m
 UseItemWidth	src/Dodge/Data/SelectionList.hs	41;"	C
-UseMapper	src/Dodge/Data/Item/Use.hs	50;"	C
+UseMapper	src/Dodge/Data/Item/Use.hs	49;"	C
 UseMvTargetPos	src/Dodge/Data/ActionPlan.hs	163;"	C
-UseNothing	src/Dodge/Data/Item/Use.hs	45;"	C
+UseNothing	src/Dodge/Data/Item/Use.hs	44;"	C
-UseScope	src/Dodge/Data/Item/Use.hs	47;"	C
+UseScope	src/Dodge/Data/Item/Use.hs	46;"	C
 UseSelf	src/Dodge/Data/ActionPlan.hs	157;"	C
 UseTarget	src/Dodge/Data/ActionPlan.hs	154;"	C
-UseToggle	src/Dodge/Data/Item/Use.hs	49;"	C
+UseToggle	src/Dodge/Data/Item/Use.hs	48;"	C
-UseUpTo	src/Dodge/Data/Item/Use.hs	155;"	C
+UseUpTo	src/Dodge/Data/Item/Use.hs	151;"	C
-UseValue	src/Dodge/Data/Item/Use.hs	46;"	C
+UseValue	src/Dodge/Data/Item/Use.hs	45;"	C
-UseableAnytime	src/Dodge/Data/Item/Use.hs	69;"	C
+UseableAnytime	src/Dodge/Data/Item/Use.hs	68;"	C
-UseableWhenAimed	src/Dodge/Data/Item/Use.hs	68;"	C
+UseableWhenAimed	src/Dodge/Data/Item/Use.hs	67;"	C
 UsedInLink	src/Dodge/Data/Room.hs	61;"	C
 UsedOutLink	src/Dodge/Data/Room.hs	56;"	C
 Utility	src/Dodge/Item/Held/Utility.hs	1;"	m
@@ -2217,9 +2222,9 @@ Zoning	src/Dodge/Zoning.hs	1;"	m
 __Just'	src/MaybeHelp.hs	13;"	f
 _actAction	src/Dodge/Data/ActionPlan.hs	81;"	f
 _actLabel	src/Dodge/Data/ActionPlan.hs	80;"	f
-_aimMuzzles	src/Dodge/Data/Item/Use.hs	117;"	f
+_aimMuzzles	src/Dodge/Data/Item/Use.hs	113;"	f
-_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	116;"	f
+_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	112;"	f
-_aimWeight	src/Dodge/Data/Item/Use.hs	115;"	f
+_aimWeight	src/Dodge/Data/Item/Use.hs	111;"	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
@@ -2231,14 +2236,14 @@ _allocRemoveID	src/Dodge/Data/RightButtonOptions.hs	34;"	f
 _allocSwapID	src/Dodge/Data/RightButtonOptions.hs	30;"	f
 _alphaDivideShader	src/Data/Preload/Render.hs	18;"	f
 _ambushTarget	src/Dodge/Data/ActionPlan.hs	178;"	f
-_ampBullet	src/Dodge/Data/Item/Use.hs	108;"	f
+_ampBullet	src/Dodge/Data/Item/Use.hs	104;"	f
-_ampCreateGas	src/Dodge/Data/Item/Use.hs	110;"	f
+_ampCreateGas	src/Dodge/Data/Item/Use.hs	106;"	f
-_ampPayload	src/Dodge/Data/Item/Use.hs	109;"	f
+_ampPayload	src/Dodge/Data/Item/Use.hs	105;"	f
 _apAction	src/Dodge/Data/ActionPlan.hs	20;"	f
 _apGoal	src/Dodge/Data/ActionPlan.hs	22;"	f
 _apImpulse	src/Dodge/Data/ActionPlan.hs	19;"	f
-_apInt	src/Dodge/Data/Item/Use.hs	77;"	f
+_apInt	src/Dodge/Data/Item/Use.hs	73;"	f
-_apProjectiles	src/Dodge/Data/Item/Use.hs	76;"	f
+_apProjectiles	src/Dodge/Data/Item/Use.hs	72;"	f
 _apStrategy	src/Dodge/Data/ActionPlan.hs	21;"	f
 _arLoaded	src/Dodge/Data/Item/Use/Consumption.hs	28;"	f
 _arMax	src/Dodge/Data/Item/Use/Consumption.hs	29;"	f
@@ -2573,7 +2578,7 @@ _fullscreenShader	src/Data/Preload/Render.hs	20;"	f
 _futureWorlds	src/Dodge/Data/World.hs	64;"	f
 _futureWorlds	src/Dodge/Data/World.hs	70;"	f
 _gameplay_rotate_to_wall	src/Dodge/Data/Config.hs	55;"	f
-_gasCreation	src/Dodge/Data/Item/Use.hs	84;"	f
+_gasCreation	src/Dodge/Data/Item/Use.hs	80;"	f
 _genPlacements	src/Dodge/Data/GenWorld.hs	25;"	f
 _genRooms	src/Dodge/Data/GenWorld.hs	26;"	f
 _getAttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	f
@@ -2608,13 +2613,12 @@ _guVel	src/Dodge/Data/Gust.hs	16;"	f
 _gusts	src/Dodge/Data/LWorld.hs	103;"	f
 _gwWorld	src/Dodge/Data/GenWorld.hs	24;"	f
 _hammerPosition	src/Dodge/Data/Hammer.hs	14;"	f
-_heldAim	src/Dodge/Data/Item/Use.hs	36;"	f
+_heldAim	src/Dodge/Data/Item/Use.hs	35;"	f
-_heldDelay	src/Dodge/Data/Item/Use.hs	35;"	f
+_heldDelay	src/Dodge/Data/Item/Use.hs	34;"	f
-_heldFrame	src/Dodge/Data/Item/Use.hs	39;"	f
+_heldFrame	src/Dodge/Data/Item/Use.hs	38;"	f
-_heldParams	src/Dodge/Data/Item/Use.hs	37;"	f
+_heldParams	src/Dodge/Data/Item/Use.hs	36;"	f
 _heldPos	src/Dodge/Data/Input.hs	54;"	f
-_heldTriggerType	src/Dodge/Data/Item/Use.hs	38;"	f
+_heldUseEffect	src/Dodge/Data/Item/Use.hs	39;"	f
-_heldUseEffect	src/Dodge/Data/Item/Use.hs	40;"	f
 _heldWorldPos	src/Dodge/Data/Input.hs	56;"	f
 _hotkeys	src/Dodge/Data/LWorld.hs	148;"	f
 _hud	src/Dodge/Data/World.hs	45;"	f
@@ -2802,20 +2806,20 @@ _mtLabel	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtTree	src/Dodge/Data/MetaTree.hs	10;"	f
 _mtTree	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _musicData	src/Data/Preload.hs	13;"	f
-_muzVel	src/Dodge/Data/Item/Use.hs	93;"	f
+_muzVel	src/Dodge/Data/Item/Use.hs	89;"	f
 _mvAimSpeed	src/Dodge/Data/Creature/Misc.hs	44;"	f
 _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _mvToPoint	src/Dodge/Data/Creature.hs	78;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	165;"	f
+_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	161;"	f
-_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	162;"	f
+_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	158;"	f
-_mzEffect	src/Dodge/Data/Item/Use.hs	164;"	f
+_mzEffect	src/Dodge/Data/Item/Use.hs	160;"	f
-_mzFlareType	src/Dodge/Data/Item/Use.hs	163;"	f
+_mzFlareType	src/Dodge/Data/Item/Use.hs	159;"	f
-_mzFrame	src/Dodge/Data/Item/Use.hs	166;"	f
+_mzFrame	src/Dodge/Data/Item/Use.hs	162;"	f
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	161;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	157;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	159;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	155;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	160;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	156;"	f
 _nodeMetaTree	src/Dodge/Data/MetaTree.hs	14;"	f
 _nodeMetaTree	src/Dodge/Tree/Compose/Data.hs	9;"	f
 _nodeTree	src/Dodge/Data/MetaTree.hs	13;"	f
@@ -2824,10 +2828,10 @@ _nodesSearched	src/Dodge/Data/Creature/Memory.hs	15;"	f
 _numLinkEW	src/Dodge/Data/Room.hs	33;"	f
 _numLinkNS	src/Dodge/Data/Room.hs	34;"	f
 _numberFloorVerxs	src/Dodge/Data/CWorld.hs	29;"	f
-_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	141;"	f
+_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	137;"	f
-_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	140;"	f
+_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	136;"	f
-_nzPressure	src/Dodge/Data/Item/Use.hs	139;"	f
+_nzPressure	src/Dodge/Data/Item/Use.hs	135;"	f
-_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	142;"	f
+_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	138;"	f
 _offPathFromEdges	src/Dodge/Data/Room.hs	74;"	f
 _oldMagnets	src/Dodge/Data/LWorld.hs	127;"	f
 _onPathFromEdges	src/Dodge/Data/Room.hs	73;"	f
@@ -2953,8 +2957,8 @@ _pyFaces	src/Polyhedra/Data.hs	14;"	f
 _radarBlips	src/Dodge/Data/LWorld.hs	113;"	f
 _radarSweeps	src/Dodge/Data/LWorld.hs	108;"	f
 _randGen	src/Dodge/Data/World.hs	39;"	f
-_randomOffset	src/Dodge/Data/Item/Use.hs	86;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	82;"	f
-_randomOffset	src/Dodge/Data/Item/Use.hs	97;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	93;"	f
 _rateMax	src/Dodge/Data/Item/HeldDelay.hs	16;"	f
 _rateTimeLastUsed	src/Dodge/Data/Item/HeldDelay.hs	17;"	f
 _rbColor	src/Dodge/Data/RadarBlip.hs	15;"	f
@@ -2968,7 +2972,7 @@ _renderData	src/Data/Preload.hs	11;"	f
 _reverseAmount	src/Dodge/Data/World.hs	63;"	f
 _reverseAmount	src/Dodge/Data/World.hs	69;"	f
 _reverseAmount	src/Dodge/Data/World.hs	73;"	f
-_rifling	src/Dodge/Data/Item/Use.hs	94;"	f
+_rifling	src/Dodge/Data/Item/Use.hs	90;"	f
 _rkHoming	src/Dodge/Data/Projectile.hs	41;"	f
 _rkSmoke	src/Dodge/Data/Projectile.hs	42;"	f
 _rlDir	src/Dodge/Data/Room.hs	26;"	f
@@ -3078,8 +3082,8 @@ _siWidth	src/Dodge/Data/SelectionList.hs	47;"	f
 _siWidth	src/Dodge/Data/SelectionList.hs	56;"	f
 _sideEffect	src/Loop/Data.hs	13;"	f
 _sideImpulses	src/Dodge/Data/ActionPlan.hs	170;"	f
-_sidePush	src/Dodge/Data/Item/Use.hs	87;"	f
+_sidePush	src/Dodge/Data/Item/Use.hs	83;"	f
-_sidePush	src/Dodge/Data/Item/Use.hs	98;"	f
+_sidePush	src/Dodge/Data/Item/Use.hs	94;"	f
 _silhouetteEBO	src/Data/Preload/Render.hs	27;"	f
 _skColor	src/Dodge/Data/Spark.hs	17;"	f
 _skDamageType	src/Dodge/Data/Spark.hs	21;"	f
@@ -3193,8 +3197,8 @@ _toPlaySoundVolume	src/Sound/Data.hs	39;"	f
 _toPlaySoundVolumeFraction	src/Sound/Data.hs	40;"	f
 _toPlaySounds	src/Dodge/Data/World.hs	40;"	f
 _topBoxSize	src/Shape/Data.hs	17;"	f
-_torqueAfter	src/Dodge/Data/Item/Use.hs	85;"	f
+_torqueAfter	src/Dodge/Data/Item/Use.hs	81;"	f
-_torqueAfter	src/Dodge/Data/Item/Use.hs	96;"	f
+_torqueAfter	src/Dodge/Data/Item/Use.hs	92;"	f
 _tractorBeams	src/Dodge/Data/LWorld.hs	121;"	f
 _trieChildren	src/SimpleTrie.hs	11;"	f
 _trieMVal	src/SimpleTrie.hs	10;"	f
@@ -3208,12 +3212,12 @@ _tuFireTime	src/Dodge/Data/Machine.hs	60;"	f
 _tuTurnSpeed	src/Dodge/Data/Machine.hs	59;"	f
 _tuWeapon	src/Dodge/Data/Machine.hs	58;"	f
 _turnToPoint	src/Dodge/Data/ActionPlan.hs	92;"	f
-_uInt	src/Dodge/Data/Item/Use.hs	44;"	f
+_uInt	src/Dodge/Data/Item/Use.hs	43;"	f
-_uScope	src/Dodge/Data/Item/Use.hs	47;"	f
+_uScope	src/Dodge/Data/Item/Use.hs	46;"	f
-_uValue	src/Dodge/Data/Item/Use.hs	46;"	f
+_uValue	src/Dodge/Data/Item/Use.hs	45;"	f
-_uaParams	src/Dodge/Data/Item/Use.hs	43;"	f
+_uaParams	src/Dodge/Data/Item/Use.hs	42;"	f
-_ubMod	src/Dodge/Data/Item/Use.hs	48;"	f
+_ubMod	src/Dodge/Data/Item/Use.hs	47;"	f
-_uequipEffect	src/Dodge/Data/Item/Use.hs	42;"	f
+_uequipEffect	src/Dodge/Data/Item/Use.hs	41;"	f
 _unCombEdge	src/Dodge/Combine/Graph.hs	31;"	f
 _unCombNode	src/Dodge/Combine/Graph.hs	24;"	f
 _unFBO	src/Shader/Data.hs	57;"	f
@@ -3228,14 +3232,14 @@ _unTO	src/Shader/Data.hs	59;"	f
 _unpauseClock	src/Dodge/Data/World.hs	54;"	f
 _unputTerminal	src/Dodge/Data/GenWorld.hs	36;"	f
 _useAheadPos	src/Dodge/Data/ActionPlan.hs	161;"	f
-_useExactly	src/Dodge/Data/Item/Use.hs	154;"	f
+_useExactly	src/Dodge/Data/Item/Use.hs	150;"	f
-_useMapperLines	src/Dodge/Data/Item/Use.hs	51;"	f
+_useMapperLines	src/Dodge/Data/Item/Use.hs	50;"	f
-_useMapperPoints	src/Dodge/Data/Item/Use.hs	52;"	f
+_useMapperPoints	src/Dodge/Data/Item/Use.hs	51;"	f
 _useMvTargetPos	src/Dodge/Data/ActionPlan.hs	164;"	f
 _useSelf	src/Dodge/Data/ActionPlan.hs	158;"	f
 _useTarget	src/Dodge/Data/ActionPlan.hs	155;"	f
-_useToggle	src/Dodge/Data/Item/Use.hs	49;"	f
+_useToggle	src/Dodge/Data/Item/Use.hs	48;"	f
-_useUpTo	src/Dodge/Data/Item/Use.hs	155;"	f
+_useUpTo	src/Dodge/Data/Item/Use.hs	151;"	f
 _uvCanContinue	src/Dodge/Data/Universe.hs	39;"	f
 _uvConfig	src/Dodge/Data/Universe.hs	37;"	f
 _uvDebug	src/Dodge/Data/Universe.hs	44;"	f
@@ -3290,10 +3294,10 @@ _wanPos	src/Dodge/Data/LWorld.hs	162;"	f
 _warmMax	src/Dodge/Data/Item/HeldDelay.hs	27;"	f
 _warmSound	src/Dodge/Data/Item/HeldDelay.hs	28;"	f
 _warmTime	src/Dodge/Data/Item/HeldDelay.hs	26;"	f
-_weaponInvLock	src/Dodge/Data/Item/Use.hs	88;"	f
+_weaponInvLock	src/Dodge/Data/Item/Use.hs	84;"	f
-_weaponInvLock	src/Dodge/Data/Item/Use.hs	102;"	f
+_weaponInvLock	src/Dodge/Data/Item/Use.hs	98;"	f
-_weaponRepeat	src/Dodge/Data/Item/Use.hs	89;"	f
+_weaponRepeat	src/Dodge/Data/Item/Use.hs	85;"	f
-_weaponRepeat	src/Dodge/Data/Item/Use.hs	103;"	f
+_weaponRepeat	src/Dodge/Data/Item/Use.hs	99;"	f
 _windowPosX	src/Dodge/Data/Config.hs	53;"	f
 _windowPosY	src/Dodge/Data/Config.hs	54;"	f
 _windowShader	src/Data/Preload/Render.hs	19;"	f
@@ -3382,10 +3386,10 @@ advanceScrollAmount	src/Dodge/Update.hs	415;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	33;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	44;"	f
 aimDelaySweep	src/Dodge/Render/Picture.hs	264;"	f
-aimStanceHandlePos	src/Dodge/Item/HeldOffset.hs	63;"	f
+aimStanceHandlePos	src/Dodge/Item/HeldOffset.hs	64;"	f
-aimStanceInfo	src/Dodge/Item/Info.hs	239;"	f
+aimStanceInfo	src/Dodge/Item/Info.hs	240;"	f
-aimTurn	src/Dodge/Creature/YourControl.hs	160;"	f
+aimTurn	src/Dodge/Creature/YourControl.hs	161;"	f
-aimingWeaponZeroPos	src/Dodge/Item/HeldOffset.hs	59;"	f
+aimingWeaponZeroPos	src/Dodge/Item/HeldOffset.hs	60;"	f
 airlock	src/Dodge/Room/Airlock.hs	19;"	f
 airlock0	src/Dodge/Room/Airlock.hs	25;"	f
 airlock90	src/Dodge/Room/Airlock.hs	122;"	f
@@ -3394,11 +3398,11 @@ airlockDoor	src/Dodge/Room/Airlock.hs	51;"	f
 airlockDoubleDoor	src/Dodge/Room/Airlock.hs	54;"	f
 airlockSimple	src/Dodge/Room/Airlock.hs	66;"	f
 airlockZ	src/Dodge/Room/Airlock.hs	91;"	f
-allInvLocs	src/Dodge/Item/Grammar.hs	310;"	f
+allInvLocs	src/Dodge/Item/Grammar.hs	311;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	131;"	f
 alongSegBy	src/Geometry.hs	40;"	f
 alteRifle	src/Dodge/Item/Held/Cane.hs	59;"	f
-ammoMagInfo	src/Dodge/Item/Info.hs	45;"	f
+ammoMagInfo	src/Dodge/Item/Info.hs	46;"	f
 ammoMagSPic	src/Dodge/Item/Draw/SPic.hs	124;"	f
 amr	src/Dodge/Item/Held/Rod.hs	41;"	f
 analyser	src/Dodge/Placement/Instance/Analyser.hs	12;"	f
@@ -3463,7 +3467,7 @@ atFstLnkOutShiftInward	src/Dodge/PlacementSpot.hs	229;"	f
 atNthLnkOutShiftBy	src/Dodge/PlacementSpot.hs	214;"	f
 atNthLnkOutShiftInward	src/Dodge/PlacementSpot.hs	232;"	f
 attachBranch	src/Dodge/Tree/Compose.hs	83;"	f
-attachInfo	src/Dodge/Item/Info.hs	54;"	f
+attachInfo	src/Dodge/Item/Info.hs	55;"	f
 attachList'	src/Dodge/Tree/Compose.hs	80;"	f
 attachOnward	src/Dodge/Tree/Compose.hs	95;"	f
 attachOnward'	src/Dodge/Tree/Compose.hs	98;"	f
@@ -3496,7 +3500,7 @@ barPP	src/Dodge/Room/Foreground.hs	236;"	f
 barrel	src/Dodge/Creature/Inanimate.hs	17;"	f
 baseAMRShape	src/Dodge/Item/Draw/SPic.hs	399;"	f
 baseBlockPane	src/Dodge/Placement/Instance/Wall.hs	86;"	f
-baseCI	src/Dodge/Item/Grammar.hs	185;"	f
+baseCI	src/Dodge/Item/Grammar.hs	186;"	f
 baseCaneShape	src/Dodge/Item/Draw/SPic.hs	306;"	f
 baseDebris	src/Dodge/Block/Debris.hs	122;"	f
 baseFloorTileSize	src/Tile.hs	45;"	f
@@ -3507,6 +3511,8 @@ baseShoulder	src/Dodge/Creature/Picture.hs	131;"	f
 baseStickShape	src/Dodge/Item/Draw/SPic.hs	283;"	f
 baseStickShapeX	src/Dodge/Item/Draw/SPic.hs	278;"	f
 baseStickSpread	src/Dodge/Item/Held/Stick.hs	39;"	f
+baseTriggerType	src/Dodge/BaseTriggerType.hs	9;"	f
+baseTriggerType	src/Dodge/Item/TriggerType.hs	5;"	f
 basicAttentionUpdate	src/Dodge/Creature/Perception.hs	127;"	f
 basicAwarenessUpdate	src/Dodge/Creature/Perception.hs	37;"	f
 basicBulDams	src/Dodge/Item/Weapon/Bullet.hs	23;"	f
@@ -3744,37 +3750,37 @@ corridorBoss	src/Dodge/LockAndKey.hs	133;"	f
 corridorN	src/Dodge/Room/Corridor.hs	52;"	f
 corridorWallN	src/Dodge/Room/Corridor.hs	71;"	f
 crAdd	src/Dodge/Room/RezBox.hs	104;"	f
-crAwayFromPost	src/Dodge/Creature/Test.hs	78;"	f
+crAwayFromPost	src/Dodge/Creature/Test.hs	79;"	f
 crBlips	src/Dodge/RadarSweep.hs	87;"	f
 crCamouflage	src/Dodge/Creature/Picture.hs	31;"	f
-crCanSeeCr	src/Dodge/Creature/Test.hs	47;"	f
+crCanSeeCr	src/Dodge/Creature/Test.hs	48;"	f
 crCrSpring	src/Dodge/Update.hs	781;"	f
 crCurrentEquipment	src/Dodge/Creature/Statistics.hs	26;"	f
 crDisplayAwareness	src/Dodge/Creature/Picture/Awareness.hs	37;"	f
 crDisplayVigilance	src/Dodge/Creature/Picture/Awareness.hs	51;"	f
-crHasTarget	src/Dodge/Creature/Test.hs	60;"	f
+crHasTarget	src/Dodge/Creature/Test.hs	61;"	f
-crHasTargetLOS	src/Dodge/Creature/Test.hs	63;"	f
+crHasTargetLOS	src/Dodge/Creature/Test.hs	64;"	f
 crHit	src/Dodge/WorldEvent/ThingsHit.hs	68;"	f
 crIXsNearCirc	src/Dodge/Zoning/Creature.hs	31;"	f
 crIXsNearPoint	src/Dodge/Zoning/Creature.hs	13;"	f
-crInAimStance	src/Dodge/Creature/Test.hs	89;"	f
+crInAimStance	src/Dodge/Creature/Test.hs	90;"	f
-crIsAiming	src/Dodge/Creature/Test.hs	55;"	f
+crIsAiming	src/Dodge/Creature/Test.hs	56;"	f
-crIsArmouredFrom	src/Dodge/Creature/Test.hs	110;"	f
+crIsArmouredFrom	src/Dodge/Creature/Test.hs	111;"	f
 crMvAbsolute	src/Dodge/Creature/Impulse/Movement.hs	27;"	f
 crMvBy	src/Dodge/Creature/Impulse/Movement.hs	20;"	f
 crMvForward	src/Dodge/Creature/Impulse/Movement.hs	41;"	f
-crNearPoint	src/Dodge/Creature/Test.hs	136;"	f
+crNearPoint	src/Dodge/Creature/Test.hs	137;"	f
 crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	22;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	85;"	f
-crSafeDistFromTarg	src/Dodge/Creature/Test.hs	68;"	f
+crSafeDistFromTarg	src/Dodge/Creature/Test.hs	69;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	48;"	f
 crSpring	src/Dodge/Update.hs	776;"	f
-crStratConMatches	src/Dodge/Creature/Test.hs	73;"	f
+crStratConMatches	src/Dodge/Creature/Test.hs	74;"	f
 crUpdate	src/Dodge/Creature/State.hs	62;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	61;"	f
 crUpdateItemLocations	src/Dodge/Inventory/Location.hs	42;"	f
 crZoneSize	src/Dodge/Zoning/Creature.hs	40;"	f
-craftInfo	src/Dodge/Item/Info.hs	164;"	f
+craftInfo	src/Dodge/Item/Info.hs	165;"	f
 craftItemSPic	src/Dodge/Item/Draw/SPic.hs	56;"	f
 crankSlowS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	446;"	f
 createArc	src/Dodge/Tesla/Arc.hs	81;"	f
@@ -3985,7 +3991,7 @@ detV	src/Geometry/Vector.hs	93;"	f
 detector	src/Dodge/Item/Held/Utility.hs	39;"	f
 detectorColor	src/Dodge/Item/Draw/SPic.hs	445;"	f
 detectorEffect	src/Dodge/Item/Weapon/Radar.hs	20;"	f
-detectorInfo	src/Dodge/Item/Info.hs	220;"	f
+detectorInfo	src/Dodge/Item/Info.hs	221;"	f
 determineProjectileTracking	src/Dodge/HeldUse.hs	774;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 did	src/Dodge/Item/InvSize.hs	54;"	f
@@ -4017,7 +4023,7 @@ divideLineExact	src/Geometry.hs	275;"	f
 divideLineOddNumPoints	src/Geometry.hs	260;"	f
 doAfterPlacement	src/Dodge/Layout.hs	86;"	f
 doAfterPlacements	src/Dodge/Layout.hs	83;"	f
-doAimTwist	src/Dodge/Creature/YourControl.hs	135;"	f
+doAimTwist	src/Dodge/Creature/YourControl.hs	136;"	f
 doAnyEquipmentEffect	src/Dodge/Creature/State.hs	189;"	f
 doArcStep	src/Dodge/Tesla/Arc.hs	135;"	f
 doBackspace	src/Dodge/Update/Input/Text.hs	31;"	f
@@ -4283,10 +4289,10 @@ eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	5;"	f
 eqSiteToPositions	src/Dodge/Inventory/RBList.hs	75;"	f
 equipAllocString	src/Dodge/Render/HUD.hs	307;"	f
-equipInfo	src/Dodge/Item/Info.hs	137;"	f
+equipInfo	src/Dodge/Item/Info.hs	138;"	f
 equipItemSPic	src/Dodge/Item/Draw/SPic.hs	144;"	f
 equipPosition	src/Dodge/Item/Draw.hs	28;"	f
-equipSiteInfo	src/Dodge/Item/Info.hs	249;"	f
+equipSiteInfo	src/Dodge/Item/Info.hs	250;"	f
 equipmentStrValue	src/Dodge/Creature/Statistics.hs	20;"	f
 errorAngleVV	src/Geometry.hs	59;"	f
 errorClosestPointOnLine	src/Geometry.hs	71;"	f
@@ -4312,8 +4318,8 @@ extTrigLitPos	src/Dodge/Placement/Instance/Button.hs	84;"	f
 extendAway	src/Dodge/Placement/Instance/LightSource.hs	200;"	f
 extendConeToScreenEdge	src/Dodge/Debug/Picture.hs	82;"	f
 extraPics	src/Dodge/Render/ShapePicture.hs	82;"	f
-extraWeaponLinks	src/Dodge/Item/Grammar.hs	118;"	f
+extraWeaponLinks	src/Dodge/Item/Grammar.hs	119;"	f
-extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	127;"	f
+extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	128;"	f
 extractRoomPos	src/Dodge/RoomPos.hs	6;"	f
 faceEdges	src/Polyhedra.hs	65;"	f
 facesToVF	src/Polyhedra/Geodesic.hs	69;"	f
@@ -4432,11 +4438,11 @@ geometryTests	test/Spec.hs	17;"	f
 geometryUnitTests	test/Spec.hs	22;"	f
 geqConstr	src/SameConstr.hs	21;"	f
 getAimZoom	src/Dodge/Update/Camera.hs	134;"	f
-getAmmoLinks	src/Dodge/Item/Grammar.hs	134;"	f
+getAmmoLinks	src/Dodge/Item/Grammar.hs	135;"	f
 getArguments	src/Dodge/Update/Scroll.hs	176;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	164;"	f
 getAttachedSFLink	src/Dodge/HeldUse.hs	460;"	f
-getAutoSpringLinks	src/Dodge/Item/Grammar.hs	113;"	f
+getAutoSpringLinks	src/Dodge/Item/Grammar.hs	114;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
 getBulletType	src/Dodge/HeldUse.hs	595;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	515;"	f
@@ -4519,19 +4525,19 @@ halfWidth	src/Dodge/Base/Window.hs	48;"	f
 haltSound	src/Dodge/SoundLogic.hs	38;"	f
 hammerCheck	src/Dodge/HeldUse.hs	80;"	f
 handleEvent	src/Dodge/Event.hs	27;"	f
-handleHotkeys	src/Dodge/Creature/YourControl.hs	40;"	f
+handleHotkeys	src/Dodge/Creature/YourControl.hs	41;"	f
 handleKeyboardEvent	src/Dodge/Event/Input.hs	22;"	f
 handleMouseButtonEvent	src/Dodge/Event/Input.hs	63;"	f
 handleMouseMotionEvent	src/Dodge/Event/Input.hs	47;"	f
 handleMouseWheelEvent	src/Dodge/Event/Input.hs	58;"	f
-handlePos	src/Dodge/Item/HeldOffset.hs	88;"	f
+handlePos	src/Dodge/Item/HeldOffset.hs	89;"	f
 handleResizeEvent	src/Dodge/Event.hs	53;"	f
 handleTextInput	src/Dodge/Event/Input.hs	18;"	f
 handleWindowMoveEvent	src/Dodge/Event.hs	44;"	f
 hardQuit	src/Dodge/Concurrent.hs	32;"	f
 hasButtonLOS	src/Dodge/Base/Collide.hs	210;"	f
 hasCaneGunDim	src/Dodge/Item/InvSize.hs	48;"	f
-hasFrontArmour	src/Dodge/Creature/Test.hs	113;"	f
+hasFrontArmour	src/Dodge/Creature/Test.hs	114;"	f
 hasLOS	src/Dodge/Base/Collide.hs	203;"	f
 hasLOSIndirect	src/Dodge/Base/Collide.hs	218;"	f
 hat	src/Dodge/Item/Equipment.hs	133;"	f
@@ -4550,13 +4556,14 @@ heldAimZoom	src/Dodge/Update/Camera.hs	139;"	f
 heldEffect	src/Dodge/HeldUse.hs	61;"	f
 heldEffectMuzzles	src/Dodge/HeldUse.hs	119;"	f
 heldEffectNoHammerCheck	src/Dodge/HeldUse.hs	69;"	f
-heldHandlePos	src/Dodge/Item/HeldOffset.hs	93;"	f
+heldHandlePos	src/Dodge/Item/HeldOffset.hs	94;"	f
-heldInfo	src/Dodge/Item/Info.hs	87;"	f
+heldInfo	src/Dodge/Item/Info.hs	88;"	f
-heldItemOffset	src/Dodge/Item/HeldOffset.hs	70;"	f
+heldItemOffset	src/Dodge/Item/HeldOffset.hs	71;"	f
-heldItemOrient2D	src/Dodge/Item/HeldOffset.hs	27;"	f
+heldItemOrient2D	src/Dodge/Item/HeldOffset.hs	28;"	f
-heldItemRelativeOrient	src/Dodge/Item/HeldOffset.hs	32;"	f
+heldItemRelativeOrient	src/Dodge/Item/HeldOffset.hs	33;"	f
 heldItemSPic	src/Dodge/Item/Draw/SPic.hs	220;"	f
-heldPositionInfo	src/Dodge/Item/Info.hs	236;"	f
+heldPositionInfo	src/Dodge/Item/Info.hs	237;"	f
+heldTriggerType	src/Dodge/BaseTriggerType.hs	14;"	f
 helpCommand	src/Dodge/Terminal.hs	66;"	f
 helpPoly3D	src/Polyhedra.hs	125;"	f
 heron	src/Geometry.hs	217;"	f
@@ -4572,7 +4579,7 @@ holsterWeapon	src/Dodge/Creature/Volition.hs	14;"	f
 homingModule	src/Dodge/Item/Scope.hs	48;"	f
 horPipe	src/Dodge/Placement/Instance/Pipe.hs	9;"	f
 hotkeyToChar	src/Dodge/Inventory/SelectionList.hs	182;"	f
-hotkeyToScancode	src/Dodge/Creature/YourControl.hs	70;"	f
+hotkeyToScancode	src/Dodge/Creature/YourControl.hs	71;"	f
 hotkeyToString	src/Dodge/Inventory/SelectionList.hs	179;"	f
 humanoidAIList	src/Dodge/Humanoid.hs	181;"	f
 iShape	src/Dodge/Placement/Instance/LightSource.hs	73;"	f
@@ -4645,16 +4652,16 @@ interweave	src/Justify.hs	17;"	f
 introScan	src/Dodge/Item/Scope.hs	57;"	f
 introScanValue	src/Dodge/Inventory/SelectionList.hs	77;"	f
 intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
-invAdj	src/Dodge/Item/Grammar.hs	291;"	f
+invAdj	src/Dodge/Item/Grammar.hs	292;"	f
 invCursorParams	src/Dodge/ListDisplayParams.hs	36;"	f
 invDP	src/Dodge/ListDisplayParams.hs	30;"	f
 invDimColor	src/Dodge/DisplayInventory.hs	192;"	f
 invHead	src/Dodge/Render/HUD.hs	404;"	f
 invItemLocUpdate	src/Dodge/Creature/State.hs	178;"	f
-invLDT	src/Dodge/Item/Grammar.hs	271;"	f
+invLDT	src/Dodge/Item/Grammar.hs	272;"	f
 invRootItemEffs	src/Dodge/Creature/State.hs	171;"	f
-invRootMap	src/Dodge/Item/Grammar.hs	280;"	f
+invRootMap	src/Dodge/Item/Grammar.hs	281;"	f
-invRootTrees	src/Dodge/Item/Grammar.hs	301;"	f
+invRootTrees	src/Dodge/Item/Grammar.hs	302;"	f
 invSelectionItem	src/Dodge/Inventory/SelectionList.hs	30;"	f
 invSetSelection	src/Dodge/Inventory.hs	180;"	f
 invSetSelectionPos	src/Dodge/Inventory.hs	188;"	f
@@ -4673,7 +4680,7 @@ invertInventoryToMap	src/Dodge/Combine.hs	56;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	23;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
 isAmmoIntLink	src/Dodge/HeldUse.hs	416;"	f
-isAnimate	src/Dodge/Creature/Test.hs	139;"	f
+isAnimate	src/Dodge/Creature/Test.hs	140;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isConnected	src/Dodge/Inventory/Swap.hs	74;"	f
 isElectrical	src/Dodge/Data/Damage.hs	42;"	f
@@ -4700,7 +4707,7 @@ isoMatrix	src/MatrixHelper.hs	30;"	f
 isotriBWH	src/Geometry/Polygon.hs	20;"	f
 itDim	src/Dodge/Item/InvSize.hs	21;"	f
 itInvHeight	src/Dodge/Item/InvSize.hs	11;"	f
-itemBaseConnections	src/Dodge/Item/Grammar.hs	188;"	f
+itemBaseConnections	src/Dodge/Item/Grammar.hs	189;"	f
 itemBaseName	src/Dodge/Item/Display.hs	57;"	f
 itemBlips	src/Dodge/RadarSweep.hs	93;"	f
 itemCombinations	src/Dodge/Combine/Combinations.hs	55;"	f
@@ -4714,7 +4721,7 @@ itemFromAttachType	src/Dodge/Item.hs	49;"	f
 itemFromBase	src/Dodge/Item.hs	17;"	f
 itemFromEquipType	src/Dodge/Item.hs	64;"	f
 itemFromHeldType	src/Dodge/Item/Held.hs	25;"	f
-itemInfo	src/Dodge/Item/Info.hs	17;"	f
+itemInfo	src/Dodge/Item/Info.hs	18;"	f
 itemInternalValue	src/Dodge/Item/Display.hs	32;"	f
 itemInvColor	src/Dodge/Item/InventoryColor.hs	9;"	f
 itemRooms	src/Dodge/LockAndKey.hs	39;"	f
@@ -4725,18 +4732,18 @@ itemScroll	src/Dodge/Update/Scroll.hs	50;"	f
 itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	118;"	f
 itemScrollValue	src/Dodge/Inventory/SelectionList.hs	145;"	f
 itemString	src/Dodge/Item/Display.hs	53;"	f
-itemToBreakLists	src/Dodge/Item/Grammar.hs	60;"	f
+itemToBreakLists	src/Dodge/Item/Grammar.hs	61;"	f
-itemToFunction	src/Dodge/Item/Grammar.hs	140;"	f
+itemToFunction	src/Dodge/Item/Grammar.hs	141;"	f
 itemTreeSPic	src/Dodge/Item/Draw/SPic.hs	22;"	f
 iterateUntil	src/MonadHelp.hs	23;"	f
 iterateWhile	src/MonadHelp.hs	30;"	f
-itmBaseInfo	src/Dodge/Item/Info.hs	27;"	f
+itmBaseInfo	src/Dodge/Item/Info.hs	28;"	f
-itmEquipSiteInfo	src/Dodge/Item/Info.hs	246;"	f
+itmEquipSiteInfo	src/Dodge/Item/Info.hs	247;"	f
-itmSpaceInfo	src/Dodge/Item/Info.hs	22;"	f
+itmSpaceInfo	src/Dodge/Item/Info.hs	23;"	f
-itmUsageInfo	src/Dodge/Item/Info.hs	226;"	f
+itmUsageInfo	src/Dodge/Item/Info.hs	227;"	f
 jShape	src/Dodge/Placement/Instance/LightSource.hs	85;"	f
 jaggedShape	src/Dodge/Block/Debris.hs	191;"	f
-joinItemsInList	src/Dodge/Item/Grammar.hs	261;"	f
+joinItemsInList	src/Dodge/Item/Grammar.hs	262;"	f
 joystick	src/Dodge/Item/Scope.hs	150;"	f
 jps0'	src/Dodge/LevelGen/PlacementHelper.hs	60;"	f
 jps0PushPS	src/Dodge/LevelGen/PlacementHelper.hs	63;"	f
@@ -4770,7 +4777,7 @@ lasTunnel	src/Dodge/Room/LasTurret.hs	126;"	f
 lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	167;"	f
 lasTurret	src/Dodge/Placement/Instance/Turret.hs	38;"	f
 laser	src/Dodge/Item/Held/BatteryGuns.hs	43;"	f
-laserLinkTest	src/Dodge/Item/Grammar.hs	194;"	f
+laserLinkTest	src/Dodge/Item/Grammar.hs	195;"	f
 lastMap	src/Dodge/DoubleTree.hs	174;"	f
 launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
@@ -4785,9 +4792,9 @@ ldtToIM	src/Dodge/DoubleTree.hs	143;"	f
 ldtToIndentList	src/Dodge/DoubleTree.hs	146;"	f
 ldtToLoc	src/Dodge/DoubleTree.hs	187;"	f
 left	src/DoubleStack.hs	16;"	f
-leftIsParentCombine	src/Dodge/Item/Grammar.hs	233;"	f
+leftIsParentCombine	src/Dodge/Item/Grammar.hs	234;"	f
 leftPad	src/Padding.hs	15;"	f
-leftRightCombine	src/Dodge/Item/Grammar.hs	247;"	f
+leftRightCombine	src/Dodge/Item/Grammar.hs	248;"	f
 legsSPic	src/Dodge/Item/Draw/SPic.hs	469;"	f
 liShape	src/Dodge/Placement/Instance/LightSource.hs	98;"	f
 light	src/Color.hs	104;"	f
@@ -4815,8 +4822,8 @@ listCursorChooseBorderScale	src/Dodge/Render/List.hs	135;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	188;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	308;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
-llleft	src/Dodge/Item/Grammar.hs	197;"	f
+llleft	src/Dodge/Item/Grammar.hs	198;"	f
-llright	src/Dodge/Item/Grammar.hs	203;"	f
+llright	src/Dodge/Item/Grammar.hs	204;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	121;"	f
 lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	393;"	f
@@ -5119,7 +5126,7 @@ oldMachineBootS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	534;"	f
 onEquipWristShield	src/Dodge/Euse.hs	56;"	f
 onRemoveWristShield	src/Dodge/Euse.hs	65;"	f
 onXY	src/Geometry/Vector3D.hs	130;"	f
-oneH	src/Dodge/Creature/Test.hs	98;"	f
+oneH	src/Dodge/Creature/Test.hs	99;"	f
 openConsole	src/Dodge/Update.hs	129;"	f
 optionMenu	src/Dodge/Menu.hs	108;"	f
 optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	52;"	f
@@ -5473,7 +5480,7 @@ reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	452;"	f
 rememberSounds	src/Dodge/Creature/Perception.hs	177;"	f
 remoteDetonator	src/Dodge/Item/Scope.hs	145;"	f
 remoteScreen	src/Dodge/Item/Scope.hs	140;"	f
-removeAimPosture	src/Dodge/Creature/YourControl.hs	142;"	f
+removeAimPosture	src/Dodge/Creature/YourControl.hs	143;"	f
 removeAmmoFromMag	src/Dodge/HeldUse.hs	582;"	f
 removeDot	src/ShortShow.hs	29;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
@@ -5518,7 +5525,7 @@ rezText'	src/Dodge/Story.hs	17;"	f
 rhombus	src/Polyhedra.hs	72;"	f
 rifle	src/Dodge/Item/Held/Cane.hs	51;"	f
 right	src/DoubleStack.hs	16;"	f
-rightIsParentCombine	src/Dodge/Item/Grammar.hs	240;"	f
+rightIsParentCombine	src/Dodge/Item/Grammar.hs	241;"	f
 rightPad	src/Padding.hs	19;"	f
 rightPadNoSquash	src/Padding.hs	23;"	f
 rlPosDir	src/Dodge/RoomLink.hs	94;"	f
@@ -5608,7 +5615,7 @@ scaleMat	src/MatrixHelper.hs	59;"	f
 scaleMatrix	src/MatrixHelper.hs	56;"	f
 scaleSH	src/Shape.hs	268;"	f
 scalp	src/Dodge/Creature/Picture.hs	96;"	f
-scancodeToHotkey	src/Dodge/Creature/YourControl.hs	90;"	f
+scancodeToHotkey	src/Dodge/Creature/YourControl.hs	91;"	f
 scodeToChar	src/Dodge/ScodeToChar.hs	6;"	f
 scorchSPic	src/Dodge/Creature/State.hs	118;"	f
 screenBox	src/Dodge/Base/Window.hs	53;"	f
@@ -5662,7 +5669,7 @@ sensorSPic	src/Dodge/Machine/Draw.hs	70;"	f
 sentinelAI	src/Dodge/Creature/SentinelAI.hs	20;"	f
 sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	83;"	f
 sentinelFireType	src/Dodge/Creature/SentinelAI.hs	50;"	f
-setAimPosture	src/Dodge/Creature/YourControl.hs	132;"	f
+setAimPosture	src/Dodge/Creature/YourControl.hs	133;"	f
 setChannelPos	src/Sound.hs	150;"	f
 setClickWorldPos	src/Dodge/Update.hs	99;"	f
 setClusterID	src/Dodge/Combine/Graph.hs	115;"	f
@@ -5768,12 +5775,12 @@ shootingRange	src/Dodge/Room/Room.hs	332;"	f
 shortPoint2	src/Dodge/ShortShow.hs	4;"	f
 shortShow	src/ShortShow.hs	9;"	f
 shotgunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	544;"	f
-shoulderHeight	src/Dodge/Item/HeldOffset.hs	73;"	f
+shoulderHeight	src/Dodge/Item/HeldOffset.hs	74;"	f
 shoulderSH	src/Dodge/Creature/Picture.hs	139;"	f
 shoulderSP	src/Dodge/Creature/HandPos.hs	170;"	f
 showAttachItem	src/Dodge/Item/Display.hs	88;"	f
 showEquipItem	src/Dodge/Item/Display.hs	102;"	f
-showInt	src/Dodge/Item/Info.hs	70;"	f
+showInt	src/Dodge/Item/Info.hs	71;"	f
 showIntsString	src/Dodge/Tree/Compose.hs	129;"	f
 showInventoryPathing	src/Dodge/Item/Display.hs	82;"	f
 showManObj	src/Dodge/TestString.hs	66;"	f
@@ -5867,7 +5874,7 @@ spreadCenter	src/Dodge/Base.hs	187;"	f
 spreadFromCenter	src/Dodge/Base.hs	176;"	f
 spreadGunCrit	src/Dodge/Creature/SpreadGunCrit.hs	12;"	f
 spreadOut	src/Dodge/Creature/Boid.hs	157;"	f
-springLinkTest	src/Dodge/Item/Grammar.hs	215;"	f
+springLinkTest	src/Dodge/Item/Grammar.hs	216;"	f
 sps	src/Dodge/LevelGen/PlacementHelper.hs	30;"	f
 sps0	src/Dodge/LevelGen/PlacementHelper.hs	42;"	f
 square	src/Geometry/Polygon.hs	46;"	f
@@ -5920,11 +5927,11 @@ strFromEquipment	src/Dodge/Creature/Statistics.hs	17;"	f
 strFromHeldItem	src/Dodge/Creature/Statistics.hs	29;"	f
 strengthFactor	src/Dodge/Creature/Impulse/Movement.hs	35;"	f
 strictify	src/MaybeHelp.hs	37;"	f
-strideRot	src/Dodge/Item/HeldOffset.hs	76;"	f
+strideRot	src/Dodge/Item/HeldOffset.hs	77;"	f
 stringToList	src/Picture/Base.hs	313;"	f
 stringToListGrad	src/Picture/Text.hs	12;"	f
 stripZ	src/Geometry/Vector3D.hs	97;"	f
-structureToPotentialFunction	src/Dodge/Item/Grammar.hs	175;"	f
+structureToPotentialFunction	src/Dodge/Item/Grammar.hs	176;"	f
 structureUseAtLoc	src/Dodge/Creature/Impulse/UseItem.hs	78;"	f
 subInvX	src/Dodge/ListDisplayParams.hs	48;"	f
 subMap	src/TreeHelp.hs	118;"	f
@@ -6031,7 +6038,7 @@ toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
 toFloatVAs	src/Shader/Compile.hs	211;"	f
 toLabel	src/Dodge/Cleat.hs	16;"	f
-toLasgunUpdate	src/Dodge/Item/Grammar.hs	208;"	f
+toLasgunUpdate	src/Dodge/Item/Grammar.hs	209;"	f
 toMultiset	src/Multiset.hs	64;"	f
 toOnward	src/Dodge/Tree/Compose.hs	101;"	f
 toTopLeft	src/Dodge/Render/List.hs	219;"	f
@@ -6067,7 +6074,7 @@ tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
 tractorSPic	src/Dodge/TractorBeam/Draw.hs	10;"	f
 tranRot	src/Picture/Base.hs	124;"	f
 transMat	src/MatrixHelper.hs	73;"	f
-transToHandle	src/Dodge/Item/HeldOffset.hs	22;"	f
+transToHandle	src/Dodge/Item/HeldOffset.hs	23;"	f
 translate	src/Picture/Base.hs	116;"	f
 translate3	src/Picture/Base.hs	120;"	f
 translateFloatingCamera	src/Dodge/Update/Camera.hs	44;"	f
@@ -6113,8 +6120,8 @@ triggerSwitchSPicLight	src/Dodge/Placement/Instance/Button.hs	31;"	f
 truncFaces	src/Polyhedra/Geodesic.hs	53;"	f
 truncate	src/Polyhedra/Geodesic.hs	38;"	f
 trunkDepth	src/TreeHelp.hs	161;"	f
-tryAttachItems	src/Dodge/Item/Grammar.hs	23;"	f
+tryAttachItems	src/Dodge/Item/Grammar.hs	24;"	f
-tryClickUse	src/Dodge/Creature/YourControl.hs	167;"	f
+tryClickUse	src/Dodge/Creature/YourControl.hs	168;"	f
 tryCombine	src/Dodge/Update/Input/InGame.hs	526;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	125;"	f
 tryGetChannel	src/Sound.hs	97;"	f
@@ -6133,14 +6140,14 @@ trySynthBullet	src/Dodge/Creature/State.hs	203;"	f
 tryUseParent	src/Dodge/Creature/State.hs	196;"	f
 turnTo	src/Dodge/Movement/Turn.hs	8;"	f
 turret	src/Dodge/Placement/Instance/Turret.hs	35;"	f
-turretItemOffset	src/Dodge/Item/HeldOffset.hs	17;"	f
+turretItemOffset	src/Dodge/Item/HeldOffset.hs	18;"	f
 tweenAngles	src/Geometry/Vector.hs	195;"	f
 twinSlowDoorChasers	src/Dodge/Room/LongDoor.hs	79;"	f
 twinSlowDoorRoom	src/Dodge/Room/LongDoor.hs	28;"	f
-twists	src/Dodge/Creature/Test.hs	104;"	f
+twists	src/Dodge/Creature/Test.hs	105;"	f
-twoFlat	src/Dodge/Creature/Test.hs	101;"	f
+twoFlat	src/Dodge/Creature/Test.hs	102;"	f
-twoFlatHRot	src/Dodge/Item/HeldOffset.hs	85;"	f
+twoFlatHRot	src/Dodge/Item/HeldOffset.hs	86;"	f
-twoHandTwistAmount	src/Dodge/Creature/YourControl.hs	145;"	f
+twoHandTwistAmount	src/Dodge/Creature/YourControl.hs	146;"	f
 twoRoomPoss	src/Dodge/PlacementSpot.hs	147;"	f
 twoStep1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
 twoStepS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	450;"	f
@@ -6295,14 +6302,14 @@ upperPrismPolyST	src/Shape.hs	107;"	f
 upperPrismPolySU	src/Shape.hs	113;"	f
 upperPrismPolyTS	src/Shape.hs	119;"	f
 upperRounded	src/Shape.hs	184;"	f
-useBreakL	src/Dodge/Item/Grammar.hs	29;"	f
+useBreakL	src/Dodge/Item/Grammar.hs	30;"	f
-useBreakListsLinkTest	src/Dodge/Item/Grammar.hs	37;"	f
+useBreakListsLinkTest	src/Dodge/Item/Grammar.hs	38;"	f
 useBulletPayload	src/Dodge/Bullet.hs	111;"	f
 useC	src/Dodge/Cuse.hs	8;"	f
 useC'	src/Dodge/Cuse.hs	13;"	f
 useE	src/Dodge/Euse.hs	34;"	f
 useGasParams	src/Dodge/HeldUse.hs	685;"	f
-useHotkey	src/Dodge/Creature/YourControl.hs	65;"	f
+useHotkey	src/Dodge/Creature/YourControl.hs	66;"	f
 useInventoryPath	src/Dodge/HeldUse.hs	929;"	f
 useItem	src/Dodge/Creature/Impulse/UseItem.hs	20;"	f
 useItemLoc	src/Dodge/Creature/Impulse/UseItem.hs	27;"	f
@@ -6364,11 +6371,11 @@ wallLine	src/Dodge/Placement/Instance/Wall.hs	71;"	f
 wallsFromRooms	src/Dodge/Layout.hs	146;"	f
 wallsToDraw	src/Dodge/Render/Walls.hs	17;"	f
 warningRooms	src/Dodge/Room/Warning.hs	27;"	f
-wasdAim	src/Dodge/Creature/YourControl.hs	121;"	f
+wasdAim	src/Dodge/Creature/YourControl.hs	122;"	f
 wasdDir	src/Dodge/WASD.hs	17;"	f
 wasdM	src/Dodge/WASD.hs	9;"	f
-wasdMovement	src/Dodge/Creature/YourControl.hs	148;"	f
+wasdMovement	src/Dodge/Creature/YourControl.hs	149;"	f
-wasdWithAiming	src/Dodge/Creature/YourControl.hs	114;"	f
+wasdWithAiming	src/Dodge/Creature/YourControl.hs	115;"	f
 watchCombinations	src/Dodge/Combine/Combinations.hs	15;"	f
 watchUpdateStrat	src/Dodge/Creature/ReaderUpdate.hs	177;"	f
 weakenMatS	src/Dodge/Material/Sound.hs	18;"	f
@@ -6430,7 +6437,7 @@ yellow	src/Color.hs	17;"	f
 you	src/Dodge/Base/You.hs	12;"	f
 youDropItem	src/Dodge/Creature/Action.hs	190;"	f
 yourAugmentedItem	src/Dodge/Render/HUD.hs	235;"	f
-yourControl	src/Dodge/Creature/YourControl.hs	23;"	f
+yourControl	src/Dodge/Creature/YourControl.hs	24;"	f
 yourDefaultSpeed	src/Dodge/Default/Creature.hs	129;"	f
 yourDefaultStrideLength	src/Dodge/Default/Creature.hs	132;"	f
 yourInfo	src/Dodge/Creature/Info.hs	8;"	f