Forest update from Mefisto part 2:

remaining images, rainforest, and hills convenience terrains

changelog

@@ -39,8 +39,9 @@ Version 1.11.0+svn:
    * Handle an exception in the SDL_net-based network code (bug #20205)
  * Terrains:
    * Added Unwalkable Overlay terrain (^Qov)
-   * Added Dense Palm (^Ftp), Savanna (^Fts) forest terrains
-   * Updated existing desert palms (^Ftd)
+   * Added Dense Palm (^Ftp), Savanna (^Fts), and Rainforest (^Ftr) terrains
+   * Updated graphics for palms (^Ftd), tropical forest (^Ft),
+     plank bridge (^Bp*), stone bridge (^Bs*), and chasm bridge (^Bcx*)
  * User interface:
    * Healing animations are now played when poison is cured.
    * Moving units to a selected hex field

data/core/terrain-graphics.cfg

@@ -134,8 +134,11 @@
 {NEW:FOREST             H*^Fp,M*^Fp     (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/pine-sparse}
 {NEW:FOREST             *^Fp            (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/pine}
 
-{NEW:FOREST             H*^Ft,M*^Ft     (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical-sparse}
-{NEW:FOREST             *^Ft            (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical}
+{NEW:FOREST             H*^Fpa,M*^Fpa   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/snow-forest-sparse}
+{NEW:FOREST             *^Fpa           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/snow-forest}
+
+{NEW:FOREST             H*^Ft,M*^Ft     (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/jungle-sparse}
+{NEW:FOREST             *^Ft            (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/jungle}
 
 {NEW:FOREST             H*^Ftd,M*^Ftd   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palm-desert-sparse}
 {NEW:FOREST             *^Ftd           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palm-desert}
@@ -143,12 +146,11 @@
 {NEW:FOREST             H*^Ftp,M*^Ftp   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palms-sparse}
 {NEW:FOREST             *^Ftp           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/palms}
 
+{NEW:FOREST             *^Ftr           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/rainforest}
+
 {NEW:FOREST             H*^Fts,M*^Fts   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/savanna-sparse}
 {NEW:FOREST             *^Fts           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/tropical/savanna}
 
-{NEW:FOREST             H*^Fpa,M*^Fpa   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/snow-forest-sparse}
-{NEW:FOREST             *^Fpa           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/snow-forest}
-
 {NEW:FOREST             H*^Fds,M*^Fds   (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/deciduous-summer-sparse}
 {NEW:FOREST             *^Fds           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/deciduous-summer}
 
@@ -176,13 +178,13 @@
 {NEW:FOREST             *^Uf*           (C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*)    forest/mushrooms}
 
 # Great-tree
-{OVERLAY_RANDOM          *^Fet                                                       forest/great-tree}
-{OVERLAY_RANDOM          *^Fetd                                                      forest/great-tree-dead}
+{OVERLAY_RANDOM          *^Fet                                              forest/great-tree}
+{OVERLAY_RANDOM          *^Fetd                                             forest/great-tree-dead}
 
 # Oasis
-{OVERLAY_P               *^Do                              30                 village/desert-oasis-1}
-{OVERLAY_P               *^Do                              43                 village/desert-oasis-2}
-{OVERLAY_P               *^Do                              100                village/desert-oasis-3}
+{OVERLAY_P               *^Do                              30               village/desert-oasis-1}
+{OVERLAY_P               *^Do                              43               village/desert-oasis-2}
+{OVERLAY_P               *^Do                              100              village/desert-oasis-3}
 
 # Swamp
 {OVERLAY_COMPLETE_LF     Ss        (!,Xv,Chs,!,C*,H*,M*,X*,Q*,A*,Ke,Kea,Kud) -85 base2      swamp/reed}

data/core/terrain.cfg

@@ -479,7 +479,7 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=forest/tropical-tile
+    symbol_image=forest/tropical/jungle-tile
     id=tropical_forest
     name= _ "Forest"
     editor_name= _ "Tropical Forest"
@@ -490,6 +490,18 @@
     editor_group=forest
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=forest/tropical/rainforest-tile
+    id=rainforest
+    name= _ "Forest"
+    editor_name= _ "Rainforest"
+    string=^Ftr
+    default_base=Gll
+    aliasof=_bas,Ft
+    mvt_alias=-,_bas,Ft
+    editor_group=forest
+[/terrain_type]
+
 [terrain_type]
     symbol_image=forest/tropical/palm-desert-tile
     id=palm_desert_forest
@@ -838,7 +850,7 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=forest/forested-tropical-hills-tile
+    symbol_image=forest/tropical/jungle-hills-tile
     id=forest_tropical_hills
     name= _ "Hills"
     editor_name= _ "Tropical Forested Hills"
@@ -859,6 +871,28 @@
     editor_group=desert, forest, rough
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=forest/tropical/palms-on-hills-tile
+    id=forest_palm_hills
+    name= _ "Hills"
+    editor_name= _ "Dense Palm Forested Hills"
+    string=Hh^Ftp
+    aliasof=Hh,Ft
+    mvt_alias=-,Hh,Ft
+    editor_group=forest, rough
+[/terrain_type]
+
+[terrain_type]
+    symbol_image=forest/tropical/savanna-hills-tile
+    id=savanna_hills
+    name= _ "Hills"
+    editor_name= _ "Savanna Forested Hills"
+    string=Hhd^Fts
+    aliasof=Hh,Ft
+    mvt_alias=-,Hh,Ft
+    editor_group=forest, rough
+[/terrain_type]
+
 #
 #    ## Interior ##
 #

players_changelog

@@ -27,7 +27,8 @@ Version 1.11.0+svn:
      Portuguese (Brazil), Russian, Slovak, Ukrainian.
 
  * Terrain:
-   * New Unwalkable Overlay (^Qov), Dense Palm (^Ftp), Savanna (^Fts) terrains.
+   * New Unwalkable Overlay (^Qov), Dense Palm (^Ftp), Savanna (^Fts) and
+     Rainforest (^Ftr) terrains.
 
  * User interface:
    * Healing animations are now played when poison is cured.