Automatically order placements

src/Dodge/Item/AimStance.hs

@@ -50,8 +50,7 @@ heldAimStance = \case
     FLAMETORRENT -> TwoHandUnder
     FLAMEWALL -> TwoHandUnder
     BLOWTORCH -> TwoHandUnder
-    SPARKGUN -> TwoHandFlat
-    TESLAGUN -> TwoHandFlat
+    TESLACOIL -> TwoHandFlat
     TRACTORGUN -> TwoHandUnder
     RLAUNCHER -> TwoHandOver
     RLAUNCHERX{} -> TwoHandOver

src/Dodge/Item/AmmoSlots.hs

@@ -45,8 +45,7 @@ heldItemAmmoSlots = \case
     FLAMESPITTER -> singleAmmo GasAmmo
     FLAMEWALL -> singleAmmo GasAmmo
     BLOWTORCH -> singleAmmo GasAmmo
-    TESLAGUN -> singleAmmo ElectricalAmmo
-    SPARKGUN -> singleAmmo ElectricalAmmo
+    TESLACOIL -> singleAmmo ElectricalAmmo
     TRACTORGUN -> singleAmmo ElectricalAmmo
     SHATTERGUN -> singleAmmo ElectricalAmmo
     LED -> singleAmmo ElectricalAmmo

src/Dodge/Item/Draw/SPic.hs

@@ -259,8 +259,7 @@ heldItemSPic ht it = case ht of
     FLAMETORRENT -> flamerPic it
     FLAMEWALL -> flamerPic it
     BLOWTORCH -> flamerPic it
-    SPARKGUN -> teslaGunPic
-    TESLAGUN -> teslaGunPic
+    TESLACOIL -> teslaGunPic
     TRACTORGUN -> tractorGunPic it
     RLAUNCHER -> rlauncherPic it
     RLAUNCHERX _ -> rlauncherPic it

src/Dodge/Item/Held.hs

@@ -58,8 +58,7 @@ itemFromHeldType ht = case ht of
     FLAMETORRENT -> flameTorrent
     FLAMEWALL -> flameWall
     BLOWTORCH -> blowTorch
-    SPARKGUN -> sparkGun
-    TESLAGUN -> teslaGun
+    TESLACOIL -> teslaCoil
 --    LASCIRCLE -> lasCircle
 --    DUALBEAM -> dualBeam
 --    LASWIDE i -> lasWide i

src/Dodge/Item/Held/BatteryGuns.hs

@@ -1,6 +1,5 @@
 module Dodge.Item.Held.BatteryGuns (
-    sparkGun,
-    teslaGun,
+    teslaCoil,
     laser,
     tractorGun,
 ) where
@@ -10,17 +9,11 @@ import Dodge.Data.Item
 import Dodge.Default.Item
 --import Geometry.Data
 
-sparkGun :: Item
-sparkGun =
-    teslaGun
-        & itType .~ HELD SPARKGUN
---        & itParams . arcSize .~ 10
-
-teslaGun :: Item
-teslaGun =
+teslaCoil :: Item
+teslaCoil =
     defHeldItem
         & itParams .~ teslaParams
-        & itType .~ HELD TESLAGUN
+        & itType .~ HELD TESLACOIL
 
 teslaParams :: ItemParams
 teslaParams =

src/Dodge/Item/HeldOffset.hs

@@ -110,8 +110,7 @@ heldHandlePos = \case
     FLAMETORRENT -> V2 3 0
     FLAMEWALL -> V2 3 0
     BLOWTORCH -> V2 3 0
-    SPARKGUN -> V2 3 0
-    TESLAGUN -> V2 3 0
+    TESLACOIL -> V2 3 0
     TRACTORGUN -> V2 3 0
     RLAUNCHER -> V2 3 0
     RLAUNCHERX{} -> V2 3 0

src/Dodge/Item/Info.hs

@@ -121,8 +121,7 @@ heldInfo hit = case hit of
     FLAMETORRENT -> "A weapon that streams out burning fuel in a torrent."
     FLAMEWALL -> "A weapon that squirts out burning fuel all around the user."
     BLOWTORCH -> "A weapon that produces a concentrated flame."
-    SPARKGUN -> "A weapon that produces an arc of electricity. The arc will attempt to discharge at a nearby object."
-    TESLAGUN -> "A weapon that discharges a sustained arc of electricity. The arc will attempt to discharge at a nearby object."
+    TESLACOIL -> "An item that creates an arc of electricity."
     TRACTORGUN -> "An item that produces a beam of gravitons."
     GLAUNCHER -> "A large tube that can launch projectiles."
     RLAUNCHER -> "A large tube that can launch self propelled projectiles. Moving the tube after launch will cause the projectile to spin."

src/Dodge/Item/InvSize.hs

@@ -20,7 +20,7 @@ itInvHeight x = case x ^. itType of
 
 itDim :: Item -> ItemDimension
 itDim x = case x ^. itType of
-    HELD TESLAGUN -> ItemDimension 9 (V3 4 0 0) (V3 10 (-5) 3)
+    HELD TESLACOIL -> ItemDimension 9 (V3 4 0 0) (V3 10 (-5) 3)
     LASER -> did & dimRad .~ 10
         & dimCenter .~ V3 15 0 0
     HELD TRACTORGUN -> did & dimRad .~ 10