Cleanup
This commit is contained in:
+1
-11
@@ -59,7 +59,6 @@ data World = World
|
||||
, _doors :: IM.IntMap Door
|
||||
, _blocks :: IM.IntMap Block
|
||||
, _wallsZone :: Zone (IM.IntMap Wall)
|
||||
, _forceFields :: IM.IntMap ForceField
|
||||
, _floorItems :: IM.IntMap FloorItem
|
||||
, _floorTiles :: [(Point3,Point3)]
|
||||
, _randGen :: StdGen
|
||||
@@ -453,7 +452,7 @@ data Particle
|
||||
, _btTimer' :: Int
|
||||
}
|
||||
type HitEffect = Particle
|
||||
-> [(Point2, Either3 Creature Wall ForceField)]
|
||||
-> [(Point2, Either Creature Wall)]
|
||||
-> World
|
||||
-> (World,Maybe Particle)
|
||||
|
||||
@@ -572,13 +571,6 @@ data Wall = Wall
|
||||
}
|
||||
-- | Strict maybe
|
||||
data Maybe' a = Just' a | Nothing'
|
||||
data ForceField = FF
|
||||
{ _ffLine :: [Point2] , _ffID :: Int
|
||||
, _ffColor :: Color
|
||||
, _ffDeflect :: Maybe (StdGen -> Point2 -> ForceField -> (Point2,StdGen))
|
||||
, _ffState :: FFState
|
||||
}
|
||||
newtype FFState = FFDestroyable { _ffsHP :: Int }
|
||||
|
||||
data ActionPlan
|
||||
= Inanimate
|
||||
@@ -757,8 +749,6 @@ makeLenses ''PjParam
|
||||
makeLenses ''Prop
|
||||
makeLenses ''Particle
|
||||
makeLenses ''Wall
|
||||
makeLenses ''ForceField
|
||||
makeLenses ''FFState
|
||||
makeLenses ''PressPlate
|
||||
makeLenses ''Button
|
||||
makeLenses ''ActionPlan
|
||||
|
||||
Reference in New Issue
Block a user