diff --git a/src/Dodge/CreatureEffect.hs b/src/Dodge/CreatureEffect.hs index dac45eb0d..d9e7be9f5 100644 --- a/src/Dodge/CreatureEffect.hs +++ b/src/Dodge/CreatureEffect.hs @@ -1,12 +1,12 @@ module Dodge.CreatureEffect where import Linear -import Data.Maybe +--import Data.Maybe import Dodge.Base.Collide import Dodge.Creature.Test import Dodge.Data.CreatureEffect import Dodge.Data.World -import Dodge.Path +--import Dodge.Path import Geometry import Control.Lens @@ -46,14 +46,14 @@ doCrAc ca = case ca of doCrWdAc :: CrWdAc -> Creature -> World -> Action doCrWdAc cw = case cw of - CrWdBFSThenReturn t -> \cr w -> fromMaybe NoAction $ do - n <- walkableNodeNear w (cr ^. crPos . _xy) + CrWdBFSThenReturn _ -> undefined +-- CrWdBFSThenReturn t -> \cr w -> fromMaybe NoAction $ do +-- n <- walkableNodeNear w (cr ^. crPos . _xy) -- let as = take 20 $ map PathTo $ bfsNodePoints n w - let as = [] - return $ DoActionThen (DoImpulses [ChangeStrategy Search]) - $ - DoReplicate t $ - foldr DoActionThen NoAction as +-- return $ DoActionThen (DoImpulses [ChangeStrategy Search]) +-- $ +-- DoReplicate t $ +-- foldr DoActionThen NoAction as ChooseMovementSpreadGun -> chooseMovementSpreadGun ChooseMovementLtAuto -> chooseMovementLtAuto diff --git a/src/Dodge/Data/CWorld.hs b/src/Dodge/Data/CWorld.hs index 83b804056..b7e87149f 100644 --- a/src/Dodge/Data/CWorld.hs +++ b/src/Dodge/Data/CWorld.hs @@ -10,7 +10,7 @@ module Dodge.Data.CWorld ( import Control.Lens import Data.Aeson import Data.Aeson.TH -import Data.Graph.Inductive +--import Data.Graph.Inductive import Data.Tile import Dodge.Data.Camera import Dodge.Data.LWorld diff --git a/src/Dodge/Data/PathGraph.hs b/src/Dodge/Data/PathGraph.hs index 5604f7ee5..4bfc1a362 100644 --- a/src/Dodge/Data/PathGraph.hs +++ b/src/Dodge/Data/PathGraph.hs @@ -14,7 +14,7 @@ import Data.Aeson.TH import Data.Graph.Inductive --import Data.Map.Strict (Map) import qualified Data.Set as Set -import Geometry.Data +--import Geometry.Data --data PathGraph = PathGraph -- { _pgGraph :: Gr Point2 PathEdge diff --git a/src/Dodge/Debug/Picture.hs b/src/Dodge/Debug/Picture.hs index 4d2863c54..703aea359 100644 --- a/src/Dodge/Debug/Picture.hs +++ b/src/Dodge/Debug/Picture.hs @@ -4,14 +4,14 @@ module Dodge.Debug.Picture where import Linear (_xy) import Control.Lens import Data.Foldable -import qualified Data.Graph.Inductive as FGL +--import qualified Data.Graph.Inductive as FGL import Data.Maybe import qualified Data.Set as S import Dodge.Base import Dodge.Creature.Picture.Awareness import Dodge.Data.Universe import Dodge.GameRoom -import Dodge.Graph +--import Dodge.Graph import Dodge.Path import Dodge.Picture.SizeInvariant --import Dodge.Render.InfoBox diff --git a/src/Dodge/Default/World.hs b/src/Dodge/Default/World.hs index 65e17b8f8..2666bf4c6 100644 --- a/src/Dodge/Default/World.hs +++ b/src/Dodge/Default/World.hs @@ -1,6 +1,6 @@ module Dodge.Default.World (defaultWorld) where -import Data.Graph.Inductive.Graph hiding ((&)) +--import Data.Graph.Inductive.Graph hiding ((&)) import qualified Data.Map as M import Dodge.Data.World import Geometry.Data diff --git a/src/Dodge/Path.hs b/src/Dodge/Path.hs index 8cfe385c4..6610591dd 100644 --- a/src/Dodge/Path.hs +++ b/src/Dodge/Path.hs @@ -19,10 +19,10 @@ import qualified Algorithm.Search as AS import Control.Lens --import Data.Bifunctor import Data.Foldable -import Data.Graph.Inductive hiding ((&)) +--import Data.Graph.Inductive hiding ((&)) import Data.List (sortOn) -import Data.Map.Strict (Map) -import qualified Data.Map.Strict as M +--import Data.Map.Strict (Map) +--import qualified Data.Map.Strict as M import Data.Maybe import Data.Set (Set) import qualified Data.Set as Set diff --git a/src/Dodge/Path/Translate.hs b/src/Dodge/Path/Translate.hs deleted file mode 100644 index da6fc0c0a..000000000 --- a/src/Dodge/Path/Translate.hs +++ /dev/null @@ -1,7 +0,0 @@ -module Dodge.Path.Translate where - -import Dodge.Data.PathGraph - ---fromEdgeTuple :: (Int, Int, PathEdge) -> PathEdgeNodes ---{-# INLINE fromEdgeTuple #-} ---fromEdgeTuple (a, b, pe) = PathEdgeNodes a b pe diff --git a/src/Dodge/Zoning/Pathing.hs b/src/Dodge/Zoning/Pathing.hs index 2c8e944b8..1641b2636 100644 --- a/src/Dodge/Zoning/Pathing.hs +++ b/src/Dodge/Zoning/Pathing.hs @@ -2,11 +2,11 @@ module Dodge.Zoning.Pathing where import qualified Data.Vector.Unboxed as UV import Data.Foldable -import Data.Set (Set) -import qualified Data.Set as Set -import Dodge.Data.World +--import Data.Set (Set) +--import qualified Data.Set as Set +--import Dodge.Data.World import Dodge.Zoning.Base -import Dodge.Zoning.Common +--import Dodge.Zoning.Common import Geometry import qualified IntMapHelp as IM import Control.Lens