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

Fix Persia civ battle bonus.

Browse source
This commit is contained in:
Duan Tao 2019-09-28 11:39:28 +08:00 committed by Yair Morgenstern
parent df2faee2a8
commit ba3103277a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/com/unciv/logic/battle/BattleDamage.kt
View file

@ -81,7 +81,8 @@ class BattleDamage{
modifiers["Great General"] = greatGeneralModifier
}
if(combatant.getCivInfo().nation.unique=="Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strength")
if(combatant.getCivInfo().nation.unique=="Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strength"
&& combatant.getCivInfo().goldenAges.isGoldenAge())
modifiers["Golden Age"] = 0.1f
}

2
core/src/com/unciv/logic/city/CityExpansionManager.kt
View file

@ -77,7 +77,7 @@ class CityExpansionManager {
relinquishOwnership(tile)
cityInfo.getCenterTile().getTilesInDistance(1)
.filter { it.getCity()==null || it.getCity()!!.civInfo==cityInfo.civInfo } // can't take ownership of owned tiles
.filter { it.getCity()==null } // can't take ownership of owned tiles
.forEach { takeOwnership(it) }
}