<URL: http://bugs.freeciv.org/Ticket/Display.html?id=34272 >
Most tilesets handle Deep Ocean from #34265 using ocean graphics as fallback. Amplio and Isotrident however use wrong colour blending between Ocean and Deep Ocean tiles in that case. Attached patch defines Deep Ocean gfx separately for them, pointing to the Ocean gfx in the end. Blending is disabled for Deep Ocean. This fixes major problem between Ocean and Deep Ocean tiles, but brings minor problem between Deep Ocean and land tiles. This is most noticeable at poles. I plan to commit first this and later #34265. - ML
diff -Nurd -X.diff_ignore freeciv/data/amplio/terrain1.spec freeciv/data/amplio/terrain1.spec --- freeciv/data/amplio/terrain1.spec 2006-07-17 23:56:22.000000000 +0300 +++ freeciv/data/amplio/terrain1.spec 2007-01-22 00:36:36.000000000 +0200 @@ -123,6 +123,7 @@ 15, 2, "mask.tile" 15, 2, "t.unknown1" 15, 3, "t.ocean1" + 15, 3, "t.deep1" 15, 4, "user.attention" 15, 5, "tx.fog" } diff -Nurd -X.diff_ignore freeciv/data/amplio/terrain2.spec freeciv/data/amplio/terrain2.spec --- freeciv/data/amplio/terrain2.spec 2006-07-17 23:56:22.000000000 +0300 +++ freeciv/data/amplio/terrain2.spec 2007-01-22 00:29:37.000000000 +0200 @@ -178,4 +178,41 @@ 2, 11, "t.ocean_cell_r101" 2, 13, "t.ocean_cell_r011" 2, 15, "t.ocean_cell_r111" + +; Deep Ocean fallback to same tiles as Ocean. + 0, 0, "t.deep_cell_u000" + 0, 2, "t.deep_cell_u100" + 0, 4, "t.deep_cell_u010" + 0, 6, "t.deep_cell_u110" + 0, 8, "t.deep_cell_u001" + 0, 10, "t.deep_cell_u101" + 0, 12, "t.deep_cell_u011" + 0, 14, "t.deep_cell_u111" + + 1, 0, "t.deep_cell_d000" + 1, 2, "t.deep_cell_d100" + 1, 4, "t.deep_cell_d010" + 1, 6, "t.deep_cell_d110" + 1, 8, "t.deep_cell_d001" + 1, 10, "t.deep_cell_d101" + 1, 12, "t.deep_cell_d011" + 1, 14, "t.deep_cell_d111" + + 2, 0, "t.deep_cell_l000" + 2, 2, "t.deep_cell_l100" + 2, 4, "t.deep_cell_l010" + 2, 6, "t.deep_cell_l110" + 2, 8, "t.deep_cell_l001" + 2, 10, "t.deep_cell_l101" + 2, 12, "t.deep_cell_l011" + 2, 14, "t.deep_cell_l111" + + 2, 1, "t.deep_cell_r000" + 2, 3, "t.deep_cell_r100" + 2, 5, "t.deep_cell_r010" + 2, 7, "t.deep_cell_r110" + 2, 9, "t.deep_cell_r001" + 2, 11, "t.deep_cell_r101" + 2, 13, "t.deep_cell_r011" + 2, 15, "t.deep_cell_r111" } diff -Nurd -X.diff_ignore freeciv/data/amplio.tilespec freeciv/data/amplio.tilespec --- freeciv/data/amplio.tilespec 2007-01-10 18:13:52.000000000 +0200 +++ freeciv/data/amplio.tilespec 2007-01-22 01:04:31.000000000 +0200 @@ -150,6 +150,13 @@ layer0_match_type = "ocean" layer0_cell_type = "rect" +[terrain_deep] +is_blended = 0 +num_layers = 1 +layer0_match_style = "bool" +layer0_match_type = "ocean" +layer0_cell_type = "rect" + [terrain_plains] is_blended = 1 num_layers = 1 diff -Nurd -X.diff_ignore freeciv/data/isotrident/terrain1.spec freeciv/data/isotrident/terrain1.spec --- freeciv/data/isotrident/terrain1.spec 2006-07-17 23:56:23.000000000 +0300 +++ freeciv/data/isotrident/terrain1.spec 2007-01-22 01:32:50.000000000 +0200 @@ -135,6 +135,7 @@ 0, 2, "mask.tile" 0, 2, "t.unknown1" 0, 3, "t.ocean1" + 0, 3, "t.deep1" 0, 4, "user.attention" 0, 5, "tx.fog" } diff -Nurd -X.diff_ignore freeciv/data/isotrident/terrain2.spec freeciv/data/isotrident/terrain2.spec --- freeciv/data/isotrident/terrain2.spec 2006-07-17 23:56:23.000000000 +0300 +++ freeciv/data/isotrident/terrain2.spec 2007-01-22 01:40:54.000000000 +0200 @@ -174,4 +174,41 @@ 2, 11, "t.ocean_cell_r101" 2, 13, "t.ocean_cell_r011" 2, 15, "t.ocean_cell_r111" + +; Deep Ocean fallback to Ocean tiles + 0, 0, "t.deep_cell_u000" + 0, 2, "t.deep_cell_u100" + 0, 4, "t.deep_cell_u010" + 0, 6, "t.deep_cell_u110" + 0, 8, "t.deep_cell_u001" + 0, 10, "t.deep_cell_u101" + 0, 12, "t.deep_cell_u011" + 0, 14, "t.deep_cell_u111" + + 1, 0, "t.deep_cell_d000" + 1, 2, "t.deep_cell_d100" + 1, 4, "t.deep_cell_d010" + 1, 6, "t.deep_cell_d110" + 1, 8, "t.deep_cell_d001" + 1, 10, "t.deep_cell_d101" + 1, 12, "t.deep_cell_d011" + 1, 14, "t.deep_cell_d111" + + 2, 0, "t.deep_cell_l000" + 2, 2, "t.deep_cell_l100" + 2, 4, "t.deep_cell_l010" + 2, 6, "t.deep_cell_l110" + 2, 8, "t.deep_cell_l001" + 2, 10, "t.deep_cell_l101" + 2, 12, "t.deep_cell_l011" + 2, 14, "t.deep_cell_l111" + + 2, 1, "t.deep_cell_r000" + 2, 3, "t.deep_cell_r100" + 2, 5, "t.deep_cell_r010" + 2, 7, "t.deep_cell_r110" + 2, 9, "t.deep_cell_r001" + 2, 11, "t.deep_cell_r101" + 2, 13, "t.deep_cell_r011" + 2, 15, "t.deep_cell_r111" } diff -Nurd -X.diff_ignore freeciv/data/isotrident.tilespec freeciv/data/isotrident.tilespec --- freeciv/data/isotrident.tilespec 2007-01-10 18:13:52.000000000 +0200 +++ freeciv/data/isotrident.tilespec 2007-01-22 01:32:19.000000000 +0200 @@ -147,6 +147,13 @@ layer0_match_type = "ocean" layer0_cell_type = "rect" +[terrain_deep] +is_blended = 0 +num_layers = 1 +layer0_match_style = "bool" +layer0_match_type = "ocean" +layer0_cell_type = "rect" + [terrain_plains] is_blended = 1 num_layers = 1
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
