testing some new water colors.

some water animations temporarily disabled.

data/core/terrain-graphics.cfg

@@ -16,6 +16,7 @@
 # NOTE the terrain _off^_usr gets its definition from the code since it's
 # themable
 
+
  # Bridges must be on top because they set some flags depending on their orientation that might be used by other macros later
  {TRACK               *^Bw\ *^Bw| *^Bw/                   bridge/wood}
  # add transition bridges<->bridges wherever images are missing 	 
@@ -344,9 +345,13 @@
 {OVERLAY_RANDOM_L        Wwf                                         -519          water/ford}
 
 #ANIMATED
-{TERRAIN_BASE_B          Wo		ANIMATION_15		   water/ocean}
+# Temporary non-animated water
+{TERRAIN_BASE            Wo		       		   water/ocean}
+{TERRAIN_BASE	         Ww,Wwf				   water/coast}
 
-{TERRAIN_BASE_B	         Ww,Wwf		ANIMATION_15		   water/coast}
+#{TERRAIN_BASE_B          Wo		ANIMATION_15		   water/ocean}
+
+#{TERRAIN_BASE_B         Ww,Wwf		ANIMATION_15		   water/coast}
 {TERRAIN_BASE_B	         Wwt		ANIMATION_15		   water/coast-tropical}
 
 {TERRAIN_BASE_RANDOM     Wwr                                                       water/reef}
@@ -515,8 +520,8 @@
 {TRANSITION_COMPLETE_L     Md               (!,Md,Qx*)                  -160               mountains/desert}
 
 # Special mountain to dry/desert terrain trans
-{TRANSITION_COMPLETE_LF    (Hhd,Rb,Re,Rd,D*,Gd)   M*                     0   transition3   mountains/blend-from-dry}
-{TRANSITION_COMPLETE_L     (M*)             (Hhd,Rb,Re,Rd,D*,Gd)        -166               hills/dry}
+{TRANSITION_COMPLETE_LF    (Hd,Hhd,Rb,Re,Rd,D*,Gd)   M*                  0   transition3   mountains/blend-from-dry}
+{TRANSITION_COMPLETE_L     (M*)             (Hd,Hhd,Rb,Re,Rd,D*,Gd)     -166               hills/dry}
 
 {TRANSITION_COMPLETE_L     (Ms,Ha)          Hh*                         -170               hills/snow-to-hills}
 {TRANSITION_COMPLETE_L     (Ms,Ha)          (W*,Ss)                     -171               hills/snow-to-water}
@@ -641,14 +646,14 @@
 {TRANSITION_COMPLETE_LF     Wwf              (Ww,Wwt,Wwr,Wo,Ss)             -515  transition2  water/ford}
 
 # For now don't need these non-animated transitions (i think...)
-#{TRANSITION_COMPLETE_L     (Wwr)            (!,Ww,Wwr,Mm,Ms,Wwf)           -520               water/coast}
-#{TRANSITION_COMPLETE_L     (Ww,Wwf)         (!,Ww,Wwr,Mm,Ms,Wo,Wwt)        -520               water/coast}
+{TRANSITION_COMPLETE_L     (Wwr)            (!,Ww,Wwr,Mm,Ms,Wwf)           -520               water/coast}
+{TRANSITION_COMPLETE_L     (Ww,Wwf)         (!,Ww,Wwr,Mm,Ms)        -520               water/coast}
 #{TRANSITION_COMPLETE_L     (Wwt)            (!,Ww,Wwr,Mm,Ms,Wwf,Wo,Wwt)    -520               water/coast-tropical}
-#{TRANSITION_COMPLETE_L     Wo               (!,Wo,Ww,Wwt)                  -540               water/ocean}
+{TRANSITION_COMPLETE_L     Wo               (!,Wo,Ww,Wwt)                  -540               water/ocean}
 
-{TRANSITION_COMPLETE_LB    (Ww,Wwf)          W*                           -550 ANIMATION_15  water/coast}
+#{TRANSITION_COMPLETE_LB    (Ww,Wwf)          W*                           -550 ANIMATION_15  water/coast}
 {TRANSITION_COMPLETE_LB    Wwt               W*                           -555 ANIMATION_15  water/coast-tropical}
-{TRANSITION_COMPLETE_LB    Wo                W*                           -560 ANIMATION_15  water/ocean}
+#{TRANSITION_COMPLETE_LB    Wo                W*                           -560 ANIMATION_15  water/ocean}
 
 #WARNING : castles are at layer -1, probably to be fixed in 1.9 time
 {TRANSITION_COMPLETE_LF    Chw              (Ch,Chr,Cha)                      0     transition2  castle/sunken-ruin}
@@ -662,6 +667,8 @@
 # ugly fillups for missing transitions
 {TRANSITION_COMPLETE_L	Ai	_off^_usr	            -800		ice}
 
+
+
 # Default terrain
 {TERRAIN_BASE _s void}
 {TERRAIN_BASE *  void}