diff --git a/.travis.yml b/.travis.yml index 3adb9a31b6..c382ca712b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: android +dist: trusty # For oracleJDK fail errors, as per advice from https://travis-ci.community/t/error-installing-oraclejdk8-expected-feature-release-number-in-range-of-9-to-14-but-got-8/3766/6 android: components: diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index 52328c28a6..c349e0618f 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -1005,7 +1005,7 @@ afterPeace:"May peace forever bless our lands.", outerColor:[0, 0, 0], - innerColor:[153,10,10], + innerColor:[18,178,210], cities:["Venice"] }, { diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index 7024f6c76e..c07bda84fa 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -901,7 +901,7 @@ French:"Mitrailleuse" } - "Anti-aircraft Gun":{ + "Anti-Aircraft Gun":{ Italian:"Cannone antiaereo" Romanian:"Tun antiaerian" Spanish:"Arma Anti-Aerea" diff --git a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt index 1c43cf6026..da4b474c82 100644 --- a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt +++ b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt @@ -236,17 +236,16 @@ class UnitMovementAlgorithms(val unit:MapUnit) { if(unit.isFortified() || unit.action=="Set Up" || unit.action=="Sleep") unit.action=null // unfortify/setup after moving - // Move through all intermediate tiles to get ancient ruins, barb encampments - // and to view tiles along the way - val pathToFinalTile = distanceToTiles.getPathToTile(destination) unit.removeFromTile() unit.putInTile(destination) + // Move through all intermediate tiles to get ancient ruins, barb encampments + // and to view tiles along the way // We only activate the moveThroughTile AFTER the putInTile because of a really weird bug - // If you're going to (or past) a ruin, and you activate the ruin bonus, and A UNIT spawns. // That unit could now be blocking your entrance to the destination, so the putInTile would fail! =0 - // Instead, we move you to the destination directly, and only afterwards activate the various tileson the way. - + // Instead, we move you to the destination directly, and only afterwards activate the various tiles on the way. + val pathToFinalTile = distanceToTiles.getPathToTile(destination) for(tile in pathToFinalTile){ unit.moveThroughTile(tile) }