wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Buildings that are missing resources are still displayed in city constructions

Browse source
This commit is contained in:
Yair Morgenstern 2020-07-23 12:54:26 +03:00
parent 7d360e5fa1
commit 1a558a70d2
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/assets/jsons/Civ V - Vanilla/Buildings.json
View file

@ -29,7 +29,7 @@
"name": "Stone Works",
"happiness": 1,
"production": 1,
"requiredNearbyImprovedResources": ["Marble","Stone"],
"requiredNearbyImprovedResources": ["Marble", "Stone"],
"resourceBonusStats": {"production": 1},
"maintenance": 1,
"hurryCostModifier": 25,

2
android/assets/jsons/Civ V - Vanilla/Units.json
View file

@ -1067,7 +1067,7 @@
"interceptRange": 2,
"cost": 375,
"requiredTech": "Combustion",
"uniques": ["Can attack submarines","[40]% chance to intercept air attacks","May withdraw before melee"], // todo: add bonus vs submarines
"uniques": ["Can attack submarines", "[40]% chance to intercept air attacks", "May withdraw before melee"], // todo: add bonus vs submarines
"hurryCostModifier": 20
},
{

1
core/src/com/unciv/models/ruleset/Building.kt
View file

@ -233,6 +233,7 @@ class Building : NamedStats(), IConstruction{
val rejectionReason = getRejectionReason(cityConstructions)
return rejectionReason==""
|| rejectionReason.startsWith("Requires")
|| rejectionReason.startsWith("Consumes")
|| rejectionReason == "Wonder is being built elsewhere"
}

4
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View file

@ -86,9 +86,7 @@ class BaseUnit : INamed, IConstruction {
return unit
}
override fun canBePurchased(): Boolean {
return true
}
override fun canBePurchased() = true
override fun getProductionCost(civInfo: CivilizationInfo): Int {
var productionCost = cost.toFloat()