Rename save/load completion callbacks for custom locations and implement error handling

android/assets/jsons/translations/German.properties

@@ -22,7 +22,8 @@ Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not s
 # Buildings
 
 Choose a free great person = Wähle eine kostenlose große Persönlichkeit
-Get [unitName] = Erhalte [unitName]
+ # Requires translation!
+Get [unitName] = 
 
 Hydro Plant = Wasserkraftwerk
 +1 population in each city = +1 Einwohner in jeder Stadt
@@ -434,7 +435,7 @@ Our proposed trade request is no longer relevant! = Unsere vorgeschlagene Handel
 [defender] withdrew from a [attacker] = [defender] hat sich vor [attacker] zurückgezogen
 [building] has provided [amount] Gold! = [building] hat [amount] Gold bereitgestellt.
 [civName] has stolen your territory! = [civName] hat uns Territorium abgeknöpft!
-Clearing a [forest] has created [amount] Production for [cityName] = Die Rodung eines [forest] ergab [amount] Produktion für [cityName]
+Clearing a [forest] has created [amount] Production for [cityName] = Die Rodung eines [forest] hat [amount] Produktion für [cityName]
 
 
 # World Screen UI
@@ -810,7 +811,8 @@ Adopt policy = Grundsatz verabschieden
 Adopt free policy = Freien Grundsatz verabschieden
 Unlocked at = Freigeschaltet bei
 Gain 2 free technologies = 2 kostenlose Technologien
-All policies adopted = Alle Grundsätze verabschiedet
+ # Requires translation!
+All policies adopted = 
 
 # Technologies
 
@@ -955,7 +957,8 @@ Walls of Babylon = Babylons Mauern
 
 'O, let not the pains of death which come upon thee enter into my body. I am the god Tem, and I am the foremost part of the sky, and the power which protecteth me is that which is with all the gods forever.'  - The Book of the Dead, translated by Sir Ernest Alfred Wallis Budge = 'Oh, laß nicht die Schmerzen des Todes, die über dich kommen, in meinen Leib kommen. Ich bin der Gott Tem, und ich bin der wichtigste Teil des Himmels, und die Macht, die mich schützt, ist die, die mit allen Göttern für immer besteht.'  - Das Buch der Toten, übersetzt von Sir Ernest Alfred Wallis Budge
 Worker construction increased 25% = Arbeiterproduktion um 25% erhöht
-[amount] free [unit] units appear = [amount] kostenlose Einheiten vom Typ [unit] erscheinen
+ # Requires translation!
+[amount] free [unit] units appear = 
 The Pyramids = Die Pyramiden
 
 Barracks = Kaserne
@@ -2368,7 +2371,8 @@ Xochicalco = Xochicalco
 Tlacopan = Tlacopan
 Atzcapotzalco = Atzcapotzalco
 Tzintzuntzan = Tzintzuntzan
-Malinalco = Malinalco
+ # Requires translation!
+Malinalco = 
 Tamuin = Tamuin
 Teayo = Teayo
 Cempoala = Cempoala

android/assets/jsons/translations/Italian.properties

@@ -22,7 +22,8 @@ Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not s
 # Buildings
 
 Choose a free great person = Scegli un Grande Personaggio gratuito
-Get [unitName] = Prendi [unitName]
+ # Requires translation!
+Get [unitName] = 
 
 Hydro Plant = Centrale idroelettrica
 +1 population in each city = +1 Popolazione in ogni città
@@ -810,7 +811,8 @@ Adopt policy = Adotta politica
 Adopt free policy = Adotta politica
 Unlocked at = Richiede
 Gain 2 free technologies = Consente di scoprire due Tecnologie gratuite
-All policies adopted = Tutte le politiche adottate
+ # Requires translation!
+All policies adopted = 
 
 # Technologies
 

android/assets/jsons/translations/Simplified_Chinese.properties

@@ -22,7 +22,8 @@ Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not s
 # Buildings
 
 Choose a free great person = 选择1个免费的伟人
-Get [unitName] = 获得[unitName]
+ # Requires translation!
+Get [unitName] = 
 
 Hydro Plant = 水电站
 +1 population in each city = 每座城市+1人口
@@ -909,9 +910,12 @@ Must be on [terrain] = 城市必须位于[terrain]之上
 +[amount]% vs [unitType] = 对战[unitType]时+[amount]%
 
 # City filters
-in this city = 在此城市
-in every city = 在每座城市
-in capital = 在首都
+ # Requires translation!
+in this city = 
+ # Requires translation!
+in every city = 
+ # Requires translation!
+in capital = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################

android/assets/jsons/translations/completionPercentages.properties

@@ -1,7 +1,7 @@
 Persian_(Pinglish-UN) = 26
 Italian = 99
 Russian = 96
-German = 100
+German = 99
 Turkish = 73
 Ukrainian = 99
 French = 91
@@ -16,7 +16,7 @@ Polish = 95
 Lithuanian = 24
 Romanian = 41
 Korean = 95
-Simplified_Chinese = 100
+Simplified_Chinese = 99
 Persian_(Pinglish-DIN) = 26
 Japanese = 99
 English = 1

core/src/com/unciv/logic/GameStarter.kt

@@ -73,16 +73,6 @@ object GameStarter {
                 for (tech in gameInfo.getDifficulty().aiFreeTechs)
                     civInfo.tech.addTechnology(tech)
 
-            // generic start with technology unique
-            for(unique in civInfo.getMatchingUniques("Starts with []")) {
-                // get the parameter from the unique
-                val techName = unique.params[0]
-
-                // check if the technology is in the ruleset and not already researched
-                if (ruleset.technologies.containsKey(techName) && !civInfo.tech.isResearched(techName))
-                    civInfo.tech.addTechnology(techName)
-            }
-
             // add all techs to spectators
             if (civInfo.isSpectator())
                 for (tech in ruleset.technologies.values)

core/src/com/unciv/logic/civilization/CivilizationInfo.kt

@@ -6,7 +6,6 @@ import com.unciv.Constants
 import com.unciv.JsonParser
 import com.unciv.UncivGame
 import com.unciv.logic.GameInfo
-import com.unciv.logic.UncivShowableException
 import com.unciv.logic.automation.NextTurnAutomation
 import com.unciv.logic.city.CityInfo
 import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
@@ -246,9 +245,7 @@ class CivilizationInfo {
         for (unit in gameInfo.ruleSet.units.values)
             if (unit.replaces == baseUnitName && unit.uniqueTo == civName)
                 return unit
-        val baseUnit = gameInfo.ruleSet.units[baseUnitName]
-        if (baseUnit == null) throw UncivShowableException("Unit $baseUnitName doesn't seem to exist!")
-        return baseUnit
+        return gameInfo.ruleSet.units[baseUnitName]!!
     }
 
     fun meetCivilization(otherCiv: CivilizationInfo) {

core/src/com/unciv/ui/trade/DiplomacyScreen.kt

@@ -32,7 +32,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
 
     init {
         onBackButtonClicked { UncivGame.Current.setWorldScreen() }
-        val splitPane = SplitPane(ScrollPane(leftSideTable), rightSideTable, false, skin)
+        val splitPane = SplitPane(ScrollPane(leftSideTable), ScrollPane(rightSideTable), false, skin)
         splitPane.splitAmount = 0.2f
 
         updateLeftSideTable()
@@ -73,10 +73,10 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
         }
     }
 
-    fun updateRightSide(otherCiv: CivilizationInfo) {
+    fun updateRightSide(otherCiv: CivilizationInfo){
         rightSideTable.clear()
-        if (otherCiv.isCityState()) rightSideTable.add(getCityStateDiplomacyTable(otherCiv))
-        else rightSideTable.add(ScrollPane(getMajorCivDiplomacyTable(otherCiv))).height(stage.height)
+        if(otherCiv.isCityState()) rightSideTable.add(getCityStateDiplomacyTable(otherCiv))
+        else rightSideTable.add(getMajorCivDiplomacyTable(otherCiv))
     }
 
     fun setTrade(civ: CivilizationInfo): TradeTable {