Steps towards making clouds list based

2021-07-21 00:05:13 +02:00
parent af44a380fc
commit 7b45a4a295
7 changed files with 65 additions and 67 deletions
@@ -55,8 +55,8 @@ data World = World
    , _creaturesZone        :: IM.IntMap (IM.IntMap (IM.IntMap Creature))
    , _creatureGroups       :: IM.IntMap CrGroupParams
    , _itemPositions        :: IM.IntMap ItemPos
-    , _clouds               :: IM.IntMap Cloud
-    , _cloudsZone           :: IM.IntMap (IM.IntMap (IM.IntMap Cloud))
+    , _clouds               :: [Cloud]
+    , _cloudsZone           :: IM.IntMap (IM.IntMap [Cloud])
    , _projectiles          :: IM.IntMap Projectile
    , _particles            :: ![Particle]
    , _staticWalls          :: IM.IntMap (IM.IntMap [Wall'])
@@ -123,14 +123,17 @@ data Corpse = Corpse
    , _cpRes :: Creature
    }
 data Cloud = Cloud
-    { _clID :: Int
-    , _clPos :: Point2
+    { _clPos :: Point2
    , _clVel :: Point2
    , _clPict :: Cloud -> Picture
    , _clRad :: Float
    , _clTimer :: Int
-    , _clEffect :: Cloud -> World -> World
+    , _clType :: CloudType
+--    , _clEffect :: Cloud -> World -> World
    }
+data CloudType
+    = SmokeCloud
+    | GasCloud
 data LightSource = LS  
    { _lsID         :: !Int
    , _lsPos        :: !Point3