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

Resolved #410 - land units on lake aren't shown as embarked

Browse Source
This commit is contained in:
Yair Morgenstern 2019-01-08 15:43:54 +02:00
parent eeb494364b
commit c282ffb423
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/Pillage.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

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

@ -504,6 +504,8 @@
Portuguese:"Políticas sociais" Portuguese:"Políticas sociais"
} }
"Options":{}
"Display options":{ "Display options":{
Italian:"Opzioni" Italian:"Opzioni"
Russian:"Параметры экрана" Russian:"Параметры экрана"

3
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -7,6 +7,7 @@ import com.unciv.logic.automation.WorkerAutomation
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tech.TechEra import com.unciv.models.gamebasics.tech.TechEra
import com.unciv.models.gamebasics.tile.TerrainType
import com.unciv.models.gamebasics.unit.BaseUnit import com.unciv.models.gamebasics.unit.BaseUnit
import com.unciv.models.gamebasics.unit.UnitType import com.unciv.models.gamebasics.unit.UnitType
import com.unciv.ui.utils.getRandom import com.unciv.ui.utils.getRandom
@ -189,7 +190,7 @@ class MapUnit {
fun isEmbarked(): Boolean { fun isEmbarked(): Boolean {
if(!type.isLandUnit()) return false if(!type.isLandUnit()) return false
return currentTile.baseTerrain=="Ocean"||currentTile.baseTerrain=="Coast" return currentTile.getBaseTerrain().type==TerrainType.Water
} }
fun isInvisible(): Boolean { fun isInvisible(): Boolean {