Fixed AI being stuck doing science or gold per turn (#3006)

* AI will no longer get stuck doing science or gold per turn

* added missing commas in jsons

android/assets/jsons/Civ V - Vanilla/Nations.json

@@ -31,7 +31,7 @@
 		"innerColor": [213,249,255],
 		"unique": "INGENUITY",
 		"uniqueName": "Ingenuity",
-		"uniques": ["Receive free [Great Scientist] when you discover [Writing]", "[Great Scientist] is earned [50]% faster"]
+		"uniques": ["Receive free [Great Scientist] when you discover [Writing]", "[Great Scientist] is earned [50]% faster"],
 		"cities": ["Babylon","Akkad","Dur-Kurigalzu","Nippur","Borsippa","Sippar","Opis","Mari","Shushan","Eshnunna",
 			"Ellasar","Erech","Kutha","Sirpurla","Neribtum","Ashur","Ninveh","Nimrud","Arbela","Nuzi",
 			"Arrapkha","Tutub","Shaduppum","Rapiqum","Mashkan Shapir","Tuttul","Ramad","Ana","Haradum","Agrab",
@@ -61,7 +61,7 @@
 		"innerColor": [68,142,249],
 		"unique": "HELLENIC_LEAGUE",
 		"uniqueName": "Hellenic League",
-		"uniques": ["City-State Influence degrades at half rate", "City-State Influence recovers at twice the normal rate"]
+		"uniques": ["City-State Influence degrades at half rate", "City-State Influence recovers at twice the normal rate"],
 		"cities": ["Athens","Sparta","Corinth","Argos","Knossos","Mycenae","Pharsalos","Ephesus","Halicarnassus","Rhodes",
 			"Eretria","Pergamon","Miletos","Megara","Phocaea","Sicyon","Tiryns","Samos","Mytilene","Chios",
 			"Paros","Elis","Syracuse","Herakleia","Gortyn","Chalkis","Pylos","Pella","Naxos","Sicyon",
@@ -87,7 +87,7 @@
 		"innerColor": [255,255,255],
 		"unique": "ART_OF_WAR",
 		"uniqueName": "Art of War",
-		"uniques": ["Great General provides double combat bonus", "[Great General] is earned [50]% faster"]
+		"uniques": ["Great General provides double combat bonus", "[Great General] is earned [50]% faster"],
 		"cities": ["Beijing","Shanghai","Guangzhou","Nanjing","Xian","Chengdu","Hangzhou","Tianjin","Macau","Shandong",
 			"Kaifeng","Ningbo","Baoding","Yangzhou","Harbin","Chongqing","Luoyang","Kunming","Taipei","Shenyang",
 			"Taiyuan","Tainan","Dalian","Lijiang","Wuxi","Suzhou","Maoming","Shaoguan","Yangjiang","Heyuan","Huangshi",
@@ -117,7 +117,7 @@
 		"innerColor": [98,10,210],
 		"unique": "MONUMENT_BUILDERS",
 		"uniqueName": "Monument Builders",
-		"uniques": ["+[20]% Production when constructing [Wonders]"]
+		"uniques": ["+[20]% Production when constructing [Wonders]"],
 		"cities": ["Thebes","Memphis","Heliopolis","Elephantine","Alexandria","Pi-Ramesses","Giza","Byblos","Akhetaten",
 			   "Hieraconpolis","Abydos","Asyut","Avaris","Lisht","Buto","Edfu","Pithom","Busiris","Kahun","Athribis",
 			   "Mendes","Elashmunein","Tanis","Bubastis","Oryx","Sebennytus","Akhmin","Karnak","Luxor","El Kab","Armant",
@@ -144,7 +144,7 @@
 		"innerColor": [255,255,255],
 		"unique": "SUN_NEVER_SETS",
 		"uniqueName": "Sun Never Sets",
-		"uniques": ["+2 movement for all naval units"]
+		"uniques": ["+2 movement for all naval units"],
 		"cities": ["London","York","Nottingham","Hastings","Canterbury","Coventry","Warwick","Newcastle","Oxford","Liverpool",
 			"Dover","Brighton","Norwich","Leeds","Reading","Birmingham","Richmond","Exeter","Cambridge","Gloucester",
 			"Manchester","Bristol","Leicester","Carlisle","Ipswich","Portsmouth","Berwick","Bath","Mumbles","Southampton",
@@ -169,7 +169,7 @@
 		"innerColor": [239,236,148],
 		"unique": "ANCIEN_REGIME",
 		"uniqueName": "Ancien Régime",
-		"uniques": ["+2 Culture per turn from cities before discovering Steam Power"]
+		"uniques": ["+2 Culture per turn from cities before discovering Steam Power"],
 		"cities": ["Paris","Orleans","Lyon","Troyes","Tours","Marseille","Chartres","Avignon","Rouen","Grenoble",
 			"Dijon","Amiens","Cherbourg","Poitiers","Toulouse","Bayonne","Strasbourg","Brest","Bordeaux","Rennes",
 			"Nice","Saint Etienne","Nantes","Reims","Le Mans","Montpellier","Limoges","Nancy","Lille","Caen","Toulon",
@@ -196,7 +196,7 @@
 		"unique": "SIBERIAN_RICHES",
 		"uniqueName": "Siberian Riches",
 		"uniques": ["[+1 Production] from every [Strategic resource]","Double quantity of [Horses] produced",
-			"Double quantity of [Iron] produced","Double quantity of [Uranium] produced"]
+			"Double quantity of [Iron] produced","Double quantity of [Uranium] produced"],
 		"cities": ["Moscow","St. Petersburg","Novgorod","Rostov","Yaroslavl","Yekaterinburg","Yakutsk","Vladivostok","Smolensk","Orenburg",
 			"Krasnoyarsk","Khabarovsk","Bryansk","Tver","Novosibirsk","Magadan","Murmansk","Irkutsk","Chita","Samara",
 			"Arkhangelsk","Chelyabinsk","Tobolsk","Vologda","Omsk","Astrakhan","Kursk","Saratov","Tula","Vladimir","Perm",
@@ -206,7 +206,7 @@
 		"name": "Rome",
 		"leaderName": "Augustus Caesar",
 		"adjective": ["Roman"],
-		"startBias":["Avoid [Tundra]","Avoid [Desert]"]
+		"startBias":["Avoid [Tundra]","Avoid [Desert]"],
 		"preferredVictoryType": "Scientific",
 		
 		"startIntroPart1": "The blessings of the gods be upon you, Caesar Augustus, emperor of Rome and all her holdings. Your empire was the greatest and longest lived of all in Western civilization. And your people single handedly shaped its culture, law, art, and warfare like none other, before or since. Through years of glorious conquest, Rome came to dominate all the lands of the Mediterranean from Spain in the west to Syria in the east. And her dominion would eventually expand to cover much of England and northern Germany. Roman art and architecture still awe and inspire the world. And she remains the envy of all lesser civilizations who have followed.",
@@ -222,7 +222,7 @@
 		"innerColor": [238,201,9],
 		"unique": "GLORY_OF_ROME",
 		"uniqueName": "The Glory of Rome",
-		"uniques": ["+25% Production towards any buildings that already exist in the Capital"]
+		"uniques": ["+25% Production towards any buildings that already exist in the Capital"],
 		"cities": ["Rome","Antium","Cumae","Neapolis","Ravenna","Arretium","Mediolanum","Arpinum","Circei","Setia",
 			"Satricum","Ardea","Ostia","Velitrae","Viroconium","Tarentum","Brundisium","Caesaraugusta","Caesarea","Palmyra",
 			"Signia","Aquileia","Clusium","Sutrium","Cremona","Placentia","Hispalis","Artaxata","Aurelianorum","Nicopolis",
@@ -272,7 +272,7 @@
 		"innerColor": [255,255,255],
 		"unique": "MANIFEST_DESTINY",
 		"uniqueName": "Manifest Destiny",
-		"uniques": ["+1 Sight for all land military units", "-50% cost when purchasing tiles"]
+		"uniques": ["+1 Sight for all land military units", "-50% cost when purchasing tiles"],
 		"cities": ["Washington","New York","Boston","Philadelphia","Atlanta","Chicago","Seattle","San Francisco","Los Angeles","Houston",
 			"Portland","St. Louis","Miami","Buffalo","Detroit","New Orleans","Baltimore","Denver","Cincinnati","Dallas","Memphis",
 			"Cleveland","Kansas City","San Diego","Richmond","Las Vegas","Phoenix","Albuquerque","Minneapolis","Pittsburgh",
@@ -300,7 +300,7 @@
 		"innerColor": [185,0,0],
 		"unique": "BUSHIDO",
 		"uniqueName": "Bushido",
-		"uniques": ["Units fight as though they were at full strength even when damaged"]
+		"uniques": ["Units fight as though they were at full strength even when damaged"],
 		"cities": ["Kyoto","Osaka","Tokyo","Satsuma","Kagoshima","Nara","Nagoya","Izumo","Nagasaki","Yokohama",
 			"Shimonoseki","Matsuyama","Sapporo","Hakodate","Ise","Toyama","Fukushima","Suo","Bizen","Echizen",
 			"Izumi","Omi","Echigo","Kozuke","Sado","Kobe","Nagano","Hiroshima","Takayama","Akita","Fukuoka","Aomori",
@@ -326,7 +326,7 @@
 		"innerColor": [255,153,51],
 		"unique": "POPULATION_GROWTH",
 		"uniqueName": "Population Growth",
-		"uniques": ["Unhappiness from number of Cities doubled", "Unhappiness from population decreased by [50]%"]
+		"uniques": ["Unhappiness from number of Cities doubled", "Unhappiness from population decreased by [50]%"],
 		"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",
 			"Bodhgaya","Kushinagar","Amaravati","Gaur","Gwalior","Jaipur","Karachi"]
@@ -433,7 +433,7 @@
 		"innerColor": [246,205,137],
 		"unique": "GREAT_WARPATH",
 		"uniqueName": "The Great Warpath",
-		"uniques": ["All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel."]
+		"uniques": ["All units move through Forest and Jungle Tiles in friendly territory as if they have roads. 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",
@@ -513,7 +513,7 @@
 		"innerColor": [193,21,17],
 		"unique": "FATHER_GOVERNS_CHILDREN",
 		"uniqueName": "Father Governs Children",
-		"uniques": ["Food and Culture from Friendly City-States are increased by 50%"]
+		"uniques": ["Food and Culture from Friendly City-States are increased by 50%"],
 		"cities": ["Sukhothai","Si Satchanalai","Muang Saluang","Lampang","Phitsanulok","Kamphaeng Pet","Nakhom Chum","Vientiane",
 			"Nakhon Si Thammarat","Martaban","Nakhon Sawan","Chainat","Luang Prabang","Uttaradit","Chiang Thong","Phrae",
 			"Nan","Tak","Suphanburi","Hongsawadee","Thawaii","Ayutthuya","Taphan Hin","Uthai Thani","Lap Buri","Ratchasima",
@@ -540,7 +540,7 @@
 		"unique": "SEVEN_CITIES_OF_GOLD",
 		"uniqueName": "Seven Cities of Gold",
 		"uniques": ["100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it)",
-			"Double Happiness from Natural Wonders", "Tile yields from Natural Wonders doubled"]
+			"Double Happiness from Natural Wonders", "Tile yields from Natural Wonders doubled"],
 		"cities": ["Madrid","Barcelona","Seville","Cordoba","Toledo","Santiago","Salamanca","Murcia","Valencia","Zaragoza","Pamplona",
 			"Vitoria","Santander","Oviedo","Jaen","Logroño","Valladolid","Palma","Teruel","Almeria","Leon","Zamora","Mida",
 			"Lugo","Alicante","Càdiz","Eiche","Alcorcon","Burgos","Vigo","Badajoz","La Coruña","Guadalquivir","Bilbao",
@@ -566,7 +566,7 @@
 		"innerColor": [90,0,10],
 		"unique": "RIVER_WARLORD",
 		"uniqueName": "River Warlord",
-		"uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "Embarked units can defend themselves"]
+		"uniques": ["Receive triple Gold from Barbarian encampments and pillaging Cities", "Embarked units can defend themselves"],
 		"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"]
@@ -591,7 +591,7 @@
 		"innerColor": [255,120,0],
 		"unique": "MONGOL_TERROR",
 		"uniqueName": "Mongol Terror",
-		"uniques": ["+30% Strength when fighting City-State units and cities", "+[1] Movement for all [Mounted] units"]
+		"uniques": ["+30% Strength when fighting City-State units and cities", "+[1] Movement for all [Mounted] units"],
 		"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","Altay","Uliastay","Bayanhongor",

android/assets/jsons/Civ V - Vanilla/Policies.json

@@ -22,7 +22,7 @@
 			{
 				"name": "Oligarchy",
 				"effect": "Units in cities cost no Maintenance, garrisoned city +50% attacking strength",
-				"uniques": ["Units in cities cost no Maintenance", "+50% attacking strength for cities with garrisoned units"]
+				"uniques": ["Units in cities cost no Maintenance", "+50% attacking strength for cities with garrisoned units"],
 				"row": 1,
 				"column": 5
 			},
@@ -58,7 +58,7 @@
 			{
 				"name": "Collective Rule",
 				"effect": "Training of settlers increased +50% in capital, receive a new settler near the capital",
-				"uniques": ["Training of settlers increased +50% in capital", "Free [Settler] appears"]
+				"uniques": ["Training of settlers increased +50% in capital", "Free [Settler] appears"],
 				"row": 1,
 				"column": 1
 			},
@@ -104,7 +104,7 @@
 		"name": "Honor",
 		"era": "Ancient era",
 		"effect": "+25% bonus vs Barbarians; gain Culture when you kill a barbarian unit",
-		"uniques": ["+25% bonus vs Barbarians", "Gain Culture when you kill a barbarian unit", "Notified of new Barbarian encampments"]
+		"uniques": ["+25% bonus vs Barbarians", "Gain Culture when you kill a barbarian unit", "Notified of new Barbarian encampments"],
 		"policies": [
 			{
 				"name": "Warrior Code",
@@ -131,7 +131,7 @@
 			{
 				"name": "Military Caste",
 				"effect": "Each city with a garrison increases happiness by 1 and culture by 2",
-				"uniques": ["[+1 Happiness, +2 Culture] in all cities with a garrison"]
+				"uniques": ["[+1 Happiness, +2 Culture] in all cities with a garrison"],
 				"requires": ["Discipline"],
 				"row": 2,
 				"column": 4
@@ -160,7 +160,7 @@
 				"name": "Organized Religion",
 				"effect": "+1 happiness for each monument, temple and monastery",
 				"uniques": ["[+1 Happiness] from every [Monument]","[+1 Happiness] from every [Temple]",
-					"[+1 Happiness] from every [Monastery]"]
+					"[+1 Happiness] from every [Monastery]"],
 				"row": 1,
 				"column": 2
 			},
@@ -182,7 +182,7 @@
 			{
 				"name": "Reformation",
 				"effect": "+33% culture in all cities with a world wonder, immediately enter a golden age",
-				"uniques": ["+33% culture in all cities with a world wonder", "Empire enters golden age"]
+				"uniques": ["+33% culture in all cities with a world wonder", "Empire enters golden age"],
 				"requires": ["Organized Religion"],
 				"row": 2,
 				"column": 3
@@ -191,7 +191,7 @@
 				"name": "Free Religion",
 				"effect": "+1 culture for each monument, temple and monastery. Gain a free policy.",
 				"uniques": ["[+1 Culture] from every [Monument]", "[+1 Culture] from every [Temple]", "[+1 Culture] from every [Monastery]",
-					"Free Social Policy"]
+					"Free Social Policy"],
 				"requires": ["Mandate Of Heaven","Reformation"],
 				"row": 3,
 				"column": 4
@@ -255,14 +255,14 @@
 			{
 				"name": "Trade Unions",
 				"effect": "Maintenance on roads & railroads reduced by 33%, +2 gold from all trade routes",
-				"uniques": ["Maintenance on roads & railroads reduced by 33%", "[+2 Gold] from each Trade Route"]
+				"uniques": ["Maintenance on roads & railroads reduced by 33%", "[+2 Gold] from each Trade Route"],
 				"row": 1,
 				"column": 2
 			},
 			{
 				"name": "Mercantilism",
 				"effect": "-25% to purchasing items in cities",
-				"uniques": ["Cost of purchasing items in cities reduced by [25]%"]
+				"uniques": ["Cost of purchasing items in cities reduced by [25]%"],
 				"row": 1,
 				"column": 5
 			},
@@ -278,7 +278,7 @@
 			{
 				"name": "Patronage",
 				"effect": "Cost of purchasing culture buildings reduced by 50%",
-				"uniques": ["Cost of purchasing [Culture] buildings reduced by [50]%"]
+				"uniques": ["Cost of purchasing [Culture] buildings reduced by [50]%"],
 				"requires": ["Mercantilism"],
 				"row": 2,
 				"column": 5
@@ -302,7 +302,7 @@
 		"name": "Rationalism",
 		"era": "Renaissance era",
 		"effect": "Production to science conversion in cities increased by 33%",
-		"uniques": ["Production to science conversion in cities increased by 33%"]
+		"uniques": ["Production to science conversion in cities increased by 33%"],
 		"policies": [
 			{
 				"name": "Secularism",
@@ -315,14 +315,14 @@
 				"name": "Humanism",
 				"effect": "+1 happiness from every university, observatory and public school",
 				"uniques": ["[+1 Happiness] from every [University]","[+1 Happiness] from every [Observatory]",
-					"[+1 Happiness] from every [Public School]"]
+					"[+1 Happiness] from every [Public School]"],
 				"row": 1,
 				"column": 5
 			},
 			{
 				"name": "Free Thought",
 				"effect": "+1 science from every trading post, +17% science from universities",
-				"uniques": ["[+1 Gold] from every [Trading post]", "+[17]% [Science] from every [University]"]
+				"uniques": ["[+1 Gold] from every [Trading post]", "+[17]% [Science] from every [University]"],
 				"requires": ["Secularism"],
 				"row": 2,
 				"column": 1
@@ -402,14 +402,14 @@
 			{
 				"name": "Constitution",
 				"effect": "+2 culture from each wonder",
-				"uniques": ["[+2 Culture] from every Wonder"]
+				"uniques": ["[+2 Culture] from every Wonder"],
 				"row": 1,
 				"column": 1
 			},
 			{
 				"name": "Universal Suffrage",
 				"effect": "+1 production per 5 population",
-				"uniques": ["[+1 Production] per [5] population in all cities"]
+				"uniques": ["[+1 Production] per [5] population in all cities"],
 				"row": 1,
 				"column": 3
 			},
@@ -423,7 +423,7 @@
 			{
 				"name": "Free Speech",
 				"effect": "+1 culture for every 2 citizens",
-				"uniques": ["[+1 Culture] per [2] population in all cities"]
+				"uniques": ["[+1 Culture] per [2] population in all cities"],
 				"requires": ["Constitution"],
 				"row": 2,
 				"column": 1
@@ -489,7 +489,7 @@
 			},
 			{
 				"name": "Autocracy Complete",
-				"effect": "+20% attack bonus to all Military Units for 30 turns"
+				"effect": "+20% attack bonus to all Military Units for 30 turns",
 				"uniques": ["+20% attack bonus to all Military Units for 30 turns"]
 			}
 		]

android/assets/jsons/Civ V - Vanilla/TileImprovements.json

@@ -174,7 +174,6 @@
 	{
 		"name": "Citadel",
 		"uniques": ["Gives a defensive bonus of [100]%", "Deal 30 damage to adjacent enemy units", "Great Improvement"]
-		// TODO (G&K): adds every tile around it to your territory
 	},
 
 	//Civilization unique improvements

android/assets/jsons/Civ V - Vanilla/UnitPromotions.json

@@ -325,7 +325,7 @@
 	
 	{
 		"name": "Sortie",
-		"prerequisites": ["Interception II", "Dogfighting II"]
+		"prerequisites": ["Interception II", "Dogfighting II"],
 		"effect": "1 extra Interception may be made per turn",
 		"unitTypes": ["Fighter"]
 	},

android/assets/jsons/Civ V - Vanilla/Units.json

@@ -496,8 +496,8 @@
 		"upgradesTo": "Musketman",
 		"obsoleteTech": "Metallurgy",
 		"requiredResource": "Iron",
-		"uniques": ["Amphibious"]
+		"uniques": ["Amphibious"],
-		"promotions": ["Shock I"]
+		"promotions": ["Shock I"],
 		"hurryCostModifier": 20,
 		"attackSound": "metalhit"
 		//Danish unique unit. Can attack from the sea without any penalty, and moves faster.

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

@@ -376,7 +376,7 @@ class CityConstructions {
         validateConstructionQueue()
         if (constructionQueue.isNotEmpty()) {
             currentConstructionIsUserSet = true
-            if (currentConstructionFromQueue != "") return
+            if (currentConstructionFromQueue != "" && getConstruction(currentConstructionFromQueue) !is PerpetualConstruction) return
         }
 
         ConstructionAutomation(this).chooseNextConstruction()