Memory performance tweaks

Renamed nation Main and Secondary to Outer and Inner colors, to be more clear what we're laking about

android/assets/jsons/Nations.json

@@ -28,8 +28,8 @@
 		afterPeace:"Foolish, foolish – letting me live.",
 		tradeRequest:"It appears that you do have a reason for existing – to make this deal with me.",
 				
-		mainColor:[27,53,63],
+		outerColor:[27,53,63],
-		secondaryColor:[213,249,255],
+		innerColor:[213,249,255],
 		uniqueName:"Ingenuity",
 		unique:"Receive free Great Scientist when you discover Writing, Earn Great Scientists 50% faster",
 		cities:["Babylon","Akkad","Dur-Kurigalzu","Nippur","Borsippa","Sippar","Opis","Mari","Shushan","Eshnunna",
@@ -64,8 +64,8 @@
 		afterPeace:"I must congratulate you on your remarkable victory."
 		tradeRequest:"My friend, does this seem reasonable to you?"
 				
-		mainColor:[181, 232, 232],
+		outerColor:[181, 232, 232],
-		secondaryColor:[68,142,249],
+		innerColor:[68,142,249],
 		/*
 		uniqueName:"Hellenic League",
 		unique:"City-State Influence degrades at half and recovers at twice the normal rate",
@@ -101,8 +101,8 @@
 		afterPeace:"The Blessings of Heaven be upon you."
 		tradeRequest:"My friend, do you think you can accept this request?"
 				
-		mainColor:[9, 112, 84],
+		outerColor:[9, 112, 84],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"Art of War",
 		unique:"Great general provides double combat bonus, and spawns 50% faster"
 		cities:["Beijing","Shanghai","Guangzhou","Nanjing","Xian","Chengdu","Hangzhou","Tianjin","Macau","Shandong",
@@ -137,8 +137,8 @@
 		afterPeace:"You know I could have destroyed you, but the feeling of generosity perfumes me today.",
 		tradeRequest:"Generous Egypt makes you this offer.",
 		
-		mainColor:[ 231, 213, 0],
+		outerColor:[ 231, 213, 0],
-		secondaryColor:[98,10,210],
+		innerColor:[98,10,210],
 		uniqueName:"Monument Builders",
 		unique:"+20% production towards Wonder construction",
 		cities:["Thebes","Memphis","Heliopolis","Elephantine","Alexandria","Pi-Ramesses","Giza","Byblos","Akhetaten","Hieraconpolis",
@@ -173,8 +173,8 @@
 		afterPeace:"Well then, that's settled."
 		tradeRequest:"Would you be interested in a trade agreement with England?"
 		
-		mainColor:[ 114, 0, 0],
+		outerColor:[ 114, 0, 0],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"Sun Never Sets"
 		unique:"+2 movement for all naval units"
 		cities:["London","York","Nottingham","Hastings","Canterbury","Coventry","Warwick","Newcastle","Oxford","Liverpool",
@@ -208,8 +208,8 @@
 		afterPeace:"It seems I underestimated you. I won't make the same mistake again, I promise you."
 		tradeRequest:"France offers you this exceptional proposition."
 		
-		mainColor:[ 38, 98, 255],
+		outerColor:[ 38, 98, 255],
-		secondaryColor:[239,236,148],
+		innerColor:[239,236,148],
 		uniqueName:"Ancien Régime"
 		unique:"+2 Culture per turn from cities before discovering Steam Power",
 		cities:["Paris","Orleans","Lyon","Troyes","Tours","Marseille","Chartres","Avignon","Rouen","Grenoble",
@@ -244,8 +244,8 @@
 		afterPeace:"Now it's the time to enjoy the fruits of peace."
 		tradeRequest:"How would you like it if I propose this kind of exchange?"
 				
-		mainColor:[ 236, 178, 0],
+		outerColor:[ 236, 178, 0],
-		secondaryColor:[0,0,0],
+		innerColor:[0,0,0],
 		uniqueName:"Siberian Riches"
 		unique:"Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity",
 		cities:["Moscow","St. Petersburg","Novgorod","Rostov","Yaroslavl","Yekaterinburg","Yakutsk","Vladivostok","Smolensk","Orenburg",
@@ -279,8 +279,8 @@
 		afterPeace:"Your soldiers fought well. I congratulate you on your victory."
 		tradeRequest:"I offer this, for your consideration."
 				
-		mainColor:[ 53,0,87],
+		outerColor:[ 53,0,87],
-		secondaryColor:[238,201,9],
+		innerColor:[238,201,9],
 		uniqueName:"The Glory of Rome"
 		unique:"+25% Production towards any buildings that already exist in the Capital",
 		cities:["Rome","Antium","Cumae","Neapolis","Ravenna","Arretium","Mediolanum","Arpinum","Circei","Setia",
@@ -315,8 +315,8 @@
 		afterPeace:"We thank you for your generous terms, we will not forget the favor you show us."
 		tradeRequest:"Come forth, let's do business."
 				
-		mainColor:[ 41,83,42],
+		outerColor:[ 41,83,42],
-		secondaryColor:[146,221,9],
+		innerColor:[146,221,9],
 		uniqueName:"Trade Caravans",
 		unique:"+1 Gold from each Trade Route, Oil resources provide double quantity"
 		cities:["Mecca","Medina","Damascus","Baghdad","Najran","Kufah","Basra","Khurasan","Anjar","Fustat",
@@ -350,8 +350,8 @@
 		afterPeace:"We welcome peace with your great nation. I pray that no future misunderstanding will come between our two peoples."
 		tradeRequest:"Is the following trade of interest to you?"
 				
-		mainColor:[ 28,51,119],
+		outerColor:[ 28,51,119],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"Manifest Destiny"
 		unique:"All land military units have +1 sight, 50% discount when purchasing tiles",
 		cities:["Washington","New York","Boston","Philadelphia","Atlanta","Chicago","Seattle","San Francisco","Los Angeles","Houston",
@@ -386,8 +386,8 @@
 		afterPeace:"It was an honor to fight you."
 		tradeRequest:"I would be grateful if you agreed on the following proposal."
 				
-		mainColor:[215,225,225],
+		outerColor:[215,225,225],
-		secondaryColor:[185,0,0],
+		innerColor:[185,0,0],
 		uniqueName:"Bushido"
 		unique: "Units fight as though they were at full strength even when damaged",
 		cities:["Kyoto","Osaka","Tokyo","Satsuma","Kagoshima","Nara","Nagoya","Izumo","Nagasaki","Yokohama",
@@ -423,8 +423,8 @@
 		afterPeace:"I am happy that it is once again peaceful at our place, even if we had to pay a price for it."
 		tradeRequest:"My friend, are you interested in this arrangement?"
 				
-		mainColor:[16,126,5],
+		outerColor:[16,126,5],
-		secondaryColor:[255,153,51],
+		innerColor:[255,153,51],
 		unique:"Unhappiness from number of Cities doubled, Unhappiness from number of Citizens halved.",
 		cities:["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad","Madurai","Ahmedabad",
 			"Kolhapur","Prayaga","Ayodhya","Indraprastha","Mathura","Ujjain","Gulbarga","Jaunpur","Rajagriha","Sravasti","Tiruchirapalli","Thanjavur",
@@ -457,8 +457,8 @@
 		afterPeace:"What do ye think about calling it a draw?"
 		tradeRequest:"It would be in your best interest, to carefully consider this proposal."
 				
-		mainColor:[150,150,150],
+		outerColor:[150,150,150],
-		secondaryColor:[60,60,60],
+		innerColor:[60,60,60],
 		uniqueName:"Furor Teutonicus"
 		unique:"67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment, -25% land units maintenance.",
 		cities:["Berlin","Hamburg","Munich","Cologne","Frankfurt","Essen","Dortmund","Stuttgart","Dusseldorf","Bremen",
@@ -498,8 +498,8 @@
 		afterPeace:"Congratulations on your victory! I hope that peace between us will last forever!"
 		tradeRequest:"Let us do business! Would you be interested?"
 				
-		mainColor:[18,84,30],
+		outerColor:[18,84,30],
-		secondaryColor:[245,248,185],
+		innerColor:[245,248,185],
 		uniqueName:"Barbary Corsairs"
 		unique:"Pay only one third the usual cost for naval unit maintenance. Melee naval units have a 1/3 chance to capture defeated naval units.",
 		cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya",
@@ -537,8 +537,8 @@
 		afterPeace:"Curses! I will sacrifice ten thousand citizens to expiate this humiliation!"
 		tradeRequest:" Accept this agreement or suffer the consequences."
 		
-		mainColor:[255,51,51],
+		outerColor:[255,51,51],
-		secondaryColor:[153,255,255],
+		innerColor:[153,255,255],
 		uniqueName:"Sacrificial Captives"
 		unique:"Gain Culture for the empire from each enemy unit killed.",
 		cities:["Tenochtitlan","Teotihuacan","Tlatelolco","Texcoco","Tlaxcala","Calixtlahuaca","Xochicalco","Tlacopan",
@@ -575,8 +575,8 @@
 		afterPeace:"It seems I have underestimate you. Very well... I won't take you head for now."
 		tradeRequest:"I am not always this generous, but we hope you take this rare opportunity we give you."
 				
-		mainColor:[51,0,0],
+		outerColor:[51,0,0],
-		secondaryColor:[0,204,102],
+		innerColor:[0,204,102],
 		uniqueName:"Mongol Terror"
 		unique:"All mounted units have +1 Movement. +30% when assaulting cities,",
 		cities:["Karakorum","Beshbalik","Turfan","Hsia","Old Sarai","New Sarai","Tabriz","Tiflis","Otrar","Sanchu","Kazan",
@@ -612,8 +612,8 @@
 		afterPeace:"Viracocha has frowned upon our war, and has agreed to our peace agreements."
 		tradeRequest:"The Incan people offer this fair trade."
 				
-		mainColor:[255,255,51],
+		outerColor:[255,255,51],
-		secondaryColor:[0,204,102],
+		innerColor:[0,204,102],
 		uniqueName:"Great Andean Road"
 		unique:"Units ignore terrain costs when moving into any tile with Hills. No maintenance costs for improvements in Hills; half cost elsewhere.",
 		cities:["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Vilcas","Vilcabamba","Vitcos",
@@ -648,8 +648,8 @@
 		afterPeace:"It appears we should call it a tie..."
 		tradeRequest:"In my endless magnanimity, I am making you this offer. You agree, of course?"
 				
-		mainColor:[255,0,0],
+		outerColor:[255,0,0],
-		secondaryColor:[255,255,0],
+		innerColor:[255,255,0],
 		uniqueName:"Achaemenid Legacy"
 		unique:"Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strenght",
 		cities:["Persepolis","Parsagadae","Susa","Ecbatana","Tarsus","Gordium","Bactra","Sardis","Ergili","Dariushkabir",
@@ -688,8 +688,8 @@
 		afterPeace:"Perhaps the stars were mistakenly placed... I will consult my Kahuna."
 		tradeRequest:"Come, let our people feast together!"
 				
-		mainColor:[255,128,0],
+		outerColor:[255,128,0],
-		secondaryColor:[255,255,0],
+		innerColor:[255,255,0],
 		uniqueName:"Wayfinding"
 		unique:"Can embark and move over Costs and Oceans immediately. +1 Sight when embarked",
 		cities:["Honolulu","Samoa","Tonga","Nuku Hiva","Raiatea","Aotearoa","Tahiti","Hilo","Te Wai Pounamu","Rapa Nui",
@@ -725,8 +725,8 @@
 		afterPeace:"It seems you implemented some interesting strategies... Very well, perhaps we should call it a tie."
 		tradeRequest:"We have many things to discuss and have much to benefit from each other."
 				
-		mainColor:[0,0,255],
+		outerColor:[0,0,255],
-		secondaryColor:[255,0,0],
+		innerColor:[255,0,0],
 		uniqueName:"Scholars of the Jade Hall"
 		unique:"+2 Science for all Great Person tile improvements. Receive a tech boost each time a scientific building/Wonder is built in the Korean capital.",
 		cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
@@ -761,8 +761,8 @@
 		afterPeace:"We thank you for bringing an end to this pointless war."
 		tradeRequest:"Can I interest you in this deal?"
 				
-		mainColor:[204,102,0],
+		outerColor:[204,102,0],
-		secondaryColor:[255,0,0],
+		innerColor:[255,0,0],
 		uniqueName:"River Warlord"
 		unique:"Embarked units gain the War Canoes and Amphibious promotions, strengthening them while embarked.",
 		cities:["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu",
@@ -797,8 +797,8 @@
 		afterPeace:"You have won, but I shall return to repay this debt."
 		tradeRequest:"Greetings. I believe this is a fair proposal for both parties. What do you think?"
 				
-		mainColor:[51,25,0],
+		outerColor:[51,25,0],
-		secondaryColor:[255,255,102],
+		innerColor:[255,255,102],
 		uniqueName:"Father Governs Children"
 		unique:"Food and Culture from Friendly City-States are increased by 50%",
 		cities:["Sukhothai","Si Satchanalai","Muang Saluang","Lampang","Phitsanulok","Kamphaeng Pet","Nakhom Chum","Vientiane",
@@ -834,8 +834,8 @@
 		afterPeace:"I thank you for your mercy. I pray that we can now be friends."
 		tradeRequest:"Does this trade work for you, my friend?"
 				
-		mainColor:[0,25,51],
+		outerColor:[0,25,51],
-		secondaryColor:[255,255,102],
+		innerColor:[255,255,102],
 		uniqueName:"The Great Warpath"
 		unique:"All units move through Forest and Jungle tiles in friendly territory as if it is Road. These tiles can be used to establish City Connections upon researching the Wheel.",
 		cities:["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River",
@@ -872,8 +872,8 @@
 		afterPeace:"By the hammer of Thor, you have proven yourself a worthy opponent today. I congratulate you!"
 		tradeRequest:"This is a fine deal! Even a drunk beggar would agree!"
 				
-		mainColor:[51,25,0],
+		outerColor:[51,25,0],
-		secondaryColor:[255,255,102],
+		innerColor:[255,255,102],
 		uniqueName:"Viking Fury"
 		unique:"+1 Movement to all embarked units, whom pay just 1 movement point to move from sea to land and viceversa. Melee units pay no movement cost to pillage.",
 		cities:["Copenhagen","Aarhus","Kaupang","Ribe","Viborg","Tunsbers","Roskilde","Hedeby","Oslo","Jelling","Truso",
@@ -894,8 +894,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[185,132,66],
+		innerColor:[185,132,66],
 		cities:["Milan"]
 	},
 	{
@@ -907,8 +907,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[62,197,252],
+		innerColor:[62,197,252],
 		cities:["Florence"]
 	},
 	{
@@ -921,8 +921,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[211, 220, 103],
+		innerColor:[211, 220, 103],
 		cities:["Rio de Janeiro"]
 	},
 	{
@@ -935,8 +935,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[194,97,255],
+		innerColor:[194,97,255],
 		cities:["Antwerp"]
 	},
 	{
@@ -948,8 +948,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[211,180,113],
+		innerColor:[211,180,113],
 		cities:["Dublin"]
 	},
 	{
@@ -962,8 +962,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[255,97,255],
+		innerColor:[255,97,255],
 		cities:["Tyre"]
 	},
 	{
@@ -976,8 +976,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[255,69,0],
+		innerColor:[255,69,0],
 		cities:["Ur"]
 	},
 	{
@@ -990,8 +990,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[45,255,86],
+		innerColor:[45,255,86],
 		cities:["Genoa"]
 	},
 	{
@@ -1004,8 +1004,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[153,10,10],
+		innerColor:[153,10,10],
 		cities:["Venice"]
 	},
 	{
@@ -1017,8 +1017,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[153,255,51],
+		innerColor:[153,255,51],
 		cities:["Brussels"]
 	},
 	{
@@ -1030,8 +1030,8 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[153,0,76],
+		innerColor:[153,0,76],
 		cities:["Kabul"]
 	},
 	{
@@ -1043,15 +1043,15 @@
 		attacked:"Very well, this shall not be forgotten.",
 		afterPeace:"May peace forever bless our lands.",
 
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[250,128,114],
+		innerColor:[250,128,114],
 		cities:["Sidon"]
 	},
 
 	//Barbarian
 	{
 		name:"Barbarians",
-		mainColor:[0,0,0],
+		outerColor:[0,0,0],
-		secondaryColor:[182,0,0]
+		innerColor:[182,0,0]
 	}
 ]

android/assets/jsons/Nations_Italian.json

@@ -27,8 +27,8 @@
 		afterPeace:"Sciocco, sciocco errore, lasciarmi vivere..."
 		tradeRequest:"Sembra che la tua ragione di esistere è fare un accordo con me..."
 	
-		mainColor:[27,53,63],
+		outerColor:[27,53,63],
-		secondaryColor:[213,249,255],
+		innerColor:[213,249,255],
 		uniqueName:"Ingenuità",
 		unique:"Ricevi un Grande Scienziato gratuito quando scopri la Scrittura. I Grandi Scienziati nascono il 50% più in fretta.",
 		cities:["Babilonia","Akkad","Dur-Kurigalzu","Nippur","Borsippa","Sippar","Opis","Mari","Shushan","Eshnunna",
@@ -63,8 +63,8 @@
 		afterPeace:"Devo congratularmi con te per la tua vittoria sbalorditiva. Forse mio padre Zeus non era dalla mia parte..."
 		tradeRequest:"Amico mio, dimmi: questo ti sembra ragionevole?"
 		
-		mainColor:[181, 232, 232],
+		outerColor:[181, 232, 232],
-		secondaryColor:[68,142,249],
+		innerColor:[68,142,249],
 		/*
 		uniqueName:"Lega Ellenica",
 		unique:"L'Influenza delle Città-Stato cala il doppio più lentamente e cresce il doppio rispetto al normale.",
@@ -100,8 +100,8 @@
 		afterPeace:"Che le benedizioni del Cielo scendano su di te e sul tuo popolo."
 		tradeRequest:"Amico mio, pensi di poter accettare questa proposta?"
 				
-		mainColor:[9, 112, 84],
+		outerColor:[9, 112, 84],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"L'Arte della Guerra",
 		unique:"Doppio bonus combattimento dai Grandi Generali, che nascono il 50% più in fretta."
 		cities:["Pechino","Shanghai","Guangzhou","Nanchino","Xian","Chengdu","Hangzhou","Tianjin","Macao","Shandong",
@@ -136,8 +136,8 @@
 		afterPeace:"Sai che avrei potuto distruggerti, ma oggi mi trattiene un'anima generosa, e mi sento magnanimo."
 		tradeRequest:"Il generoso regno d'Egitto ti fa quest'offerta."
 		
-		mainColor:[ 231, 213, 0],
+		outerColor:[ 231, 213, 0],
-		secondaryColor:[98,10,210],
+		innerColor:[98,10,210],
 		uniqueName:"Costruttori di Monumenti",
 		unique:"+20% Produzione durante la costruzione di una Meraviglia"
 		cities:["Tebe","Menfi","Eliopoli","Elefantina","Alessandria","Pi-Ramesse","Giza","Biblo","Akhetaten","Ieraconpoli",
@@ -172,8 +172,8 @@
 		afterPeace:"Hai combattuto con onore. Finiamola qui."
 		tradeRequest:"Ti interessa un accordo commerciale con il regno inglese?"
 		
-		mainColor:[ 114, 0, 0],
+		outerColor:[ 114, 0, 0],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"Il Sole non tramonta mai",
 		unique:"+2 movimento per tutte le unità navali"
 		cities:["Londra","York","Nottingham","Hastings","Canterbury","Coventry","Warwick","Newcastle","Oxford","Liverpool",
@@ -208,8 +208,8 @@
 		afterPeace:"Sembra che ti abbia sottovalutato. Ti prometto che non ripeterò un simile errore."
 		tradeRequest:"La Francia ti offre questa proposta eccezionale."
 		
-		mainColor:[ 38, 98, 255],
+		outerColor:[ 38, 98, 255],
-		secondaryColor:[239,236,148],
+		innerColor:[239,236,148],
 		uniqueName:"Ancien Régime",
 		unique:"+2 Cultura al turno dalle città prima della scoperta dell'Energia a Vapore",
 		cities:["Parigi","Orleans","Lione","Troyes","Tours","Marsiglia","Chartres","Avignon","Rouen","Grenoble",
@@ -244,8 +244,8 @@
 		afterPeace:"Ora è il momento di godersi i frutti della pace."
 		tradeRequest:"Ti piacerebbe se ti proponessi questo scambio?"
 				
-		mainColor:[ 236, 178, 0],
+		outerColor:[ 236, 178, 0],
-		secondaryColor:[0,0,0],
+		innerColor:[0,0,0],
 		uniqueName:"Ricchezze Siberiane",
 		unique:"+1 Produzione dalle risorse strategiche, e doppia quantità da Cavalli, Ferro e Uranio.",
 		cities:["Mosca","San Pietroburgo","Novgorod","Rostov","Yaroslavl","Yekaterinburg","Yakutsk","Vladivostok","Smolensk",
@@ -280,8 +280,8 @@
 		afterPeace:"I tuoi soldati hanno combattuto bene. Mi congratulo per la tua vittoria."
 		tradeRequest:"Ti offro questo, per la tua considerazione."
 				
-		mainColor:[ 53,0,87],
+		outerColor:[ 53,0,87],
-		secondaryColor:[238,201,9],
+		innerColor:[238,201,9],
 		uniqueName:"La Gloria di Roma",
 		unique:"+25% bonus di Produzione verso qualunque edificio già esistente nella Capitale.",
 		cities:["Roma","Anzio","Cuma","Napoli","Ravenna","Arretium","Milano","Arpinum","Circei","Setia","Satricum","Ardea",
@@ -315,8 +315,8 @@
 		afterPeace:"Vi ringraziamo per questi termini generosi. Non dimenticheremo il favore che ci hai mostrati."
 		tradeRequest:"Avanti, facciamo un affare."
 				
-		mainColor:[ 41,83,42],
+		outerColor:[ 41,83,42],
-		secondaryColor:[146,221,9],
+		innerColor:[146,221,9],
 		uniqueName:"Carovane Commerciali",
     		unique:"+1 Oro per ogni rotta commerciale, e doppia quantita da Petrolio.",
 		cities:["Mecca","Medina","Damasco","Baghdad","Najran","Kufah","Basra","Khurasan","Anjar","Fustat","Aden","Yamama",
@@ -350,8 +350,8 @@
 		afterPeace:"Accogliamo la pace con la vostra grande nazione. Preghiamo che non vi siano altri futuri malintesi tra di noi."
 		tradeRequest:"Ti interessa forse questo accordo commerciale?"
 				
-		mainColor:[ 28,51,119],
+		outerColor:[ 28,51,119],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"Destino Manifesto",
 		unique:"+1 Visione per tutte le unità militari terrestri. 50% di sconto per l'acquisto delle caselle",
 		cities:["Washington","New York","Boston","Philadelphia","Atlanta","Chicago","Seattle","San Francisco","Los Angeles",
@@ -386,8 +386,8 @@
 		afterPeace:"Combatterti è stato un onore, ma adesso è il momento di terminare questo spargimento di sangue."
 		tradeRequest:"Sarei grato se accettassi questa mia proposta."
 		
-		mainColor:[215,225,225],
+		outerColor:[215,225,225],
-		secondaryColor:[185,0,0],
+		innerColor:[185,0,0],
 		uniqueName:"Bushido",
 		unique: "Le unità combattono come se fossero perfettamente sane. +1 Cultura dai Pescherecci.",
 		cities:["Kyoto","Osaka","Tokyo","Satsuma","Kagoshima","Nara","Nagoya","Izumo","Nagasaki","Yokohama","Shimonoseki",
@@ -422,8 +422,8 @@
 		afterPeace:"Sono contento che siamo di nuovo in pace, anche se abbiamo dovuto pagare un prezzo per ciò."
 		tradeRequest:"Amico mio, ti interessa questo accordo?"
 				
-		mainColor:[16,126,5],
+		outerColor:[16,126,5],
-		secondaryColor:[255,153,51],
+		innerColor:[255,153,51],
 		unique:"Infelicità dal numero di Città raddoppiata, Infelicità dal numero di Cittadini dimezzata.",//not translated
 		cities:["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad",
 			"Madurai","Ahmedabad","Kolhapur","Prayaga","Ayodhya","Indraprastha","Mathura","Ujjain","Gulbarga","Jaunpur",
@@ -457,8 +457,8 @@
 		afterPeace:"Che ne pensi di metterci una pietra sopra?"
 		tradeRequest:"Considerare con cautela questa proposta sarebbe nei nostri migliori interessi."
 				
-		mainColor:[224,224,224],
+		outerColor:[224,224,224],
-		secondaryColor:[64,64,64],
+		innerColor:[64,64,64],
 		uniqueName:"Furor Teutonicus",
 		unique:"67% di chance di guadagnare 25 Oro e reclutare un'unità barbarica da un accampamento conquistato. -25% manutenzione per le unità terrestri.",//not translated
 		cities:["Berlino","Amburgo","Monaco","Colonia","Francoforte","Essen","Dortmund","Stoccarta","Dusseldorf","Bremen",
@@ -495,8 +495,8 @@
 		afterPeace:"Complimenti per la tua vittoria! Speriamo che la pace scenda su di noi in eterno!"
 		tradeRequest:"Facciamo un affare! Ti interessa?"
 				
-		mainColor:[204,255,229],
+		outerColor:[204,255,229],
-		secondaryColor:[0,102,0],
+		innerColor:[0,102,0],
 		uniqueName:"Corsari barbarici",
 		unique:"La manutenzione delle navi costa solo un terzo rispetto al normale. Tutte le navi da mischia ricevono la promozione Cattura Navale, che permette loro di catturare le navi nemiche sconfitte.",//not translated
 		cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya",
@@ -533,8 +533,8 @@
 		afterPeace:"Sembra che ti abbia sottovalutato. Molto bene... per ora la tua testa rimane sulle tue spalle."
 		tradeRequest:"Non sono sempre così generoso, ma spero tu accolga questa rara opportunità che noi ti diamo."
 				
-		mainColor:[51,0,0],
+		outerColor:[51,0,0],
-		secondaryColor:[0,204,102],
+		innerColor:[0,204,102],
 		uniqueName:"Terrore mongolo",
 		unique:"+1 Movimento per le unità a cavallo. +30% Forza quando assali una Città-Stato o ne attacchi le unità.",
 		cities:["Karakorum","Beshbalik","Turfan","Hsia","Old Sarai","New Sarai","Tabriz","Tiflis","Otrar","Sanchu","Kazan",
@@ -567,8 +567,8 @@
 		afterPeace:"Ti ringrazio per la tua pietà. Preghiamo che sia l'inizio di una nuova amicizia."
 		tradeRequest:"Questo affare ti congenia, amico mio?"
 				
-		mainColor:[0,25,51],
+		outerColor:[0,25,51],
-		secondaryColor:[255,255,102],
+		innerColor:[255,255,102],
 		uniqueName:"La Grande Via del Guerriero",
 		unique:"Tutte le unità trattano le caselle di Foresta e Giungla come fossero Strade; queste caselle stabiliscono Rotte Commerciali una volta scoperta la Ruota.",
 		cities:["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River",
@@ -602,8 +602,8 @@
 		afterPeace:"Vedo che hai sviluppato delle strategie interessanti... Benissimo, credo dovremo finirla qui."
 		tradeRequest:"Abbiamo molte cose da discutere e tanto da guadagnare tra di noi."
 				
-		mainColor:[0,0,255],
+		outerColor:[0,0,255],
-		secondaryColor:[255,0,0],
+		innerColor:[255,0,0],
 		uniqueName:"Sapienti della Sala di Giada",
 		unique:"+2 Scienza per ogni miglioramento da Gran Personaggio. Ricevi uno sprint tecnologico quando costruisci una struttura/Meraviglia scientifica nella Capitale.",
 		cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
@@ -637,8 +637,8 @@
 		afterPeace:"Sembra che mi convenga finirla qui..."
 		tradeRequest:"Nella mia infinita misericordia, ti faccio questa offerta. Di certo, sarai d'accordo?"
 				
-		mainColor:[255,0,0],
+		outerColor:[255,0,0],
-		secondaryColor:[255,255,0],
+		innerColor:[255,255,0],
 		uniqueName:"Eredità Achemenide",
 		unique:"Le Età dell'Oro durano il 50% in più, e in esse le Unità ricevono +1 Movimento e +10% Forza",
 		cities:["Persepoli","Parsagade","Susa","Ecbatana","Tarsus","Gordium","Bactra","Sardi","Ergili","Dariushkabir",
@@ -675,8 +675,8 @@
 		afterPeace:"Forse le stelle hanno sbagliato posto... Consulterò il mio Kahuna."
 		tradeRequest:"Vieni, organizziamo un banchetto!"
 				
-		mainColor:[255,128,0],
+		outerColor:[255,128,0],
-		secondaryColor:[255,255,0],
+		innerColor:[255,255,0],
 		unique:"Le unità imbarcate possono attraversare Coste e Oceani fin da subito, e ottengono +1 Visione.",
 		cities:["Honolulu","Samoa","Tonga","Nuku Hiva","Raiatea","Aotearoa","Tahiti","Hilo","Te Wai Pounamu","Rapa Nui",
 			"Tuamotu","Rarotonga","Tuvalu","Tubuai","Mangareva","Oahu","Kiritimati","Ontong Java","Niue","Rekohu",
@@ -696,8 +696,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[185,132,66],
+		innerColor:[185,132,66],
 		cities:["Milano"]
 	},
 	{
@@ -710,8 +710,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[62,197,252],
+		innerColor:[62,197,252],
 		cities:["Firenze"]
 	},
 	{
@@ -725,8 +725,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[211, 220, 103],
+		innerColor:[211, 220, 103],
 		cities:["Rio de Janeiro"]
 	},
 	{
@@ -740,8 +740,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[194,97,255],
+		innerColor:[194,97,255],
 		cities:["Anversa"]
 	},
 	{
@@ -754,8 +754,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[211,180,113],
+		innerColor:[211,180,113],
 		cities:["Dublino"]
 	},
 	{
@@ -769,8 +769,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[255,97,255],
+		innerColor:[255,97,255],
 		cities:["Tiro"]
 	},
 	{
@@ -783,8 +783,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[255,69,0],
+		innerColor:[255,69,0],
 		cities:["Ur"]
 	},
 	{
@@ -798,8 +798,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[45,255,86],
+		innerColor:[45,255,86],
 		cities:["Genova"]
 	},
 	{
@@ -813,8 +813,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[153,10,10],
+		innerColor:[153,10,10],
 		cities:["Venezia"]
 	},
 	{
@@ -827,8 +827,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[153,255,51],
+		innerColor:[153,255,51],
 		cities:["Bruxelles"]
 	},
 	{
@@ -840,8 +840,8 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 		
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[153,0,76],
+		innerColor:[153,0,76],
 		cities:["Kabul"]
 	},
 	{
@@ -854,15 +854,15 @@
 		attacked:"Benissimo, questo non lo dimenticheremo.",
 		afterPeace:"Possa la pace benedire in eterno i nostri reami.",
 
-		mainColor:[0, 0, 0],
+		outerColor:[0, 0, 0],
-		secondaryColor:[250,128,114],
+		innerColor:[250,128,114],
 		cities:["Sidone"]
 	},
 	
 	//Barbarian
 	{
 		name:"Barbarians",
-		mainColor:[0,0,0],
+		outerColor:[0,0,0],
-		secondaryColor:[182,0,0]
+		innerColor:[182,0,0]
 	}
 ]

android/assets/jsons/Nations_Simplified_Chinese.json

@@ -27,8 +27,8 @@
 		afterPeace:"愚蠢啊，愚蠢啊——让我活下去。对敌人的仁慈是一剂自杀的毒药。",
 		tradeRequest:"看来你确实有存在的理由—给我提供些有价值的东西吧。",
 				
-		mainColor:[27,53,63],
+		outerColor:[27,53,63],
-		secondaryColor:[213,249,255],
+		innerColor:[213,249,255],
 		uniqueName:"智慧创新",
 		unique:"发明文字后立即获得一个大科学家，大科学家点数积累速率+50%",
 		cities:["巴比伦","阿卡德","杜尔-库里加尔祖","尼普尔","博尔西帕","西帕尔","俄庇斯","马里","苏萨","埃什努那",
@@ -63,8 +63,8 @@
 		afterPeace:"在通向胜利前偶尔也可以停下来欣赏风景。",
 		tradeRequest:"我的朋友，这笔交易对你还算公平吧？",
 				
-		mainColor:[181, 232, 232],
+		outerColor:[181, 232, 232],
-		secondaryColor:[68,142,249],
+		innerColor:[68,142,249],
 		cities:["雅典","斯巴达","科林斯","阿尔戈斯","克诺索斯","迈锡尼","法萨卢斯","以弗所","哈利卡纳苏斯","罗德",
 			"埃雷特里亚","帕加马","米勒斯","迈加拉","福西亚","西锡安","梯林斯","萨摩斯","米提利尼","希俄斯",
 			"帕洛斯","埃利斯","锡拉库萨","赫拉克莱娅","格尔腾","加尔西斯","皮洛斯","佩拉","纳克索斯"]
@@ -96,8 +96,8 @@
 		afterPeace:"昊天上帝在上，愿阁下天命长存霸业永延。",
 		tradeRequest:"朕之决断阁下以为如何？",
 				
-		mainColor:[9, 112, 84],
+		outerColor:[9, 112, 84],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"兵法韬略",
 		unique:"大军事家提供双倍战斗力加成，大军事家产生速率+50%",
 		cities:["北京","上海","广州","南京","西安","成都","杭州","天津","澳门","山东",
@@ -132,8 +132,8 @@
 		afterPeace:"你知道我完全能够消灭你，但是我今天我选择宽容。",
 		tradeRequest:"慷慨的埃及向你提议以下交易。",
 		
-		mainColor:[ 231, 213, 0],
+		outerColor:[ 231, 213, 0],
-		secondaryColor:[98,10,210],
+		innerColor:[98,10,210],
 		uniqueName:"永恒建筑",
 		unique:"建造奇观时+20%产能积累速率",
 		cities:["底比斯","孟斐斯","赫利奥波利斯","埃勒凡他尼","亚历山大","塔尔-拉美西斯","吉萨","比布鲁斯","阿肯塔顿","希拉孔波利斯",
@@ -168,8 +168,8 @@
 		afterPeace:"忍耐和时间，往往比力量和愤怒更有效，姑且待之。",
 		tradeRequest:"我亲爱的朋友，你有兴趣与英格兰做一笔交易吗？",
 		
-		mainColor:[ 114, 0, 0],
+		outerColor:[ 114, 0, 0],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"日不落",
 		unique:"所有海军单位+2移动力",
 		cities:["伦敦","约克","诺丁汉","海斯汀","坎特伯雷","考文垂","华威","纽卡斯尔","牛津","利物浦",
@@ -203,8 +203,8 @@
 		afterPeace:"没有人能逃脱自己的命运。人不会两次踏进同一条河流，祝你好运。",
 		tradeRequest:"我的朋友，法兰西有一个卑微的提议。",
 		
-		mainColor:[ 38, 98, 255],
+		outerColor:[ 38, 98, 255],
-		secondaryColor:[239,236,148],
+		innerColor:[239,236,148],
 		uniqueName:"传统制度",
 		unique:"获得蒸汽机科技前每个城市每回合+2文化",
 		cities:["巴黎","奥尔良","里昂","特鲁瓦","图尔","马赛","沙特尔","阿维尼翁","卢昂","格勒诺布尔",
@@ -239,8 +239,8 @@
 		afterPeace:"战争的终点就是和平。",
 		tradeRequest:"这份交易你认为如何？",
 				
-		mainColor:[ 236, 178, 0],
+		outerColor:[ 236, 178, 0],
-		secondaryColor:[0,0,0],
+		innerColor:[0,0,0],
 		uniqueName:"自然财富",
 		unique:"每处战略资源+1产能，每处马、铁和铀资源储量加倍",
 		cities:["莫斯科","圣彼得堡","诺夫哥罗德","罗斯托夫","雅罗斯拉夫尔","叶卡捷琳堡","雅库茨克","符拉迪沃斯托克","斯摩棱斯克","奥伦堡",
@@ -274,8 +274,8 @@
 		afterPeace:"这不是和平，只是短暂的休战。祝你好运！",
 		tradeRequest:"我有项提议，希望你能考虑。",
 				
-		mainColor:[ 53,0,87],
+		outerColor:[ 53,0,87],
-		secondaryColor:[238,201,9],
+		innerColor:[238,201,9],
 		uniqueName:"罗马荣耀",
 		unique:"在其他城市建造首都已有建筑时+25%产能积累",
 		cities:["罗马","阿提乌姆","库迈","那不勒斯","拉维纳","亚雷提乌姆","米兰","阿尔庇努姆","科尔切伊","赛提亚",
@@ -310,8 +310,8 @@
 		afterPeace:"感谢你的慷慨和仁慈，我们将永远铭记。",
 		tradeRequest:"请上前来，让我们做成这笔买卖。",
 				
-		mainColor:[ 41,83,42],
+		outerColor:[ 41,83,42],
-		secondaryColor:[146,221,9],
+		innerColor:[146,221,9],
 		uniqueName:"沙漠之舟",
 		unique:"每条贸易路线+1金钱，石油资源储量加倍",
 		cities:["麦加","麦地那","大马士革","巴格达","那基兰","库费","巴士拉","呼罗珊","安嘉尔","福斯塔",
@@ -345,8 +345,8 @@
 		afterPeace:"不论用何方法获得名誉，如没有品格来维持，终将会失去，请好自为之！",
 		tradeRequest:"我们来做笔交易你感兴趣吗？",
 				
-		mainColor:[ 28,51,119],
+		outerColor:[ 28,51,119],
-		secondaryColor:[255,255,255],
+		innerColor:[255,255,255],
 		uniqueName:"昭昭天命",
 		unique:"陆军单位+1视野，购买地块费用-50%",
 		cities:["华盛顿","纽约","波士顿","费城","亚特兰大","芝加哥","西雅图","旧金山","洛杉矶","休斯敦",
@@ -381,8 +381,8 @@
 		afterPeace:"光阴如露，梦幻似水，岂有长生不灭者？愿阁下武运昌隆。",
 		tradeRequest:"吾之珍宝阁下是否有兴致？",
 				
-		mainColor:[215,225,225],
+		outerColor:[215,225,225],
-		secondaryColor:[185,0,0],
+		innerColor:[185,0,0],
 		uniqueName:"武士道",
 		unique: "受伤单位战斗力不减",
 		cities:["京都","大阪","东京","萨摩","鹿儿岛","奈良","名古屋","出云","长崎","横滨","下关","松山","札幌","函馆","伊势","富山","福岛","周防","备前","越前","和泉","近江","越后","高崎","佐渡","神户","长野","广岛","高山","秋田","福冈","青森","镰仓","高知","那霸","仙台","岐阜","山口","大田","鸟取"]
@@ -414,8 +414,8 @@
 		afterPeace:"What do ye think about calling it a draw?"
 		tradeRequest:"It would be in your best interest, to carefully consider this proposal."
 				
-		mainColor:[224,224,224],
+		outerColor:[224,224,224],
-		secondaryColor:[64,64,64],
+		innerColor:[64,64,64],
 		uniqueName:"Furor Teutonicus"
 		unique:"Upon defeating a Barbarian unit inside an encampment, there is a 67% chance to earn 25 Gold and they join the Germans. Also, land unit manteinance is reduced by 25%.",
 		cities:["Berlin","Hamburg","Munich","Cologne","Frankfurt","Essen","Dortmund","Stuttgart","Dusseldorf","Bremen",
@@ -452,8 +452,8 @@
 		afterPeace:"I am happy that it is once again peaceful at our place, even if we had to pay a price for it."
 		tradeRequest:"My friend, are you interested in this arrangement?"
 				
-		mainColor:[0,255,0],
+		outerColor:[0,255,0],
-		secondaryColor:[255,153,51],
+		innerColor:[255,153,51],
 		unique:"Unhappiness from number of Cities doubled, Unhappiness from number of Citizens halved.",
 		cities:["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad","Madurai","Ahmedabad",
 			"Kolhapur","Prayaga","Ayodhya","Indraprastha","Mathura","Ujjain","Gulbarga","Jaunpur","Rajagriha","Sravasti","Tiruchirapalli","Thanjavur",
@@ -486,8 +486,8 @@
 		afterPeace:"Curses! I will sacrifice ten thousand citizens to expiate this humiliation!"
 		tradeRequest:" Accept this agreement or suffer the consequences."
 		
-		mainColor:[255,51,51],
+		outerColor:[255,51,51],
-		secondaryColor:[153,255,255],
+		innerColor:[153,255,255],
 		unique:"Gain Culture for the empire from each enemy unit killed.",
 		cities:["Tenochtitlan","Teotihuacan","Tlatelolco","Texcoco","Tlaxcala","Calixtlahuaca","Xochicalco","Tlacopan","Atzcapotzalco","Tzintzuntzan","Malinalco","Tula","Tamuin","Teayo","Cempoala","Chalco","Tlalmanalco","Ixtapaluca","Huexotla","Tepexpan","Tepetlaoxtoc","Chiconautla","Zitlaltepec","Coyotepec","Tequixquiac","Jilotzingo","Tlapanaloya","Tultitan","Ecatepec","Coatepec","Chalchiuites","Chiauhita","Chapultepec","Itzapalapa","Ayotzinco","Iztapam"]
 	},
@@ -518,8 +518,8 @@
 		afterPeace:"It seems I have underestimate you. Very well... I won't take you head for now."
 		tradeRequest:"I am not always this generous, but we hope you take this rare opportunity we give you."
 				
-		mainColor:[51,0,0],
+		outerColor:[51,0,0],
-		secondaryColor:[0,204,102],
+		innerColor:[0,204,102],
 		unique:"All mounted units have +1 Movement. +30% when assaulting cities,",
 		cities:["Karakorum","Beshbalik","Turfan","Hsia","Old Sarai","New Sarai","Tabriz","Tiflis","Otrar","Sanchu","Kazan","Almarikh","Ulaanbaatar","Hovd","Darhan","Dalandzadgad","Mandalgovi","Choybalsan","Erdenet","Tsetserieg","Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Atlay","Uliastay","Bayanhongor","Har-Ayrag","Nalayh","Tes"]
 	},
@@ -548,8 +548,8 @@
 		afterPeace:"Viracocha has frowned upon our war, and has agreed to our peace agreements."
 		tradeRequest:"The Incan people offer this fair trade."
 				
-		mainColor:[255,255,51],
+		outerColor:[255,255,51],
-		secondaryColor:[0,204,102],
+		innerColor:[0,204,102],
 		unique:"Units ignore terrain costs when moving into any tile with Hills. No maintenance costs for improvements in Hills; half cost elsewhere.",
 		cities:["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Vilcas","Vilcabamba","Vitcos","Andahuaylas","Ica","Arequipa","Nasca","Atico","Juli","Chuito","Chuquiapo","Huanuco Pampa","Tamboccocha","Huaras","Riobamba","Caxamalca","Sausa","Tambo Colorado","Huaca","Tumbes","Chan Chan","Sipan","Pachacamac","Llactapata","Pisac","Kuelap","Pajaten","Chucuito","Choquequirao"]
 	}
@@ -578,8 +578,8 @@
 		afterPeace:"It appears we should call it a tie..."
 		tradeRequest:"In my endless magnanimity, I am making you this offer. You agree, of course?"
 				
-		mainColor:[255,0,0],
+		outerColor:[255,0,0],
-		secondaryColor:[255,255,0],
+		innerColor:[255,255,0],
 		unique:"Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strenght",
 		cities:["Persepolis","Parsagadae","Susa","Ecbatana","Tarsus","Gordium","Bactra","Sardis","Ergili","Dariushkabir","Ghulaman","Zohak","Istakhr","Jinjan","Borazjan","Herat","Dakyanus","Bampur","Turengtepe","Rey","Shiraz","Thuspa","Hasanlu","Gabae","Merv","Behistun","Kandahar","Altintepe","Bunyan","Charsadda","Uratyube","Dura Europos","Aleppo","Qatna","Kabul","Capisa","Kyreskhata","Marakanda","Peshawar","Van","Pteira","Arshada","Artakaona","Aspabota","Autiyara","Bagastana","Baxtri","Darmasa","Daphnai","Drapsaka","Eion","Gandutava","Gaugamela","Harmozeia","Ekatompylos","Izata","Kampada","Kapisa","Karmana","Kounaxa","Kuganaka","Nautaka","Paishiyauvada","Patigrbana","Phrada"]
 	},
@@ -608,8 +608,8 @@
 		afterPeace:"Perhaps the stars were mistakenly placed... I will consult my Kahuna."
 		tradeRequest:"Come, let our people feast together!"
 				
-		mainColor:[255,128,0],
+		outerColor:[255,128,0],
-		secondaryColor:[255,255,0],
+		innerColor:[255,255,0],
 		unique:"Can embark and move over Costs and Oceans immediately. +1 Sight when embarked",
 		cities:["Honolulu","Samoa","Tonga","Nuku Hiva","Raiatea","Aotearoa","Tahiti","Hilo","Te Wai Pounamu","Rapa Nui","Tuamotu","Rarotonga","Tuvalu","Tubuai","Mangareva","Oahu","Kiritimati","Ontong Java","Niue","Rekohu","Rakahanga","Bora Bora","Kailua","Uvea","Futuna","Rotuma","Tokelau","Lahaina","Bellona","Mungava","Tikopia","Emae","Kapingamarangi","Takuu","Nukuoro","Sikaiana","Anuta","Nuguria","Pileni","Nukumanu"]
 	},
@@ -639,8 +639,8 @@
 		afterPeace:"It seems you implemented some interesting strategies... Very well, perhaps we should call it a tie."
 		tradeRequest:"We have many thinkgs to discuss and have much to benefit from each other."
 				
-		mainColor:[0,0,255],
+		outerColor:[0,0,255],
-		secondaryColor:[255,0,0],
+		innerColor:[255,0,0],
 		unique:"+2 Science for all Great Person tile improvements. Receive a tech boost each time a scientific building/Wonder is built in the Korean capital.",
 		cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan","Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju","Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]
 	},
@@ -669,8 +669,8 @@
 		afterPeace:"We thank you for bringing an end to this pointless war."
 		tradeRequest:"Can I interest you in this deal?"
 				
-		mainColor:[204,102,0],
+		outerColor:[204,102,0],
-		secondaryColor:[255,0,0],
+		innerColor:[255,0,0],
 		unique:"Embarked units gain the War Canoes and Amphibious promotions, strengthening them while embarked.",
 		cities:["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu","Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano","Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"]
 	},
@@ -699,8 +699,8 @@
 		afterPeace:"Congratulations on your victory! I hope that peace between us will last forever!"
 		tradeRequest:"Let us do business! Would you be interested?"
 				
-		mainColor:[204,255,229],
+		outerColor:[204,255,229],
-		secondaryColor:[0,102,0],
+		innerColor:[0,102,0],
 		unique:"Pay only one.third the usual cost for naval unit maintenance. All melee naval units have the Prize Ships promotion, allowing them to capture defeated ships.",
 		cities:["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya","Marsin","Antalya","Zonguldak","Denizli","Ordu","Mugia","Eskishehir","Inebolu","Sinop","Adana","Artuin","Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar","Bitlis","Yalova"]
 	},
@@ -729,8 +729,8 @@
 		afterPeace:"I thank you for your mercy. I pray that we can now be friends."
 		tradeRequest:"Does this trade work for you, my friend?"
 				
-		mainColor:[0,25,51],
+		outerColor:[0,25,51],
-		secondaryColor:[255,255,102],
+		innerColor:[255,255,102],
 		unique:"All units move through Forest and Jungle tiles in friendly territory as if it is Road. These tiles can be used to establish City Connections upon researching the Wheel.",
 		cities:["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River","Canandaigua Lake","Lake Simcoe","Salamanca","Gowanda","Cuba","Akron","Kanesatake","Ganienkeh","Cayuga Castle","Chondote","Canajoharie","Nedrow","Oneida Lake","Kanonwalohale","Green Bay","Southwold","Mohawk Valley","Schoharie","Bay of Quinte","Kanawale","Kanatsiokareke","Tyendinaga","Hahta"]
 	},
@@ -759,8 +759,8 @@
 		afterPeace:"By the hammer of Thor, you have proven yourself a worthy opponent today. I congratulate you!"
 		tradeRequest:"This is a fine deal! Even a drunk beggar would agree!"
 				
-		mainColor:[51,25,0],
+		outerColor:[51,25,0],
-		secondaryColor:[255,255,102],
+		innerColor:[255,255,102],
 		unique:"+1 Movement to all embarked units, whom pay just 1 movement point to move from sea to land and viceversa.",
 		cities:["Copenhagen","Aarhus","Kaupang","Ribe","Viborg","Tunsbers","Roskilde","Hedeby","Oslo","Jelling","Truso","Bergen","Faeroerne","Reykjavik","Trondheim","Godthab","Helluland","Lillehammer","Markland","Elsinore","Sarpsborg","Odense","Aalborg","Stavanger","Vorbasse","Schleswig","Kristiansand","Halogaland","Randers","Fredrikstad","Kolding","Horsens","Tromsoe","Vejle","Koge","Sandnes","Holstebro","Slagelse","Drammen","Hillerod","Sonderborg","Skien","Svendborg","Holbaek","Hjorring","Fladstrand","Haderslev","Ringsted","Skrive"]
 	},
@@ -768,7 +768,7 @@
 	{
 		name:"Barbarians",
 		translatedName:"蛮族",
-		mainColor:[0,0,0],
+		outerColor:[0,0,0],
-		secondaryColor:[182,0,0]
+		innerColor:[182,0,0]
 	}
 ]

core/src/com/unciv/logic/automation/UnitAutomation.kt

@@ -101,9 +101,8 @@ class UnitAutomation{
 
     private fun tryHeadTowardsEncampment(unit: MapUnit): Boolean {
         if(unit.civInfo.isBarbarianCivilization()) return false
-        val knownEncampments = unit.civInfo.exploredTiles.asSequence()
+        val knownEncampments = unit.civInfo.gameInfo.tileMap.values.asSequence()
-                .map { unit.civInfo.gameInfo.tileMap[it] }
+                .filter { it.improvement==Constants.barbarianEncampment && unit.civInfo.exploredTiles.contains(it.position) }
-                .filter { it.improvement==Constants.barbarianEncampment }
         val cities = unit.civInfo.cities
         val encampmentsCloseToCities
                 = knownEncampments.filter { cities.any { city -> city.getCenterTile().arialDistanceTo(it) < 6 } }

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

@@ -18,21 +18,31 @@ class CivInfoTransientUpdater(val civInfo: CivilizationInfo){
     // This is a big performance
     fun updateViewableTiles() {
         val newViewableTiles = HashSet<TileInfo>()
-        newViewableTiles.addAll(civInfo.cities.flatMap { it.getTiles() }.flatMap { it.neighbors }) // tiles adjacent to city tiles
+
-        newViewableTiles.addAll(civInfo.getCivUnits().flatMap { it.viewableTiles})
+        // There are a LOT of tiles usually.
+        // And making large lists of them just as intermediaries before we shove them into the hashset is very space-inefficient.
+        // Ans so, sequences to the rescue!
+        val ownedTiles = civInfo.cities.asSequence().flatMap { it.getTiles().asSequence() }
+        newViewableTiles.addAll(ownedTiles)
+        val neighboringUnownedTiles = ownedTiles.flatMap { it.neighbors.asSequence().filter { it.getOwner()!=civInfo } }
+        newViewableTiles.addAll(neighboringUnownedTiles)
+        newViewableTiles.addAll(civInfo.getCivUnits().asSequence().flatMap { it.viewableTiles.asSequence()})
         civInfo.viewableTiles = newViewableTiles // to avoid concurrent modification problems
 
         val newViewableInvisibleTiles = HashSet<TileInfo>()
-        newViewableInvisibleTiles.addAll(civInfo.getCivUnits()
+        newViewableInvisibleTiles.addAll(civInfo.getCivUnits().asSequence()
                 .filter {it.hasUnique("Can attack submarines")}
-                .flatMap {it.viewableTiles})
+                .flatMap {it.viewableTiles.asSequence()})
         civInfo.viewableInvisibleUnitsTiles = newViewableInvisibleTiles
         // updating the viewable tiles also affects the explored tiles, obvs
 
-        val newExploredTiles = HashSet(civInfo.exploredTiles)
+        // So why don't we play switcharoo with the explored tiles as well?
-        newExploredTiles.addAll(newViewableTiles.asSequence().map { it.position }
+        // Well, because it gets REALLY LARGE so it's a lot of memory space,
-                .filterNot { civInfo.exploredTiles.contains(it) })
+        // and we never actually iterate on the explored tiles (only check contains()),
-        civInfo.exploredTiles = newExploredTiles // ditto
+        // so there's no fear of concurrency problems.
+        val newlyExploredTiles = newViewableTiles.asSequence().map { it.position }
+                .filterNot { civInfo.exploredTiles.contains(it) }
+        civInfo.exploredTiles.addAll(newlyExploredTiles)
 
 
         val viewedCivs = HashSet<CivilizationInfo>()

core/src/com/unciv/models/gamebasics/Nation.kt

@@ -45,18 +45,18 @@ class Nation : INamed {
 
     var afterPeace=""
 
-    lateinit var mainColor: List<Int>
+    lateinit var outerColor: List<Int>
     var unique:String?=null
-    var secondaryColor: List<Int>?=null
+    var innerColor: List<Int>?=null
     var startBias = ArrayList<String>()
 
 
     fun getColor(): Color {
-        return colorFromRGB(mainColor[0], mainColor[1], mainColor[2])
+        return colorFromRGB(outerColor[0], outerColor[1], outerColor[2])
     }
     fun getSecondaryColor(): Color {
-        if(secondaryColor==null) return Color.BLACK
+        if(innerColor==null) return Color.BLACK
-        return colorFromRGB(secondaryColor!![0], secondaryColor!![1], secondaryColor!![2])
+        return colorFromRGB(innerColor!![0], innerColor!![1], innerColor!![2])
     }
 
     fun isCityState()= cityStateType != null

core/src/com/unciv/ui/worldscreen/Minimap.kt

@@ -73,10 +73,9 @@ class Minimap(val tileMapHolder: TileMapHolder) : ScrollPane(null){
     }
 
     fun update(cloneCivilization: CivilizationInfo) {
-        val exploredTiles = cloneCivilization.exploredTiles
         for(tileInfo in tileMapHolder.tileMap.values) {
             val hex = tileImages[tileInfo]!!
-            if (!(UnCivGame.Current.viewEntireMapForDebug || exploredTiles.contains(tileInfo.position)))
+            if (!(UnCivGame.Current.viewEntireMapForDebug || cloneCivilization.exploredTiles.contains(tileInfo.position)))
                 hex.color = Color.DARK_GRAY
             else if (tileInfo.isCityCenter() && !tileInfo.isWater)
                 hex.color = tileInfo.getOwner()!!.getNation().getSecondaryColor()

core/src/com/unciv/ui/worldscreen/TileMapHolder.kt

@@ -45,6 +45,8 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
 
         val allTiles = TileGroupMap(daTileGroups,worldScreen.stage.width)
 
+        // Memory profiling reveals that creating an GestureDetector inside the ActorGestureListener
+        // for every tile is VERY memory-intensive
         for(tileGroup in tileGroups.values){
             tileGroup.addListener (object: ActorGestureListener() {
                 override fun tap(event: InputEvent?, x: Float, y: Float, count: Int, button: Int) {

core/src/com/unciv/ui/worldscreen/WorldScreen.kt

@@ -364,8 +364,8 @@ class WorldScreen : CameraStageBaseScreen() {
         if(resources.any { it.resource.resourceType==ResourceType.Luxury }) displayTutorials("LuxuryResource")
         if(resources.any { it.resource.resourceType==ResourceType.Strategic}) displayTutorials("StrategicResource")
         if("EnemyCity" !in shownTutorials
-                && currentPlayerCiv.exploredTiles.asSequence().map { gameInfo.tileMap[it] }
+                && gameInfo.civilizations.filter { it!=currentPlayerCiv }
-                        .any { it.isCityCenter() && it.getOwner()!=currentPlayerCiv })
+                        .flatMap { it.cities }.any { currentPlayerCiv.exploredTiles.contains(it.location) })
             displayTutorials("EnemyCity")
         if(currentPlayerCiv.containsBuildingUnique("Enables construction of Spaceship parts"))
             displayTutorials("ApolloProgram")