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

Use ranged strength when defending against ranged attacks (#6783)

Browse Source 
* Ranged units should use ranged strength when defending against ranged attacks.

* Renamed variable plus some minor style cleanup

Co-authored-by: OptimizedForDensity <>
This commit is contained in:
OptimizedForDensity 2022-05-12 17:11:04 -04:00 committed by GitHub
parent 940f361a5f
commit 4ab7d56c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@ object BattleDamage {
*/
private fun getDefendingStrength(attacker: ICombatant, defender: ICombatant): Float {
val defenceModifier = modifiersToMultiplicationBonus(getDefenceModifiers(attacker, defender))
return max(1f, defender.getDefendingStrength() * defenceModifier)
return max(1f, defender.getDefendingStrength(attacker.isRanged()) * defenceModifier)
}
fun calculateDamageToAttacker(

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

@ -33,7 +33,7 @@ class CityCombatant(val city: CityInfo) : ICombatant {
override fun getUnitType(): UnitType = UnitType.City
override fun getAttackingStrength(): Int = (getCityStrength(CombatAction.Attack) * 0.75).roundToInt()
override fun getDefendingStrength(): Int {
override fun getDefendingStrength(attackedByRanged: Boolean): Int {
if (isDefeated()) return 1
return getCityStrength()
}

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

@ -7,19 +7,19 @@ import com.unciv.models.ruleset.unit.UnitType
interface ICombatant {
fun getName(): String
fun getHealth():Int
fun getMaxHealth():Int
fun getHealth(): Int
fun getMaxHealth(): Int
fun getUnitType(): UnitType
fun getAttackingStrength(): Int
fun getDefendingStrength(): Int
fun takeDamage(damage:Int)
fun isDefeated():Boolean
fun getDefendingStrength(attackedByRanged: Boolean = false): Int
fun takeDamage(damage: Int)
fun isDefeated(): Boolean
fun getCivInfo(): CivilizationInfo
fun getTile(): TileInfo
fun isInvisible(to: CivilizationInfo): Boolean
fun canAttack(): Boolean
/** Implements [UniqueParameterType.CombatantFilter][com.unciv.models.ruleset.unique.UniqueParameterType.CombatantFilter] */
fun matchesCategory(category:String): Boolean
fun matchesCategory(category: String): Boolean
fun getAttackSound(): UncivSound
fun isMelee(): Boolean = !isRanged()

6
core/src/com/unciv/logic/battle/MapUnitCombatant.kt
View File

@ -18,7 +18,7 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant {
override fun isDefeated(): Boolean = unit.health <= 0
override fun isInvisible(to: CivilizationInfo): Boolean = unit.isInvisible(to)
override fun canAttack(): Boolean = unit.canAttack()
override fun matchesCategory(category:String) = unit.matchesFilter(category)
override fun matchesCategory(category: String) = unit.matchesFilter(category)
override fun getAttackSound() = unit.baseUnit.attackSound.let {
if (it==null) UncivSound.Click else UncivSound.custom(it)
}
@ -34,9 +34,11 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant {
else unit.baseUnit().strength
}
override fun getDefendingStrength(): Int {
override fun getDefendingStrength(attackedByRanged: Boolean): Int {
return if (unit.isEmbarked() && !isCivilian())
unit.civInfo.getEra().embarkDefense
else if (isRanged() && attackedByRanged)
unit.baseUnit().rangedStrength
else unit.baseUnit().strength
}

9
core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
View File

@ -121,8 +121,13 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
addSeparator().pad(0f)
add(attacker.getAttackingStrength().toString() + Fonts.strength)
add(defender.getDefendingStrength().toString() + Fonts.strength).row()
val attackIcon = if (attacker.isRanged()) Fonts.rangedStrength else Fonts.strength
var defenceIcon =
if (attacker.isRanged() && defender.isRanged() && !defender.isCity() && !(defender is MapUnitCombatant && defender.unit.isEmbarked()))
Fonts.rangedStrength
else Fonts.strength // use strength icon if attacker is melee, defender is melee, defender is a city, or defender is embarked
add(attacker.getAttackingStrength().toString() + attackIcon)
add(defender.getDefendingStrength(attacker.isRanged()).toString() + defenceIcon).row()
val quarterScreen = worldScreen.stage.width/4