<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39453 >
Here is the 3 layer solution, with the border between shallow and deep
water. The graphics have some problems, but overall it's workable.
Note that all water now has coastline with the glacier, using the new
match_with (pair) revision.
Also, updated the ocean.png and water.png graphics a bit, although they
still need much more work.
Committed trunk revision 13118.
Index: data/amplio/water.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/amplio/water.spec
===================================================================
--- data/amplio/water.spec (revision 13117)
+++ data/amplio/water.spec (working copy)
@@ -73,6 +73,25 @@
10, 2, "tx.river_outlet_s"
10, 3, "tx.river_outlet_w"
+; ocean vent as overlay
+
+ 4, 0, "t.l1.vent_n0e0s0w0"
+ 4, 1, "t.l1.vent_n0e0s0w1"
+ 4, 2, "t.l1.vent_n0e0s1w0"
+ 4, 3, "t.l1.vent_n0e0s1w1"
+ 4, 4, "t.l1.vent_n0e1s0w0"
+ 4, 5, "t.l1.vent_n0e1s0w1"
+ 4, 6, "t.l1.vent_n0e1s1w0"
+ 4, 7, "t.l1.vent_n0e1s1w1"
+ 5, 0, "t.l1.vent_n1e0s0w0"
+ 5, 1, "t.l1.vent_n1e0s0w1"
+ 5, 2, "t.l1.vent_n1e0s1w0"
+ 5, 3, "t.l1.vent_n1e0s1w1"
+ 5, 4, "t.l1.vent_n1e1s0w0"
+ 5, 5, "t.l1.vent_n1e1s0w1"
+ 5, 6, "t.l1.vent_n1e1s1w0"
+ 5, 7, "t.l1.vent_n1e1s1w1"
+
; ocean ridge as overlay
6, 0, "t.l1.ridge_n0e0s0w0"
@@ -124,397 +143,226 @@
tiles = { "row", "column", "tag"
-; ocean cell sprites. See doc/README.graphics
- 0, 0, "t.l0.ocean_cell_u000"
- 0, 2, "t.l0.ocean_cell_u100"
- 0, 4, "t.l0.ocean_cell_u010"
- 0, 6, "t.l0.ocean_cell_u110"
- 0, 8, "t.l0.ocean_cell_u001"
- 0, 10, "t.l0.ocean_cell_u101"
- 0, 12, "t.l0.ocean_cell_u011"
- 0, 14, "t.l0.ocean_cell_u111"
+; coastal ice cell sprites:
+ 0, 0, "t.l1.coast_cell_u_w_w_w" ;vacant cell
+ 0, 2, "t.l1.coast_cell_u_i_w_w"
+ 0, 4, "t.l1.coast_cell_u_w_i_w"
+ 0, 6, "t.l1.coast_cell_u_i_i_w"
+ 0, 8, "t.l1.coast_cell_u_w_w_i"
+ 0, 10, "t.l1.coast_cell_u_i_w_i"
+ 0, 12, "t.l1.coast_cell_u_w_i_i"
+ 0, 14, "t.l1.coast_cell_u_i_i_i"
- 1, 0, "t.l0.ocean_cell_d000"
- 1, 2, "t.l0.ocean_cell_d100"
- 1, 4, "t.l0.ocean_cell_d010"
- 1, 6, "t.l0.ocean_cell_d110"
- 1, 8, "t.l0.ocean_cell_d001"
- 1, 10, "t.l0.ocean_cell_d101"
- 1, 12, "t.l0.ocean_cell_d011"
- 1, 14, "t.l0.ocean_cell_d111"
+ 1, 0, "t.l1.coast_cell_d_w_w_w" ;vacant cell
+ 1, 2, "t.l1.coast_cell_d_i_w_w"
+ 1, 4, "t.l1.coast_cell_d_w_i_w"
+ 1, 6, "t.l1.coast_cell_d_i_i_w"
+ 1, 8, "t.l1.coast_cell_d_w_w_i"
+ 1, 10, "t.l1.coast_cell_d_i_w_i"
+ 1, 12, "t.l1.coast_cell_d_w_i_i"
+ 1, 14, "t.l1.coast_cell_d_i_i_i"
- 2, 0, "t.l0.ocean_cell_l000"
- 2, 2, "t.l0.ocean_cell_l100"
- 2, 4, "t.l0.ocean_cell_l010"
- 2, 6, "t.l0.ocean_cell_l110"
- 2, 8, "t.l0.ocean_cell_l001"
- 2, 10, "t.l0.ocean_cell_l101"
- 2, 12, "t.l0.ocean_cell_l011"
- 2, 14, "t.l0.ocean_cell_l111"
+ 2, 0, "t.l1.coast_cell_l_w_w_w" ;vacant cell
+ 2, 2, "t.l1.coast_cell_l_i_w_w"
+ 2, 4, "t.l1.coast_cell_l_w_i_w"
+ 2, 6, "t.l1.coast_cell_l_i_i_w"
+ 2, 8, "t.l1.coast_cell_l_w_w_i"
+ 2, 10, "t.l1.coast_cell_l_i_w_i"
+ 2, 12, "t.l1.coast_cell_l_w_i_i"
+ 2, 14, "t.l1.coast_cell_l_i_i_i"
- 2, 1, "t.l0.ocean_cell_r000"
- 2, 3, "t.l0.ocean_cell_r100"
- 2, 5, "t.l0.ocean_cell_r010"
- 2, 7, "t.l0.ocean_cell_r110"
- 2, 9, "t.l0.ocean_cell_r001"
- 2, 11, "t.l0.ocean_cell_r101"
- 2, 13, "t.l0.ocean_cell_r011"
- 2, 15, "t.l0.ocean_cell_r111"
+ 2, 1, "t.l1.coast_cell_r_w_w_w"
+ 2, 3, "t.l1.coast_cell_r_i_w_w"
+ 2, 5, "t.l1.coast_cell_r_w_i_w"
+ 2, 7, "t.l1.coast_cell_r_i_i_w"
+ 2, 9, "t.l1.coast_cell_r_w_w_i"
+ 2, 11, "t.l1.coast_cell_r_i_w_i"
+ 2, 13, "t.l1.coast_cell_r_w_i_i"
+ 2, 15, "t.l1.coast_cell_r_i_i_i"
-; 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"
- 0, 6, "t.l0.coast_cell_u110"
- 0, 8, "t.l0.coast_cell_u001"
- 0, 10, "t.l0.coast_cell_u101"
- 0, 12, "t.l0.coast_cell_u011"
- 0, 14, "t.l0.coast_cell_u111"
+; ocean shelf ice cell sprites:
+ 0, 0, "t.l1.shelf_cell_u_w_w_w" ;vacant cell
+ 0, 2, "t.l1.shelf_cell_u_i_w_w"
+ 0, 4, "t.l1.shelf_cell_u_w_i_w"
+ 0, 6, "t.l1.shelf_cell_u_i_i_w"
+ 0, 8, "t.l1.shelf_cell_u_w_w_i"
+ 0, 10, "t.l1.shelf_cell_u_i_w_i"
+ 0, 12, "t.l1.shelf_cell_u_w_i_i"
+ 0, 14, "t.l1.shelf_cell_u_i_i_i"
- 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"
- 1, 6, "t.l0.coast_cell_d110"
- 1, 8, "t.l0.coast_cell_d001"
- 1, 10, "t.l0.coast_cell_d101"
- 1, 12, "t.l0.coast_cell_d011"
- 1, 14, "t.l0.coast_cell_d111"
+ 1, 0, "t.l1.shelf_cell_d_w_w_w" ;vacant cell
+ 1, 2, "t.l1.shelf_cell_d_i_w_w"
+ 1, 4, "t.l1.shelf_cell_d_w_i_w"
+ 1, 6, "t.l1.shelf_cell_d_i_i_w"
+ 1, 8, "t.l1.shelf_cell_d_w_w_i"
+ 1, 10, "t.l1.shelf_cell_d_i_w_i"
+ 1, 12, "t.l1.shelf_cell_d_w_i_i"
+ 1, 14, "t.l1.shelf_cell_d_i_i_i"
- 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"
- 2, 6, "t.l0.coast_cell_l110"
- 2, 8, "t.l0.coast_cell_l001"
- 2, 10, "t.l0.coast_cell_l101"
- 2, 12, "t.l0.coast_cell_l011"
- 2, 14, "t.l0.coast_cell_l111"
+ 2, 0, "t.l1.shelf_cell_l_w_w_w" ;vacant cell
+ 2, 2, "t.l1.shelf_cell_l_i_w_w"
+ 2, 4, "t.l1.shelf_cell_l_w_i_w"
+ 2, 6, "t.l1.shelf_cell_l_i_i_w"
+ 2, 8, "t.l1.shelf_cell_l_w_w_i"
+ 2, 10, "t.l1.shelf_cell_l_i_w_i"
+ 2, 12, "t.l1.shelf_cell_l_w_i_i"
+ 2, 14, "t.l1.shelf_cell_l_i_i_i"
- 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"
- 2, 7, "t.l0.coast_cell_r110"
- 2, 9, "t.l0.coast_cell_r001"
- 2, 11, "t.l0.coast_cell_r101"
- 2, 13, "t.l0.coast_cell_r011"
- 2, 15, "t.l0.coast_cell_r111"
+ 2, 1, "t.l1.shelf_cell_r_w_w_w"
+ 2, 3, "t.l1.shelf_cell_r_i_w_w"
+ 2, 5, "t.l1.shelf_cell_r_w_i_w"
+ 2, 7, "t.l1.shelf_cell_r_i_i_w"
+ 2, 9, "t.l1.shelf_cell_r_w_w_i"
+ 2, 11, "t.l1.shelf_cell_r_i_w_i"
+ 2, 13, "t.l1.shelf_cell_r_w_i_i"
+ 2, 15, "t.l1.shelf_cell_r_i_i_i"
- 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"
+; ocean floor ice cell sprites:
+ 0, 0, "t.l1.floor_cell_u_w_w_w" ;vacant cell
+ 0, 2, "t.l1.floor_cell_u_i_w_w"
+ 0, 4, "t.l1.floor_cell_u_w_i_w"
+ 0, 6, "t.l1.floor_cell_u_i_i_w"
+ 0, 8, "t.l1.floor_cell_u_w_w_i"
+ 0, 10, "t.l1.floor_cell_u_i_w_i"
+ 0, 12, "t.l1.floor_cell_u_w_i_i"
+ 0, 14, "t.l1.floor_cell_u_i_i_i"
- 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"
+ 1, 0, "t.l1.floor_cell_d_w_w_w" ;vacant cell
+ 1, 2, "t.l1.floor_cell_d_i_w_w"
+ 1, 4, "t.l1.floor_cell_d_w_i_w"
+ 1, 6, "t.l1.floor_cell_d_i_i_w"
+ 1, 8, "t.l1.floor_cell_d_w_w_i"
+ 1, 10, "t.l1.floor_cell_d_i_w_i"
+ 1, 12, "t.l1.floor_cell_d_w_i_i"
+ 1, 14, "t.l1.floor_cell_d_i_i_i"
- 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, 0, "t.l1.floor_cell_l_w_w_w" ;vacant cell
+ 2, 2, "t.l1.floor_cell_l_i_w_w"
+ 2, 4, "t.l1.floor_cell_l_w_i_w"
+ 2, 6, "t.l1.floor_cell_l_i_i_w"
+ 2, 8, "t.l1.floor_cell_l_w_w_i"
+ 2, 10, "t.l1.floor_cell_l_i_w_i"
+ 2, 12, "t.l1.floor_cell_l_w_i_i"
+ 2, 14, "t.l1.floor_cell_l_i_i_i"
- 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"
+ 2, 1, "t.l1.floor_cell_r_w_w_w"
+ 2, 3, "t.l1.floor_cell_r_i_w_w"
+ 2, 5, "t.l1.floor_cell_r_w_i_w"
+ 2, 7, "t.l1.floor_cell_r_i_i_w"
+ 2, 9, "t.l1.floor_cell_r_w_w_i"
+ 2, 11, "t.l1.floor_cell_r_i_w_i"
+ 2, 13, "t.l1.floor_cell_r_w_i_i"
+ 2, 15, "t.l1.floor_cell_r_i_i_i"
-; 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"
- 0, 6, "t.l0.shelf_cell_u110"
- 0, 8, "t.l0.shelf_cell_u001"
- 0, 10, "t.l0.shelf_cell_u101"
- 0, 12, "t.l0.shelf_cell_u011"
- 0, 14, "t.l0.shelf_cell_u111"
+; ocean trench ice cell sprites:
+ 0, 0, "t.l2.trench_cell_u_w_w_w" ;vacant cell
+ 0, 2, "t.l2.trench_cell_u_i_w_w"
+ 0, 4, "t.l2.trench_cell_u_w_i_w"
+ 0, 6, "t.l2.trench_cell_u_i_i_w"
+ 0, 8, "t.l2.trench_cell_u_w_w_i"
+ 0, 10, "t.l2.trench_cell_u_i_w_i"
+ 0, 12, "t.l2.trench_cell_u_w_i_i"
+ 0, 14, "t.l2.trench_cell_u_i_i_i"
- 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"
- 1, 6, "t.l0.shelf_cell_d110"
- 1, 8, "t.l0.shelf_cell_d001"
- 1, 10, "t.l0.shelf_cell_d101"
- 1, 12, "t.l0.shelf_cell_d011"
- 1, 14, "t.l0.shelf_cell_d111"
+ 1, 0, "t.l2.trench_cell_d_w_w_w" ;vacant cell
+ 1, 2, "t.l2.trench_cell_d_i_w_w"
+ 1, 4, "t.l2.trench_cell_d_w_i_w"
+ 1, 6, "t.l2.trench_cell_d_i_i_w"
+ 1, 8, "t.l2.trench_cell_d_w_w_i"
+ 1, 10, "t.l2.trench_cell_d_i_w_i"
+ 1, 12, "t.l2.trench_cell_d_w_i_i"
+ 1, 14, "t.l2.trench_cell_d_i_i_i"
- 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"
- 2, 6, "t.l0.shelf_cell_l110"
- 2, 8, "t.l0.shelf_cell_l001"
- 2, 10, "t.l0.shelf_cell_l101"
- 2, 12, "t.l0.shelf_cell_l011"
- 2, 14, "t.l0.shelf_cell_l111"
+ 2, 0, "t.l2.trench_cell_l_w_w_w" ;vacant cell
+ 2, 2, "t.l2.trench_cell_l_i_w_w"
+ 2, 4, "t.l2.trench_cell_l_w_i_w"
+ 2, 6, "t.l2.trench_cell_l_i_i_w"
+ 2, 8, "t.l2.trench_cell_l_w_w_i"
+ 2, 10, "t.l2.trench_cell_l_i_w_i"
+ 2, 12, "t.l2.trench_cell_l_w_i_i"
+ 2, 14, "t.l2.trench_cell_l_i_i_i"
- 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"
- 2, 7, "t.l0.shelf_cell_r110"
- 2, 9, "t.l0.shelf_cell_r001"
- 2, 11, "t.l0.shelf_cell_r101"
- 2, 13, "t.l0.shelf_cell_r011"
- 2, 15, "t.l0.shelf_cell_r111"
+ 2, 1, "t.l2.trench_cell_r_w_w_w"
+ 2, 3, "t.l2.trench_cell_r_i_w_w"
+ 2, 5, "t.l2.trench_cell_r_w_i_w"
+ 2, 7, "t.l2.trench_cell_r_i_i_w"
+ 2, 9, "t.l2.trench_cell_r_w_w_i"
+ 2, 11, "t.l2.trench_cell_r_i_w_i"
+ 2, 13, "t.l2.trench_cell_r_w_i_i"
+ 2, 15, "t.l2.trench_cell_r_i_i_i"
-; 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"
+; ocean ridge ice cell sprites:
+ 0, 0, "t.l2.ridge_cell_u_w_w_w" ;vacant cell
+ 0, 2, "t.l2.ridge_cell_u_i_w_w"
+ 0, 4, "t.l2.ridge_cell_u_w_i_w"
+ 0, 6, "t.l2.ridge_cell_u_i_i_w"
+ 0, 8, "t.l2.ridge_cell_u_w_w_i"
+ 0, 10, "t.l2.ridge_cell_u_i_w_i"
+ 0, 12, "t.l2.ridge_cell_u_w_i_i"
+ 0, 14, "t.l2.ridge_cell_u_i_i_i"
- 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"
+ 1, 0, "t.l2.ridge_cell_d_w_w_w" ;vacant cell
+ 1, 2, "t.l2.ridge_cell_d_i_w_w"
+ 1, 4, "t.l2.ridge_cell_d_w_i_w"
+ 1, 6, "t.l2.ridge_cell_d_i_i_w"
+ 1, 8, "t.l2.ridge_cell_d_w_w_i"
+ 1, 10, "t.l2.ridge_cell_d_i_w_i"
+ 1, 12, "t.l2.ridge_cell_d_w_i_i"
+ 1, 14, "t.l2.ridge_cell_d_i_i_i"
- 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, 0, "t.l2.ridge_cell_l_w_w_w" ;vacant cell
+ 2, 2, "t.l2.ridge_cell_l_i_w_w"
+ 2, 4, "t.l2.ridge_cell_l_w_i_w"
+ 2, 6, "t.l2.ridge_cell_l_i_i_w"
+ 2, 8, "t.l2.ridge_cell_l_w_w_i"
+ 2, 10, "t.l2.ridge_cell_l_i_w_i"
+ 2, 12, "t.l2.ridge_cell_l_w_i_i"
+ 2, 14, "t.l2.ridge_cell_l_i_i_i"
- 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"
+ 2, 1, "t.l2.ridge_cell_r_w_w_w"
+ 2, 3, "t.l2.ridge_cell_r_i_w_w"
+ 2, 5, "t.l2.ridge_cell_r_w_i_w"
+ 2, 7, "t.l2.ridge_cell_r_i_i_w"
+ 2, 9, "t.l2.ridge_cell_r_w_w_i"
+ 2, 11, "t.l2.ridge_cell_r_i_w_i"
+ 2, 13, "t.l2.ridge_cell_r_w_i_i"
+ 2, 15, "t.l2.ridge_cell_r_i_i_i"
-; Deep Ocean sprites.
- 3, 0, "t.l0.deep_cell_u000"
- 3, 2, "t.l0.deep_cell_u100"
- 3, 4, "t.l0.deep_cell_u010"
- 3, 6, "t.l0.deep_cell_u110"
- 3, 8, "t.l0.deep_cell_u001"
- 3, 10, "t.l0.deep_cell_u101"
- 3, 12, "t.l0.deep_cell_u011"
- 3, 14, "t.l0.deep_cell_u111"
+; ocean vent ice cell sprites:
+ 0, 0, "t.l2.vent_cell_u_w_w_w" ;vacant cell
+ 0, 2, "t.l2.vent_cell_u_i_w_w"
+ 0, 4, "t.l2.vent_cell_u_w_i_w"
+ 0, 6, "t.l2.vent_cell_u_i_i_w"
+ 0, 8, "t.l2.vent_cell_u_w_w_i"
+ 0, 10, "t.l2.vent_cell_u_i_w_i"
+ 0, 12, "t.l2.vent_cell_u_w_i_i"
+ 0, 14, "t.l2.vent_cell_u_i_i_i"
- 4, 0, "t.l0.deep_cell_d000"
- 4, 2, "t.l0.deep_cell_d100"
- 4, 4, "t.l0.deep_cell_d010"
- 4, 6, "t.l0.deep_cell_d110"
- 4, 8, "t.l0.deep_cell_d001"
- 4, 10, "t.l0.deep_cell_d101"
- 4, 12, "t.l0.deep_cell_d011"
- 4, 14, "t.l0.deep_cell_d111"
+ 1, 0, "t.l2.vent_cell_d_w_w_w" ;vacant cell
+ 1, 2, "t.l2.vent_cell_d_i_w_w"
+ 1, 4, "t.l2.vent_cell_d_w_i_w"
+ 1, 6, "t.l2.vent_cell_d_i_i_w"
+ 1, 8, "t.l2.vent_cell_d_w_w_i"
+ 1, 10, "t.l2.vent_cell_d_i_w_i"
+ 1, 12, "t.l2.vent_cell_d_w_i_i"
+ 1, 14, "t.l2.vent_cell_d_i_i_i"
- 5, 0, "t.l0.deep_cell_l000"
- 5, 2, "t.l0.deep_cell_l100"
- 5, 4, "t.l0.deep_cell_l010"
- 5, 6, "t.l0.deep_cell_l110"
- 5, 8, "t.l0.deep_cell_l001"
- 5, 10, "t.l0.deep_cell_l101"
- 5, 12, "t.l0.deep_cell_l011"
- 5, 14, "t.l0.deep_cell_l111"
+ 2, 0, "t.l2.vent_cell_l_w_w_w" ;vacant cell
+ 2, 2, "t.l2.vent_cell_l_i_w_w"
+ 2, 4, "t.l2.vent_cell_l_w_i_w"
+ 2, 6, "t.l2.vent_cell_l_i_i_w"
+ 2, 8, "t.l2.vent_cell_l_w_w_i"
+ 2, 10, "t.l2.vent_cell_l_i_w_i"
+ 2, 12, "t.l2.vent_cell_l_w_i_i"
+ 2, 14, "t.l2.vent_cell_l_i_i_i"
- 5, 1, "t.l0.deep_cell_r000"
- 5, 3, "t.l0.deep_cell_r100"
- 5, 5, "t.l0.deep_cell_r010"
- 5, 7, "t.l0.deep_cell_r110"
- 5, 9, "t.l0.deep_cell_r001"
- 5, 11, "t.l0.deep_cell_r101"
- 5, 13, "t.l0.deep_cell_r011"
- 5, 15, "t.l0.deep_cell_r111"
+ 2, 1, "t.l2.vent_cell_r_w_w_w"
+ 2, 3, "t.l2.vent_cell_r_i_w_w"
+ 2, 5, "t.l2.vent_cell_r_w_i_w"
+ 2, 7, "t.l2.vent_cell_r_i_i_w"
+ 2, 9, "t.l2.vent_cell_r_w_w_i"
+ 2, 11, "t.l2.vent_cell_r_i_w_i"
+ 2, 13, "t.l2.vent_cell_r_w_i_i"
+ 2, 15, "t.l2.vent_cell_r_i_i_i"
-; 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"
- 3, 6, "t.l0.floor_cell_u110"
- 3, 8, "t.l0.floor_cell_u001"
- 3, 10, "t.l0.floor_cell_u101"
- 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"
- 4, 6, "t.l0.floor_cell_d110"
- 4, 8, "t.l0.floor_cell_d001"
- 4, 10, "t.l0.floor_cell_d101"
- 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"
- 5, 6, "t.l0.floor_cell_l110"
- 5, 8, "t.l0.floor_cell_l001"
- 5, 10, "t.l0.floor_cell_l101"
- 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"
- 5, 7, "t.l0.floor_cell_r110"
- 5, 9, "t.l0.floor_cell_r001"
- 5, 11, "t.l0.floor_cell_r101"
- 5, 13, "t.l0.floor_cell_r011"
- 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"
- 3, 6, "t.l0.trench_cell_u110"
- 3, 8, "t.l0.trench_cell_u001"
- 3, 10, "t.l0.trench_cell_u101"
- 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"
- 4, 6, "t.l0.trench_cell_d110"
- 4, 8, "t.l0.trench_cell_d001"
- 4, 10, "t.l0.trench_cell_d101"
- 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"
- 5, 6, "t.l0.trench_cell_l110"
- 5, 8, "t.l0.trench_cell_l001"
- 5, 10, "t.l0.trench_cell_l101"
- 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"
- 5, 7, "t.l0.trench_cell_r110"
- 5, 9, "t.l0.trench_cell_r001"
- 5, 11, "t.l0.trench_cell_r101"
- 5, 13, "t.l0.trench_cell_r011"
- 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"
- 3, 6, "t.l0.ridge_cell_u110"
- 3, 8, "t.l0.ridge_cell_u001"
- 3, 10, "t.l0.ridge_cell_u101"
- 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"
- 4, 6, "t.l0.ridge_cell_d110"
- 4, 8, "t.l0.ridge_cell_d001"
- 4, 10, "t.l0.ridge_cell_d101"
- 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"
- 5, 6, "t.l0.ridge_cell_l110"
- 5, 8, "t.l0.ridge_cell_l001"
- 5, 10, "t.l0.ridge_cell_l101"
- 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"
- 5, 7, "t.l0.ridge_cell_r110"
- 5, 9, "t.l0.ridge_cell_r001"
- 5, 11, "t.l0.ridge_cell_r101"
- 5, 13, "t.l0.ridge_cell_r011"
- 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"
- 3, 6, "t.l0.vent_cell_u110"
- 3, 8, "t.l0.vent_cell_u001"
- 3, 10, "t.l0.vent_cell_u101"
- 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"
- 4, 6, "t.l0.vent_cell_d110"
- 4, 8, "t.l0.vent_cell_d001"
- 4, 10, "t.l0.vent_cell_d101"
- 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"
- 5, 6, "t.l0.vent_cell_l110"
- 5, 8, "t.l0.vent_cell_l001"
- 5, 10, "t.l0.vent_cell_l101"
- 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"
- 5, 7, "t.l0.vent_cell_r110"
- 5, 9, "t.l0.vent_cell_r001"
- 5, 11, "t.l0.vent_cell_r101"
- 5, 13, "t.l0.vent_cell_r011"
- 5, 15, "t.l0.vent_cell_r111"
-
}
Index: data/amplio/terrain1.spec
===================================================================
--- data/amplio/terrain1.spec (revision 13117)
+++ data/amplio/terrain1.spec (working copy)
@@ -44,7 +44,8 @@
6, 0, "t.l0.tundra1"
7, 0, "t.l0.arctic1"
- 7, 0, "t.l1.arctic1"
+;7, 0, "t.l1.arctic1" not redrawn
+;7, 0, "t.l2.arctic1" not redrawn
8, 0, "t.l0.swamp1"
@@ -123,7 +124,7 @@
15, 0, "tx.darkness"
15, 2, "mask.tile"
15, 2, "t.unknown1"
- 15, 3, "t.blend.ocean"
+ 7, 0, "t.blend.arctic" ;ice over neighbors
15, 3, "t.blend.coast"
15, 4, "user.attention"
15, 5, "tx.fog"
Index: data/amplio/ocean.spec
===================================================================
--- data/amplio/ocean.spec (revision 13117)
+++ data/amplio/ocean.spec (working copy)
@@ -25,85 +25,86 @@
tiles = { "row", "column", "tag"
+;land, shallow(coast/shelf), deep(floor/trench/ridge/vent)
8, 8, "t.l0.cellgroup_d_d_d_d"
- 8, 7, "t.l0.cellgroup_o_d_d_d"
- 8, 6, "t.l0.cellgroup_c_d_d_d"
- 8, 5, "t.l0.cellgroup_d_d_d_o"
- 8, 4, "t.l0.cellgroup_o_d_d_o"
- 8, 3, "t.l0.cellgroup_c_d_d_o"
- 8, 2, "t.l0.cellgroup_d_d_d_c"
- 8, 1, "t.l0.cellgroup_o_d_d_c"
- 8, 0, "t.l0.cellgroup_c_d_d_c"
- 7, 8, "t.l0.cellgroup_d_o_d_d"
- 7, 7, "t.l0.cellgroup_o_o_d_d"
- 7, 6, "t.l0.cellgroup_c_o_d_d"
- 7, 5, "t.l0.cellgroup_d_o_d_o"
- 7, 4, "t.l0.cellgroup_o_o_d_o"
- 7, 3, "t.l0.cellgroup_c_o_d_o"
- 7, 2, "t.l0.cellgroup_d_o_d_c"
- 7, 1, "t.l0.cellgroup_o_o_d_c"
- 7, 0, "t.l0.cellgroup_c_o_d_c"
- 6, 8, "t.l0.cellgroup_d_c_d_d"
- 6, 7, "t.l0.cellgroup_o_c_d_d"
- 6, 6, "t.l0.cellgroup_c_c_d_d"
- 6, 5, "t.l0.cellgroup_d_c_d_o"
- 6, 4, "t.l0.cellgroup_o_c_d_o"
- 6, 3, "t.l0.cellgroup_c_c_d_o"
- 6, 2, "t.l0.cellgroup_d_c_d_c"
- 6, 1, "t.l0.cellgroup_o_c_d_c"
- 6, 0, "t.l0.cellgroup_c_c_d_c"
- 5, 8, "t.l0.cellgroup_d_d_o_d"
- 5, 7, "t.l0.cellgroup_o_d_o_d"
- 5, 6, "t.l0.cellgroup_c_d_o_d"
- 5, 5, "t.l0.cellgroup_d_d_o_o"
- 5, 4, "t.l0.cellgroup_o_d_o_o"
- 5, 3, "t.l0.cellgroup_c_d_o_o"
- 5, 2, "t.l0.cellgroup_d_d_o_c"
- 5, 1, "t.l0.cellgroup_o_d_o_c"
- 5, 0, "t.l0.cellgroup_c_d_o_c"
- 4, 8, "t.l0.cellgroup_d_o_o_d"
- 4, 7, "t.l0.cellgroup_o_o_o_d"
- 4, 6, "t.l0.cellgroup_c_o_o_d"
- 4, 5, "t.l0.cellgroup_d_o_o_o"
- 4, 4, "t.l0.cellgroup_o_o_o_o"
- 4, 3, "t.l0.cellgroup_c_o_o_o"
- 4, 2, "t.l0.cellgroup_d_o_o_c"
- 4, 1, "t.l0.cellgroup_o_o_o_c"
- 4, 0, "t.l0.cellgroup_c_o_o_c"
- 3, 8, "t.l0.cellgroup_d_c_o_d"
- 3, 7, "t.l0.cellgroup_o_c_o_d"
- 3, 6, "t.l0.cellgroup_c_c_o_d"
- 3, 5, "t.l0.cellgroup_d_c_o_o"
- 3, 4, "t.l0.cellgroup_o_c_o_o"
- 3, 3, "t.l0.cellgroup_c_c_o_o"
- 3, 2, "t.l0.cellgroup_d_c_o_c"
- 3, 1, "t.l0.cellgroup_o_c_o_c"
- 3, 0, "t.l0.cellgroup_c_c_o_c"
- 2, 8, "t.l0.cellgroup_d_d_c_d"
- 2, 7, "t.l0.cellgroup_o_d_c_d"
- 2, 6, "t.l0.cellgroup_c_d_c_d"
- 2, 5, "t.l0.cellgroup_d_d_c_o"
- 2, 4, "t.l0.cellgroup_o_d_c_o"
- 2, 3, "t.l0.cellgroup_c_d_c_o"
- 2, 2, "t.l0.cellgroup_d_d_c_c"
- 2, 1, "t.l0.cellgroup_o_d_c_c"
- 2, 0, "t.l0.cellgroup_c_d_c_c"
- 1, 8, "t.l0.cellgroup_d_o_c_d"
- 1, 7, "t.l0.cellgroup_o_o_c_d"
- 1, 6, "t.l0.cellgroup_c_o_c_d"
- 1, 5, "t.l0.cellgroup_d_o_c_o"
- 1, 4, "t.l0.cellgroup_o_o_c_o"
- 1, 3, "t.l0.cellgroup_c_o_c_o"
- 1, 2, "t.l0.cellgroup_d_o_c_c"
- 1, 1, "t.l0.cellgroup_o_o_c_c"
- 1, 0, "t.l0.cellgroup_c_o_c_c"
- 0, 8, "t.l0.cellgroup_d_c_c_d"
- 0, 7, "t.l0.cellgroup_o_c_c_d"
- 0, 6, "t.l0.cellgroup_c_c_c_d"
- 0, 5, "t.l0.cellgroup_d_c_c_o"
- 0, 4, "t.l0.cellgroup_o_c_c_o"
- 0, 3, "t.l0.cellgroup_c_c_c_o"
- 0, 2, "t.l0.cellgroup_d_c_c_c"
- 0, 1, "t.l0.cellgroup_o_c_c_c"
- 0, 0, "t.l0.cellgroup_c_c_c_c"
+ 8, 7, "t.l0.cellgroup_s_d_d_d"
+ 8, 6, "t.l0.cellgroup_l_d_d_d"
+ 8, 5, "t.l0.cellgroup_d_d_d_s"
+ 8, 4, "t.l0.cellgroup_s_d_d_s"
+ 8, 3, "t.l0.cellgroup_l_d_d_s"
+ 8, 2, "t.l0.cellgroup_d_d_d_l"
+ 8, 1, "t.l0.cellgroup_s_d_d_l"
+ 8, 0, "t.l0.cellgroup_l_d_d_l"
+ 7, 8, "t.l0.cellgroup_d_s_d_d"
+ 7, 7, "t.l0.cellgroup_s_s_d_d"
+ 7, 6, "t.l0.cellgroup_l_s_d_d"
+ 7, 5, "t.l0.cellgroup_d_s_d_s"
+ 7, 4, "t.l0.cellgroup_s_s_d_s"
+ 7, 3, "t.l0.cellgroup_l_s_d_s"
+ 7, 2, "t.l0.cellgroup_d_s_d_l"
+ 7, 1, "t.l0.cellgroup_s_s_d_l"
+ 7, 0, "t.l0.cellgroup_l_s_d_l"
+ 6, 8, "t.l0.cellgroup_d_l_d_d"
+ 6, 7, "t.l0.cellgroup_s_l_d_d"
+ 6, 6, "t.l0.cellgroup_l_l_d_d"
+ 6, 5, "t.l0.cellgroup_d_l_d_s"
+ 6, 4, "t.l0.cellgroup_s_l_d_s"
+ 6, 3, "t.l0.cellgroup_l_l_d_s"
+ 6, 2, "t.l0.cellgroup_d_l_d_l"
+ 6, 1, "t.l0.cellgroup_s_l_d_l"
+ 6, 0, "t.l0.cellgroup_l_l_d_l"
+ 5, 8, "t.l0.cellgroup_d_d_s_d"
+ 5, 7, "t.l0.cellgroup_s_d_s_d"
+ 5, 6, "t.l0.cellgroup_l_d_s_d"
+ 5, 5, "t.l0.cellgroup_d_d_s_s"
+ 5, 4, "t.l0.cellgroup_s_d_s_s"
+ 5, 3, "t.l0.cellgroup_l_d_s_s"
+ 5, 2, "t.l0.cellgroup_d_d_s_l"
+ 5, 1, "t.l0.cellgroup_s_d_s_l"
+ 5, 0, "t.l0.cellgroup_l_d_s_l"
+ 4, 8, "t.l0.cellgroup_d_s_s_d"
+ 4, 7, "t.l0.cellgroup_s_s_s_d"
+ 4, 6, "t.l0.cellgroup_l_s_s_d"
+ 4, 5, "t.l0.cellgroup_d_s_s_s"
+ 4, 4, "t.l0.cellgroup_s_s_s_s"
+ 4, 3, "t.l0.cellgroup_l_s_s_s"
+ 4, 2, "t.l0.cellgroup_d_s_s_l"
+ 4, 1, "t.l0.cellgroup_s_s_s_l"
+ 4, 0, "t.l0.cellgroup_l_s_s_l"
+ 3, 8, "t.l0.cellgroup_d_l_s_d"
+ 3, 7, "t.l0.cellgroup_s_l_s_d"
+ 3, 6, "t.l0.cellgroup_l_l_s_d"
+ 3, 5, "t.l0.cellgroup_d_l_s_s"
+ 3, 4, "t.l0.cellgroup_s_l_s_s"
+ 3, 3, "t.l0.cellgroup_l_l_s_s"
+ 3, 2, "t.l0.cellgroup_d_l_s_l"
+ 3, 1, "t.l0.cellgroup_s_l_s_l"
+ 3, 0, "t.l0.cellgroup_l_l_s_l"
+ 2, 8, "t.l0.cellgroup_d_d_l_d"
+ 2, 7, "t.l0.cellgroup_s_d_l_d"
+ 2, 6, "t.l0.cellgroup_l_d_l_d"
+ 2, 5, "t.l0.cellgroup_d_d_l_s"
+ 2, 4, "t.l0.cellgroup_s_d_l_s"
+ 2, 3, "t.l0.cellgroup_l_d_l_s"
+ 2, 2, "t.l0.cellgroup_d_d_l_l"
+ 2, 1, "t.l0.cellgroup_s_d_l_l"
+ 2, 0, "t.l0.cellgroup_l_d_l_l"
+ 1, 8, "t.l0.cellgroup_d_s_l_d"
+ 1, 7, "t.l0.cellgroup_s_s_l_d"
+ 1, 6, "t.l0.cellgroup_l_s_l_d"
+ 1, 5, "t.l0.cellgroup_d_s_l_s"
+ 1, 4, "t.l0.cellgroup_s_s_l_s"
+ 1, 3, "t.l0.cellgroup_l_s_l_s"
+ 1, 2, "t.l0.cellgroup_d_s_l_l"
+ 1, 1, "t.l0.cellgroup_s_s_l_l"
+ 1, 0, "t.l0.cellgroup_l_s_l_l"
+ 0, 8, "t.l0.cellgroup_d_l_l_d"
+ 0, 7, "t.l0.cellgroup_s_l_l_d"
+ 0, 6, "t.l0.cellgroup_l_l_l_d"
+ 0, 5, "t.l0.cellgroup_d_l_l_s"
+ 0, 4, "t.l0.cellgroup_s_l_l_s"
+ 0, 3, "t.l0.cellgroup_l_l_l_s"
+ 0, 2, "t.l0.cellgroup_d_l_l_l"
+ 0, 1, "t.l0.cellgroup_s_l_l_l"
+ 0, 0, "t.l0.cellgroup_l_l_l_l"
}
Index: data/amplio/ocean.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/amplio.tilespec
===================================================================
--- data/amplio.tilespec (revision 13117)
+++ data/amplio.tilespec (working copy)
@@ -63,6 +63,7 @@
files =
"amplio/terrain1.spec",
"amplio/terrain2.spec",
+ "amplio/ocean.spec",
"amplio/water.spec",
"amplio/tiles.spec",
"amplio/fog.spec",
@@ -95,73 +96,94 @@
; Terrain info - see README.graphics
[layer0]
-match_types = "land", "water"
+match_types = "shallow", "deep", "land"
[layer1]
-match_types = "forest", "hills", "mountains", "shallow", "ridge", "trench",
"deep"
+match_types = "forest", "hills", "mountains", "ridge", "trench", "water", "ice"
+[layer2]
+match_types = "water", "ice"
+
; Water graphics referenced by terrain.ruleset
;
[tile_coast]
is_blended = 1
num_layers = 2
-layer0_match_type = "water"
-;layer0_match_with = "water"
+layer0_match_type = "shallow"
+layer0_match_with = "deep", "land"
layer0_sprite_type = "corner"
-layer1_match_type = "shallow"
-layer1_match_with = "shallow"
+layer1_match_type = "water"
+layer1_match_with = "ice"
layer1_sprite_type = "corner"
[tile_shelf]
is_blended = 0
num_layers = 2
-layer0_match_type = "water"
-;layer0_match_with = "water"
+layer0_match_type = "shallow"
+layer0_match_with = "deep", "land"
layer0_sprite_type = "corner"
-layer1_match_type = "shallow"
-layer1_match_with = "shallow"
+;layer1_match_type = "shallow"
+;layer1_match_with = "shallow"
+;layer1_sprite_type = "corner"
+layer1_match_type = "water"
+layer1_match_with = "ice"
layer1_sprite_type = "corner"
[tile_floor]
is_blended = 0
-num_layers = 1
-layer0_match_type = "water"
-layer0_match_with = "water"
+num_layers = 2
+layer0_match_type = "deep"
+layer0_match_with = "shallow", "land"
layer0_sprite_type = "corner"
+layer1_match_type = "water"
+layer1_match_with = "ice"
+layer1_sprite_type = "corner"
[tile_trench]
is_blended = 0
-num_layers = 2
-layer0_match_type = "water"
-layer0_match_with = "water"
+num_layers = 3
+layer0_match_type = "deep"
+layer0_match_with = "shallow", "land"
layer0_sprite_type = "corner"
layer1_match_type = "trench"
layer1_match_with = "trench"
+layer2_match_type = "water"
+layer2_match_with = "ice"
+layer2_sprite_type = "corner"
[tile_ridge]
is_blended = 0
-num_layers = 2
-layer0_match_type = "water"
-layer0_match_with = "water"
+num_layers = 3
+layer0_match_type = "deep"
+layer0_match_with = "shallow", "land"
layer0_sprite_type = "corner"
layer1_match_type = "ridge"
layer1_match_with = "ridge"
+layer2_match_type = "water"
+layer2_match_with = "ice"
+layer2_sprite_type = "corner"
[tile_vent]
is_blended = 0
-num_layers = 1
-layer0_match_type = "water"
-layer0_match_with = "water"
+num_layers = 3
+layer0_match_type = "deep"
+layer0_match_with = "shallow", "land"
layer0_sprite_type = "corner"
+layer1_match_type = "ridge"
+layer1_match_with = "ridge"
+layer2_match_type = "water"
+layer2_match_with = "ice"
+layer2_sprite_type = "corner"
; Land graphics referenced by terrain.ruleset
;
[tile_arctic]
-; TODO: ice cliffs
+; treated as water for ice cliffs
is_blended = 0
-num_layers = 2
-layer0_match_type = "land"
-layer1_match_type = "shallow"
+num_layers = 3
+layer0_match_type = "shallow"
+layer1_match_type = "ice"
+layer2_match_type = "ice"
mine_sprite = "tx.oil_mine"
[tile_desert]
_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev
