Cleanup

src/Dodge/Data/ActionPlan.hs

@@ -43,7 +43,6 @@ data Impulse
     | MakeSound SoundID
     | ChangeStrategy Strategy
     | AddGoal Goal
-    | ArbitraryImpulseEffect CrWdWd
     | ImpulseUseTarget { _impulseUseTarget :: CrImp }
     | ImpulseNothing
     deriving (Eq, Ord, Show) --Generic, Flat)
@@ -141,9 +140,6 @@ data Action
     | UseSelf
         { _useSelf :: CrAc
         }
-    | UseMvTargetPos
-        { _useMvTargetPos :: MP2Ac
-        }
     | ArbitraryAction
         {_arbitraryAction :: CrWdAc}
     | -- | Repeatedly perform impulses alongside a main action until the main action terminates

src/Dodge/Data/CreatureEffect.hs

@@ -8,17 +8,9 @@ module Dodge.Data.CreatureEffect where
 import Data.Aeson
 import Data.Aeson.TH
 
-data CrWdWd = CrWdWdId
+data CrImp = NoCrImp | TurnTowardCr Float -- turn amount
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data CrImp
-    = NoCrImp
-    | TurnTowardCr Float -- turn amount
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
---data P2Imp = P2ImpNo
---    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data WdCrBl
     = WdCrTrue
     | WdCrBlfromCrBl CrBl
@@ -27,30 +19,20 @@ data WdCrBl
     | WdCrSafeDistFromTarget Float
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data CrBl
-    = CrCanShoot
-    | CrIsAiming
-    | CrIsAnimate
+data CrBl = CrCanShoot | CrIsAiming | CrIsAnimate
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrAc = CrTurnAround
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data MP2Ac = MP2NoAction
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data CrWdAc
     = CrWdBFSThenReturn Int
     | ChooseMovementSpreadGun
     | ChooseMovementLtAuto
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
---deriveJSON defaultOptions ''WdCrCr
---deriveJSON defaultOptions ''CrWdImp
-deriveJSON defaultOptions ''CrWdWd
 deriveJSON defaultOptions ''CrImp
 deriveJSON defaultOptions ''CrBl
 deriveJSON defaultOptions ''WdCrBl
 deriveJSON defaultOptions ''CrAc
-deriveJSON defaultOptions ''MP2Ac
 deriveJSON defaultOptions ''CrWdAc