Cleanup

ghcidOutput

@@ -1 +1 @@
-All good (608 modules, at 14:21:16)
+All good (607 modules, at 14:27:18)

src/Dodge/Data/Item/HeldUse.hs

@@ -40,7 +40,6 @@ data Euse
     | EAmmoSource 
         { _euseAmmoAmount :: Int
         , _euseAmmoMax :: Int
---        , _euseAmmoSourceType :: AmmoSourceType
         , _euseAmmoLink :: Maybe Int
         }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)

src/Dodge/Item/Held/BatteryGuns.hs

@@ -42,6 +42,7 @@ teslaGun =
         & itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
         & itUse . heldTriggerType .~ AutoTrigger
 
+-- previous phaseV parameters: 0.2, 1, 5
 lasGun :: Item
 lasGun =
     defaultHeldItem
@@ -61,105 +62,21 @@ lasGun =
                 , _lasCycle = 0
                 , _lasDamage = 11
                 }
---        & itTweaks
---            .~ Tweakable
---                { _tweakParams = IM.fromList [(0, lasGunTweak)]
---                }
         & itDimension . dimRad .~ 10
         & itDimension . dimCenter .~ V3 15 0 0
---        & itUse . heldUse .~ HeldLaser --shootLaser
         & itUse . heldAim . aimWeight .~ 6
         & itUse . heldAim . aimRange .~ 1
         & itUse . heldAim . aimStance .~ TwoHandUnder
-        -- & itUse . heldAim . aimHandlePos .~ 5
-        -- & itUse . heldAim . aimMuzPos .~ 30
         & itType .~ HELD LASGUN
 
---lasGunTweak :: TweakParam
+-- previous attractionPower values: 1, -1, -10, 0
---lasGunTweak =
---    TweakParam
---        { _tweakType = TweakPhaseV
---        , _tweakVal = 1
---        , _tweakMax = 3
---        }
-
 tractorGun :: Item
 tractorGun =
     lasGun
         & itParams .~ Attracting{_attractionPower = 1}
---        & itTweaks
---            .~ Tweakable
---                { _tweakParams = IM.fromList [(0, tractorGunTweak)]
---                }
         & itUse . heldDelay .~ NoDelay
         & itUse . heldAim . aimWeight .~ 6
         & itUse . heldAim . aimRange .~ 1
         & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ DefaultFlareType
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTractor
         & itType .~ HELD TRACTORGUN
-
---tractorGunTweak :: TweakParam
---tractorGunTweak =
---    TweakParam
---        { _tweakType = TweakTractionPower
---        , _tweakVal = 1
---        , _tweakMax = 4
---        }
-
---lasWide :: Int -> Item
---lasWide n =
---    lasGun
---        & itType . iyBase .~ HELD (LASWIDE n)
---        & itParams . lasColor .~ yellow
---        & itParams . lasDamage .~ 2
---        & itUse . heldMods .~ LasWideMod n
---        & itUse . heldAim . aimMuzzles 
---            .~ [Muzzle (V2 30 y) 0 0 0 DefaultFlareType MuzzleLaser Nothing | y <- spreadFromCenter n 1]
-
---defaultBatteryGun :: Item
---defaultBatteryGun =
---    defaultHeldItem
---        & itType . iyModules .~ batteryModules
-
---batteryModules :: M.Map ModuleSlot ItemModuleType
---batteryModules =
---    M.fromList
---        [ (ModBattery, EMPTYMODULE)
---        , (ModTeleport, EMPTYMODULE)
---        ]
-
---lasCircle :: Item
---lasCircle =
---    lasGun
---        & itType . iyBase .~ HELD LASCIRCLE
---        & itParams . lasColor .~ orange
---        & itParams . lasDamage .~ 2
---        & itUse . heldDelay .~ NoDelay
-----        & itUse . heldUse .~ HeldCircleLaser --circleLaser
---        & itUse . heldMods .~ CircleLaserMod
---        & itUse . heldAim . aimWeight .~ 6
---        & itUse . heldAim . aimRange .~ 1
-
---dualBeam :: Item
---dualBeam =
---    lasGun
---        & itType . iyBase .~ HELD DUALBEAM
---        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0 0 DefaultFlareType MuzzleLaser Nothing]
---        & itParams
---            .~ DualBeam
---                { _phaseV = 1
---                , _lasColor = red
---                , _lasColor2 = green
---                , _lasCycle = 0
---                , _lasDamage = 11
---                , _lasBeam = BeamCombine LasBeamCombine
---                , _subParams = Nothing
---                , _dbGap = 20
---                }
-----        & itUse . heldUse .~ HeldDualLaser --shootDualLaser
---        & itUse . heldDelay .~ NoDelay
---        & itUse . heldMods .~ DualBeamMod
---        & itUse . heldAim . aimWeight .~ 6
---        & itUse . heldAim . aimRange .~ 1
---        & itUse . heldAim . aimStance .~ TwoHandFlat
---        & itType . iyModules . at ModDualBeam ?~ EMPTYMODULE

src/Dodge/Item/Held/Launcher.hs

@@ -18,10 +18,6 @@ launcher =
                 , _shellSpinAmount = 2
                 , _shellThrustDelay = 20
                 }
---        & itTweaks
---            .~ Tweakable
---                { _tweakParams = basicAmPjMoves
---                }
         & itInvSize .~ 3
         & itDimension . dimRad .~ 9
         & itDimension . dimCenter .~ V3 10 0 0
@@ -52,45 +48,3 @@ launcherX i =
         & itUse . heldAmmoTypes .~ IM.fromList [(j,ProjectileAmmo) | j <- [0..i-1]]
   where
     angles = take i [0,2*pi/ fromIntegral i ..]
-    --angles = take i [1,2 ..]
-
---remoteLauncher :: Item
---remoteLauncher =
---    launcher
---        & itType . iyBase .~ HELD REMOTELAUNCHER
-----        & itUse . heldUse .~ HeldFireRemoteShell --fireRemoteShell
-----        & itUse . heldMods .~ FireRemoteShellMod
---        & itScope .~ RemoteScope (V2 0 0) 1
-----        & itUse . heldConsumption . laAmmoType . amPjDraw .~ DrawRemoteShell
-
---basicAmPjMoves :: IM.IntMap TweakParam
---basicAmPjMoves =
---    IM.fromList . zip [0 ..] $
---        [ spinDrag
---        , spinStart
---        , thrustParam
---        ]
-
---spinDrag :: TweakParam
---spinDrag =
---    TweakParam
---        { _tweakType = TweakSpinDrag
---        , _tweakVal = 1
---        , _tweakMax = 5
---        }
---
---spinStart :: TweakParam
---spinStart =
---    TweakParam
---        { _tweakType = TweakSpinAmount
---        , _tweakVal = 2
---        , _tweakMax = 5
---        }
---
---thrustParam :: TweakParam
---thrustParam =
---    TweakParam
---        { _tweakType = TweakThrustDelay
---        , _tweakVal = 1
---        , _tweakMax = 5
---        }

src/Dodge/Render/HUD.hs

@@ -30,7 +30,6 @@ import Dodge.Render.List
 import Dodge.ScreenPos
 import Dodge.SelectionSections
 import Dodge.SelectionSections.Draw
---import Dodge.Tweak.Show
 import Geometry
 import qualified IntMapHelp as IM
 import Justify

src/Dodge/Tweak.hs

@@ -1,4 +1,4 @@
-module Dodge.Tweak where
+module Dodge.Tweak () where
 
 import Control.Lens
 import Dodge.Data.Item

src/Dodge/Tweak/Show.hs

@@ -1,27 +0,0 @@
-module Dodge.Tweak.Show where
-
---import Dodge.Data.Item.Tweak
-
---showTweak :: TweakParam -> String
---showTweak tp = case tt of
---    TweakPhaseV -> showPhaseV ct
---    TweakTractionPower -> showTractionPower ct
---    TweakSpinDrag -> show ct
---    TweakSpinAmount -> show ct
---    TweakThrustDelay -> show ct
---  where
---    tt = _tweakType tp
---    ct = _tweakVal tp
---
---showPhaseV :: Int -> String
---showPhaseV 0 = "V"
---showPhaseV 1 = "/"
---showPhaseV 2 = "Z"
---showPhaseV i = show i ++ " should not be possible"
---
---showTractionPower :: Int -> String
---showTractionPower 0 = "+"
---showTractionPower 1 = "-"
---showTractionPower 2 = "#"
---showTractionPower 3 = "0" -- object should stay in the center of the beam
---showTractionPower i = "THIS SHOULD NOT BE POSSIBLE" ++ show i