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

Civilian should not move when bought (#2621)

Browse Source 
* Civilian cannot move when bought same as military unit

* Minor code restyling
This commit is contained in:
Jack Rainy
2020-05-16 21:57:36 +03:00
committed by GitHub
parent 4026c9b91d
commit 8877c18f31
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -156,6 +156,10 @@ class BaseUnit : INamed, IConstruction {
val unit = construction.cityInfo.civInfo.placeUnitNearTile(construction.cityInfo.location, name)
if (unit == null) return false // couldn't place the unit, so there's actually no unit =(
//movement penalty
if (wasBought && !unit.hasUnique("Can move directly once bought"))
unit.currentMovement = 0f
if (this.unitType.isCivilian()) return true // tiny optimization makes save files a few bytes smaller
var XP = construction.getBuiltBuildings().sumBy { it.xpForNewUnits }
@ -166,10 +170,6 @@ class BaseUnit : INamed, IConstruction {
&& construction.cityInfo.containsBuildingUnique("All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion"))
unit.promotions.addPromotion("Drill I", isFree = true)
//movement penalty
if(!unit.hasUnique("Can move directly once bought") && wasBought)
unit.currentMovement = 0f
return true
}