From cf912279d60bb3c3a66b486196084fad1c685bb7 Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 1 Apr 2026 19:06:56 +0100 Subject: [PATCH] Remove unused datatype --- src/Dodge/Creature/Mass.hs | 1 + src/Dodge/Creature/Material.hs | 1 + src/Dodge/Creature/MaxHP.hs | 1 + src/Dodge/Creature/Radius.hs | 1 + src/Dodge/Creature/Shape.hs | 8 ++++---- src/Dodge/Data/Creature/Misc.hs | 22 +--------------------- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/Dodge/Creature/Mass.hs b/src/Dodge/Creature/Mass.hs index 27cc4a0e1..930730372 100644 --- a/src/Dodge/Creature/Mass.hs +++ b/src/Dodge/Creature/Mass.hs @@ -6,6 +6,7 @@ crMass :: CreatureType -> Float crMass = \case Avatar {} -> 10 ChaseCrit {} -> 10 + HoverCrit {} -> 5 SwarmCrit -> 2 AutoCrit -> 10 BarrelCrit{} -> 10 diff --git a/src/Dodge/Creature/Material.hs b/src/Dodge/Creature/Material.hs index 7320ac31b..d43498233 100644 --- a/src/Dodge/Creature/Material.hs +++ b/src/Dodge/Creature/Material.hs @@ -9,6 +9,7 @@ crMaterial :: CreatureType -> Material crMaterial = \case Avatar{_avatarMaterial = mt} -> mt ChaseCrit {} -> Flesh + HoverCrit {} -> Metal SwarmCrit -> Flesh AutoCrit -> Flesh BarrelCrit{} -> Metal diff --git a/src/Dodge/Creature/MaxHP.hs b/src/Dodge/Creature/MaxHP.hs index fb051af02..a9b95a2f7 100644 --- a/src/Dodge/Creature/MaxHP.hs +++ b/src/Dodge/Creature/MaxHP.hs @@ -7,6 +7,7 @@ crMaxHP :: CreatureType -> Int crMaxHP = \case Avatar {} -> 15000 ChaseCrit {} -> 150 + HoverCrit {} -> 100 SwarmCrit -> 50 AutoCrit -> 100 BarrelCrit{} -> 100 diff --git a/src/Dodge/Creature/Radius.hs b/src/Dodge/Creature/Radius.hs index 9aa603b19..1c0b4b79a 100644 --- a/src/Dodge/Creature/Radius.hs +++ b/src/Dodge/Creature/Radius.hs @@ -9,6 +9,7 @@ crRad :: CreatureType -> Float crRad = \case Avatar {} -> 10 ChaseCrit {} -> 10 + HoverCrit {} -> 8 SwarmCrit -> 2 AutoCrit -> 10 BarrelCrit{} -> 10 diff --git a/src/Dodge/Creature/Shape.hs b/src/Dodge/Creature/Shape.hs index 65d788379..2beeb94fa 100644 --- a/src/Dodge/Creature/Shape.hs +++ b/src/Dodge/Creature/Shape.hs @@ -7,9 +7,9 @@ import Dodge.Data.Creature.Misc crShape :: CreatureType -> CreatureShape crShape = \case - Avatar{} -> Humanoid (greyN 0.9) (lightx4 black) (greyN 0.3) InanimateAI - ChaseCrit {} -> Humanoid (greyN 0.9) (lightx4 green) (greyN 0.3) ChaseAI - SwarmCrit -> Humanoid (greyN 0.9) (lightx4 yellow) (greyN 0.3) SwarmAI - AutoCrit -> Humanoid (greyN 0.9) (lightx4 red) (greyN 0.3) AutoAI + Avatar{} -> Humanoid (greyN 0.9) (lightx4 black) (greyN 0.3) + ChaseCrit {} -> Humanoid (greyN 0.9) (lightx4 green) (greyN 0.3) + SwarmCrit -> Humanoid (greyN 0.9) (lightx4 yellow) (greyN 0.3) + AutoCrit -> Humanoid (greyN 0.9) (lightx4 red) (greyN 0.3) BarrelCrit {} -> Barreloid LampCrit {} -> NonDrawnCreature diff --git a/src/Dodge/Data/Creature/Misc.hs b/src/Dodge/Data/Creature/Misc.hs index 3f375eb72..451b29846 100644 --- a/src/Dodge/Data/Creature/Misc.hs +++ b/src/Dodge/Data/Creature/Misc.hs @@ -35,21 +35,6 @@ data CrMvType } deriving (Eq, Ord, Show, Read) --Generic, Flat) -data HumanoidAI - = ChaseAI - | InanimateAI - | SpreadGunAI - | PistolAI - | LtAutoAI - | LauncherAI - | SwarmAI - | AutoAI - | FlockArmourChaseAI - | MiniGunAI - | LongAI - | MultGunAI - deriving (Eq, Ord, Show, Read) --Generic, Flat) - data Pulse = PulseStatus { _pulseRate :: Int , _pulseProgress :: Int @@ -67,6 +52,7 @@ data CreatureType , _avPosture :: AvatarPosture } | ChaseCrit {_meleeCooldown :: Int} + | HoverCrit | SwarmCrit | AutoCrit | BarrelCrit {_barrelType :: BarrelType} @@ -79,7 +65,6 @@ data CreatureShape { _skinHead :: Color , _skinUpper :: Color , _skinLower :: Color - , _humanoidAI :: HumanoidAI } | Barreloid | NonDrawnCreature @@ -99,12 +84,7 @@ makeLenses ''CrMvType makeLenses ''CreatureType makeLenses ''CreatureShape deriveJSON defaultOptions ''Pulse - ---deriveJSON defaultOptions ''CreatureStatistics deriveJSON defaultOptions ''Vocalization - ---deriveJSON defaultOptions ''CrMvType -deriveJSON defaultOptions ''HumanoidAI deriveJSON defaultOptions ''BarrelType deriveJSON defaultOptions ''AvatarPosture deriveJSON defaultOptions ''CreatureType