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

Resolved #435 - profit from disbanding units

Browse source
This commit is contained in:
Yair Morgenstern 2019-01-26 22:39:48 +02:00
parent 665af17ae5
commit f80077a412
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -293,6 +293,8 @@
Portuguese:"Voçê realmente quer desfazer essa unidade?" Portuguese:"Voçê realmente quer desfazer essa unidade?"
German:"Wollen Sie diese Einheit wirklich auflösen?" German:"Wollen Sie diese Einheit wirklich auflösen?"
} }
"Disband this unit for [goldAmount] gold?":{}
"Yes":{ "Yes":{
Italian:"Sì" Italian:"Sì"
Russian:"Да" Russian:"Да"

6
core/src/com/unciv/logic/map/MapUnit.kt
View file

@ -392,6 +392,12 @@ class MapUnit {
civInfo.updateViewableTiles() civInfo.updateViewableTiles()
} }
fun disband(){
destroy()
if(currentTile.isCityCenter() && currentTile.getOwner()==civInfo)
civInfo.gold += baseUnit.getDisbandGold()
}
private fun getAncientRuinBonus() { private fun getAncientRuinBonus() {
currentTile.improvement=null currentTile.improvement=null
val actions: ArrayList<() -> Unit> = ArrayList() val actions: ArrayList<() -> Unit> = ArrayList()

6
core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
View file

@ -87,12 +87,16 @@ class BaseUnit : INamed, IConstruction, ICivilopedia {
override fun getProductionCost(adoptedPolicies: HashSet<String>): Int = cost override fun getProductionCost(adoptedPolicies: HashSet<String>): Int = cost
fun getBaseGoldCost() = Math.pow((30 * cost).toDouble(), 0.75) * (1 + hurryCostModifier / 100)
override fun getGoldCost(adoptedPolicies: HashSet<String>): Int { override fun getGoldCost(adoptedPolicies: HashSet<String>): Int {
var cost = Math.pow((30 * cost).toDouble(), 0.75) * (1 + hurryCostModifier / 100) var cost = getBaseGoldCost()
if(adoptedPolicies.contains("Militarism")) cost *= 0.66f if(adoptedPolicies.contains("Militarism")) cost *= 0.66f
return (cost / 10).toInt() * 10 // rounded down o nearest ten return (cost / 10).toInt() * 10 // rounded down o nearest ten
} }
fun getDisbandGold() = getBaseGoldCost().toInt()/20
fun isBuildable(civInfo:CivilizationInfo): Boolean { fun isBuildable(civInfo:CivilizationInfo): Boolean {
if (unbuildable) return false if (unbuildable) return false
if (requiredTech!=null && !civInfo.tech.isResearched(requiredTech!!)) return false if (requiredTech!=null && !civInfo.tech.isResearched(requiredTech!!)) return false

7
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View file

@ -200,8 +200,11 @@ class UnitActions {
actionList += UnitAction("Disband unit",unit.currentMovement >0 actionList += UnitAction("Disband unit",unit.currentMovement >0
) { ) {
YesNoPopupTable("Do you really want to disband this unit?".tr(), val disbandText = if(unit.currentTile.getOwner()==unit.civInfo)
{unit.destroy(); worldScreen.shouldUpdate=true} ) "Disband this unit for [${unit.baseUnit.getDisbandGold()}] gold?".tr()
else "Do you really want to disband this unit?".tr()
YesNoPopupTable(disbandText,
{unit.disband(); worldScreen.shouldUpdate=true} )
} }
return actionList return actionList