X-Git-Url: https://git.danieliu.xyz/?p=ekitaihs.git;a=blobdiff_plain;f=Sim.hs;fp=Sim.hs;h=64aef9b18e07c7aa516926b894909fcdddb20beb;hp=97456fc1ac96517044dba5eb15e45e4a1b32f0e8;hb=4de2980e358a4ed8bb05e615a3fee16215b03c1f;hpb=76d05eb2de39a69e93c2c342073cde2627c9f50c

diff --git a/Sim.hs b/Sim.hs
index 97456fc..64aef9b 100644
--- a/Sim.hs
+++ b/Sim.hs
@@ -17,7 +17,9 @@ data Simulation = Simulation
 
 data ChunkType = Air
     | Water 
-    | Wall deriving (Show, Enum)
+    | Wall
+    | Pump
+    | Drain deriving (Show, Enum)
 
 data ChunkData = ChunkData 
     { chunkType         :: ChunkType
@@ -47,6 +49,8 @@ _physStep grid acc sim@Simulation{simSpace=s,simW=w,simH=h} =
           valid = validDirects x y w h
           next = case simGetChunkType sim x y of
               Water -> updateWaterChunk x y valid acc
+              Pump -> updatePumpChunk x y valid acc
+              Drain -> updateDrainChunk x y valid acc
               _ -> acc
           -- spawn = simSet next (ChunkData Water) 5 0
 
@@ -77,6 +81,26 @@ updateWaterChunk x y valid sim =
     -- stay put
     else sim
 
+updatePumpChunk x y valid sim =
+    if elem (0,1) valid && fromEnum (simGetChunkType sim x (y+1)) == fromEnum Air
+        then simSet sim ChunkData { chunkType=Water } x (y+1)
+    else if elem (-1,0) valid && fromEnum (simGetChunkType sim (x-1) y) == fromEnum Air
+        then simSet sim ChunkData { chunkType=Water } (x-1) y
+    else if elem (1,0) valid && fromEnum (simGetChunkType sim (x+1) y) == fromEnum Air
+        then simSet sim ChunkData { chunkType=Water } (x+1) y
+    else sim
+
+updateDrainChunk x y valid sim =
+    if elem (0,1) valid && fromEnum (simGetChunkType sim x (y+1)) == fromEnum Water
+        then simSet sim ChunkData { chunkType=Air } x (y+1)
+    else if elem (0,-1) valid && fromEnum (simGetChunkType sim x (y-1)) == fromEnum Water
+        then simSet sim ChunkData { chunkType=Air } x (y-1)
+    else if elem (1,0) valid && fromEnum (simGetChunkType sim (x+1) y) == fromEnum Water
+        then simSet sim ChunkData { chunkType=Air } (x+1) y
+    else if elem (-1,0) valid && fromEnum (simGetChunkType sim (x-1) y) == fromEnum Water
+        then simSet sim ChunkData { chunkType=Air } (x-1) y
+    else sim
+
 -- gets chunks around a given chunk that are inside grid
 -- validDirects x y w h | trace ("w:"++ show w ++ "h:" ++ show h) False = undefined
 validDirects x y w h = filter
@@ -118,6 +142,8 @@ chunkToChar c =
         Water -> '~'
         Air -> ' '
         Wall -> '#'
+        Pump -> '@'
+        Drain -> 'O'
         _ -> '?'
 
 -- this is redundant, fix this somehow
@@ -126,5 +152,7 @@ charToChunk c =
     ChunkData { chunkType=ctype }
     where ctype = if c=='~' then Water
                   else if c=='#' then Wall
+                  else if c=='@' then Pump
+                  else if c=='O' then Drain
                   else Air