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

Revert "-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)" (#3301)

Browse Source 
This reverts commit 49cdf09b44.
This commit is contained in:
Yair Morgenstern 2020-10-27 00:22:02 +02:00 committed by GitHub
parent 49cdf09b44
commit 247350d6a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,6 @@
"isWonder": true,
"greatPersonPoints": {"culture": 1},
"requiredTech": "Construction",
"uniques": ["Unbuildable", "Will not be displayed in Civilopedia"],
"quote": "'Regard your soldiers as your children, and they will follow you into the deepest valleys; look on them as your own beloved sons, and they will stand by you even unto death.' - Sun Tzu"
// will be introduced in G&K expansion pack
},
@ -548,7 +547,7 @@
"isWonder": true,
"providesFreeBuilding": "Castle",
"percentStatBonus": {"culture": 20},
"uniques": ["All newly-trained [relevant] units in this city receive the [Drill I] promotion", "Unbuildable", "Will not be displayed in Civilopedia"],
"uniques": ["All newly-trained [relevant] units in this city receive the [Drill I] promotion"],
"requiredTech": "Chivalry",
"quote": "'Justice is an unassailable fortress, built on the brow of a mountain which cannot be overthrown by the violence of torrents, nor demolished by the force of armies.' - Joseph Addison"
// will be introduced in G&K expansion pack
@ -634,14 +633,15 @@
{
"name": "Hanse",
"replaces": "Bank",
"uniqueTo": "Germany",
"gold": 2,
"specialistSlots": {"Merchant": 1},
"hurryCostModifier": 15,
"percentStatBonus": {"gold": 25},
"uniques": ["+5% Production for every Trade Route with a City-State in the empire", "Unbuildable", "Will not be displayed in Civilopedia"],
"uniques": ["+5% Production for every Trade Route with a City-State in the empire"],
"requiredBuilding": "Market",
"requiredTech": "Banking"
// will be introduced in BNW expansion pack and unique for Germany
// will be introduced in BNW expansion pack
},
{
"name": "Forbidden Palace",
@ -665,7 +665,7 @@
"culture": 1,
"isWonder": true,
"greatPersonPoints": {"culture": 1},
"uniques": ["Free Great Person", "Unbuildable", "Will not be displayed in Civilopedia"],
"uniques": ["Free Great Person"],
"requiredTech": "Printing Press",
"quote": "'Don't clap too hard - it's a very old building.' - John Osbourne"
// will be introduced in G&K expansion pack
@ -917,7 +917,7 @@
"greatPersonPoints": {"gold": 1},
"isWonder": true,
"uniques": ["[+1 Happiness, +2 Culture, +3 Gold] from every [Castle]",
"Must have an owned [Mountain] within [2] tiles", "Unbuildable", "Will not be displayed in Civilopedia"],
"Must have an owned [Mountain] within [2] tiles"],
"requiredTech": "Railroad",
"quote": "'...the location is one of the most beautiful to be found, holy and unapproachable, a worthy temple for the divine friend who has brought salvation and true blessing to the world.' - King Ludwig II of Bavaria"
// will be introduced in G&K expansion pack
@ -1029,7 +1029,7 @@
"greatPersonPoints": {"science": 1},
"providesFreeBuilding": "Spaceship Factory",
"uniques": ["[2] free [Great Scientist] units appear",
"+[25]% production when building [Spaceship part] in this city", "Unbuildable", "Will not be displayed in Civilopedia"],
"+[25]% production when building [Spaceship part] in this city"],
"requiredTech": "Satellites",
"quote": "'The wonder is, not that the field of stars is so vast, but that man has measured it.' - Anatole France"
// will be introduced in G&K expansion pack

7
core/src/com/unciv/models/ruleset/tech/Technology.kt
View File

@ -86,9 +86,7 @@ class Technology {
fun getEnabledBuildings(civInfo: CivilizationInfo): List<Building> {
var enabledBuildings = civInfo.gameInfo.ruleSet.buildings.values.filter {
it.requiredTech == name &&
(it.uniqueTo == null || it.uniqueTo == civInfo.civName) &&
"Unbuildable" !in it.uniques
(it.uniqueTo == null || it.uniqueTo == civInfo.civName)
}
val replacedBuildings = enabledBuildings.mapNotNull { it.replaces }
enabledBuildings = enabledBuildings.filter { it.name !in replacedBuildings }
@ -108,8 +106,7 @@ class Technology {
fun getEnabledUnits(civInfo: CivilizationInfo): List<BaseUnit> {
var enabledUnits = civInfo.gameInfo.ruleSet.units.values.filter {
it.requiredTech == name &&
(it.uniqueTo == null || it.uniqueTo == civInfo.civName) &&
"Unbuildable" !in it.uniques
(it.uniqueTo == null || it.uniqueTo == civInfo.civName)
}
val replacedUnits = civInfo.gameInfo.ruleSet.units.values.filter { it.uniqueTo == civInfo.civName }
.mapNotNull { it.replaces }