Work on held item usage

src/Dodge/HeldUse.hs

@@ -87,6 +87,7 @@ useMod hm = case hm of
         , withSoundForI tone440sawtoothquietS 2
         , withItem $ \it -> withMuzPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
         , withItem $ \it -> withTempLight 1 100 (xyzV4 (_lasColor $ _itParams it))
+        , duplicateLoadedBarrels
         , ammoCheckI
         ]
     DualBeamMod ->
@@ -97,11 +98,11 @@ useMod hm = case hm of
         , ammoCheckI
         ]
     LasMod ->
-        [ crAtMuzPos
-        , useAmmoAmount 1
-        , withItem $ \it -> withMuzPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
+        [ useAmmoAmount 1
+--        , withItem $ \it -> withMuzPos $ flareCircleAt (_lasColor $ _itParams it) 0.8
         , withSoundForI tone440sawtoothquietS 2
-        , withItem $ \it -> withTempLight 1 100 (xyzV4 (_lasColor $ _itParams it))
+--        , withItem $ \it -> withTempLight 1 100 (xyzV4 (_lasColor $ _itParams it))
+        , duplicateLoadedBarrels
         , ammoCheckI
         ]
     LauncherXMod i ->
@@ -130,7 +131,7 @@ useMod hm = case hm of
         [ withMuzFlareI
         , withSmoke 1 black 20 200 5
         , withRecoil
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withTorqueAfter
         , useAmmoAmount 1
         , withSoundStart tap3S
@@ -141,7 +142,6 @@ useMod hm = case hm of
     VolleyGunMod ->
         [ withRecoil
         , withMuzFlareI
-        , applyInaccuracy
         , duplicateLoadedBarrels
         , withTorqueAfter
         , useAllAmmo
@@ -155,7 +155,7 @@ useMod hm = case hm of
         [ withMuzFlareI
         , withSmoke 1 black 20 200 5
         , withRecoil
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withTorqueAfter
         , useAmmoAmount 1
         , withSoundStart tap3S
@@ -166,7 +166,7 @@ useMod hm = case hm of
         [ withRecoil
         , withMuzFlareI
         , withThickSmokeI
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withTorqueAfter
         , useAmmoAmount 1
         , withSoundStart bangEchoS
@@ -178,7 +178,7 @@ useMod hm = case hm of
         [ withRecoil
         , withMuzFlareI
         , withThickSmokeI
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withTorqueAfter
         , useAmmoAmount 1
         , withSoundStart bangEchoS
@@ -190,7 +190,7 @@ useMod hm = case hm of
         [ withRecoil
         , withMuzFlareI
         , withThickSmokeI
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withTorqueAfter
         , useAmmoAmount 1
         , withSoundStart bangEchoS
@@ -222,7 +222,7 @@ useMod hm = case hm of
         , withSidePushI 50
         , withRecoil
         , withTorqueAfter
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withSoundStart tap3S
         , useAmmoAmount 1
         , useTimeCheck
@@ -234,7 +234,7 @@ useMod hm = case hm of
         , withSidePushI 50
         , withRecoil
         , withTorqueAfter
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withSoundStart tap3S
         , useAmmoAmount 1
         , useTimeCheck
@@ -245,7 +245,7 @@ useMod hm = case hm of
         , withRecoil
         , withSidePushI 50
         , withTorqueAfter
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withSoundStart tap1S
         , useAmmoAmount 1
         , useTimeCheck
@@ -254,7 +254,7 @@ useMod hm = case hm of
     BurstRifleMod ->
         [ withRecoil
         , withMuzFlareI
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , useAmmoAmount 1
         , withSoundStart tap3S
         , repeatOnFrames [3, 6] BurstRifleRepeatMod
@@ -267,7 +267,7 @@ useMod hm = case hm of
     BurstRifleRepeatMod ->
         [ withRecoil
         , withMuzFlareI
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , useAmmoAmount 1
         , withSoundStart tap3S
         , sideEffectOnFrame 7 (\_ cr -> TorqueCr 0.2 (_crID cr)) --(torqueSideEffect 0.2)
@@ -294,7 +294,7 @@ useMod hm = case hm of
         , withSidePushI 30
         , withRecoil
         , withTorqueAfter
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , withSoundStart tap3S
         , useAmmoAmount 1
         , useTimeCheck
@@ -305,7 +305,7 @@ useMod hm = case hm of
         , withTorqueAfter
          --        , spreadLoaded
         , withMuzFlareI
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , useAmmoUpTo 1
         , withSoundStart tap3S
         , repeatOnFrames [2, 4, 6, 8, 10] RevolverXRepeatMod
@@ -320,7 +320,7 @@ useMod hm = case hm of
         [ withRecoil
         , withTorqueAfter
         , withMuzFlareI
-        , applyInaccuracy
+        , duplicateLoadedBarrels
         , useAmmoUpTo 1
         ,  withSoundStart tap3S
         , ammoCheckI
@@ -329,9 +329,9 @@ useMod hm = case hm of
         [ withRandomItemParams coneRandItemParams
         , withRandomItemUpdate coneRandItemUpdate
         , withRandomOffset
-        , applyInaccuracy
-        , withMuzFlareI
+        , duplicateLoadedBarrels
         , duplicateLoaded
+        , withMuzFlareI
         , withRecoil
         , withTorqueAfter
         , useAllAmmo
@@ -511,7 +511,7 @@ shootTeslaArc it cr w =
   where
     itRef = cr ^?! crManipulation . manObject . inInventory . ispItem -- unsafe!! TODO change
     (w', ip) = makeTeslaArc (_itParams it) pos dir w
-    pos = _crPos cr +.+ aimingMuzzlePos cr it *.* unitVectorAtAngle dir
+    pos = _crPos cr +.+ aimingMuzzleLength cr it *.* unitVectorAtAngle dir
     dir = _crDir cr
 
 -- I believe because the targeting returns to nothing straight after you release