Added animated smoke to volcanoes, and made them use the new lava

wesnoth · Jan 8, 2017 · 5588667 · 5588667
1 parent 15bea09
commit 5588667
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 4 deletions.
diff --git a/data/core/images/terrain/misc/smoke-A01.png b/data/core/images/terrain/misc/smoke-A01.png
diff --git a/data/core/images/terrain/misc/smoke-A02.png b/data/core/images/terrain/misc/smoke-A02.png
diff --git a/data/core/images/terrain/misc/smoke-A03.png b/data/core/images/terrain/misc/smoke-A03.png
diff --git a/data/core/images/terrain/misc/smoke-A04.png b/data/core/images/terrain/misc/smoke-A04.png
diff --git a/data/core/images/terrain/misc/smoke-A05.png b/data/core/images/terrain/misc/smoke-A05.png
diff --git a/data/core/images/terrain/misc/smoke-A06.png b/data/core/images/terrain/misc/smoke-A06.png
diff --git a/data/core/images/terrain/misc/smoke-A07.png b/data/core/images/terrain/misc/smoke-A07.png
diff --git a/data/core/images/terrain/misc/smoke-A08.png b/data/core/images/terrain/misc/smoke-A08.png
diff --git a/data/core/images/terrain/misc/smoke-A09.png b/data/core/images/terrain/misc/smoke-A09.png
diff --git a/data/core/images/terrain/misc/smoke-A10.png b/data/core/images/terrain/misc/smoke-A10.png
diff --git a/data/core/images/terrain/misc/smoke-A11.png b/data/core/images/terrain/misc/smoke-A11.png
diff --git a/data/core/images/terrain/misc/smoke-A12.png b/data/core/images/terrain/misc/smoke-A12.png
diff --git a/data/core/images/terrain/mountains/volcano-small.png b/data/core/images/terrain/mountains/volcano-small.png
diff --git a/data/core/images/terrain/mountains/volcano-tile.png b/data/core/images/terrain/mountains/volcano-tile.png
diff --git a/data/core/images/terrain/mountains/volcano.png b/data/core/images/terrain/mountains/volcano.png
diff --git a/data/core/images/terrain/mountains/volcano6_1.png b/data/core/images/terrain/mountains/volcano6_1.png
diff --git a/data/core/images/terrain/mountains/volcano6_2.png b/data/core/images/terrain/mountains/volcano6_2.png
diff --git a/data/core/images/terrain/mountains/volcano6_3.png b/data/core/images/terrain/mountains/volcano6_3.png
diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
@@ -191,10 +191,12 @@
 {OVERLAY_COMPLETE_LF     Chs       (!,C*,K*,Ss)                              -85 base2      swamp/reed}
 
 # Large volcano
-{VOLCANO_2x2             Mv              Mm,Md                  100       base2  mountains/volcano6}
+{VOLCANO_2x2             Mv              Mm,Md                  100            base2  mountains/volcano6}
 
 # Single-hex volcano
-{OVERLAY_COMPLETE_F      Mv              (!,Xv,Mv,!,C*,K*,X*,Q*)          base,base2  mountains/volcano}
+{OVERLAY_COMPLETE_F      Mv              (!,Xv,Mv,!,C*,K*,X*,Q*)               base2  mountains/volcano}
+
+{NEW:OVERLAY             Mv                                       misc/smoke-A CENTER=90,108 ANIM=[01~12] TIME=100}
 
 # Mountains
 {MOUNTAIN_RESTRICTED     Mm       (!,Xv,!,C*,K*,X*,Ql,Qx*)                     base2  mountains/basic-castle}
@@ -545,7 +547,7 @@
 
 {NEW:WATER_342_180_TILE_FLAGS}
 
-{NEW:WATER_342_180         Ql,Qlf                               unwalkable/lava 16}
+{NEW:WATER_342_180         Ql,Qlf,Mv                               unwalkable/lava 16}
 
 {NEW:WATER_342_180         Wo,Wog,Wot                               water/ocean 21}
 {NEW:WATER_342_180         Ww,Wwr,Wwf,Wwg,Wwrg,Wwt,Wwrt,Chw,Cm*,Km* water/water 17}

diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg
@@ -61,6 +61,9 @@ overlay#endarg
 #arg TIME
 #endarg
 
+#arg CENTER
+90,144#endarg
+
     [terrain_graphics]
         map="
 , *
@@ -81,7 +84,7 @@ overlay#endarg
             variations=";2;3;4;5;6;7;8;9;10;11"
             layer={LAYER}
             base=90,160
-            center=90,144
+            center={CENTER}
         [/image]
     [/terrain_graphics]
 #enddef