Delete some reified action/impulse stuff

src/Dodge/Data/ActionPlan.hs

@@ -43,20 +43,9 @@ data Impulse
     | MakeSound SoundID
     | ChangeStrategy Strategy
     | AddGoal Goal
-    | ArbitraryImpulseFunction WdCrCr
-    | ArbitraryImpulse CrWdImp
     | ArbitraryImpulseEffect CrWdWd
---    | ImpulseUseTargetCID
---        { _impulseUseTargetCID :: IntImp
---        }
-    | ImpulseUseTarget
-        { _impulseUseTarget :: CrImp
-        }
-    | ImpulseUseAheadPos
-        { _impulseUseAheadPos :: P2Imp
-        }
+    | ImpulseUseTarget { _impulseUseTarget :: CrImp }
     | ImpulseNothing
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
     deriving (Eq, Ord, Show) --Generic, Flat)
 
 data RandImpulse
@@ -152,9 +141,6 @@ data Action
     | UseSelf
         { _useSelf :: CrAc
         }
-    | UseAheadPos
-        { _useAheadPos :: P2Ac
-        }
     | UseMvTargetPos
         { _useMvTargetPos :: MP2Ac
         }

src/Dodge/Data/CreatureEffect.hs

@@ -8,25 +8,16 @@ module Dodge.Data.CreatureEffect where
 import Data.Aeson
 import Data.Aeson.TH
 
-data WdCrCr = NoCreatureEffect
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data CrWdImp = NoCrWdImp
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data CrWdWd = CrWdWdId
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
---data IntImp = NoIntImp
---    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 P2Imp = P2ImpNo
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdCrBl
     = WdCrTrue
@@ -45,9 +36,6 @@ data CrBl
 data CrAc = CrTurnAround
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data P2Ac = P2NoAction
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data MP2Ac = MP2NoAction
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
@@ -57,15 +45,12 @@ data CrWdAc
     | ChooseMovementLtAuto
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-deriveJSON defaultOptions ''WdCrCr
-deriveJSON defaultOptions ''CrWdImp
+--deriveJSON defaultOptions ''WdCrCr
+--deriveJSON defaultOptions ''CrWdImp
 deriveJSON defaultOptions ''CrWdWd
---deriveJSON defaultOptions ''IntImp
 deriveJSON defaultOptions ''CrImp
-deriveJSON defaultOptions ''P2Imp
 deriveJSON defaultOptions ''CrBl
 deriveJSON defaultOptions ''WdCrBl
 deriveJSON defaultOptions ''CrAc
-deriveJSON defaultOptions ''P2Ac
 deriveJSON defaultOptions ''MP2Ac
 deriveJSON defaultOptions ''CrWdAc