diff --git a/android/Images/OtherIcons/Pillage.png b/android/Images/OtherIcons/Pillage.png index dfa9e31dd0..490aaa13a5 100644 Binary files a/android/Images/OtherIcons/Pillage.png and b/android/Images/OtherIcons/Pillage.png differ 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 {