diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 8c2e90b3bb..9a41cff62b 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -13,7 +13,7 @@ Romanian:"Runda" } - "in "{ // As in "Opera House in 3 turns" + "in ":{ // As in "Opera House in 3 turns" } @@ -97,7 +97,7 @@ } "Science":{ Italian:"Scienza" - Russian:"Наука + Russian:"Наука" French:"Science" Romanian:"Ştiinţă" } @@ -205,22 +205,22 @@ } // Notifications - " has grown"{ // eg Alexandria has grown + " has grown":{ // eg Alexandria has grown } - " is starving"{ + " is starving":{ } - " has expanded its borders"{ // eg Alexandria has grown + " has expanded its borders":{ // eg Alexandria has grown } - "An enemy "{ + "An enemy ":{ } - " has attacked our "{ // eg Alexandria has grown + " has attacked our ":{ // eg Alexandria has grown } - " has destroyed our "{ // eg Alexandria has grown + " has destroyed our ":{ // eg Alexandria has grown } diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index cbe683925b..ae086ca567 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -45,7 +45,7 @@ rangedStrength:7, cost: 40, hurryCostModifier:20 - requiredTech:"Ranged", + requiredTech:"Archery", obsoleteTech:"Machinery", upgradesTo:"Crossbowman" }, diff --git a/core/src/com/unciv/logic/automation/Automation.kt b/core/src/com/unciv/logic/automation/Automation.kt index e726b03baf..fd579a5cd6 100644 --- a/core/src/com/unciv/logic/automation/Automation.kt +++ b/core/src/com/unciv/logic/automation/Automation.kt @@ -85,7 +85,7 @@ class Automation { chosenUnit = combatUnits.filter { it.unitType== UnitType.Ranged }.maxBy { it.cost }!! else{ // randomize type of unit and takee the most expensive of its kind - val chosenUnitType = combatUnits.map { it.unitType }.distinct().getRandom() + val chosenUnitType = combatUnits.map { it.unitType }.distinct().filterNot{it==UnitType.Scout}.getRandom() chosenUnit = combatUnits.filter { it.unitType==chosenUnitType }.maxBy { it.cost }!! } diff --git a/core/src/com/unciv/ui/CivilopediaScreen.kt b/core/src/com/unciv/ui/CivilopediaScreen.kt index 11936df261..71d1d4c194 100644 --- a/core/src/com/unciv/ui/CivilopediaScreen.kt +++ b/core/src/com/unciv/ui/CivilopediaScreen.kt @@ -74,7 +74,7 @@ class CivilopediaScreen : CameraStageBaseScreen() { buttonClicked() } - buttonTable.add(button).width(button.width * 0.7f) + buttonTable.add(button) } val sp = ScrollPane(nameList)