Refactor, try to limit dependencies

2022-07-28 00:59:56 +01:00
parent 8aa5c17ab9
commit 160560af5f
418 changed files with 15104 additions and 13342 deletions
@@ -1,45 +1,51 @@
-module Dodge.Creature.ArmourChase
-    ( armourChaseCrit
-    , flockArmourChaseCrit
-    ) where
-import Dodge.Data
+module Dodge.Creature.ArmourChase (
+    armourChaseCrit,
+    flockArmourChaseCrit,
+) where
+
+import Control.Lens
+import Dodge.Creature.ChaseCrit
+import Dodge.Data.Creature
 import Dodge.Data.FloatFunction
 import Dodge.Default
-import Dodge.Creature.ChaseCrit
-import Dodge.Item.Equipment
 import Dodge.Item.Consumable
-
+import Dodge.Item.Equipment
 import qualified IntMapHelp as IM
-import Control.Lens

 flockArmourChaseCrit :: Creature
-flockArmourChaseCrit = defaultCreature
-    { _crName = "armourChaseCrit"
-    , _crHP = 300
-    , _crInv = IM.fromList 
-        [(0,frontArmour)
-        ,(1,medkit 200)
-        ]
-    , _crActionPlan = ActionPlan
-        {_apImpulse     = []
-        ,_apAction      = []
-        ,_apStrategy    = FollowImpulses
-        ,_apGoal        = [Kill 0]
+flockArmourChaseCrit =
+    defaultCreature
+        { _crName = "armourChaseCrit"
+        , _crHP = 300
+        , _crInv =
+            IM.fromList
+                [ (0, frontArmour)
+                , (1, medkit 200)
+                ]
+        , _crActionPlan =
+            ActionPlan
+                { _apImpulse = []
+                , _apAction = []
+                , _apStrategy = FollowImpulses
+                , _apGoal = [Kill 0]
+                }
+        , _crMeleeCooldown = 0
+        , _crGroup = ShieldGroup
+        , _crMvType = defaultChaseMvType
        }
-    , _crMeleeCooldown = 0
-    , _crGroup = ShieldGroup
-    , _crMvType = defaultChaseMvType
-    }  
-    & crType . humanoidAI .~ FlockArmourChaseAI
+        & crType . humanoidAI .~ FlockArmourChaseAI
+
 armourChaseCrit :: Creature
-armourChaseCrit = chaseCrit
-    { _crName = "armourChaseCrit"
-    --, _crUpdate = defaultImpulsive []
-    , _crInv = IM.fromList 
-        [(0,frontArmour)
-        ,(1,medkit 200)
-        ]
-    , _crMvType = defaultChaseMvType {_mvTurnRad = FloatConst 0.05}
-    } 
-    & crEquipment . at OnChest ?~ 0
-    & crInvEquipped . at 0 ?~ OnChest
+armourChaseCrit =
+    chaseCrit
+        { _crName = "armourChaseCrit"
+        , --, _crUpdate = defaultImpulsive []
+          _crInv =
+            IM.fromList
+                [ (0, frontArmour)
+                , (1, medkit 200)
+                ]
+        , _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05}
+        }
+        & crEquipment . at OnChest ?~ 0
+        & crInvEquipped . at 0 ?~ OnChest