From 278962c37dc040625c670443a5a99270e8d2b76c Mon Sep 17 00:00:00 2001 From: GGGuenni Date: Mon, 10 May 2021 11:47:41 +0200 Subject: [PATCH] Fixed Forest on Hill does not show (#3909) * Removed Duplicates and HillForest since the Image HillForest got renamed to Forest to reduce ruleVariants * reorganized legacy variants * Added "Offshore Platform" for oil well on water --- android/assets/jsons/TileSets/FantasyHex.json | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/android/assets/jsons/TileSets/FantasyHex.json b/android/assets/jsons/TileSets/FantasyHex.json index 4b1611e0ba..34919a97ac 100644 --- a/android/assets/jsons/TileSets/FantasyHex.json +++ b/android/assets/jsons/TileSets/FantasyHex.json @@ -1,17 +1,15 @@ { "useColorAsBaseTerrain": "false", "ruleVariants": { + //Legacy hill support "Hill": ["Grassland","Hill"], - - "Hill+Forest+Uranium": ["Grassland","Hill","Uranium","HillForest"], - "Grassland+Hill+Forest+Uranium": ["Grassland","Hill","Uranium","HillForest"], + "Hill+Forest+Uranium": ["Grassland","Hill","Uranium","Forest"], + "Hill+Forest+Furs": ["Grassland","Hill","Furs","HillForest"], + "Hill+Forest+Deer": ["Grassland","Hill","Deer","HillForest"], //Special forest and jungle "Grassland+Forest": ["Grassland","GrasslandForest"], "Plains+Forest": ["Plains","PlainsForest"], - - "Grassland+Jungle+Oil": ["Grassland","Oil","GrasslandJungle"], - "Plains+Jungle+Oil": ["Plains","Oil","PlainsJungle"], "Plains+Jungle": ["Plains","PlainsJungle"], "Tundra+Forest": ["Tundra","TundraForest"], "Tundra+Hill+Forest": ["Tundra","Hill","TundraForest"], @@ -87,18 +85,11 @@ "Tundra+Hill+Forest+Aluminum": ["Tundra","Hill","Aluminum","TundraForest"], "Tundra+Hill+Forest+Uranium": ["Tundra","Hill","Uranium","TundraForest"], "Tundra+Hill+Forest+Furs": ["Tundra","Hill","Furs","TundraForest"], - "Tundra+Hill+Forest+Deer": ["Tundra","Hill","Deer","TundraForest"] - "Hill+Forest+Furs": ["Grassland","Hill","Furs","HillForest"], - "Hill+Forest+Deer": ["Grassland","Hill","Deer","HillForest"], - - "Grassland+Hill+Forest": ["Grassland","Hill","HillForest"], - "Plains+Hill+Forest": ["Plains","Hill","HillForest"], - "Tundra+Hill+Forest": ["Tundra","Hill","HillForest"], - "Desert+Hill+Forest": ["Desert","Hill","HillForest"], - "Snow+Hill+Forest": ["Snow","Hill","HillForest"], + "Tundra+Hill+Forest+Deer": ["Tundra","Hill","Deer","TundraForest"], "Grassland+Forest+Ancient ruins": ["Grassland","Ancient ruins", "GrasslandForest"], "Grassland+Cattle+Ancient ruins": ["Grassland","Ancient ruins","Cattle"], "Grassland+Sheep+Ancient ruins": ["Grassland","Ancient ruins","Sheep"], + "Coast+Oil+Oil well": ["Coast","Offshore Platform"] } } \ No newline at end of file