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

Added city destroy to Battle.kt

Browse Source
This commit is contained in:
PhiRite 2025-09-15 15:01:58 +08:00 committed by GitHub
parent 6319863fb4
commit 17c59c02ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -213,6 +213,18 @@ object Battle {
|| attacker.unit.hasUnique(UniqueType.CannotCaptureCities, checkCivInfoUniques = true) || attacker.unit.hasUnique(UniqueType.CannotCaptureCities, checkCivInfoUniques = true)
) return ) return
// Must come before normal conquest logic so units that cannot capture cities can still destroy them
// Melee units can capture capitals; any unit with CanDestroyCities can destroy non-capital cities
if (defender.isDefeated() && defender is CityCombatant && attacker is MapUnitCombatant) {
if (!defender.city.isCapital()) {
val destroyFilters = attacker.unit.getMatchingUniques(UniqueType.CanDestroyCities).map { it.params[0] }
if (destroyFilters.any { filter: String -> defender.city.matchesFilter(filter.trim(), attacker.getCivInfo()) }) {
defender.city.destroyCity()
return // crashes due to continueing to conquer after this so its required
}
}
}
// Barbarians can't capture cities, instead raiding them for gold // Barbarians can't capture cities, instead raiding them for gold
if (attacker.unit.civ.isBarbarian) { if (attacker.unit.civ.isBarbarian) {
defender.takeDamage(-1) // Back to 2 HP defender.takeDamage(-1) // Back to 2 HP