mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-19 04:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Changed all "[] from [] tiles" to "[] from every []""

Browse Source 
This reverts commit c89041e2d4.
This commit is contained in:
Yair Morgenstern
2020-08-16 20:16:01 +03:00
parent 1937e3f3c9
commit f2f14b6570
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -177,7 +177,6 @@ open class TileInfo {
stats.add(terrainFeatureBase)
}
// This is to be deprecated and converted to [] from every [] - keeping it here to that mods with this can still work for now
if(city!=null) for(unique in city.cityConstructions.builtBuildingUniqueMap.getUniques("[] from [] tiles")) {
val tileType = unique.params[1]
if (baseTerrain == tileType || terrainFeature == tileType || resource == tileType || improvement == tileType
@ -187,8 +186,7 @@ open class TileInfo {
if(city!=null) for(unique in city.civInfo.getMatchingUniques("[] from every []")) {
val tileType = unique.params[1]
if (baseTerrain == tileType || terrainFeature == tileType || resource == tileType || improvement == tileType
|| (tileType == "Strategic resource" && hasViewableResource(observingCiv) && getTileResource().resourceType == ResourceType.Strategic))
if (baseTerrain == tileType || terrainFeature == tileType)
stats.add(Stats.parse(unique.params[0]))
}