<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39453 >

Committed trunk revision 13096.

Index: data/amplio/water.spec
===================================================================
--- data/amplio/water.spec      (revision 13095)
+++ data/amplio/water.spec      (working copy)
@@ -25,7 +25,7 @@
 dy = 48
 pixel_border = 1
 
-tiles = { "row", "column","tag"
+tiles = { "row", "column", "tag"
 
 ; Rivers (as special type), and whether north, south, east, west 
 ; also has river or is ocean:
@@ -122,7 +122,7 @@
 dy = 24
 pixel_border = 1
 
-tiles = { "row", "column","tag"
+tiles = { "row", "column", "tag"
 
 ; ocean cell sprites.  See doc/README.graphics
  0, 0,  "t.l0.ocean_cell_u000"
@@ -162,6 +162,7 @@
  2, 15, "t.l0.ocean_cell_r111"
 
 ; coast cell sprites.  See doc/README.graphics
+ 0, 0,  "t.l0.coast_cell_u"
  0, 0,  "t.l0.coast_cell_u000"
  0, 2,  "t.l0.coast_cell_u100"
  0, 4,  "t.l0.coast_cell_u010"
@@ -171,6 +172,7 @@
  0, 12, "t.l0.coast_cell_u011"
  0, 14, "t.l0.coast_cell_u111"
  
+ 1, 0,  "t.l0.coast_cell_d"
  1, 0,  "t.l0.coast_cell_d000"
  1, 2,  "t.l0.coast_cell_d100"
  1, 4,  "t.l0.coast_cell_d010"
@@ -180,6 +182,7 @@
  1, 12, "t.l0.coast_cell_d011"
  1, 14, "t.l0.coast_cell_d111"
 
+ 2, 0,  "t.l0.coast_cell_l"
  2, 0,  "t.l0.coast_cell_l000"
  2, 2,  "t.l0.coast_cell_l100"
  2, 4,  "t.l0.coast_cell_l010"
@@ -189,6 +192,7 @@
  2, 12, "t.l0.coast_cell_l011"
  2, 14, "t.l0.coast_cell_l111"
 
+ 2, 1,  "t.l0.coast_cell_r"
  2, 1,  "t.l0.coast_cell_r000"
  2, 3,  "t.l0.coast_cell_r100"
  2, 5,  "t.l0.coast_cell_r010"
@@ -198,7 +202,44 @@
  2, 13, "t.l0.coast_cell_r011"
  2, 15, "t.l0.coast_cell_r111"
 
-; shelf fallback to coast tiles
+ 0, 0,  "t.l1.coast_cell_u000"
+ 0, 2,  "t.l1.coast_cell_u100"
+ 0, 4,  "t.l1.coast_cell_u010"
+ 0, 6,  "t.l1.coast_cell_u110"
+ 0, 8,  "t.l1.coast_cell_u001"
+ 0, 10, "t.l1.coast_cell_u101"
+ 0, 12, "t.l1.coast_cell_u011"
+ 0, 14, "t.l1.coast_cell_u111"
+ 
+ 1, 0,  "t.l1.coast_cell_d000"
+ 1, 2,  "t.l1.coast_cell_d100"
+ 1, 4,  "t.l1.coast_cell_d010"
+ 1, 6,  "t.l1.coast_cell_d110"
+ 1, 8,  "t.l1.coast_cell_d001"
+ 1, 10, "t.l1.coast_cell_d101"
+ 1, 12, "t.l1.coast_cell_d011"
+ 1, 14, "t.l1.coast_cell_d111"
+
+ 2, 0,  "t.l1.coast_cell_l000"
+ 2, 2,  "t.l1.coast_cell_l100"
+ 2, 4,  "t.l1.coast_cell_l010"
+ 2, 6,  "t.l1.coast_cell_l110"
+ 2, 8,  "t.l1.coast_cell_l001"
+ 2, 10, "t.l1.coast_cell_l101"
+ 2, 12, "t.l1.coast_cell_l011"
+ 2, 14, "t.l1.coast_cell_l111"
+
+ 2, 1,  "t.l1.coast_cell_r000"
+ 2, 3,  "t.l1.coast_cell_r100"
+ 2, 5,  "t.l1.coast_cell_r010"
+ 2, 7,  "t.l1.coast_cell_r110"
+ 2, 9,  "t.l1.coast_cell_r001"
+ 2, 11, "t.l1.coast_cell_r101"
+ 2, 13, "t.l1.coast_cell_r011"
+ 2, 15, "t.l1.coast_cell_r111"
+
+; shelf cell sprites.  See doc/README.graphics
+ 0, 0,  "t.l0.shelf_cell_u"
  0, 0,  "t.l0.shelf_cell_u000"
  0, 2,  "t.l0.shelf_cell_u100"
  0, 4,  "t.l0.shelf_cell_u010"
@@ -208,6 +249,7 @@
  0, 12, "t.l0.shelf_cell_u011"
  0, 14, "t.l0.shelf_cell_u111"
  
+ 1, 0,  "t.l0.shelf_cell_d"
  1, 0,  "t.l0.shelf_cell_d000"
  1, 2,  "t.l0.shelf_cell_d100"
  1, 4,  "t.l0.shelf_cell_d010"
@@ -217,6 +259,7 @@
  1, 12, "t.l0.shelf_cell_d011"
  1, 14, "t.l0.shelf_cell_d111"
 
+ 2, 0,  "t.l0.shelf_cell_l"
  2, 0,  "t.l0.shelf_cell_l000"
  2, 2,  "t.l0.shelf_cell_l100"
  2, 4,  "t.l0.shelf_cell_l010"
@@ -226,6 +269,7 @@
  2, 12, "t.l0.shelf_cell_l011"
  2, 14, "t.l0.shelf_cell_l111"
 
+ 2, 1,  "t.l0.shelf_cell_r"
  2, 1,  "t.l0.shelf_cell_r000"
  2, 3,  "t.l0.shelf_cell_r100"
  2, 5,  "t.l0.shelf_cell_r010"
@@ -235,6 +279,43 @@
  2, 13, "t.l0.shelf_cell_r011"
  2, 15, "t.l0.shelf_cell_r111"
 
+; note: inverse of floor (below)
+ 0, 0,  "t.l1.shelf_cell_u000"
+ 4, 2,  "t.l1.shelf_cell_u100"
+ 4, 14, "t.l1.shelf_cell_u010"
+ 4, 6,  "t.l1.shelf_cell_u110"
+ 4, 8,  "t.l1.shelf_cell_u001"
+ 4, 10, "t.l1.shelf_cell_u101"
+ 4, 12, "t.l1.shelf_cell_u011"
+ 4,  4, "t.l1.shelf_cell_u111"
+ 
+ 1, 0,  "t.l1.shelf_cell_d000"
+ 3, 2,  "t.l1.shelf_cell_d100"
+ 3, 14, "t.l1.shelf_cell_d010"
+ 3, 6,  "t.l1.shelf_cell_d110"
+ 3, 8,  "t.l1.shelf_cell_d001"
+ 3, 10, "t.l1.shelf_cell_d101"
+ 3, 12, "t.l1.shelf_cell_d011"
+ 3,  4, "t.l1.shelf_cell_d111"
+
+ 2, 0,  "t.l1.shelf_cell_l000"
+ 5, 3,  "t.l1.shelf_cell_l100"
+ 5, 15, "t.l1.shelf_cell_l010"
+ 5, 7,  "t.l1.shelf_cell_l110"
+ 5, 9,  "t.l1.shelf_cell_l001"
+ 5, 11, "t.l1.shelf_cell_l101"
+ 5, 13, "t.l1.shelf_cell_l011"
+ 5,  5, "t.l1.shelf_cell_l111"
+
+ 2, 1,  "t.l1.shelf_cell_r000"
+ 5, 2,  "t.l1.shelf_cell_r100"
+ 5, 14,  "t.l1.shelf_cell_r010"
+ 5, 6,  "t.l1.shelf_cell_r110"
+ 5, 8,  "t.l1.shelf_cell_r001"
+ 5, 10, "t.l1.shelf_cell_r101"
+ 5, 12, "t.l1.shelf_cell_r011"
+ 5,  4, "t.l1.shelf_cell_r111"
+
 ; Deep Ocean sprites.
  3, 0,  "t.l0.deep_cell_u000"
  3, 2,  "t.l0.deep_cell_u100"
@@ -273,6 +354,7 @@
  5, 15, "t.l0.deep_cell_r111"
 
 ; ocean floor sprites.
+ 3, 0,  "t.l0.floor_cell_u"
  3, 0,  "t.l0.floor_cell_u000"
  3, 2,  "t.l0.floor_cell_u100"
  3, 4,  "t.l0.floor_cell_u010"
@@ -282,6 +364,7 @@
  3, 12, "t.l0.floor_cell_u011"
  3, 14, "t.l0.floor_cell_u111"
  
+ 4, 0,  "t.l0.floor_cell_d"
  4, 0,  "t.l0.floor_cell_d000"
  4, 2,  "t.l0.floor_cell_d100"
  4, 4,  "t.l0.floor_cell_d010"
@@ -291,6 +374,7 @@
  4, 12, "t.l0.floor_cell_d011"
  4, 14, "t.l0.floor_cell_d111"
 
+ 5, 0,  "t.l0.floor_cell_l"
  5, 0,  "t.l0.floor_cell_l000"
  5, 2,  "t.l0.floor_cell_l100"
  5, 4,  "t.l0.floor_cell_l010"
@@ -300,6 +384,7 @@
  5, 12, "t.l0.floor_cell_l011"
  5, 14, "t.l0.floor_cell_l111"
 
+ 5, 1,  "t.l0.floor_cell_r"
  5, 1,  "t.l0.floor_cell_r000"
  5, 3,  "t.l0.floor_cell_r100"
  5, 5,  "t.l0.floor_cell_r010"
@@ -310,6 +395,7 @@
  5, 15, "t.l0.floor_cell_r111"
 
 ; ocean trench fallback to floor tiles
+ 3, 0,  "t.l0.trench_cell_u"
  3, 0,  "t.l0.trench_cell_u000"
  3, 2,  "t.l0.trench_cell_u100"
  3, 4,  "t.l0.trench_cell_u010"
@@ -319,6 +405,7 @@
  3, 12, "t.l0.trench_cell_u011"
  3, 14, "t.l0.trench_cell_u111"
  
+ 4, 0,  "t.l0.trench_cell_d"
  4, 0,  "t.l0.trench_cell_d000"
  4, 2,  "t.l0.trench_cell_d100"
  4, 4,  "t.l0.trench_cell_d010"
@@ -328,6 +415,7 @@
  4, 12, "t.l0.trench_cell_d011"
  4, 14, "t.l0.trench_cell_d111"
 
+ 5, 0,  "t.l0.trench_cell_l"
  5, 0,  "t.l0.trench_cell_l000"
  5, 2,  "t.l0.trench_cell_l100"
  5, 4,  "t.l0.trench_cell_l010"
@@ -337,6 +425,7 @@
  5, 12, "t.l0.trench_cell_l011"
  5, 14, "t.l0.trench_cell_l111"
 
+ 5, 1,  "t.l0.trench_cell_r"
  5, 1,  "t.l0.trench_cell_r000"
  5, 3,  "t.l0.trench_cell_r100"
  5, 5,  "t.l0.trench_cell_r010"
@@ -347,6 +436,7 @@
  5, 15, "t.l0.trench_cell_r111"
 
 ; ocean ridge fallback to floor tiles
+ 3, 0,  "t.l0.ridge_cell_u"
  3, 0,  "t.l0.ridge_cell_u000"
  3, 2,  "t.l0.ridge_cell_u100"
  3, 4,  "t.l0.ridge_cell_u010"
@@ -356,6 +446,7 @@
  3, 12, "t.l0.ridge_cell_u011"
  3, 14, "t.l0.ridge_cell_u111"
  
+ 4, 0,  "t.l0.ridge_cell_d"
  4, 0,  "t.l0.ridge_cell_d000"
  4, 2,  "t.l0.ridge_cell_d100"
  4, 4,  "t.l0.ridge_cell_d010"
@@ -365,6 +456,7 @@
  4, 12, "t.l0.ridge_cell_d011"
  4, 14, "t.l0.ridge_cell_d111"
 
+ 5, 0,  "t.l0.ridge_cell_l"
  5, 0,  "t.l0.ridge_cell_l000"
  5, 2,  "t.l0.ridge_cell_l100"
  5, 4,  "t.l0.ridge_cell_l010"
@@ -374,6 +466,7 @@
  5, 12, "t.l0.ridge_cell_l011"
  5, 14, "t.l0.ridge_cell_l111"
 
+ 5, 1,  "t.l0.ridge_cell_r"
  5, 1,  "t.l0.ridge_cell_r000"
  5, 3,  "t.l0.ridge_cell_r100"
  5, 5,  "t.l0.ridge_cell_r010"
@@ -384,6 +477,7 @@
  5, 15, "t.l0.ridge_cell_r111"
 
 ; ocean vent fallback to floor tiles
+ 3, 0,  "t.l0.vent_cell_u"
  3, 0,  "t.l0.vent_cell_u000"
  3, 2,  "t.l0.vent_cell_u100"
  3, 4,  "t.l0.vent_cell_u010"
@@ -393,6 +487,7 @@
  3, 12, "t.l0.vent_cell_u011"
  3, 14, "t.l0.vent_cell_u111"
  
+ 4, 0,  "t.l0.vent_cell_d"
  4, 0,  "t.l0.vent_cell_d000"
  4, 2,  "t.l0.vent_cell_d100"
  4, 4,  "t.l0.vent_cell_d010"
@@ -402,6 +497,7 @@
  4, 12, "t.l0.vent_cell_d011"
  4, 14, "t.l0.vent_cell_d111"
 
+ 5, 0,  "t.l0.vent_cell_l"
  5, 0,  "t.l0.vent_cell_l000"
  5, 2,  "t.l0.vent_cell_l100"
  5, 4,  "t.l0.vent_cell_l010"
@@ -411,6 +507,7 @@
  5, 12, "t.l0.vent_cell_l011"
  5, 14, "t.l0.vent_cell_l111"
 
+ 5, 1,  "t.l0.vent_cell_r"
  5, 1,  "t.l0.vent_cell_r000"
  5, 3,  "t.l0.vent_cell_r100"
  5, 5,  "t.l0.vent_cell_r010"
Index: data/amplio/terrain1.spec
===================================================================
--- data/amplio/terrain1.spec   (revision 13095)
+++ data/amplio/terrain1.spec   (working copy)
@@ -24,7 +24,7 @@
 dy = 48
 pixel_border = 1
 
-tiles = { "row", "column","tag"
+tiles = { "row", "column", "tag"
 
 ; terrain
  0,  0, "t.l0.desert1"
@@ -44,6 +44,7 @@
  6,  0, "t.l0.tundra1"
 
  7,  0, "t.l0.arctic1"
+ 7,  0, "t.l1.arctic1"
 
  8,  0, "t.l0.swamp1"
 
Index: data/amplio.tilespec
===================================================================
--- data/amplio.tilespec        (revision 13095)
+++ data/amplio.tilespec        (working copy)
@@ -100,23 +100,29 @@
 
 [layer1]
 match_style = "BOOL"
-match_types = "forest", "hills", "mountains", "ridge", "trench", "deep"
+match_types = "forest", "hills", "mountains", "shallow", "ridge", "trench", 
"deep"
 
 ; Water graphics referenced by terrain.ruleset
 ;
 [terrain_coast]
 is_blended = 1
-num_layers = 1
-layer0_match_style = "bool"
+num_layers = 2
+;layer0_match_style = "bool"
 layer0_match_type = "water"
 layer0_cell_type = "rect"
+layer1_match_style = "bool"
+layer1_match_type  = "shallow"
+layer1_cell_type   = "rect"
 
 [terrain_shelf]
 is_blended = 0
-num_layers = 1
-layer0_match_style = "bool"
+num_layers = 2
+;layer0_match_style = "bool"
 layer0_match_type = "water"
 layer0_cell_type = "rect"
+layer1_match_style = "bool"
+layer1_match_type  = "shallow"
+layer1_cell_type   = "rect"
 
 [terrain_floor]
 is_blended = 0
@@ -153,9 +159,11 @@
 ; Land graphics referenced by terrain.ruleset
 ;
 [terrain_arctic]
-is_blended = 1
-num_layers = 1
+; TODO: ice cliffs
+is_blended = 0
+num_layers = 2
 layer0_match_type = "land"
+layer1_match_type  = "shallow"
 mine_sprite = "tx.oil_mine"
 
 [terrain_desert]
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to