Remove some deriving clauses

This commit is contained in:
2022-08-22 10:37:24 +01:00
parent df905ce2cc
commit c9c3d8f392
7 changed files with 113 additions and 18 deletions
+4 -4
View File
@@ -28,12 +28,12 @@ data Beam = Beam
, _bmOrigin :: Maybe Int
, _bmType :: BeamType
}
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BeamDraw
= BasicBeamDraw
| BeamDrawColor Color
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BeamCombineType
= FlameBeamCombine
@@ -41,14 +41,14 @@ data BeamCombineType
| TeslaBeamCombine
| SplitBeamCombine
| NoBeamCombine
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BeamType
= BeamCombine
{ _beamCombine :: BeamCombineType -- (Point2 , (Point2,Point2,Beam) , (Point2,Point2,Beam)) -> World -> World
}
| BeamSimple
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
makeLenses ''BeamType
makeLenses ''Beam
+3 -3
View File
@@ -73,17 +73,17 @@ data Creature = Creature
, _crStatistics :: CreatureStatistics
, _crCamouflage :: CamouflageStatus
}
deriving (Eq, Show, Read) --Generic, Flat)
--deriving (Eq, Show, Read) --Generic, Flat)
data CreatureCorpse = MakeDefaultCorpse
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data Intention = Intention
{ _targetCr :: Maybe Creature
, _mvToPoint :: Maybe Point2
, _viewPoint :: Maybe Point2
}
deriving (Eq, Show, Read) --Generic, Flat)
--deriving (Eq, Show, Read) --Generic, Flat)
crSel :: Creature -> Int
crSel = _iselPos . _crInvSel
+1 -1
View File
@@ -12,7 +12,7 @@ import Dodge.Data.Item
import Geometry.Data
data FloorItem = FlIt {_flIt :: Item, _flItPos :: Point2, _flItRot :: Float, _flItID :: Int}
deriving (Eq, Show, Read) --Generic, Flat)
--deriving (Eq, Show, Read) --Generic, Flat)
makeLenses ''FloorItem
deriveJSON defaultOptions ''FloorItem
+1 -1
View File
@@ -49,7 +49,7 @@ data Item = Item
--, _itValue :: ItemValue
, _itParams :: ItemParams
}
deriving (Eq, Show, Read) --Generic, Flat)
--deriving (Eq, Show, Read) --Generic, Flat)
_itUseAimStance :: Item -> AimStance
_itUseAimStance = _aimStance . _heldAim . _itUse
+6 -6
View File
@@ -68,13 +68,13 @@ data ItemParams
}
| ParamMID {_paramMID :: Maybe Int}
| BoostPropIX {_boostPropIX :: Maybe Int}
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data ShrinkGunStatus = FullSize | Shrunk
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data GunBarrels
= MultiBarrel
@@ -87,7 +87,7 @@ data GunBarrels
, _brlInaccuracy :: Float
}
| SingleBarrel {_brlInaccuracy :: Float}
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data Nozzle = Nozzle
{ _nzPressure :: Float
@@ -97,13 +97,13 @@ data Nozzle = Nozzle
, _nzWalkSpeed :: Float
, _nzLength :: Float
}
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
data BarrelSpread
= AlignedBarrels
| SpreadBarrels {_spreadAngle :: Float}
| RotatingBarrels {_rotatingBarrelInaccuracy :: Float}
deriving (Eq, Ord, Show, Read) --Generic, Flat)
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
makeLenses ''BarrelSpread
makeLenses ''ItemParams
+3 -3
View File
@@ -43,7 +43,7 @@ data Machine = Machine
, _mcCloseSound :: Maybe SoundID
, _mcWidth :: Float
}
deriving (Eq, Show, Read) --, Generic)
--deriving (Eq, Show, Read) --, Generic)
--hderiving (Eq, Show, Read) --Generic, Flat)
data MachineType
@@ -51,7 +51,7 @@ data MachineType
| McTerminal
| McSensor Sensor
| McTurret Turret
deriving (Eq, Show, Read) --, Generic)
--deriving (Eq, Show, Read) --, Generic)
--hderiving (Eq, Show, Read) --Generic, Flat)
data Turret = Turret
@@ -60,7 +60,7 @@ data Turret = Turret
, _tuFireTime :: Int
, _tuDir :: Float
}
deriving (Eq, Show, Read) --, Generic)
--deriving (Eq, Show, Read) --, Generic)
--hderiving (Eq, Show, Read) --Generic, Flat)
makeLenses ''Machine