Permalink
Browse files

more interactions

  • Loading branch information...
1 parent 9ff2e76 commit 0dab6bf3c282c58f90635ae3f4b14670f7836164 @tranma committed Nov 11, 2012
Showing with 30 additions and 3 deletions.
  1. +27 −0 Alchemy.hs
  2. +3 −3 World.hs
  3. BIN tooltips/lava.png
View
27 Alchemy.hs
@@ -43,4 +43,31 @@ applyAlchemy r 7 26 = if r < 1 then (water, sand) else (water, metal)
applyAlchemy r 26 8 = if r < 3 then (sand, salt_water) else (metal, salt_water)
applyAlchemy r 8 26 = if r < 3 then (salt_water, sand) else (salt_water, metal)
+-- lava + stone = 2 x lava
+applyAlchemy r 27 11 = if r < 5 then (lava, lava) else (lava, stone)
+applyAlchemy r 11 27 = if r < 5 then (lava, lava) else (stone, lava)
+
+-- lava + metal/sand/salt = 2 x lava
+applyAlchemy r 27 26 = if r < 1 then (lava, lava) else (lava, metal)
+applyAlchemy r 26 27 = if r < 1 then (lava, lava) else (metal, lava)
+applyAlchemy r 27 9 = if r < 50 then (lava, lava) else (lava, sand)
+applyAlchemy r 9 27 = if r < 50 then (lava, lava) else (sand, lava)
+applyAlchemy r 27 10 = if r < 50 then (lava, lava) else (lava, salt)
+applyAlchemy r 10 27 = if r < 50 then (lava, lava) else (salt, lava)
+
+-- lava + oil/plant = lava + fire
+applyAlchemy r 27 6 = if r < 80 then (lava, fire) else (lava, oil)
+applyAlchemy r 6 27 = if r < 80 then (fire, lava) else (oil, lava)
+applyAlchemy r 27 24 = if r < 80 then (lava, fire) else (lava, plant)
+applyAlchemy r 24 27 = if r < 80 then (fire, lava) else (plant, lava)
+
+-- water + lava = steam + stone
+applyAlchemy _ 7 27 = (steam_water, stone)
+applyAlchemy _ 27 7 = (stone, steam_water)
+
+-- salt_water + lava = steam + stone OR steam + salt
+applyAlchemy r 8 27 = if r < 20 then (steam_water, salt) else (steam_water, stone)
+applyAlchemy r 27 8 = if r < 20 then (salt, steam_water) else (stone, steam_water)
+
+
applyAlchemy _ a b = (a, b)
View
6 World.hs
@@ -5,7 +5,7 @@ module World
, Weight (..), WeightEnv (..)
, nothing, steam_water, steam_condensed, fire, fire_end, oil
- , water, salt_water, sand, salt, stone, torch, plant, spout, metal, wall
+ , water, salt_water, sand, salt, stone, torch, plant, spout, metal, wall, lava
, isFluid, isWall, isFire
, weight, age
@@ -105,8 +105,8 @@ weight :: Element -> Weight
weight 0 = 2 -- nothing
weight 1 = 0 -- steam water
weight 2 = 0 -- steam water
-weight 10 = salt -- sand == salt
-weight 27 = stone -- lava == stone
+weight 9 = salt -- sand == salt
+weight 27 = water -- lava == water
weight x | isFire x = 0
| otherwise = fromIntegral x
View
BIN tooltips/lava.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0dab6bf

Please sign in to comment.