Cleanup

src/Dodge/Creature/Impulse.hs

@@ -65,10 +65,10 @@ followImpulse cr w imp = case imp of
     ArbitraryImpulseFunction f -> crup $ doWdCrCr f w cr
     ArbitraryImpulse f -> followImpulse cr w (doCrWdImp f cr w)
     ArbitraryImpulseEffect f -> (doCrWdWd f cr, cr)
-    ImpulseUseTargetCID f -> fromMaybe (crup cr) $ do
-        i <- cr ^? crIntention . targetCr . _Just
-        tcr <- w ^? cWorld . lWorld . creatures . ix i
-        return $ followImpulse cr w (doIntImp f $ _crID tcr)
+--    ImpulseUseTargetCID f -> fromMaybe (crup cr) $ do
+--        i <- cr ^? crIntention . targetCr . _Just
+--        tcr <- w ^? cWorld . lWorld . creatures . ix i
+--        return $ followImpulse cr w (doIntImp f $ _crID tcr)
     ImpulseUseTarget f -> fromMaybe (crup cr) $ do
         i <- cr ^? crIntention . targetCr . _Just
         tcr <- w ^? cWorld . lWorld . creatures . ix i

src/Dodge/CreatureEffect.hs

@@ -22,9 +22,9 @@ doCrWdWd :: CrWdWd -> Creature -> World -> World
 doCrWdWd cww = case cww of
     CrWdWdId -> const id
 
-doIntImp :: IntImp -> Int -> Impulse
-doIntImp ii = case ii of
-    NoIntImp -> const ImpulseNothing
+--doIntImp :: IntImp -> Int -> Impulse
+--doIntImp ii = case ii of
+--    NoIntImp -> const ImpulseNothing
 
 doCrImp :: CrImp -> Creature -> Impulse
 doCrImp ci = case ci of

src/Dodge/Data/ActionPlan.hs

@@ -46,9 +46,9 @@ data Impulse
     | ArbitraryImpulseFunction WdCrCr
     | ArbitraryImpulse CrWdImp
     | ArbitraryImpulseEffect CrWdWd
-    | ImpulseUseTargetCID
-        { _impulseUseTargetCID :: IntImp
-        }
+--    | ImpulseUseTargetCID
+--        { _impulseUseTargetCID :: IntImp
+--        }
     | ImpulseUseTarget
         { _impulseUseTarget :: CrImp
         }

src/Dodge/Data/CreatureEffect.hs

@@ -17,8 +17,8 @@ data CrWdImp = NoCrWdImp
 data CrWdWd = CrWdWdId
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data IntImp = NoIntImp
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--data IntImp = NoIntImp
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrImp
     = NoCrImp
@@ -42,9 +42,7 @@ data CrBl
     | CrIsAnimate
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data CrAc
-    = CrTurnAround
---    | CrFleeFromTarget
+data CrAc = CrTurnAround
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data P2Ac = P2NoAction
@@ -62,7 +60,7 @@ data CrWdAc
 deriveJSON defaultOptions ''WdCrCr
 deriveJSON defaultOptions ''CrWdImp
 deriveJSON defaultOptions ''CrWdWd
-deriveJSON defaultOptions ''IntImp
+--deriveJSON defaultOptions ''IntImp
 deriveJSON defaultOptions ''CrImp
 deriveJSON defaultOptions ''P2Imp
 deriveJSON defaultOptions ''CrBl

src/Dodge/Humanoid.hs

@@ -10,7 +10,6 @@ import Geometry
 import LensHelp
 import RandomHelp
 
-
 updateHumanoid :: Creature -> World -> World
 updateHumanoid cr = case cr ^?! crType of
     ChaseCrit {} ->