From c282ffb4233c08bc7ff7bfed538e70708692a1fe Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 8 Jan 2019 15:43:54 +0200 Subject: [PATCH] Resolved #410 - land units on lake aren't shown as embarked --- android/Images/OtherIcons/Pillage.png | Bin 7265 -> 3339 bytes android/assets/jsons/Translations.json | 2 ++ core/src/com/unciv/logic/map/MapUnit.kt | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/android/Images/OtherIcons/Pillage.png b/android/Images/OtherIcons/Pillage.png index dfa9e31dd0faad555101e6fbc9b30587d3c653b0..490aaa13a5a22308b090a579e9b993e00ac689b9 100644 GIT binary patch literal 3339 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 V$yiarBk%wK002ovPDHLkV1lHhi>Ckp literal 7265 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 diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 72c63ceeb2..1f834e48af 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -503,6 +503,8 @@ Simplified_Chinese:"社会政策" Portuguese:"Políticas sociais" } + + "Options":{} "Display options":{ Italian:"Opzioni" diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 27e4988a78..72b79e576c 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -7,6 +7,7 @@ import com.unciv.logic.automation.WorkerAutomation import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.gamebasics.GameBasics 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.UnitType import com.unciv.ui.utils.getRandom @@ -189,7 +190,7 @@ class MapUnit { fun isEmbarked(): Boolean { if(!type.isLandUnit()) return false - return currentTile.baseTerrain=="Ocean"||currentTile.baseTerrain=="Coast" + return currentTile.getBaseTerrain().type==TerrainType.Water } fun isInvisible(): Boolean {