From a34abb870f5dd04f13bd8ce45216ba22b20131a9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 7 Jan 2024 21:31:21 +0200 Subject: [PATCH 30/30] Amplio2: Add volcano terrains Art by XYZ See osdn #48900 Signed-off-by: Marko Lindqvist --- data/amplio2.tilespec | 27 ++++++++++++++++++++++++++- data/amplio2/Makefile.am | 2 ++ data/amplio2/volcano.png | Bin 0 -> 10899 bytes data/amplio2/volcano.spec | 32 ++++++++++++++++++++++++++++++++ meson.build | 2 ++ 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 data/amplio2/volcano.png create mode 100644 data/amplio2/volcano.spec diff --git a/data/amplio2.tilespec b/data/amplio2.tilespec index 1308f95e18..2c322a790d 100644 --- a/data/amplio2.tilespec +++ b/data/amplio2.tilespec @@ -147,6 +147,7 @@ files = "amplio2/mountains.spec", "amplio2/ocean.spec", "amplio2/water.spec", + "amplio2/volcano.spec", "amplio2/tiles.spec", "amplio2/upkeep.spec", "amplio2/activities.spec", @@ -307,7 +308,31 @@ layer0_match_type = "land" [tile_inaccessible] tag = "inaccessible" -blend_layer = 0 +blend_layer = 1 +num_layers = 1 +layer0_match_type = "land" +layer1_match_type = "hills" +layer1_match_with = "hills" + +[tile_volcano] +tag = "volcano" +blend_layer = 1 +num_layers = 1 +layer0_match_type = "land" +layer1_match_type = "hills" +layer1_match_with = "hills" + +[tile_erupting_volcanoa] +tag = "erupting_volcanoa" +blend_layer = 1 +num_layers = 1 +layer0_match_type = "land" +layer1_match_type = "hills" +layer1_match_with = "hills" + +[tile_erupting_volcanob] +tag = "erupting_volcanob" +blend_layer = 1 num_layers = 1 layer0_match_type = "land" diff --git a/data/amplio2/Makefile.am b/data/amplio2/Makefile.am index c3ab72114e..4ad5687e50 100644 --- a/data/amplio2/Makefile.am +++ b/data/amplio2/Makefile.am @@ -44,6 +44,8 @@ pkgdata_DATA = \ upkeep.spec \ veterancy.png \ veterancy.spec \ + volcano.png \ + volcano.spec \ water.png \ water.spec diff --git a/data/amplio2/volcano.png b/data/amplio2/volcano.png new file mode 100644 index 0000000000000000000000000000000000000000..477fa5338a0a0eb2e4d5963c80a8c845906b9ad8 GIT binary patch literal 10899 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 u&H~nWp5-bn|FQ7o|7T{PtNP_Dd{Yj=J