diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index ce19bada75..e303b71a01 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -326,7 +326,6 @@ greatPersonPoints:{production:1}, isWonder:true, providesFreeBuilding: "Walls", - freeTechs:1, uniques:["Enemy land units must spend 1 extra movement point when inside your territory (obsolete upon Dynamite)"] requiredTech:"Engineering", quote:"'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu" diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 5948015517..421482c760 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -764,7 +764,7 @@ } "Pick construction":{ - Italian:"Scegli la costruzione" + Italian:"Scegli costruzione" Russian:"Выбрать здание" French:"Sélectionner la construction" Romanian:"Alege construcția" @@ -985,7 +985,7 @@ } "Sell for [sellAmount] gold":{ // when selling a building - Italian:"Vendi per [sellAmount] Oro" //es. + Italian:"Vendi ([sellAmount] Oro)" //es. Russian:"Продать за [sellAmount] золота" French:"Vendre pour [sellAmount] or" Romanian:"Vindem [sellAmount] de aur" @@ -1362,7 +1362,7 @@ ////// Policy picker screen "You have entered the [newEra]!":{//e.g.:"You have entered the Ancient era!", please re-translate it. - Italian:"Sei entrato in una nuova era, l'Epoca [newEra]!" //[newEra] not translated in Italian + Italian:"Benvenuto nell'Era [newEra]!" Russian:"Вы вошли в эпоху [newEra]!" French:"Vous êtes entré dans l'ère [newEra]!" Romanian:"Ai intrat în epoca [newEra]!" @@ -1563,7 +1563,7 @@ } "Unit upkeep":{ - Italian:"Mantenimento dell'unità" + Italian:"Mantenimento unità" Russian:"Содержание" French:"Entretien des unités" Romanian:"Întreținere unități" @@ -1702,7 +1702,7 @@ Portuguese:"Você ganhou uma vitória cultural!" } - "You have won a conquest victory!":{ + "You have won a domination victory!":{ Italian:"Hai ottenuto una Vittoria per Dominazione!" German:"Sie haben den Dominanzsieg errungen!" French:"Vous avez fait une victoire militaire !" @@ -1814,6 +1814,10 @@ Italian:"Riduci a Stato Fantoccio" } + "Liberate":{ + Italian:"Libera" + } + "Raze":{ Italian:"Distruggi" French:"Razer" @@ -2068,4 +2072,16 @@ Italian:"Punto iniziale di [nation]" } + "Clear terrain features":{ + Italian:"Elimina caratteristica del terreno" + } + + "Clear improvements":{ + Italian:"Elimina miglioramenti" + } + + "Clear resource":{ + Italian:"Elimina risorsa" + } + } diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 7628be26f9..a0bd1ec199 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -261,11 +261,14 @@ class CityInfo { } fun destroyCity() { + for(airUnit in getCenterTile().airUnits.toList()) airUnit.destroy() //Destroy planes stationed in city + // Edge case! What if a water unit is in a city, and you raze the city? // Well, the water unit has to return to the water! - for(unit in getCenterTile().getUnits()) - if(!unit.movement.canPassThrough(getCenterTile())) + for(unit in getCenterTile().getUnits()) { + if (!unit.movement.canPassThrough(getCenterTile())) unit.movement.teleportToClosestMoveableTile() + } civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) } getTiles().forEach { expansion.relinquishOwnership(it) }