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

Added combat penalty when attacking across a river

Browse Source
This commit is contained in:
Yair Morgenstern 2020-05-31 16:47:52 +03:00
parent 69dc3cc5f1
commit e81e048169
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,14 @@ object BattleDamage {
} }
if (numberOfAttackersSurroundingDefender > 1) if (numberOfAttackersSurroundingDefender > 1)
modifiers["Flanking"] = 0.1f * (numberOfAttackersSurroundingDefender-1) //https://www.carlsguides.com/strategy/civilization5/war/combatbonuses.php modifiers["Flanking"] = 0.1f * (numberOfAttackersSurroundingDefender-1) //https://www.carlsguides.com/strategy/civilization5/war/combatbonuses.php
if (attacker.getTile().isConnectedByRiver(defender.getTile())){
if (!attacker.getTile().hasConnection(attacker.getCivInfo()) // meaning, the tiles are not road-connected for this civ
|| !defender.getTile().hasConnection(attacker.getCivInfo())
|| !attacker.getCivInfo().tech.roadsConnectAcrossRivers){
modifiers["Across river"] = -0.2f
}
}
} }
if (policies.autocracyCompletedTurns > 0 && policies.hasEffect("+20% attack bonus to all Military Units for 30 turns")) if (policies.autocracyCompletedTurns > 0 && policies.hasEffect("+20% attack bonus to all Military Units for 30 turns"))
@ -153,8 +161,6 @@ object BattleDamage {
modifiers["Oligarchy"] = 0.5f modifiers["Oligarchy"] = 0.5f
} }
return modifiers return modifiers
} }
@ -217,7 +223,8 @@ object BattleDamage {
|| tile.terrainFeature != Constants.jungle)) || tile.terrainFeature != Constants.jungle))
modifiers[tile.baseTerrain] = 0.25f modifiers[tile.baseTerrain] = 0.25f
if(unit.getCivInfo().nation.unique == UniqueAbility.WAYFINDING && tile.getTilesInDistance(2).any { it.improvement=="Moai" }) if(unit.getCivInfo().nation.unique == UniqueAbility.WAYFINDING
&& tile.getTilesInDistance(2).any { it.improvement=="Moai" })
modifiers["Moai"] = 0.1f modifiers["Moai"] = 0.1f
if(tile.neighbors.flatMap { it.getUnits() } if(tile.neighbors.flatMap { it.getUnits() }

4
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -341,12 +341,14 @@ open class TileInfo {
return toString(null) return toString(null)
} }
/** The two tiles have a river between them */
fun isConnectedByRiver(otherTile:TileInfo): Boolean { fun isConnectedByRiver(otherTile:TileInfo): Boolean {
if(otherTile !in neighbors) throw Exception("Should never call this function on a non-neighbor!")
val xDifference = this.position.x - otherTile.position.x val xDifference = this.position.x - otherTile.position.x
val yDifference = this.position.y - otherTile.position.y val yDifference = this.position.y - otherTile.position.y
return when { return when {
yDifference < -1f || xDifference < -1f || yDifference > 1f || xDifference > 1f ->
throw Exception("Should never call this function on a non-neighbor!")
xDifference == 1f && yDifference == 1f -> hasBottomRiver // we're directly above it xDifference == 1f && yDifference == 1f -> hasBottomRiver // we're directly above it
xDifference == 1f -> hasBottomRightRiver // we're to the top-left of it xDifference == 1f -> hasBottomRightRiver // we're to the top-left of it
yDifference == 1f -> hasBottomLeftRiver // we're to the top-right of it yDifference == 1f -> hasBottomLeftRiver // we're to the top-right of it