From 2e9b1e6de6bd1bf5218c593fab6104ac043bdb09 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 5 Nov 2019 10:18:43 +0200 Subject: [PATCH] Added 750x500 resolution for tiny screens (it still looks OK, but if we go lower to 600*400 then...no) City states no longer get starting Scouts - #1289 --- core/src/com/unciv/logic/GameStarter.kt | 3 ++- .../ui/worldscreen/optionstable/WorldScreenOptionsTable.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt index 61fbf2fd9d..005af2c346 100644 --- a/core/src/com/unciv/logic/GameStarter.kt +++ b/core/src/com/unciv/logic/GameStarter.kt @@ -110,7 +110,8 @@ class GameStarter{ civ.placeUnitNearTile(startingLocation.position, Constants.settler) civ.placeUnitNearTile(startingLocation.position, getWarriorEquivalent(civ)) - civ.placeUnitNearTile(startingLocation.position, "Scout") + if(civ.isMajorCiv()) // City-states don't get initial Scouts + civ.placeUnitNearTile(startingLocation.position, "Scout") if (!civ.isPlayerCivilization() && civ.isMajorCiv()) { for (unit in gameInfo.getDifficulty().aiFreeUnits) { diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt index 1428bb4321..07af43478a 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt @@ -195,7 +195,7 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr val resolutionSelectBox = SelectBox(skin) val resolutionArray = Array() - resolutionArray.addAll("900x600", "1050x700", "1200x800", "1500x1000") + resolutionArray.addAll("750x500","900x600", "1050x700", "1200x800", "1500x1000") resolutionSelectBox.items = resolutionArray resolutionSelectBox.selected = UnCivGame.Current.settings.resolution innerTable.add(resolutionSelectBox).pad(10f).row()