diff --git a/data/terrain-graphics.cfg b/data/terrain-graphics.cfg index 663d751172e..804c2eac89d 100644 --- a/data/terrain-graphics.cfg +++ b/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} diff --git a/images/terrain/snow-forest-ctrans-n-ne.png b/images/terrain/snow-forest-ctrans-n-ne.png deleted file mode 100644 index 8fc2c1df5cf..00000000000 Binary files a/images/terrain/snow-forest-ctrans-n-ne.png and /dev/null differ diff --git a/images/terrain/snow-forest-ctrans-n.png b/images/terrain/snow-forest-ctrans-n.png deleted file mode 100644 index ba6b5089c8a..00000000000 Binary files a/images/terrain/snow-forest-ctrans-n.png and /dev/null differ diff --git a/images/terrain/snow-forest-ctrans-ne.png b/images/terrain/snow-forest-ctrans-ne.png deleted file mode 100644 index 7ef76f95126..00000000000 Binary files a/images/terrain/snow-forest-ctrans-ne.png and /dev/null differ diff --git a/images/terrain/snow-forest-ctrans-nw-n-ne.png b/images/terrain/snow-forest-ctrans-nw-n-ne.png deleted file mode 100644 index c649ba5d7bf..00000000000 Binary files a/images/terrain/snow-forest-ctrans-nw-n-ne.png and /dev/null differ diff --git a/images/terrain/snow-forest-ctrans-nw-n.png b/images/terrain/snow-forest-ctrans-nw-n.png deleted file mode 100644 index 5581117a353..00000000000 Binary files a/images/terrain/snow-forest-ctrans-nw-n.png and /dev/null differ diff --git a/images/terrain/snow-forest-ctrans-nw-ne.png b/images/terrain/snow-forest-ctrans-nw-ne.png deleted file mode 100644 index b9e0a283161..00000000000 Binary files a/images/terrain/snow-forest-ctrans-nw-ne.png and /dev/null differ diff --git a/images/terrain/snow-forest-ctrans-nw.png b/images/terrain/snow-forest-ctrans-nw.png deleted file mode 100644 index 810aed74893..00000000000 Binary files a/images/terrain/snow-forest-ctrans-nw.png and /dev/null differ diff --git a/images/terrain/snow-forest-n-ne.png b/images/terrain/snow-forest-n-ne.png deleted file mode 100644 index f19c9d15138..00000000000 Binary files a/images/terrain/snow-forest-n-ne.png and /dev/null differ diff --git a/images/terrain/snow-forest-n.png b/images/terrain/snow-forest-n.png deleted file mode 100644 index b026d8fb54e..00000000000 Binary files a/images/terrain/snow-forest-n.png and /dev/null differ diff --git a/images/terrain/snow-forest-ne.png b/images/terrain/snow-forest-ne.png deleted file mode 100644 index fdbf550ee7b..00000000000 Binary files a/images/terrain/snow-forest-ne.png and /dev/null differ diff --git a/images/terrain/snow-forest-nw-n-ne.png b/images/terrain/snow-forest-nw-n-ne.png deleted file mode 100644 index 10490bccad2..00000000000 Binary files a/images/terrain/snow-forest-nw-n-ne.png and /dev/null differ diff --git a/images/terrain/snow-forest-nw.png b/images/terrain/snow-forest-nw.png deleted file mode 100644 index 3559e86bb69..00000000000 Binary files a/images/terrain/snow-forest-nw.png and /dev/null differ diff --git a/images/terrain/snow-forest-s-sw.png b/images/terrain/snow-forest-s-sw.png deleted file mode 100644 index 4501f9f37f7..00000000000 Binary files a/images/terrain/snow-forest-s-sw.png and /dev/null differ diff --git a/images/terrain/snow-forest-s.png b/images/terrain/snow-forest-s.png deleted file mode 100644 index 90cbfd7dd49..00000000000 Binary files a/images/terrain/snow-forest-s.png and /dev/null differ diff --git a/images/terrain/snow-forest-se-s-sw.png b/images/terrain/snow-forest-se-s-sw.png deleted file mode 100644 index c4a7526def7..00000000000 Binary files a/images/terrain/snow-forest-se-s-sw.png and /dev/null differ diff --git a/images/terrain/snow-forest-se-s.png b/images/terrain/snow-forest-se-s.png deleted file mode 100644 index 90879cce13d..00000000000 Binary files a/images/terrain/snow-forest-se-s.png and /dev/null differ diff --git a/images/terrain/snow-forest-se.png b/images/terrain/snow-forest-se.png deleted file mode 100644 index 1b1cc29026a..00000000000 Binary files a/images/terrain/snow-forest-se.png and /dev/null differ diff --git a/images/terrain/snow-forest-sw.png b/images/terrain/snow-forest-sw.png deleted file mode 100644 index bc31dd6e850..00000000000 Binary files a/images/terrain/snow-forest-sw.png and /dev/null differ diff --git a/images/terrain/snow-forest.png b/images/terrain/snow-forest.png index e3016393b84..2a7a4dbf892 100644 Binary files a/images/terrain/snow-forest.png and b/images/terrain/snow-forest.png differ diff --git a/images/terrain/snow-forest2.png b/images/terrain/snow-forest2.png index 06433913884..8b868ae9c1c 100644 Binary files a/images/terrain/snow-forest2.png and b/images/terrain/snow-forest2.png differ diff --git a/images/terrain/snow-forest3.png b/images/terrain/snow-forest3.png index 11ea24651f1..da754105a1b 100644 Binary files a/images/terrain/snow-forest3.png and b/images/terrain/snow-forest3.png differ