justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
justin
2022-08-20 18:41:04 +01:00
parent ff9dbdf068
commit 6e598339f1
84 changed files with 58 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Data/Item/Combine.hs
-2
View File
@@ -7,8 +7,6 @@ module Dodge.Data.Item.Combine where
import Flat
import Control.Lens
import TH.Derive
import Data.Store
import Data.Aeson
import Data.Aeson.TH
import qualified Data.Map.Strict as M
src/Dodge/Data/Item/CurseStatus.hs
-2
View File
@@ -8,8 +8,6 @@ module Dodge.Data.Item.CurseStatus where
import Flat
import Data.Aeson
import Data.Aeson.TH
import TH.Derive
import Data.Store
data CurseStatus
= Uncursed
src/Dodge/Data/Item/Effect.hs
-4
View File
@@ -9,8 +9,6 @@ import Flat
import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import TH.Derive
import Data.Store
data ItEffect = ItEffect
{ _ieInv :: ItInvEffect --Item -> Creature -> World -> World
@@ -32,11 +30,9 @@ data ItInvEffect
deriving (Eq, Ord, Show, Read, Generic, Flat)
data ItFloorEffect = NoFloorEffect
| DefaultFloorEffect
deriving (Eq, Ord, Show, Read, Generic, Flat)
data ItDropEffect = NoDropEffect
| DefaultDropEffect
deriving (Eq, Ord, Show, Read, Generic, Flat)
makeLenses ''ItEffect
src/Dodge/Data/Item/HeldDelay.hs
-2
View File
@@ -9,8 +9,6 @@ import Flat
import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import TH.Derive
import Data.Store
data UseDelay -- should just be Delay
= NoDelay
src/Dodge/Data/Item/HeldScroll.hs
-2
View File
@@ -10,8 +10,6 @@ import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import qualified Data.Sequence as Seq
import TH.Derive
import Data.Store
data HeldScroll
= HeldScrollDoNothing
src/Dodge/Data/Item/HeldUse.hs
-2
View File
@@ -10,8 +10,6 @@ import Data.Aeson
import Data.Aeson.TH
import Dodge.Data.CamouflageStatus
import Dodge.Data.Item.Combine
import TH.Derive
import Data.Store
data HeldUse
= HeldDoNothing
src/Dodge/Data/Item/Location.hs
-2
View File
@@ -8,8 +8,6 @@ import Flat
import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import TH.Derive
import Data.Store
data ItemLocation
= InInv {_ipCrID :: Int, _ipInvID :: Int}
src/Dodge/Data/Item/Misc.hs
+1 -3
View File
@@ -10,9 +10,7 @@ import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import Geometry.Data
import TH.Derive
import Data.Store
import LinearHelp
import LinearHelp ()
data ItemDimension = ItemDimension
{ _dimRad :: Float
src/Dodge/Data/Item/Params.hs
-2
View File
@@ -13,8 +13,6 @@ import Data.Aeson.TH
import Dodge.Data.ArcStep
import Dodge.Data.Beam
import Geometry.Data
import TH.Derive
import Data.Store
data ItemParams
= NoParams
src/Dodge/Data/Item/Scope.hs
+1 -3
View File
@@ -10,9 +10,7 @@ import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import Geometry.Data
import TH.Derive
import Data.Store
import LinearHelp
import LinearHelp ()
data Scope
= NoScope
src/Dodge/Data/Item/Targeting.hs
+1 -3
View File
@@ -10,9 +10,7 @@ import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import Geometry.Data
import TH.Derive
import Data.Store
import LinearHelp
import LinearHelp ()
data Targeting
= NoTargeting
src/Dodge/Data/Item/Tweak.hs
-2
View File
@@ -10,8 +10,6 @@ import Control.Lens
import Data.Aeson
import Data.Aeson.TH
import qualified IntMapHelp as IM
import TH.Derive
import Data.Store
data ItemTweaks
= NoTweaks
src/Dodge/Data/Item/Use.hs
-2
View File
@@ -23,8 +23,6 @@ import Dodge.Data.Item.HeldUse
import Dodge.Data.Item.Use.Consumption
import Dodge.Data.Item.Use.Equipment
import Dodge.Data.Item.HeldDelay
import TH.Derive
import Data.Store
data ItemUse
= HeldUse
src/Dodge/Data/Item/Use/Consumption.hs
+5 -3
View File
@@ -1,6 +1,7 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE StrictData #-}
{-# LANGUAGE TemplateHaskell #-}
@@ -11,8 +12,6 @@ module Dodge.Data.Item.Use.Consumption (
) where
import Flat
import TH.Derive
import Data.Store
import Control.Lens
import Data.Aeson
import Data.Aeson.TH
@@ -45,7 +44,10 @@ data LeftConsumption
deriving (Eq, Show, Read, Generic, Flat)
newtype ItAmount = ItAmount {_getItAmount :: Int}
deriving (Eq, Ord, Read, Show, Num, Real, Enum, Integral, Generic, Flat)
-- deriving (Eq, Ord, Read, Show, Num, Real, Generic, Flat)
deriving newtype (Eq, Ord, Read, Show, Num, Real, Enum, Integral)
deriving stock (Generic)
deriving anyclass (Flat)
makeLenses ''HeldConsumption
makeLenses ''LeftConsumption
src/Dodge/Data/Item/Use/Consumption/Ammo.hs
-2
View File
@@ -10,8 +10,6 @@ module Dodge.Data.Item.Use.Consumption.Ammo (
) where
import Flat
import TH.Derive
import Data.Store
import Control.Lens
import Data.Aeson
import Data.Aeson.TH
src/Dodge/Data/Item/Use/Consumption/LoadAction.hs
-2
View File
@@ -11,8 +11,6 @@ import Data.Aeson
import Data.Aeson.TH
import Dodge.Data.Hammer
import Sound.Data
import TH.Derive
import Data.Store
data LoadAction
= LoadEject {_actionTime :: Int, _actionSound :: SoundID}
src/Dodge/Data/Item/Use/Equipment.hs
-2
View File
@@ -14,8 +14,6 @@ import Data.Aeson
import Data.Aeson.TH
import Dodge.Data.Equipment.Misc
import Dodge.Data.Item.HeldUse
import TH.Derive
import Data.Store
data EquipEffect = EquipEffect
{ _eeUse :: Euse --Item -> Creature -> World -> World