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

Steam Power and Astronomy now increase embarked units' movement

Browse Source
This commit is contained in:
Yair Morgenstern
2018-11-04 13:07:03 +02:00
parent fb2538524a
commit 937687a0f4
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -6,7 +6,6 @@ import com.unciv.logic.automation.UnitAutomation
import com.unciv.logic.automation.WorkerAutomation
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tile.TerrainType
import com.unciv.models.gamebasics.unit.BaseUnit
import com.unciv.ui.utils.getRandom
import java.text.DecimalFormat
@ -43,6 +42,8 @@ class MapUnit {
fun getMovementString(): String = DecimalFormat("0.#").format(currentMovement.toDouble()) + "/" + getMaxMovement()
fun getTile(): TileInfo = currentTile
fun getMaxMovement(): Int {
if(isEmbarked()) return getEmbarkedMovement()
var movement = baseUnit.movement
movement += getUniques().count{it=="+1 Movement"}
@ -67,7 +68,7 @@ class MapUnit {
fun updateUniques(){
val uniques = ArrayList<String>()
val baseUnit = baseUnit()
if(baseUnit.uniques!=null) uniques.addAll(baseUnit.uniques!!)
uniques.addAll(baseUnit.uniques)
uniques.addAll(promotions.promotions.map { GameBasics.UnitPromotions[it]!!.effect })
tempUniques = uniques
}
@ -164,11 +165,11 @@ class MapUnit {
return currentTile.baseTerrain=="Ocean"||currentTile.baseTerrain=="Coast"
}
fun getEmbarkedMovement(){
fun getEmbarkedMovement(): Int {
var movement=2
movement += civInfo.tech.techsResearched.map { GameBasics.Technologies[it]!! }
.count { it.baseDescription!=null && it.baseDescription!! == "Increases embarked movement" }
if(civInfo.tech.isResearched("Steam Power")) movement += 1
.count { it.baseDescription!=null && it.baseDescription!! == "Increases embarked movement +1" }
return movement
}
//endregion