From b227b1e95790d712c61b47db652a7f0afb8a8c6b Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 21 Aug 2022 10:12:39 +0100 Subject: [PATCH] Comment out ItemValue --- src/Dodge/Data/Item.hs | 2 +- src/Dodge/Data/Item/Misc.hs | 22 +++++++++++----------- src/Dodge/Default/Item.hs | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Dodge/Data/Item.hs b/src/Dodge/Data/Item.hs index 6fdae4cfa..e37bf515c 100644 --- a/src/Dodge/Data/Item.hs +++ b/src/Dodge/Data/Item.hs @@ -47,7 +47,7 @@ data Item = Item , _itCurseStatus :: CurseStatus , _itTweaks :: ItemTweaks , _itScope :: Scope - , _itValue :: ItemValue + --, _itValue :: ItemValue , _itParams :: ItemParams } deriving (Eq, Show, Read, Generic, Flat) diff --git a/src/Dodge/Data/Item/Misc.hs b/src/Dodge/Data/Item/Misc.hs index ae3033b63..3405b5579 100644 --- a/src/Dodge/Data/Item/Misc.hs +++ b/src/Dodge/Data/Item/Misc.hs @@ -28,19 +28,19 @@ data ItemPortage | NoPortage deriving (Eq, Show, Read, Generic, Flat) -data ItemValue = ItemValue - { _ivInt :: Int - , _ivType :: ItemValueType - } - deriving (Eq, Show, Read, Generic, Flat) - -data ItemValueType = MundaneItem | ArtefactItem - deriving (Eq, Show, Read, Generic, Flat) +--data ItemValue = ItemValue +-- { _ivInt :: Int +-- , _ivType :: ItemValueType +-- } +-- deriving (Eq, Show, Read, Generic, Flat) +-- +--data ItemValueType = MundaneItem | ArtefactItem +-- deriving (Eq, Show, Read, Generic, Flat) makeLenses ''ItemDimension makeLenses ''ItemPortage -makeLenses ''ItemValue +--makeLenses ''ItemValue deriveJSON defaultOptions ''ItemDimension deriveJSON defaultOptions ''ItemPortage -deriveJSON defaultOptions ''ItemValue -deriveJSON defaultOptions ''ItemValueType +--deriveJSON defaultOptions ''ItemValue +--deriveJSON defaultOptions ''ItemValueType diff --git a/src/Dodge/Default/Item.hs b/src/Dodge/Default/Item.hs index f0af75f2b..0cc7bdffc 100644 --- a/src/Dodge/Default/Item.hs +++ b/src/Dodge/Default/Item.hs @@ -29,7 +29,7 @@ defaultItem = , _itTweaks = NoTweaks , _itScope = NoScope , _itTargeting = NoTargeting - , _itValue = ItemValue 0 MundaneItem +-- , _itValue = ItemValue 0 MundaneItem } defaultLeftItem :: Item