<URL: http://bugs.freeciv.org/Ticket/Display.html?id=34262 >
Most tilesets have two layer0 match_type: "ocean" and "other". This patch renames "other" as "land". Even if some terrain type later needs special match_type, it has to come in addition to "land", since drawing second ocean type correctly will require common match_type for all land terrain types. - ML
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-21 23:37:37.000000000 +0200 @@ -92,7 +92,7 @@ [layer0] match_style = "BOOL" -match_types = "ocean", "other" +match_types = "ocean", "land" [layer1] match_style = "BOOL" @@ -101,31 +101,31 @@ [terrain_arctic] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_desert] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_forest] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "forest" layer1_match_style = "bool" [terrain_grassland] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_hills] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "hills" layer1_match_style = "bool" mine_sprite = "tx.mine" @@ -133,12 +133,12 @@ [terrain_jungle] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_mountains] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "mountains" layer1_match_style = "bool" mine_sprite = "tx.mine" @@ -153,14 +153,14 @@ [terrain_plains] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_swamp] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_tundra] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" diff -Nurd -X.diff_ignore freeciv/data/hex2t.tilespec freeciv/data/hex2t.tilespec --- freeciv/data/hex2t.tilespec 2007-01-10 18:13:52.000000000 +0200 +++ freeciv/data/hex2t.tilespec 2007-01-21 23:42:40.000000000 +0200 @@ -109,7 +109,7 @@ [layer0] match_style = "BOOL" -match_types = "ocean", "other" +match_types = "ocean", "land" [layer1] match_style = "BOOL" @@ -118,31 +118,31 @@ [terrain_arctic] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_desert] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_forest] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "forest" [terrain_grassland] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_hills] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "steep" mine_sprite = "tx.mine" @@ -150,14 +150,14 @@ [terrain_jungle] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "none" layer1_match_type = "jungle" [terrain_mountains] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "steep" mine_sprite = "tx.mine" @@ -172,14 +172,14 @@ [terrain_plains] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_swamp] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_tundra] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" diff -Nurd -X.diff_ignore freeciv/data/isophex.tilespec freeciv/data/isophex.tilespec --- freeciv/data/isophex.tilespec 2007-01-10 18:13:52.000000000 +0200 +++ freeciv/data/isophex.tilespec 2007-01-21 23:41:20.000000000 +0200 @@ -100,7 +100,7 @@ [layer0] match_style = "BOOL" -match_types = "ocean", "other" +match_types = "ocean", "land" [layer1] match_style = "BOOL" @@ -109,31 +109,31 @@ [terrain_arctic] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_desert] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_forest] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "forest" [terrain_grassland] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_hills] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "hills" mine_sprite = "tx.mine" @@ -141,12 +141,12 @@ [terrain_jungle] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_mountains] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "mountains" mine_sprite = "tx.mine" @@ -161,14 +161,14 @@ [terrain_plains] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_swamp] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_tundra] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" 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-21 23:40:14.000000000 +0200 @@ -89,7 +89,7 @@ [layer0] match_style = "BOOL" -match_types = "ocean", "other" +match_types = "ocean", "land" [layer1] match_style = "BOOL" @@ -98,31 +98,31 @@ [terrain_arctic] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_desert] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_forest] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "forest" layer1_match_style = "bool" [terrain_grassland] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_hills] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "hills" layer1_match_style = "bool" mine_sprite = "tx.mine" @@ -130,12 +130,12 @@ [terrain_jungle] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_mountains] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "mountains" layer1_match_style = "bool" mine_sprite = "tx.mine" @@ -150,14 +150,14 @@ [terrain_plains] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_swamp] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_tundra] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land"
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
