Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Barbarians don't move/attack on the turn of their spawning

Browse Source
This commit is contained in:
dumichno 2020-01-18 18:47:36 +03:00
parent 02def2ffa9
commit b088fb8cb5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ class MapUnit {
lateinit var name: String
var currentMovement: Float = 0f
var health:Int = 100
var createdThisTurn = true
var mapUnitAction : MapUnitAction? = null
@ -77,6 +78,7 @@ class MapUnit {
toReturn.name=name
toReturn.currentMovement=currentMovement
toReturn.health=health
toReturn.createdThisTurn=createdThisTurn
toReturn.action=action
toReturn.attacksThisTurn=attacksThisTurn
toReturn.promotions=promotions.clone()
@ -397,6 +399,7 @@ class MapUnit {
fun endTurn() {
createdThisTurn = false
doPostTurnAction()
if(currentMovement== getMaxMovement().toFloat() // didn't move this turn
|| getUniques().contains("Unit will heal every turn, even if it performs an action")){
@ -405,7 +408,7 @@ class MapUnit {
}
fun startTurn(){
currentMovement = getMaxMovement().toFloat()
currentMovement = if (createdThisTurn && civInfo.isBarbarian()) 0f else getMaxMovement().toFloat()
attacksThisTurn=0
due = true