Refactor, try to limit dependencies

2022-07-28 00:59:56 +01:00
parent 8aa5c17ab9
commit 160560af5f
418 changed files with 15104 additions and 13342 deletions
@@ -1,24 +1,71 @@
-module Dodge.Item.Held
-    where
-import Dodge.Default.Weapon
-import Dodge.Data.Item
-import Control.Lens
-flatShield :: Item
-flatShield =
-    defaultWeapon
-        & itEffect . ieInv .~ EffectIfHeld CreateShieldWall RemoveShieldWall
-        & itUse
-            .~ defaultrUse
-                { _useAim =
-                    AimParams
-                        { _aimWeight = 5
-                        , _aimRange = 0
-                        , _aimZoom = ItZoom 20 0.2 1
-                        , _aimStance = TwoHandFlat
-                        , _aimHandlePos = 0
-                        , _aimMuzPos = 0
-                        }
-                }
-        & itInvSize .~ 3
-        & itType . iyBase .~ HELD FLATSHIELD
+module Dodge.Item.Held (
+    module Dodge.Item.Held,
+    module Dodge.Item.Held.Utility,
+    module Dodge.Item.Held.Launcher,
+    module Dodge.Item.Held.Weapons,
+    module Dodge.Item.Held.Stick,
+    module Dodge.Item.Held.Cone,
+    module Dodge.Item.Held.Cane,
+    module Dodge.Item.Held.Rod,
+    module Dodge.Item.Held.SprayGuns,
+    module Dodge.Item.Held.BatteryGuns,
+) where

+import Dodge.Data.Item
+import Dodge.Item.Held.Launcher
+import Dodge.Item.Held.BatteryGuns
+import Dodge.Item.Held.Utility
+import Dodge.Item.Held.Weapons
+import Dodge.Item.Held.Stick
+import Dodge.Item.Held.Cone
+import Dodge.Item.Held.Cane
+import Dodge.Item.Held.Rod
+import Dodge.Item.Held.SprayGuns
+
+itemFromHeldType :: HeldItemType -> Item
+itemFromHeldType ht = case ht of
+    KEYCARD i -> keyCard i
+    TORCH -> torch
+    SHATTERGUN -> shatterGun
+    BANGSTICK i -> bangStick i
+    PISTOL -> pistol
+    REVOLVER -> revolver
+    REVOLVERX i -> revolverX i
+    MACHINEPISTOL -> machinePistol
+    AUTOPISTOL -> autoPistol
+    SMG -> smg
+    BANGCONE -> bangCone
+    BLUNDERBUSS -> blunderbuss
+    GRAPECANNON i -> grapeCannon i
+    MINIGUNX i -> miniGunX i
+    VOLLEYGUN i -> volleyGun i
+    RIFLE -> rifle
+    REPEATER -> repeater
+    AUTORIFLE -> autoRifle
+    BURSTRIFLE -> burstRifle
+    BANGROD -> bangRod
+    ELEPHANTGUN -> elephantGun
+    AMR -> amr
+    AUTOAMR -> autoAmr
+    SNIPERRIFLE -> sniperRifle
+    MACHINEGUN -> machineGun
+    FLAMESPITTER -> flameSpitter
+    FLAMETHROWER -> flameThrower
+    FLAMETORRENT -> flameTorrent
+    FLAMEWALL -> flameWall
+    BLOWTORCH -> blowTorch
+    SPARKGUN -> sparkGun
+    TESLAGUN -> teslaGun
+    LASGUN -> lasGun
+    LASCIRCLE -> lasCircle
+    DUALBEAM -> dualBeam
+    LASWIDE i -> lasWide i
+    TRACTORGUN -> tractorGun
+    LAUNCHER -> launcher
+    LAUNCHERX i -> launcherX i
+    REMOTELAUNCHER -> remoteLauncher
+    POISONSPRAYER -> poisonSprayer
+    DRONELAUNCHER -> undefined
+    FORCEFIELDGUN -> forceFieldGun
+    HELDDETECTOR d -> clickDetector d
+    FLATSHIELD -> flatShield