From c601f7f9ec084fedf83480434d96b4aa12954f43 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 6 May 2021 14:34:40 +0300 Subject: [PATCH] Genericized "No Maintenance costs for improvements in [] tiles" --- android/assets/jsons/Civ V - Vanilla/Nations.json | 2 +- .../com/unciv/logic/civilization/CivInfoStats.kt | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/android/assets/jsons/Civ V - Vanilla/Nations.json b/android/assets/jsons/Civ V - Vanilla/Nations.json index 986ea01c30..deefca7779 100644 --- a/android/assets/jsons/Civ V - Vanilla/Nations.json +++ b/android/assets/jsons/Civ V - Vanilla/Nations.json @@ -637,7 +637,7 @@ "uniqueName": "Great Andean Road", "uniques": ["Units ignore terrain costs when moving into any tile with Hills", "Maintenance on roads & railroads reduced by [50]%", - "No Maintenance costs for improvements in Hills"], + "No Maintenance costs for improvements in [Hill] tiles"], "cities": ["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Rumicucho","Vilcabamba","Vitcos", "Andahuaylas","Ica","Arequipa","Nasca","Atico","Juli","Chuito","Chuquiapo","Huanuco Pampa","Tamboccocha", "Huaras","Riobamba","Caxamalca","Sausa","Tambo Colorado","Huaca","Tumbes","Chan Chan","Sipan","Pachacamac", diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt index 3080bd82d9..2c5ccf1ef4 100644 --- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt +++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt @@ -48,21 +48,14 @@ class CivInfoStats(val civInfo: CivilizationInfo) { // we no longer use .flatMap, because there are a lot of tiles and keeping them all in a list // just to go over them once is a waste of memory - there are low-end phones who don't have much ram - val ignoredTileTypes = civInfo.getMatchingUniques("No Maintenance costs for improvements in []") + val ignoredTileTypes = civInfo.getMatchingUniques("No Maintenance costs for improvements in [] tiles") .map { it.params[0] }.toHashSet() // needs to be .toHashSet()ed, // Because we go over every tile in every city and check if it's in this list, which can get real heavy. - // accounting for both the old way and the new way of doing no maintenance in hills - val ignoreHillTiles = civInfo.hasUnique("No Maintenance costs for improvements in Hills") || "Hills" in ignoredTileTypes - for (city in civInfo.cities) { for (tile in city.getTiles()) { if (tile.isCityCenter()) continue - if (ignoreHillTiles && tile.isHill()) continue - - if (tile.terrainFeatures.any { it in ignoredTileTypes } || tile.baseTerrain in ignoredTileTypes) { - continue - } + if (ignoredTileTypes.any { tile.matchesUniqueFilter(it, civInfo) }) continue val tileUpkeep = when (tile.roadStatus) { @@ -103,7 +96,7 @@ class CivInfoStats(val civInfo: CivilizationInfo) { val sciencePercentage = civInfo .getMatchingUniques("Allied City-States provide Science equal to []% of what they produce for themselves") .sumBy { it.params[0].toInt() } - statMap.add("City-States",Stats().apply { science = otherCiv.statsForNextTurn.science * (sciencePercentage/100f) }) + statMap.add("City-States", Stats().apply { science = otherCiv.statsForNextTurn.science * (sciencePercentage / 100f) }) } }