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

2.13.14

Browse Source
This commit is contained in:
Yair Morgenstern
2019-03-14 22:29:25 +02:00
parent 9bccc739d4
commit 10d098b9de
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 215 versionCode 216
versionName "2.13.13" versionName "2.13.14"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

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

@ -77,15 +77,15 @@ class Battle(val gameInfo:GameInfo) {
if(defender.isDefeated() if(defender.isDefeated()
&& defender.getUnitType() == UnitType.City && defender is CityCombatant
&& attacker.isMelee() && attacker.isMelee()
&& attacker.getUnitType().isLandUnit()){ && attacker.getUnitType().isLandUnit()){
conquerCity((defender as CityCombatant).city, attacker) conquerCity(defender.city, attacker)
} }
// we're a melee unit and we destroyed\captured an enemy unit // we're a melee unit and we destroyed\captured an enemy unit
else if (attacker.isMelee() else if (attacker.isMelee()
&& (defender.isDefeated() || defender.getCivInfo()==attacker.getCivInfo() ) && (defender.isDefeated() || defender.getCivInfo()==attacker.getCivInfo())
// This is so that if we attack e.g. a barbarian in enemy territory that we can't enter, we won't enter it // This is so that if we attack e.g. a barbarian in enemy territory that we can't enter, we won't enter it
&& (attacker as MapUnitCombatant).unit.canMoveTo(attackedTile)) { && (attacker as MapUnitCombatant).unit.canMoveTo(attackedTile)) {
// we destroyed an enemy military unit and there was a civilian unit in the same tile as well // we destroyed an enemy military unit and there was a civilian unit in the same tile as well