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

Building.requiredBuildingInAllCities -> "Requires a [] in all cities" unique

Browse Source
This commit is contained in:
Yair Morgenstern 2020-12-17 15:46:17 +02:00
parent 32a2c784fe
commit e3f1c33654
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
android/assets/jsons/Civ V - Vanilla/Buildings.json
View File

@ -218,8 +218,7 @@
"happiness": 5,
"culture": 1,
"isNationalWonder": true,
"requiredBuildingInAllCities": "Colosseum",
"uniques": ["Cost increases by [30] per owned city"],
"uniques": ["Requires a [Colosseum] in all cities", "Cost increases by [30] per owned city"],
"requiredTech": "Horseback Riding"
},
{
@ -300,9 +299,8 @@
"name": "National Epic",
"cost": 125,
"culture": 1,
"uniques": ["+[25]% great person generation in this city", "Cost increases by [30] per owned city"],
"isNationalWonder": true,
"requiredBuildingInAllCities": "Monument",
"uniques": ["Requires a [Monument] in all cities", "+[25]% great person generation in this city", "Cost increases by [30] per owned city"],
"requiredTech": "Philosophy"
},
{
@ -319,8 +317,7 @@
"gold": 8,
"culture": 1,
"isNationalWonder": true,
"requiredBuildingInAllCities": "Market",
"uniques": ["Cost increases by [30] per owned city"],
"uniques": ["Requires a [Market] in all cities", "Cost increases by [30] per owned city"],
"requiredTech": "Currency"
},
{
@ -376,8 +373,8 @@
"cost": 125,
"culture": 1,
"isNationalWonder": true,
"requiredBuildingInAllCities": "Barracks",
"uniques": ["All newly-trained [non-air] units in this city receive the [Morale] promotion", "Cost increases by [30] per owned city"],
"uniques": ["Requires a [Barracks] in all cities", "All newly-trained [non-air] units in this city receive the [Morale] promotion",
"Cost increases by [30] per owned city"],
"requiredTech": "Iron Working"
},
@ -415,8 +412,7 @@
"culture": 1,
"isNationalWonder": true,
"percentStatBonus": {"science": 50},
"requiredBuildingInAllCities": "Library",
"uniques": ["Cost increases by [30] per owned city"],
"uniques": ["Requires a [Library] in all cities", "Cost increases by [30] per owned city"],
"requiredTech": "Philosophy"
},
{
@ -505,8 +501,7 @@
"science": 3,
"culture": 1,
"isNationalWonder": true,
"requiredBuildingInAllCities": "University",
"uniques": ["Free Technology", "Cost increases by [30] per owned city"],
"uniques": ["Requires a [University] in all cities", "Free Technology", "Cost increases by [30] per owned city"],
"requiredTech": "Education"
},
{
@ -556,8 +551,7 @@
"production": 8,
"culture": 1,
"isNationalWonder": true,
"requiredBuildingInAllCities": "Workshop",
"uniques": ["Cost increases by [30] per owned city"],
"uniques": ["Requires a [Workshop] in all cities", "Cost increases by [30] per owned city"],
"requiredTech": "Machinery"
},
{
@ -691,8 +685,7 @@
"percentStatBonus": {"culture": 50},
"culture": 5,
"isNationalWonder": true,
"requiredBuildingInAllCities": "Opera House",
"uniques": ["Cost increases by [30] per owned city"],
"uniques": ["Requires a [Opera House] in all cities", "Cost increases by [30] per owned city"],
"requiredTech": "Archaeology"
},
{

4
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -228,10 +228,10 @@ class CivilizationInfo {
}
}
fun removeUnit(mapUnit: MapUnit){
fun removeUnit(mapUnit: MapUnit) {
val newList = ArrayList(units)
newList.remove(mapUnit)
units=newList
units = newList
updateStatsForNextTurn() // unit upkeep
updateDetailedCivResources()
}

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

@ -273,6 +273,9 @@ class Building : NamedStats(), IConstruction {
"Requires a [] in this city" -> if (!construction.containsBuildingOrEquivalent(unique.params[0]))
return "Requires a [${civInfo.getEquivalentBuilding(unique.params[0])}] in this city" // replace with civ-specific building for user
"Requires a [] in all cities" -> if (civInfo.cities.any { !it.cityConstructions.containsBuildingOrEquivalent(unique.params[0]) } )
return "Requires a [${civInfo.getEquivalentBuilding(unique.params[0])}] in all cities" // replace with civ-specific building for user
"Obsolete with []" -> if (civInfo.tech.isResearched(unique.params[0])) return unique.text
"Must have an owned mountain within 2 tiles" -> // Deprecated as of 3.10.8 . Use "Must have an owned [Mountain] within [2] tiles" instead

1
core/src/com/unciv/ui/utils/Popup.kt
View File

@ -34,7 +34,6 @@ open class Popup(val screen: CameraStageBaseScreen): Table(CameraStageBaseScreen
screen.stage.addActor(this)
pack()
center(screen.stage)
}
open fun close() {