From 5b6699767a33c152dbc8e02d8c5b93054e1e2d35 Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 21 Dec 2024 12:10:21 +0000 Subject: [PATCH] Cleanup --- src/Dodge/Data/Creature.hs | 11 ----------- src/Dodge/Default/Creature.hs | 5 ----- 2 files changed, 16 deletions(-) diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs index 793c021d0..054fb4a53 100644 --- a/src/Dodge/Data/Creature.hs +++ b/src/Dodge/Data/Creature.hs @@ -71,15 +71,6 @@ data Creature = Creature , _crStatistics :: CreatureStatistics } ---deriving (Eq, Show, Read) --Generic, Flat) --- ---data CreatureTargeting = CreatureTargeting --- { _ctPos :: Maybe Point2 --- , _ctType :: Maybe TargetingType --- , _ctID :: Maybe Int --- , _ctActive :: Bool --- } - data CreatureCorpse = MakeDefaultCorpse --deriving (Eq, Ord, Show, Read) --Generic, Flat) @@ -93,7 +84,6 @@ data Intention = Intention --deriving (Eq, Show, Read) --Generic, Flat) makeLenses ''Creature ---makeLenses ''CreatureTargeting makeLenses ''Intention concat @@ -102,5 +92,4 @@ concat [ ''CreatureCorpse , ''Creature , ''Intention --- , ''CreatureTargeting ] diff --git a/src/Dodge/Default/Creature.hs b/src/Dodge/Default/Creature.hs index daf94bbf8..766a634b1 100644 --- a/src/Dodge/Default/Creature.hs +++ b/src/Dodge/Default/Creature.hs @@ -55,13 +55,8 @@ defaultCreature = , _crHammerPosition = HammerUp , _crName = "DEFAULTCRNAME" , _crStatistics = CreatureStatistics 50 50 50 --- , _crCamouflage = FullyVisible --- , _crTargeting = defaultCreatureTargeting } ---defaultCreatureTargeting :: CreatureTargeting ---defaultCreatureTargeting = CreatureTargeting Nothing Nothing Nothing False - defaultCreatureSkin :: CreatureType defaultCreatureSkin = Humanoid (greyN 0.9) (lightx4 green) (greyN 0.3) InanimateAI