New multihex snow forest

data/terrain-graphics.cfg

@@ -15,7 +15,7 @@
 #-----------------------------------------------------------------
 # Forest<->Castle|Encampment special cases
 #-----------------------------------------------------------------
-#define FORESTADJCASTLEA ID PROB TILE
+#define FORESTADJCASTLEA FID ID PROB TILE
 [terrain_graphics]
       map="
   1
@@ -31,7 +31,7 @@
 
          [tile]
                  pos=2
-                 type=f
+                 type={FID}
                  no_flag="overlay"
                  set_flag="overlay"
          [/tile]
@@ -49,9 +49,10 @@
 [/terrain_graphics]
 #enddef
 
-{FORESTADJCASTLEA Cn 100 forest-castle}
+{FORESTADJCASTLEA f Cn 100 forest-castle}
+{FORESTADJCASTLEA F Cn 100 snow-forest-castle}
 
-#define FORESTADJCASTLES ID PROB TILE
+#define FORESTADJCASTLES FID ID PROB TILE
 [terrain_graphics]
       map="
   1
@@ -67,7 +68,7 @@
 
          [tile]
                  pos=2
-                 type=f
+                 type={FID}
                  no_flag="overlay"
                  set_flag="overlay"
          [/tile]
@@ -85,9 +86,10 @@
 [/terrain_graphics]
 #enddef
 
-{FORESTADJCASTLES Cn 100 forest-castle}
+{FORESTADJCASTLES f Cn 100 forest-castle}
+{FORESTADJCASTLES F Cn 100 snow-forest-castle}
 
-#define FORESTADJCASTLEO ID PROB TILE
+#define FORESTADJCASTLEO FID ID PROB TILE
 [terrain_graphics]
       map="
   1
@@ -103,7 +105,7 @@
 
          [tile]
                  pos=2
-                 type=f
+                 type={FID}
                  no_flag="overlay"
                  set_flag="overlay"
          [/tile]
@@ -121,9 +123,10 @@
 [/terrain_graphics]
 #enddef
 
-{FORESTADJCASTLEO Cn 100 forest-castle}
+{FORESTADJCASTLEO f Cn 100 forest-castle}
+{FORESTADJCASTLEO F Cn 100 snow-forest-castle}
 
-#define FORESTADJCASTLE ID PROB TILE
+#define FORESTADJCASTLE FID ID PROB TILE
 [terrain_graphics]
       map="
   1
@@ -139,7 +142,7 @@
 
          [tile]
                  pos=2
-                 type=f
+                 type={FID}
                  no_flag="overlay"
                  set_flag="overlay"
          [/tile]
@@ -157,13 +160,14 @@
 [/terrain_graphics]
 #enddef
 
-{FORESTADJCASTLE Cnv 100 forest-castle}
+{FORESTADJCASTLE f Cnv 100 forest-castle}
+{FORESTADJCASTLE F Cnv 100 snow-forest-castle}
 
 #-----------------------------------------------------------------
 # Use a Different forest tile  when next to:
 # Shallow and deep Water, mountain, desert hill & mountain, swamp
 #-----------------------------------------------------------------
-#define FORESTADJ ID PROB TILE
+#define FORESTADJ FID ID PROB TILE
 [terrain_graphics]
       map="
   1
@@ -179,7 +183,7 @@
 
          [tile]
                  pos=2
-                 type=f
+                 type={FID}
                  no_flag="overlay"
                  set_flag="overlay"
          [/tile]
@@ -197,10 +201,12 @@
 [/terrain_graphics]
 #enddef
 
-{FORESTADJ csmJMw 33 forest_small}
-{FORESTADJ csmJMw 25 forest3}
-{FORESTADJ csmJMw 10 forest4}
-{FORESTADJ csmJMw 100 forest2_small}
+{FORESTADJ f csmJMw 33 forest_small}
+{FORESTADJ f csmJMw 25 forest3}
+{FORESTADJ f csmJMw 10 forest4}
+{FORESTADJ f csmJMw 100 forest2_small}
+
+{FORESTADJ F csmJMw 100 snow-forest_small}
 
 #Macro for Single Hex
 #define SHEX TYPE FLAG PROB TILE
@@ -235,6 +241,12 @@
 {SHEX f overlay 10 forest4}
 {SHEX f overlay 100 forest2}
 
+#Single hex normal snow forest tiles
+{SHEX F overlay 25 snow-forest2}
+{SHEX F overlay 25 snow-forest3}
+{SHEX F overlay 25 snow-forest4}
+{SHEX F overlay 100 snow-forest}
+
 #Multi-hex: shadow for desert village
 [terrain_graphics]
       map="
@@ -276,19 +288,19 @@
 
 # Castle-specific transitions. Those are placed before base terrains, as they
 # override the normal base terrain.
-{CASTLE_TRANSITION CK f forest-ctrans}
-{CASTLE_TRANSITION CK F snow-forest-ctrans}
+#{CASTLE_TRANSITION CK f forest-ctrans}
+#{CASTLE_TRANSITION CK F snow-forest-ctrans}
 {CASTLE_TRANSITION CK T tropical-forest-ctrans}
 #Special cases for encampment (nw, nw-n-ne and ne)
-{CASTLE_TRANSITION nK f forest-etrans}
-{CASTLE_TRANSITION nK F snow-forest-ctrans}
+#{CASTLE_TRANSITION nK f forest-etrans}
+#{CASTLE_TRANSITION nK F snow-forest-ctrans}
 {CASTLE_TRANSITION nK T tropical-forest-ctrans}
 #On the rest fall back on forest-castle
 {CASTLE_TRANSITION nK f forest-ctrans}
 #added ruins
-{CASTLE_TRANSITION NK f forest-ctrans}
-{CASTLE_TRANSITION QK f forest-ctrans}
-{CASTLE_TRANSITION qK f forest-ctrans}
+#{CASTLE_TRANSITION NK f forest-ctrans}
+#{CASTLE_TRANSITION QK f forest-ctrans}
+#{CASTLE_TRANSITION qK f forest-ctrans}
 
 #
 # Attachs graphics to each known terrain types
@@ -324,9 +336,9 @@
 {TERRAIN_BASE_PROB            SF snow2 30}
 {TERRAIN_BASE_PROB            SF snow3 30}
 {TERRAIN_BASE                 SF snow}
-{TERRAIN_BASE_PROB_OV         F snow-forest2        30}
-{TERRAIN_BASE_PROB_OV         F snow-forest3        30}
-{TERRAIN_BASE_OV              F snow-forest}
+#{TERRAIN_BASE_PROB_OV         F snow-forest2        30}
+#{TERRAIN_BASE_PROB_OV         F snow-forest3        30}
+#{TERRAIN_BASE_OV              F snow-forest}
 {TERRAIN_BASE_PROB            g grassland-rocks1    2}
 {TERRAIN_BASE_PROB            g grassland-rocks2    2}
 {TERRAIN_BASE_PROB            g grassland-flowers1  3}
@@ -680,7 +692,7 @@
 # {TERRAIN_ADJACENT_OV       -78         F      !F      snow-forest}
 #added ruins
 {TERRAIN_ADJACENT_VERTICAL             T      !TNQq      tropical-forest}
-{TERRAIN_ADJACENT_VERTICAL             F      !FNQq      snow-forest}
+#{TERRAIN_ADJACENT_VERTICAL             F      !FNQq      snow-forest}
 #{TERRAIN_ADJACENT_VERTICAL             f      !fNQq      forest}
 {TERRAIN_ADJACENT          -174        mHhfF  N       grassland}
 {TERRAIN_ADJACENT          -175        M     !M       desert-mountains}