Add forgotten files, many updates concerning turrets and shields
This commit is contained in:
+13
-1
@@ -56,6 +56,7 @@ data World = World
|
||||
, _clouds :: [Cloud]
|
||||
, _cloudsZone :: Zone [Cloud]
|
||||
, _props :: IM.IntMap Prop
|
||||
, _instantParticles :: [Particle]
|
||||
, _particles :: ![Particle]
|
||||
, _walls :: !(IM.IntMap Wall)
|
||||
, _doors :: IM.IntMap Door
|
||||
@@ -397,6 +398,11 @@ data ItEffect = NoItEffect
|
||||
,_itFloorEffect :: Int -> World -> World
|
||||
,_itEffectCounter :: Int
|
||||
}
|
||||
| ItInvEffectID
|
||||
{_itInvEffect :: ItEffect -> Creature -> Int -> World -> World
|
||||
-- the Int is the items inventory position
|
||||
,_itEffectID :: Maybe Int
|
||||
}
|
||||
data ItZoom = ItZoom
|
||||
{ _itZoomMax :: Float
|
||||
, _itZoomMin :: Float
|
||||
@@ -568,7 +574,7 @@ data MachineType
|
||||
| Turret
|
||||
{ _tuWeapon :: Item
|
||||
, _tuTurnSpeed :: Float
|
||||
, _tuFiring :: Bool
|
||||
, _tuFireTime :: Int
|
||||
}
|
||||
data Door = Door
|
||||
{ _drID :: Int
|
||||
@@ -587,7 +593,9 @@ data Wall = Wall
|
||||
, _wlSeen :: Bool
|
||||
, _wlOpacity :: Opacity
|
||||
, _wlPathable :: Bool
|
||||
, _wlWalkable :: Bool
|
||||
, _wlFireThrough :: Bool
|
||||
, _wlReflect :: Bool
|
||||
, _wlDraw :: Bool
|
||||
, _wlRotateTo :: Bool
|
||||
, _wlStructure :: WallStructure
|
||||
@@ -602,6 +610,10 @@ data WallStructure
|
||||
| DoorPart { _wlStDoor :: Int }
|
||||
| MachinePart { _wlStMachine :: Int }
|
||||
| BlockPart { _wlStBlock :: Int }
|
||||
| CreaturePart
|
||||
{ _wlStCreature :: Int
|
||||
, _wlStDamCreature :: DamageType -> Wall -> Int -> World -> World
|
||||
}
|
||||
-- | Strict maybe
|
||||
data Maybe' a = Just' a | Nothing'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user