AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 10:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-added && attacker.getCivInfo().isCityState and remove space in UnitAutomation.kt

Browse Source
This commit is contained in:
Emandac 2025-09-13 23:47:53 +02:00
parent 546e57c971
commit 099ee7c387
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
View File

@ -67,8 +67,7 @@ object UnitAutomation {
if (unit.civ.isHuman() && tryUpgradeUnit(unit)) return
//This allows for military units with certain civilian abilities to behave as civilians in peace and soldiers in war
if ((unit.hasUnique(UniqueType.BuildImprovements) ||
unit.hasUnique(UniqueType.FoundCity) ||
if ((unit.hasUnique(UniqueType.BuildImprovements) || unit.hasUnique(UniqueType.FoundCity) ||
unit.hasUnique(UniqueType.ReligiousUnit) || unit.hasUnique(UniqueType.CreateWaterImprovements))
&& !unit.civ.isAtWar()){
CivilianUnitAutomation.automateCivilianUnit(unit, getDangerousTiles(unit))

2
core/src/com/unciv/logic/battle/BattleUnitCapture.kt
View File

@ -146,7 +146,7 @@ object BattleUnitCapture {
wasDestroyedInstead = true
}
// City states can never capture settlers at all
capturedUnit.hasUnique(UniqueType.FoundCity, GameContext.IgnoreConditionals) -> {
capturedUnit.hasUnique(UniqueType.FoundCity, GameContext.IgnoreConditionals) && attacker.getCivInfo().isCityState -> {
capturedUnit.destroy()
wasDestroyedInstead = true
}