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

Resolved #424 and upgraded gradle

Browse source
This commit is contained in:
Yair Morgenstern 2019-01-20 22:44:09 +02:00
parent f765566cbc
commit effec4856c
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/assets/jsons/Translations.json
View file

@ -663,6 +663,11 @@
Portuguese:"Comprar por [amount] peças de ouro"
}
"Buy":{ // for when the construction is a wonder/special and can't be bought, the button is disabled but still displays text
}
"Would you like to purchase [constructionName] for [buildingGoldCost] gold?":{}
"Maintenance cost":{
Italian:"Costo di manutenzione"
Russian:"Стоимость обслуживания"

2
build.gradle
View file

@ -16,7 +16,7 @@ buildscript {
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
}
}

9
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View file

@ -14,6 +14,7 @@ import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tr
import com.unciv.models.gamebasics.unit.BaseUnit
import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable
class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScreen.skin){
@ -128,14 +129,16 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
val buildingGoldCost = construction.getGoldCost(city.civInfo.policies.getAdoptedPolicies())
purchaseConstructionButton = TextButton("Buy for [$buildingGoldCost] gold".tr(), CameraStageBaseScreen.skin)
purchaseConstructionButton.onClick("coin") {
city.cityConstructions.purchaseBuilding(city.cityConstructions.currentConstruction)
update()
YesNoPopupTable("Would you like to purchase [${construction.name}] for [$buildingGoldCost] gold?".tr(), {
city.cityConstructions.purchaseBuilding(city.cityConstructions.currentConstruction)
update()
}, cityScreen)
}
if (buildingGoldCost > city.civInfo.gold) {
purchaseConstructionButton.disable()
}
} else {
purchaseConstructionButton = TextButton("Buy", CameraStageBaseScreen.skin)
purchaseConstructionButton = TextButton("Buy".tr(), CameraStageBaseScreen.skin)
purchaseConstructionButton.disable()
}
add(purchaseConstructionButton).pad(10f).row()

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sun Dec 02 12:14:58 IST 2018
#Sun Jan 20 22:21:26 IST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip