mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-03 00:29:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3817 - don't display resource requirements from uniques twice

Browse Source
This commit is contained in:
Yair Morgenstern
2021-04-19 19:29:21 +03:00
parent 8d4aa955b3
commit 1eb3629c09
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -769,7 +769,7 @@ class MapUnit {
if ((filter == "Wounded" || filter == "wounded units") && health < 100) return true if ((filter == "Wounded" || filter == "wounded units") && health < 100) return true
if (hasUnique(filter)) return true if (hasUnique(filter)) return true
if ((filter == "Barbarians" || filter == "Barbarian") && civInfo.isBarbarian()) return true if ((filter == "Barbarians" || filter == "Barbarian") && civInfo.isBarbarian()) return true
if (filter == "Embarked" && isEmbarked()) return true
return false return false
} }

2
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -102,7 +102,7 @@ class Building : NamedStats(), IConstruction {
val stats = unique.params[0] val stats = unique.params[0]
if (!tileBonusHashmap.containsKey(stats)) tileBonusHashmap[stats] = ArrayList() if (!tileBonusHashmap.containsKey(stats)) tileBonusHashmap[stats] = ArrayList()
tileBonusHashmap[stats]!!.add(unique.params[1]) tileBonusHashmap[stats]!!.add(unique.params[1])
} else finalUniques += unique.text } else if (unique.placeholderText != "Consumes [] []") finalUniques += unique.text
for ((key, value) in tileBonusHashmap) for ((key, value) in tileBonusHashmap)
finalUniques += "[stats] from [tileFilter] tiles in this city".fillPlaceholders(key, value.joinToString { it.tr() }) finalUniques += "[stats] from [tileFilter] tiles in this city".fillPlaceholders(key, value.joinToString { it.tr() })
return finalUniques return finalUniques