Merge branch 'master' of https://github.com/yairm210/UnCiv

android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json

@@ -265,6 +265,7 @@
 		German:"Gott"
 	}
 	
+	//Civilization select
 	
 	"AI":{
 		Italian:"IA"
@@ -341,6 +342,14 @@
 		Russian:"Скопировать ID игры"
 	}
 	
+	"Set current user":{
+		Italian:"Imposta utente attuale"
+	}
+	
+	"Player ID from clipboard":{
+		Italian:"Copia ID giocatore dagli appunti"
+	}
+	
 	/// tutorials for multiplayer
 	"To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID.":{
 		Italian:"Per creare una partita multigiocatore, attiva la spunta su 'Multigiocatore' nella schermata Nuova Partita, e inserisci l'ID utente per del giocatore per ogni rispettivo giocatore umano"

core/src/com/unciv/logic/battle/BattleDamage.kt

@@ -81,7 +81,8 @@ class BattleDamage{
                 modifiers["Great General"] = greatGeneralModifier
             }
 
-            if(combatant.getCivInfo().nation.unique=="Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strength")
+            if(combatant.getCivInfo().nation.unique=="Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strength"
+                    && combatant.getCivInfo().goldenAges.isGoldenAge())
                 modifiers["Golden Age"] = 0.1f
 
         }

core/src/com/unciv/logic/city/CityExpansionManager.kt

@@ -77,7 +77,7 @@ class CityExpansionManager {
             relinquishOwnership(tile)
 
         cityInfo.getCenterTile().getTilesInDistance(1)
-                .filter { it.getCity()==null || it.getCity()!!.civInfo==cityInfo.civInfo } // can't take ownership of owned tiles
+                .filter { it.getCity()==null } // can't take ownership of owned tiles
                 .forEach { takeOwnership(it) }
     }