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

Ranged units capture civilian (#11012)

Browse Source 
* Ranged units don't shoot civilian units, they prioritise capturing instead

* Cities don't bombard capturable civilian units
This commit is contained in:
Oskar Niesen
2024-01-28 03:06:32 -06:00
committed by GitHub
parent f1dd08ccc2
commit 819541838c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/logic/automation/unit/BattleHelper.kt
View File

@ -26,8 +26,14 @@ object BattleHelper {
val enemyTileToAttack = chooseAttackTarget(unit, attackableEnemies) val enemyTileToAttack = chooseAttackTarget(unit, attackableEnemies)
if (enemyTileToAttack != null) { if (enemyTileToAttack != null) {
if (enemyTileToAttack.tileToAttack.militaryUnit == null && unit.baseUnit.isRanged()
&& unit.movement.canMoveTo(enemyTileToAttack.tileToAttack)) {
// Ranged units should move to caputre a civilian unit instead of attacking it
unit.movement.moveToTile(enemyTileToAttack.tileToAttack)
} else {
Battle.moveAndAttack(MapUnitCombatant(unit), enemyTileToAttack) Battle.moveAndAttack(MapUnitCombatant(unit), enemyTileToAttack)
} }
}
return unit.currentMovement == 0f return unit.currentMovement == 0f
} }
@ -148,12 +154,14 @@ object BattleHelper {
else attackValue -= (attacksToKill * 5).toInt() else attackValue -= (attacksToKill * 5).toInt()
} else if (civilianUnit != null) { } else if (civilianUnit != null) {
attackValue = 50 attackValue = 50
// Only melee units should really attack/capture civilian units, ranged units take more than one turn // Only melee units should really attack/capture civilian units, ranged units may be able to capture by moving
if (attacker.baseUnit.isMelee()) { if (attacker.baseUnit.isMelee() || attacker.movement.canReachInCurrentTurn(attackTile.tileToAttack)) {
if (civilianUnit.isGreatPerson()) { if (civilianUnit.isGreatPerson()) {
attackValue += 150 attackValue += 150
} }
if (civilianUnit.hasUnique(UniqueType.FoundCity)) attackValue += 60 if (civilianUnit.hasUnique(UniqueType.FoundCity)) attackValue += 60
} else if (attacker.baseUnit.isRanged() && !civilianUnit.hasUnique(UniqueType.Uncapturable)) {
return 10 // Don't shoot civilians that we can capture!
} }
} }
// Prioritise closer units as they are generally more threatening to this unit // Prioritise closer units as they are generally more threatening to this unit

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

@ -496,6 +496,7 @@ object UnitAutomation {
private fun chooseBombardTarget(city: City): ICombatant? { private fun chooseBombardTarget(city: City): ICombatant? {
var targets = TargetHelper.getBombardableTiles(city).map { Battle.getMapCombatantOfTile(it)!! } var targets = TargetHelper.getBombardableTiles(city).map { Battle.getMapCombatantOfTile(it)!! }
.filterNot { it.isCivilian() && !it.getUnitType().hasUnique(UniqueType.Uncapturable) } // Don't bombard capturable civilians
if (targets.none()) return null if (targets.none()) return null
val siegeUnits = targets val siegeUnits = targets