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

Travis test + minor fixes

Browse Source
This commit is contained in:
Yair Morgenstern 2019-07-27 23:21:40 +03:00
parent b131372b13
commit 98eb4c8cd7
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -1,4 +1,5 @@
language: android 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: android:
components: components:

2
android/assets/jsons/Nations.json
View File

@ -1005,7 +1005,7 @@
afterPeace:"May peace forever bless our lands.", afterPeace:"May peace forever bless our lands.",
outerColor:[0, 0, 0], outerColor:[0, 0, 0],
innerColor:[153,10,10], innerColor:[18,178,210],
cities:["Venice"] cities:["Venice"]
}, },
{ {

2
android/assets/jsons/Translations/Units,Promotions.json
View File

@ -901,7 +901,7 @@
French:"Mitrailleuse" French:"Mitrailleuse"
} }
"Anti-aircraft Gun":{ "Anti-Aircraft Gun":{
Italian:"Cannone antiaereo" Italian:"Cannone antiaereo"
Romanian:"Tun antiaerian" Romanian:"Tun antiaerian"
Spanish:"Arma Anti-Aerea" Spanish:"Arma Anti-Aerea"

9
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -236,17 +236,16 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
if(unit.isFortified() || unit.action=="Set Up" || unit.action=="Sleep") if(unit.isFortified() || unit.action=="Set Up" || unit.action=="Sleep")
unit.action=null // unfortify/setup after moving 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.removeFromTile()
unit.putInTile(destination) 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 - // 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. // 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 // 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){ for(tile in pathToFinalTile){
unit.moveThroughTile(tile) unit.moveThroughTile(tile)
} }