Cleanup and reorganise

src/Dodge/Creature/Volition.hs

@@ -1,8 +1,13 @@
 {- | Not a good name, perhaps: internal creature actions. -}
 module Dodge.Creature.Volition
-    where
+    ( holsterWeapon
+    , drawWeapon
+    , shootTillEmpty
+    , fleeFrom
+    , shootFirstMiss
+    ) where
 import Dodge.Data
-import Dodge.Base.Collide
+--import Dodge.Base.Collide
 import Dodge.Creature.Test
 import Dodge.Creature.Stance.Data
 import Dodge.SoundLogic.LoadSound
@@ -22,17 +27,17 @@ shootTillEmpty :: Action
 shootTillEmpty = (crCanShoot `DoActionWhile` DoImpulses [UseItem])
     `DoActionThen` 20 `WaitThen` holsterWeapon
 
-advanceShoot' :: Int -> Action
-advanceShoot' tcid = lostest `DoActionWhile`
-    advanceShoot `DoActionThen`
-    75 `DoReplicate` 
-    advanceShoot
-  where
-    lostest (w,cr) = canSee (_crID cr) tcid w 
-    advanceShoot = ImpulsesList [[UseItem, MoveForward 3]]
+--advanceShoot :: Int -> Action
+--advanceShoot tcid = lostest `DoActionWhile`
+--    advanceShoot' `DoActionThen`
+--    75 `DoReplicate` 
+--    advanceShoot'
+--  where
+--    lostest (w,cr) = canSee (_crID cr) tcid w 
+--    advanceShoot' = ImpulsesList [[UseItem, MoveForward 3]]
 
-shootFirstMiss' :: Action
-shootFirstMiss' =
+shootFirstMiss :: Action
+shootFirstMiss =
     LeadTarget (V2 30 50) `DoActionThen`
     DoImpulses [UseItem] `DoActionThen`
     (crCanShoot `DoActionWhile` DoActions [LeadTarget (V2 0 0),DoImpulses [UseItem]])