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

Fixed error message of ConditionalBuilding (#11279)

Browse Source 
* Fixed error message of ConditionalBuilding

* Added new error messages in the translation template

* Removed old error message

* Add space at the end
This commit is contained in:
Jeremy Woo
2024-03-18 05:13:11 +08:00
committed by GitHub
parent b678f697a5
commit 1431e3928c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/assets/jsons/translations/template.properties
View File

@ -82,7 +82,8 @@ Requires worked [resource] near city =
Requires at least one of the following resources worked near the city: = Requires at least one of the following resources worked near the city: =
Wonder is being built elsewhere = Wonder is being built elsewhere =
National Wonder is being built elsewhere = National Wonder is being built elsewhere =
Requires a [buildingName] in all cities = Requires a [buildingName] in all [cityFilter] cities =
Requires a [buildingName] in at least [amount] of [cityFilter] cities =
[buildingName] required: = [buildingName] required: =
Requires a [buildingName] in this city = Requires a [buildingName] in this city =
Cannot be built with [buildingName] = Cannot be built with [buildingName] =

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

@ -462,18 +462,18 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
if (numberOfCities < amount) if (numberOfCities < amount)
{ {
yield(RejectionReasonType.RequiresBuildingInSomeCities.toInstance( yield(RejectionReasonType.RequiresBuildingInSomeCities.toInstance(
"Requires a [$building] in at least [$amount] cities" + "Requires a [$building] in at least [$amount] of [${cityFilter}] cities" +
" ($numberOfCities/$numberOfCities)")) " ($numberOfCities/$numberOfCities)"))
} }
} }
UniqueType.ConditionalBuildingBuiltAll -> { UniqueType.ConditionalBuildingBuiltAll -> {
val building = civ.getEquivalentBuilding(conditional.params[0]).name val building = civ.getEquivalentBuilding(conditional.params[0]).name
val cityFilter = conditional.params[1] val cityFilter = conditional.params[1]
if(civ.cities.any { it.matchesFilter(cityFilter) if (civ.cities.any { it.matchesFilter(cityFilter)
!it.isPuppet && !it.cityConstructions.containsBuildingOrEquivalent(building) !it.isPuppet && !it.cityConstructions.containsBuildingOrEquivalent(building)
}) { }) {
yield(RejectionReasonType.RequiresBuildingInAllCities.toInstance( yield(RejectionReasonType.RequiresBuildingInAllCities.toInstance(
"Requires a [${building}] in all cities")) "Requires a [${building}] in all [${cityFilter}] cities"))
} }
} }
else -> { else -> {