Commit before partial cleanup, continue weapon effect refactor

2024-09-21 16:04:23 +01:00
parent bb18831393
commit 9dff2fcd7a
37 changed files with 817 additions and 856 deletions
@@ -40,11 +40,12 @@ forceFieldGun =
 --        & itUse . heldUse .~ HeldForceField --useForceFieldGun
        & itUse . heldDelay .~ NoDelay
        -- & itUse . heldMods .~ AmmoHammerTimeUseOneMod -- this is slightly different
-        & itUse . heldMods .~ ForceFieldMod -- this is slightly different
+--        & itUse . heldMods .~ ForceFieldMod -- this is slightly different
        -- than the list below
        --[ hammerCheckI , ammoCheckI , useAmmoAmount 1]
        & itType . iyBase .~ HELD FORCEFIELDGUN
        & itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
+        & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleForceField

 {- |
 Sends out pulses that display walls.
@@ -55,7 +56,8 @@ clickDetector dt =
        & itUse . heldDelay . rateMax .~ 20
 --        & itUse . heldUse .~ HeldDetectorEffect dt --detectorEffect dt
 --        & itUse . heldMods .~ AmmoUseCheckMod
-        & itUse . heldMods .~ DetectorMod dt --detectorEffect dt
+--        & itUse . heldMods .~ DetectorMod dt --detectorEffect dt
        & itUse . heldAim . aimRange .~ 1
        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}
        & itType . iyBase .~ HELD (HELDDETECTOR dt)
+        & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleDetector