Implement custom save locations for Android and Desktop (#3160)

* Implement custom save locations for Android and Desktop

* Request write permission to save to external storage

* Fix race condition for custom saves/loads caused by autosaves

* Remove unnecessary WRITE_EXTERNAL_STORAGE permission for saving files

* Fix padding for custom save/load location buttons

* Use nullability checks as defined in coding style guide

* Use nullability checks as defined in coding style guide

* Use early return for readability

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

.gitignore

@@ -68,6 +68,7 @@ com_crashlytics_export_strings.xml
 /html/build/
 /ios/build/
 /ios-moe/build/
+/buildSrc/build
 
 /nbbuild/
 /android/nbbuild/
@@ -136,3 +137,4 @@ android/release/
 android/assets/mods/
 android/assets/SaveFiles/
 android/assets/GameSettingsOld.json
+android/assets/scenarios/

.travis.yml

@@ -27,11 +27,20 @@ script:
 - ./gradlew check
 - ./gradlew tests:test  
 - if [ -n "$TRAVIS_TAG" ]; then
-    wget  -O jdk-windows.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip;
+    wget -O jdk-windows-64.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip  > /dev/null;
+    wget -O jdk-windows-32.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.252-2.b09-x86/java-1.8.0-openjdk-1.8.0.252-2.b09.ojdkbuild.windows.x86.zip > /dev/null;
+    wget -O butler.zip https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default > /dev/null;
+    unzip butler.zip;
+    chmod +x butler;
+    ./butler -V;
     ./gradlew desktop:packrWindows32;
+    ./butler push deploy/Unciv-Windows32.zip yairm210/unciv:Windows32 --userversion $TRAVIS_TAG;
     ./gradlew desktop:packrWindows64;
+    ./butler push deploy/Unciv-Windows64.zip yairm210/unciv:Windows64 --userversion $TRAVIS_TAG;
     ./gradlew desktop:packrLinux32;
+    ./butler push deploy/Unciv-Linux32.zip yairm210/unciv:Linux32     --userversion $TRAVIS_TAG;
     ./gradlew desktop:packrLinux64;
+    ./butler push deploy/Unciv-Linux64.zip yairm210/unciv:Linux64     --userversion $TRAVIS_TAG;
     ./gradlew desktop:zipLinuxFilesForJar;
   fi
     
@@ -45,6 +54,7 @@ deploy:
     - desktop/build/libs/Unciv.jar
     - deploy/Unciv-Linux32.zip
     - deploy/Unciv-Linux64.zip
+    - deploy/Unciv-Windows32.zip
     - deploy/Unciv-Windows64.zip
     - deploy/linuxFilesForJar.zip
   on:

README.md

@@ -1,18 +1,16 @@
 # Unciv - Civ V for Android (+Desktop)
 
-![](https://lh3.googleusercontent.com/l8fuQ2DnNjoD9pFnHLsli1xt8OClfr6O9GSBJJ9w7IIb2VHOyxqKZ9lNZXtMqOabCfyI=w1920-h867-rw)
+![](/extraImages/GithubPreviewImage.png)
 
-
-[![Google Play](https://img.shields.io/badge/Google-Play-black.svg)](https://play.google.com/store/apps/details?id=com.unciv.app)
+[![Google Play](https://img.shields.io/static/v1?label=Google&message=Play&color=607D8B&logo=google-play)](https://play.google.com/store/apps/details?id=com.unciv.app)
 [![F-Droid](https://img.shields.io/f-droid/v/com.unciv.app)](https://f-droid.org/en/packages/com.unciv.app/)
+[![itch.io](https://img.shields.io/static/v1?label=itch.io&message=Unciv&color=607D8B&logo=itch.io)](https://yairm210.itch.io/unciv)
 
-[![Travis CI w/ Logo](https://img.shields.io/travis/yairm210/UnCiv/master.svg?logo=travis)](https://travis-ci.org/yairm210/UnCiv)  
-[![Discord Chat](https://img.shields.io/discord/586194543280390151.svg)](https://discord.gg/bjrB4Xw)  
+[![Travis CI w/ Logo](https://img.shields.io/travis/yairm210/UnCiv/master.svg?logo=travis)](https://travis-ci.org/yairm210/UnCiv)
+[![Discord Chat](https://img.shields.io/discord/586194543280390151.svg)](https://discord.gg/bjrB4Xw)
 
 [![LibGDX](https://img.shields.io/badge/libgdx-1.9.10-red.svg)](https://libgdx.badlogicgames.com/)
-[![Kotlin](https://img.shields.io/badge/kotlin-1.3.50-orange.svg)](http://kotlinlang.org/)
-
-
+[![Kotlin](https://img.shields.io/badge/kotlin-1.3.710-0095D5.svg?logo=kotlin)](http://kotlinlang.org/)
 
 
 # What is this?
@@ -27,11 +25,7 @@ Is this order:
 * Polish! As you may have noticed, Unciv is fully functional but rough around the edges. This means:
     * UI+UX improvements (suggestions welcome!)
     * Better automation, AI etc. in-game
-* Development and distribution cycle
-   * Automated tests - done!
-   * Automated F-droid and Google Play version deployment - done!
-   * Standalone Desktop executables - done!
-   * Maybe Itch.io?
+* Development and distribution cycle - Done! (tests, f-droid/Google Play/itch.io deployment)
 * Missing features from Vanilla - Natural wonders (done!), city-state quests, missing civs etc.
 * G&K mechanics - religion, faith etc.
 * BNW mechanics - trade routes etc.
@@ -40,17 +34,16 @@ Is this order:
 
 ## How can I help?
 
-If you're a programmer, get started at [here!](https://github.com/yairm210/Unciv/wiki/Getting-Started)
+Programmers start [here!](https://github.com/yairm210/Unciv/wiki/Getting-Started)
 
-If you want to help with the translation, get started [here!](https://github.com/yairm210/Unciv/wiki/Translating)
+Translators start [here!](https://github.com/yairm210/Unciv/wiki/Translating)
+
+Modders start [here!](https://github.com/yairm210/Unciv/wiki/Mods)
 
 You can join us in any of the open issue, or work on improving anything you want - once you're finished, issue a pull request and it'll go into the next version!
 
 If not, you can help by spreading the word - vote for Unciv where you can, mention it on Reddit or Twitter etc, and help us with new ideas of how to get the word out!
 
-If you REALLY want to donate for some reason, I have a Patreon page [here!](https://www.patreon.com/yairm210)
-        
-If you want to mod, see [here!](https://github.com/yairm210/Unciv/wiki/Mods)
 
 # FAQ
 
@@ -66,15 +59,17 @@ If not, then the feature won't be added until we've finished all the features fr
 
 THE most common request, hands down. Everyone wants their favorite Civ in the game, I get that. But there are so many other things to work on - automations, AI, UI, graphics, bugs, and of course other features from the original game that are currently missing. Eventually we'll have them all, but the key word is "eventually".
 
+In the meantime, you can [mod it yourself!](https://github.com/yairm210/Unciv/wiki/Mods)
+
 ## Will you implement Civ VI?
 
-Maybe, once we've finished with all of Civ V. But considering how long it took to get this far, Civ VII may be out by then.
+Considering how long it took to get this far, no.
 
 ## Is there a desktop version?
 
-There are standalone zip files for each operating system in [Releases](https://github.com/yairm210/UnCiv/releases) which contain everything needed for Unciv to run
+Yes! Windows and Linux versions are available at [itch.io](https://yairm210.itch.io/unciv), and if you're using the Itch app, your game will stay up-to-date - and we release pretty frequently so that's an issue ;)
 
-If you have Java 8, and are familiar with the command line, there are (considerably smaller) JARs in [Releases](https://github.com/yairm210/UnCiv/releases) which you can run with `java -jar Unciv.jar`
+If you have Java 8, and are familiar with the command line, there are (considerably smaller) JARs in [Releases](https://github.com/yairm210/UnCiv/releases) which you can run with `java -jar Unciv.jar`. This is also (currently) the only way to run the game on MacOS.
 
 Be aware that the game will generate files inside the folder where the Jar is located!
 
@@ -94,11 +89,29 @@ Building: `./gradlew desktop:dist`
 
 If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` first. *This is a one-time procedure.*
 
+If you get an error that Android SDK folder wasn't found, firstly install it by doing in terminal:
+
+`sudo apt update && sudo apt install android-sdk` (Debian, Ubuntu, Mint etc.)
+
+After that you should put its folder to the file `local.properties` by adding this line:
+
+`sdk.dir = /path/to/android/sdk` which can be `/usr/lib/android-sdk` or something other.
+
+If during the first launch it throws an error that the JDK version is wrong try [this JDK installation](https://www.azul.com/downloads/zulu-community/?package=jdk).
+
 Gradle may take up to several minutes to download files. Be patient.
 After building, the output .JAR file should be in /desktop/build/libs/Unciv.jar
 
 For actual development, you'll probably need to download Android Studio and build it yourself - see Contributing :)
 
+
+## How about IOS?
+
+I'm not planning on it.
+
+It means paying money to Apple, yet another release path,
+ and since I don't have an IOS device it means I can't test it properly.
+
 ## How can I learn to play? Where's the wiki?
 
 All the tutorial information is available in-game at menu > civilopedia > tutorials
@@ -122,4 +135,10 @@ From what I understand, intellectual property rights apply to names, characters
 
 If anyone has any real legal sources, or can shed some light on the limits of what is and is not allowed, I'd be happy to hear!
 
+## Disclosure
+
+Multiplayer takes advantage of Dropbox, which is *non-free software*, for syncing purposes.
+
+Single player does not use this feature.
+
 # [Credits and 3rd parties](docs/Credits.md)

android/assets/GameSettingsOld.json

@@ -1 +0,0 @@
-{showResourcesAndImprovements:false,tutorialsShown:[World_Map,Unit_Selected,Slow_Start,_City_Founded,First_Steps,Injured_Units,Workers,_OtherCivEncountered,_BarbarianEncountered,Roads_and_Railroads,Golden_Age,Idle_Units,Contact_Me,Luxury_Resource,Strategic_Resource,Enemy_City,Apollo_Program,Embarking,Tile_Clicked,Technology,Culture_and_Policies,City_Range,Cities,Next_Turn,Siege_Units,Happiness,Unhappiness,New_Game,_GameCrashed],missionsCompleted:[Move unit,Found city,Enter city screen,Found city,Enter city screen,Enter city screen,Found city,Pick technology,Enter city screen,Pick construction,Found city,Enter city screen,Enter city screen,Pass a turn,Enter city screen,Enter city screen,Reassign worked tiles,Pass a turn,Meet another civilization,Open the options table,Pass a turn,Pass a turn,Meet another civilization,Pass a turn,Pick technology,Pass a turn,Pass a turn,Move unit],soundEffectsVolume:1,musicVolume:0,showPixelUnits:true,nuclearWeaponEnabled:true,userId:8d2cbffc-2b96-4617-aa49-0c68f6fe15c4}

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

@@ -29,11 +29,11 @@
 		"name": "Stone Works", 
 		"happiness": 1,
 		"production": 1,
-		"requiredNearbyImprovedResources": ["Marble","Stone"],
+		"requiredNearbyImprovedResources": ["Marble", "Stone"],
 		"resourceBonusStats": {"production": 1},
 		"maintenance": 1,
 		"hurryCostModifier": 25,
-		"uniques": ["Must not be on plains"],
+		"uniques": ["Must not be on [Plains]"],
 		"requiredTech": "Calendar"
 	},
 	{
@@ -48,7 +48,7 @@
 		"name": "Library",
 		"hurryCostModifier": 25,
 		"maintenance": 1,
-		"uniques": ["+1 Science Per 2 Population"],
+		"uniques": ["[+1 Science] Per [2] Population in this city"],
 		"requiredTech": "Writing"
 	},
 	{
@@ -68,7 +68,7 @@
 		"uniqueTo": "China",
 		"hurryCostModifier": 25,
 		"gold": 2,
-		"uniques": ["+1 Science Per 2 Population"],
+		"uniques": ["[+1 Science] Per [2] Population in this city"],
 		"requiredTech": "Writing"
 	},
 	{
@@ -78,19 +78,38 @@
 		"hurryCostModifier": 25,
 		"requiredTech": "Trapping"
 	},
-	
-	/*
+	{
+		"name": "Water Mill",
+		"maintenance": 2,
+		"food": 2,
+		"production": 1,
+		"hurryCostModifier": 25,
+		"uniques": ["Must be on [River]"],
+		"requiredTech": "The Wheel"
+	},
+	{
+		"name": "Floating Gardens",
+		"replaces": "Water Mill",
+		"uniqueTo": "Aztecs",
+		"cost": 75,
+		"food": 2,
+		"production": 1,
+		"uniques": ["[+2 Food] from [Lakes] tiles in this city", "Must be next to [Fresh water]"],
+		"hurryCostModifier": 25,
+		"maintenance": 1,
+		"percentStatBonus": {"food": 15},
+		"requiredTech": "The Wheel"     
+	},
 	{
 		"name": "Temple of Artemis",
 		"culture": 1,
 		"isWonder": true,
+		"cost": 185,
 		"greatPersonPoints": {"production": 1},
-		"uniques": ["+10% Growth in all Cities.","+15% Production towards Ranged Units."],
-		"requiredTech": "Archery"
-		"quote": "'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson"
+		"uniques": ["+[10]% growth in all cities", "+[15]% Production when constructing [ranged units]"],
+		"requiredTech": "Archery",
+		"quote": "'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.'  - Robert Louis Stevenson"
 	},
-	*/
-	
 	{
 		"name": "Walls",
 		"cityStrength": 5,
@@ -113,7 +132,7 @@
 		"culture": 1,
 		"greatPersonPoints": {"production": 1},
 		"isWonder": true,
-		"uniques": ["Worker construction increased 25%","Provides 2 free workers"],
+		"uniques": ["Worker construction increased 25%","[2] free [Worker] units appear"],
 		"requiredTech": "Masonry",
 		"quote": "'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"
 	},
@@ -130,7 +149,7 @@
 		"gold": 5,
 		"greatPersonPoints": {"gold": 1},
 		"isWonder": true,
-		"uniques": ["Can only be built in coastal cities", "+1 gold from worked water tiles in city"],
+		"uniques": ["Must be next to [Coast]", "[+1 Gold] from [Water] tiles in this city"],
 		"requiredTech": "Iron Working",
 		"quote": "'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar"
 	},
@@ -149,7 +168,7 @@
 		"culture": 1,
 		"isWonder": true,
 		"uniques": ["+15% Combat Strength for all units when attacking Cities"],
-		"requiredTech": "Bronze Working"
+		"requiredTech": "Bronze Working",
 		"quote": "'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad"
 	},
 	{
@@ -157,8 +176,9 @@
 		"culture": 1,
 		"greatPersonPoints": {"gold": 1},
 		"isWonder": true,
-		"uniques": ["Provides a sum of gold each time you spend a Great Person", "+2 Gold for each source of Marble and Stone"],
-		"requiredTech": "Masonry"
+		"uniques": ["Provides a sum of gold each time you spend a Great Person",
+			"[+2 Gold] from [Marble] tiles in this city", "[+2 Gold] from [Stone] tiles in this city"],
+		"requiredTech": "Masonry",
 		"quote": "'The whole earth is the tomb of heroic men and their story is not given only on stone over their clay but abides everywhere without visible symbol woven into the stuff of other men's lives.' - Pericles"
 	},
 	
@@ -169,7 +189,7 @@
 		"hurryCostModifier": 25,
 		"maintenance": 1,
 		"resourceBonusStats": {"food": 1},
-		"uniques": ["Can only be built in coastal cities","+1 food from Ocean and Coast tiles"],
+		"uniques": ["Must be next to [Coast]", "[+1 Food] from [Ocean] tiles in this city", "[+1 Food] from [Coast] tiles in this city"],
 		"requiredTech": "Optics"
 	},
 	{
@@ -178,7 +198,7 @@
 		"greatPersonPoints": {"gold": 1},
 		"isWonder": true,
 		"providesFreeBuilding":  "Lighthouse",
-		"uniques": ["Can only be built in coastal cities", "All military naval units receive +1 movement and +1 sight"],
+		"uniques": ["Must be next to [Coast]", "All military naval units receive +1 movement and +1 sight"],
 		"requiredTech": "Optics",
 		"quote": "'They that go down to the sea in ships, that do business in great waters; these see the works of the Lord, and his wonders in the deep.' - The Bible, Psalms 107:23-24"
 	},
@@ -188,7 +208,7 @@
 		"requiredNearbyImprovedResources": ["Horses","Sheep","Cattle"],
 		"resourceBonusStats": {"production": 1},
 		"hurryCostModifier": 25,
-		"uniques": ["+15% Production when building Mounted Units in this city"],
+		"uniques": ["+[15]% production when building [mounted units] in this city"],
 		"requiredTech": "Horseback Riding"
 	},
 	{
@@ -288,7 +308,7 @@
 		"hurryCostModifier": 25,
 		"percentStatBonus": {"gold": 25},
 		"uniques": ["Provides 1 extra copy of each improved luxury resource near this City",
-			"+2 Gold for each source of Oil and oasis"],
+			"[+2 Gold] from [Oil] tiles in this city", "[+2 Gold] from [Oasis] tiles in this city"],
 		"requiredTech": "Currency"
 	},
 	{
@@ -299,23 +319,22 @@
 		"hurryCostModifier": 25,
 		"requiredTech": "Currency"
 	},
-	
 	/*
-	{ //Must be built in or near Desert
+	{ // Will be Introduced in Gods & Kings. Flood plains are not supposed to be affected by this wonder. Add stats to all desert tiles and then add negative stats to flood plains to undo the effect on them for now
 		"name": "Petra",
 		"culture": 1,
 		"isWonder": true,
 		"greatPersonPoints": {"production": 1},
-		"uniques": ["+1 Food and +1 Production from all worked Desert tiles in the City (except Flood plains).","+6 Culture when discovering Archeology."],
-		"requiredTech": "Currency"
-		"quote": "'...who drinks the water I shall give him, says the Lord, will have a spring inside him welling up for eternal life. Let them bring me to your holy mountain in the place where you dwell. Across the desert and through the mountain to the Canyon of the Crescent Moon...' - Indiana Jones"
+		"uniques": ["Must be next to [Desert]", "[+1 Food, +1 Production] from [Desert] tiles in this city", "[-1 Food, -1 Production] from [Flood plains] tiles in this city", "[+6 Culture] once [Archaeology] is discovered"],
+		"requiredTech": "Currency",
+		"quote": "'...who drinks the water I shall give him, says the Lord, will have a spring inside him welling up for eternal life. Let them bring me to your holy mountain in the place where you dwell. Across the desert and through the mountain to the Canyon of the Crescent Moon...'  - Indiana Jones"
 	},
 	*/
 	{
 		"name": "Aqueduct",
 		"maintenance": 1,
 		"hurryCostModifier": 25,
-		"uniques": ["40% of food is carried over after a new citizen is born"],
+		"uniques": ["[40]% of food is carried over after population increases"],
 		"requiredTech": "Engineering"
 	},
 	{
@@ -331,6 +350,14 @@
 	
 	// Medieval Era
 	
+	{
+		"name": "Garden",
+		"cost": 120,
+		"uniques": ["+[25]% great person generation in this city", "Must be next to [Fresh water]"],
+		"hurryCostModifier": 25,
+		"maintenance": 1,
+		"requiredTech": "Theology"
+	},
 	{
 		"name": "Monastery",
 		"maintenance": 0,
@@ -344,7 +371,7 @@
 		"culture": 1,
 		"greatPersonPoints": {"culture": 1},
 		"isWonder": true,
-		"uniques": ["+33% great person generation in all cities"],
+		"uniques": ["+[33]% great person generation in all cities"],
 		"requiredTech": "Theology",
 		"quote": "'For it soars to a height to match the sky, and as if surging up from among the other buildings it stands on high and looks down upon the remainder of the city, adorning it, because it is a part of it, but glorying in its own beauty'  - Procopius, De Aedificis"
 	},
@@ -369,7 +396,7 @@
 		"happiness": 4,
 		"greatPersonPoints": {"production": 1},
 		"isWonder": true,
-		"uniques": ["Golden Age length increases +50%"],
+		"uniques": ["Golden Age length increased by [50]%"],
 		"requiredTech": "Civil Service",
 		"quote": "'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.'  - The Books of Chilam Balam"
 	},
@@ -379,7 +406,7 @@
 		"greatPersonPoints": {"gold": 1},
 		"culture": 1,
 		"isWonder": true,
-		"uniques": ["Gold from all trade routes +25%","Must have an owned mountain within 2 tiles"],
+		"uniques": ["Gold from all trade routes +25%","Must have an owned [Mountain] within [2] tiles"],
 		"requiredTech": "Guilds",
 		"quote": "'Few romances can ever surpass that of the granite citadel on top of the beetling precipices of Machu Picchu, the crown of Inca Land.'  - Hiram Bingham"
 	},
@@ -401,7 +428,7 @@
 		"production": 2,
 		"specialistSlots": {"production": 1},
 		"hurryCostModifier": 25,
-		"uniques": ["+1 Production from each worked Forest tile"],
+		"uniques": ["[+1 Production] from [Forest] tiles in this city"],
 		"requiredTech": "Metal Casting"
 	},
 	{
@@ -411,14 +438,14 @@
 		"requiredNearbyImprovedResources": ["Iron"],
 		"resourceBonusStats": {"production": 1},
 		"requiredTech": "Metal Casting",
-		"uniques": ["+15% production of land units", "Increases production of spaceship parts by 15%"]
+		"uniques": ["+[15]% production when building [land units] in this city", "+[15]% production when building [Spaceship part] in this city"]
 	},
 	{
 		"name": "Harbor",
 		"maintenance": 2,
 		"hurryCostModifier": 25,
-		"uniques": ["+1 production from all sea resources worked by the city",
-			"Connects trade routes over water","Can only be built in coastal cities"],
+		"uniques": ["[+1 Production] from [Water resource] tiles in this city",
+			"Connects trade routes over water","Must be next to [Coast]"],
 		"requiredTech": "Compass"
 	},
 	{
@@ -428,7 +455,7 @@
 		"percentStatBonus": {"science": 33},
 		"specialistSlots": {"science": 2},
 		"requiredBuilding": "Library",
-		"uniques": ["+2 Science from each worked Jungle tile"],
+		"uniques": ["[+2 Science] from [Jungle] tiles in this city"],
 		"requiredTech": "Education"
 	},
 	{
@@ -441,7 +468,7 @@
 		"specialistSlots": {"science": 2},
 		"culture": 3,
 		"requiredBuilding": "Library",
-		"uniques": ["+2 Science from each worked Jungle tile"],
+		"uniques": ["[+2 Science] from [Jungle] tiles in this city"],
 		"requiredTech": "Education"
 	},
 	{
@@ -471,6 +498,7 @@
 		"culture": 2,
 		"hurryCostModifier": 25,
 		"requiredBuilding": "Walls",
+		"uniques": ["[+1 Gold] once [Flight] is discovered"],
 		"requiredTech": "Chivalry"
 	},
 	{
@@ -489,7 +517,7 @@
 		"isWonder": true,
 		"providesFreeBuilding": "Castle",
 		"percentStatBonus": {"culture": 20},
-		"uniques": ["All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion"],
+		"uniques": ["All newly-trained [relevant] units in this city receive the [Drill I] promotion"],
 		"requiredTech": "Chivalry",
 		"quote": "'Justice is an unassailable fortress, built on the brow of a mountain which cannot be overthrown by the violence of torrents, nor demolished by the force of armies.'  - Joseph Addison"
 	},
@@ -527,7 +555,7 @@
 		"hurryCostModifier": 25,
 		"percentStatBonus": {"science": 50},
 		"requiredBuilding": "Library",
-		"uniques": ["Must be next to mountain"],
+		"uniques": ["Must be next to [Mountain]"],
 		"requiredTech": "Astronomy"
 	},
 	{
@@ -586,7 +614,7 @@
 		"culture": 1,
 		"isWonder": true,
 		"greatPersonPoints": {"culture": 1},
-		"uniques": ["Unhappiness from population decreased by 10%"],
+		"uniques": ["Unhappiness from population decreased by [10]%"],
 		"requiredTech": "Banking",
 		"quote": "'Most of us can, as we choose, make of this world either a palace or a prison' - John Lubbock"
 	},
@@ -639,7 +667,7 @@
 		"culture": 1,
 		"happiness": 4,
 		"isWonder": true,
-		"uniques": ["2 free Great Artists appear"],
+		"uniques": ["[2] free [Great Artist] units appear"],
 		"requiredTech": "Archaeology",
 		"quote": "'Every genuine work of art has as much reason for being as the earth and the sun'  - Ralph Waldo Emerson"
 	},
@@ -648,8 +676,8 @@
 		"hurryCostModifier": 25,
 		"maintenance": 2,
 		"requiredBuilding": "Harbor",
-		"uniques": ["+1 production and gold from all sea resources worked by the city",
-			"Can only be built in coastal cities", "+15% production of naval units"],
+		"uniques": ["[+1 Production, +1 Gold] from [Water resource] tiles in this city",
+			"Must be next to [Coast]", "+[15]% production when building [naval units] in this city"],
 		"requiredTech": "Navigation"
 	},
 	{
@@ -667,7 +695,7 @@
 		"culture": 1,
 		"greatPersonPoints": {"science": 2},
 		"isWonder": true,
-		"uniques": ["Free great scientist appears","Science gained from research agreements +50%"],
+		"uniques": ["Free [Great Scientist] appears","Science gained from research agreements +50%"],
 		"requiredTech": "Architecture",
 		"quote": "'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.'  - James Russell Lowell"
 	}, 
@@ -678,7 +706,7 @@
 		"hurryCostModifier": 25,
 		"maintenance": 2,
 		"percentStatBonus": {"production": 10},
-		"uniques": ["Must not be on hill"],
+		"uniques": ["Must not be on [Hill]"],
 		"requiredTech": "Economics"
 	},
 	
@@ -691,7 +719,7 @@
 		"requiredBuilding": "University",
 		"maintenance": 3,
 		"hurryCostModifier": 0,
-		"uniques": ["+1 Science Per 2 Population"],
+		"uniques": ["[+1 Science] Per [2] Population in this city"],
 		"requiredTech": "Scientific Theory"
 	},
 	{
@@ -719,7 +747,7 @@
 		"xpForNewUnits": 15,
 		"greatPersonPoints": {"science": 2},
 		"isWonder": true,
-		"uniques": ["Free Great General appears near the Capital"],
+		"uniques": ["Free [Great General] appears"],
 		"requiredTech": "Military Science",
 		"quote": "'Pale Death beats equally at the poor man's gate and at the palaces of kings.'  - Horace"
 	},
@@ -746,10 +774,21 @@
 		"gold": 4,
 		"greatPersonPoints": {"gold": 2},
 		"isWonder": true,
-		"uniques": ["-15% to purchasing items in cities"],
+		"uniques": ["Cost of purchasing items in cities reduced by [15]%"],
 		"requiredTech": "Industrialization",
 		"quote": "'To achieve great things, two things are needed: a plan, and not quite enough time.'  - Leonard Bernstein"
 	},
+	/* This works and even has icon but AI cannot manage its Aluminum at this moment
+	{
+		"name": "Hydro Plant",
+		"cost": 360,
+		"requiredResource": "Aluminum",
+		"hurryCostModifier": 25,
+		"maintenance": 3,
+		"uniques": ["Must be on [River]","[+1 Production] from [River] tiles in this city"],
+		"requiredTech": "Electricity"
+	},
+	*/
 	
 	// Modern Era
 	
@@ -776,7 +815,7 @@
 		"culture": 1,
 		"isWonder": true,
 		"greatPersonPoints": {"production": 2},
-		"uniques": ["+1 Production from specialists"],
+		"uniques": ["[+1 Production] from every specialist"],
 		"requiredTech": "Replaceable Parts",
 		"quote": "'Give me your tired, your poor, your huddled masses yearning to breathe free, the wretched refuse of your teeming shore. Send these, the homeless, tempest-tossed to me, I lift my lamp beside the golden door!'  - Emma Lazarus"
 	},
@@ -821,8 +860,8 @@
 		"gold": 6,
 		"greatPersonPoints": {"gold": 1},
 		"isWonder": true,
-		"uniques": ["+1 happiness, +2 culture and +3 gold from every Castle",
-			"Must have an owned mountain within 2 tiles"],
+		"uniques": ["[+1 Happiness, +2 Culture, +3 Gold] from every [Castle]",
+			"Must have an owned [Mountain] within [2] tiles"],
 		"requiredTech": "Railroad",
 		"quote": "'...the location is one of the most beautiful to be found, holy and unapproachable, a worthy temple for the divine friend who has brought salvation and true blessing to the world.'  - King Ludwig II of Bavaria"
 		
@@ -835,7 +874,7 @@
 		"requiredBuilding": "Hospital",
 		"maintenance": 3,
 		"requiredTech": "Pharmaceuticals",
-		"uniques": ["25% of food is carried over after a new citizen is born"]
+		"uniques": ["[25]% of food is carried over after population increases"]
 	},
 	{
 		"name": "Nuclear Plant",
@@ -855,14 +894,14 @@
 		"maintenance": 3,
 		"cannotBeBuiltWith": "Nuclear Plant",
 		"requiredTech": "Ecology",
-		"uniques": ["Must be next to desert"]
+		"uniques": ["Must be next to [Desert]"]
 	},
 	{
 		"name": "Sydney Opera House",
 		"isWonder": true,
 		"greatPersonPoints": {"culture": 2},
 		"percentStatBonus": {"culture": 50},
-		"uniques": ["Free Social Policy","Can only be built in coastal cities"],
+		"uniques": ["Free Social Policy","Must be next to [Coast]"],
 		"requiredTech": "Ecology",
 		"quote": "'Those who lose dreaming are lost.'  - Australian Aboriginal saying"
 	},
@@ -890,7 +929,7 @@
 		"production": 3,
 		"requiredResource": "Aluminum",
 		"cost": 360,
-		"uniques": ["Increases production of spaceship parts by 50%"],
+		"uniques": ["+[50]% production when building [Spaceship part] in this city"],
 		"requiredBuilding": "Factory",
 		"requiredTech": "Robotics"
 	},
@@ -898,7 +937,7 @@
 		"name": "SS Booster",
 		"requiredResource": "Aluminum",
 		"requiredTech": "Robotics",
-		"uniques": ["Spaceship part"]
+		"uniques": ["Spaceship part", "Cannot be purchased"]
 	},
 	{
 		"name": "Apollo Program",
@@ -916,8 +955,8 @@
 		"isWonder": true,
 		"greatPersonPoints": {"science": 1},		
 		"providesFreeBuilding":  "Spaceship Factory",
-		"uniques": ["2 free great scientists appear",
-			"Increases production of spaceship parts by 25%"],
+		"uniques": ["[2] free [Great Scientist] units appear",
+			"+[25]% production when building [Spaceship part] in this city"],
 		"requiredTech": "Satellites",
 		"quote": "'The wonder is, not that the field of stars is so vast, but that man has measured it.'  - Anatole France"
 	},
@@ -925,18 +964,18 @@
 		"name": "SS Cockpit",
 		"requiredResource": "Aluminum",
 		"requiredTech": "Satellites",
-		"uniques": ["Spaceship part"]
+		"uniques": ["Spaceship part", "Cannot be purchased"]
 	},
 	{
 		"name": "SS Engine",
 		"requiredResource": "Aluminum",
 		"requiredTech": "Particle Physics",
-		"uniques": ["Spaceship part"]
+		"uniques": ["Spaceship part", "Cannot be purchased"]
 	},
 	{
 		"name": "SS Stasis Chamber",
 		"requiredResource": "Aluminum",
 		"requiredTech": "Nanotechnology",
-		"uniques": ["Spaceship part"]
+		"uniques": ["Spaceship part", "Cannot be purchased"]
 	}
 ]

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

@@ -9,6 +9,7 @@
 		"policyCostModifier": 0.5,
 		"unhappinessModifier": 0.4,
 		"barbarianBonus": 0.75,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 1.6, // that is to say it'll take them 1.6 times as long to grow the city
 		"aiUnitCostModifier": 1.75,
 		"aiBuildingCostModifier": 1.6,
@@ -16,7 +17,8 @@
 		"aiBuildingMaintenanceModifier": 1,
 		"aiUnitMaintenanceModifier": 1,
 		"aiFreeTechs": [],
-		"aiFreeUnits": [],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 1,
 		"aisExchangeTechs": false,
 		"turnBarbariansCanEnterPlayerTiles": 10000,
@@ -32,6 +34,7 @@
 		"policyCostModifier": 0.67,
 		"unhappinessModifier": 0.6,
 		"barbarianBonus": 0.5,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 1.3,
 		"aiUnitCostModifier": 1.3,
 		"aiBuildingCostModifier": 1.3,
@@ -39,7 +42,8 @@
 		"aiBuildingMaintenanceModifier": 1,
 		"aiUnitMaintenanceModifier": 1,
 		"aiFreeTechs": [],
-		"aiFreeUnits": [],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 1,
 		"aisExchangeTechs": false,
 		"turnBarbariansCanEnterPlayerTiles": 60,
@@ -55,6 +59,7 @@
 		"policyCostModifier": 0.85,
 		"unhappinessModifier": 0.75,
 		"barbarianBonus": 0.4,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 1.1,
 		"aiUnitCostModifier": 1.1,
 		"aiBuildingCostModifier": 1.1,
@@ -62,7 +67,8 @@
 		"aiBuildingMaintenanceModifier": 1,
 		"aiUnitMaintenanceModifier": 1,
 		"aiFreeTechs": [],
-		"aiFreeUnits": [],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 1,
 		"aisExchangeTechs": false,
 		"turnBarbariansCanEnterPlayerTiles": 20,
@@ -78,6 +84,7 @@
 		"policyCostModifier": 1,
 		"unhappinessModifier": 1,
 		"barbarianBonus": 0.33,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 1,
 		"aiUnitCostModifier": 1,
 		"aiBuildingCostModifier": 1,
@@ -85,7 +92,8 @@
 		"aiBuildingMaintenanceModifier": 1,
 		"aiUnitMaintenanceModifier": 0.85,
 		"aiFreeTechs": [],
-		"aiFreeUnits": [],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 1,
 		"aisExchangeTechs": true,
 		"turnBarbariansCanEnterPlayerTiles": 0,
@@ -101,6 +109,7 @@
 		"policyCostModifier": 1,
 		"unhappinessModifier": 1,
 		"barbarianBonus": 0.25,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 0.9,
 		"aiUnitCostModifier": 0.85,
 		"aiBuildingCostModifier": 0.85,
@@ -108,7 +117,8 @@
 		"aiBuildingMaintenanceModifier": 0.85,
 		"aiUnitMaintenanceModifier": 0.8,
 		"aiFreeTechs": ["Pottery"],
-		"aiFreeUnits": ["Warrior"],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior", "Warrior"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 0.9,
 		"aisExchangeTechs": true,
 		"turnBarbariansCanEnterPlayerTiles": 0,
@@ -124,6 +134,7 @@
 		"policyCostModifier": 1,
 		"unhappinessModifier": 1,
 		"barbarianBonus": 0.2,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 0.85,
 		"aiUnitCostModifier": 0.8,
 		"aiBuildingCostModifier": 0.8,
@@ -131,7 +142,8 @@
 		"aiBuildingMaintenanceModifier": 0.8,
 		"aiUnitMaintenanceModifier": 0.75,
 		"aiFreeTechs": ["Pottery","Animal Husbandry"],
-		"aiFreeUnits": ["Warrior", "Scout"],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior", "Warrior", "Scout"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 0.85,
 		"aisExchangeTechs": true,
 		"turnBarbariansCanEnterPlayerTiles": 0,
@@ -147,6 +159,7 @@
 		"policyCostModifier": 1,
 		"unhappinessModifier": 1,
 		"barbarianBonus": 0.1,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 0.75,
 		"aiUnitCostModifier": 0.65,
 		"aiBuildingCostModifier": 0.65,
@@ -154,7 +167,8 @@
 		"aiBuildingMaintenanceModifier": 0.65,
 		"aiUnitMaintenanceModifier": 0.65,
 		"aiFreeTechs": ["Pottery","Animal Husbandry","Mining"],
-		"aiFreeUnits": ["Warrior", "Warrior", "Worker", "Scout"],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior", "Warrior", "Warrior", "Worker", "Scout"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 0.75,
 		"aisExchangeTechs": true,
 		"turnBarbariansCanEnterPlayerTiles": 0,
@@ -170,6 +184,7 @@
 		"policyCostModifier": 1,
 		"unhappinessModifier": 1,
 		"barbarianBonus": 0,
+		"startingUnits": ["Settler", "Warrior"],
 		"aiCityGrowthModifier": 0.6,
 		"aiUnitCostModifier": 0.5,
 		"aiBuildingCostModifier": 0.5,
@@ -177,7 +192,8 @@
 		"aiBuildingMaintenanceModifier": 0.5,
 		"aiUnitMaintenanceModifier": 0.5,
 		"aiFreeTechs": ["Pottery","Animal Husbandry","Mining","The Wheel"],
-		"aiFreeUnits": ["Settler", "Warrior", "Warrior", "Worker", "Worker", "Scout"],
+		"aiMajorCivStartingUnits": ["Settler", "Warrior", "Settler", "Warrior", "Warrior", "Worker", "Worker", "Scout"],
+		"aiCityStateStartingUnits": ["Settler", "Warrior"],
 		"aiUnhappinessModifier": 0.6,
 		"aisExchangeTechs": true,
 		"turnBarbariansCanEnterPlayerTiles": 0,

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

@@ -1,10 +1,17 @@
 [
+	//Spectator
+	{
+		"name": "Spectator",
+		"outerColor": [255,255,255]
+//		"innerColor": [255,255,255]
+	},
+
 	{
 		//nations
 		"name": "Babylon",
 		"leaderName": "Nebuchadnezzar II",
 		"adjective": ["Babylonian"],
-		"startBias": ["Avoid Tundra"],
+		"startBias": ["Avoid [Tundra]"],
 		"preferredVictoryType": "Scientific",
 		
 		"startIntroPart1": "May the blessings of heaven be upon you, O great Nebuchadnezzar, father of mighty and ancient Babylon! Young was the world when Sargon built Babylon some five thousand years ago, long did it grow and prosper, gaining its first empire the eighteenth century BC, under godlike Hammurabi, the giver of law. Although conquered by the Kassites and then by the Assyrians, Babylon endured, emerging phoenix-like from its ashes of destruction and regaining its independence despite its many enemies. Truly was Babylon the center of arts and learning in the ancient world. O Nebuchadnezzar, your empire endured but a short time after your death, falling to the mighty Persians, and then to the Greeks, until the great city was destroyed by 141 BC.",
@@ -22,7 +29,8 @@
 				
 		"outerColor": [27,53,63],
 		"innerColor": [213,249,255],
-		"unique": "INGENUITY",
+		"uniqueName": "Ingenuity",
+		"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",
@@ -50,10 +58,11 @@
 				
 		"outerColor": [181, 232, 232],
 		"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"],
 		"cities": ["Athens","Sparta","Corinth","Argos","Knossos","Mycenae","Pharsalos","Ephesus","Halicarnassus","Rhodes",
 			"Eretria","Pergamon","Miletos","Megara","Phocaea","Sicyon","Tiryns","Samos","Mytilene","Chios",
-			"Paros","Ellis","Syracuse","Herakleia","Gortyn","Chalkis","Pylos","Pella","Naxos","Sicyon",
+			"Paros","Elis","Syracuse","Herakleia","Gortyn","Chalkis","Pylos","Pella","Naxos","Sicyon",
 			"Larissa","Apollonia","Messene","Orchomenos","Ambracia","Kos","Knidos","Amphipolis",
 			"Patras","Lamia","Nafplion","Apolyton"]
 	},
@@ -74,7 +83,8 @@
 		"tradeRequest": "My friend, do you think you can accept this request?",
 		"outerColor": [9, 112, 84],
 		"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"],
 		"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",
@@ -84,7 +94,7 @@
 		"name": "Egypt",
 		"leaderName": "Ramesses II",
 		"adjective": ["Egyptian"],
-		"startBias": ["Avoid Jungle","Avoid Forest"],
+		"startBias": ["Avoid [Jungle]","Avoid [Forest]"],
 		"preferredVictoryType": "Cultural",
 		
 		"startIntroPart1": "We greet thee, oh great Ramesses, Pharaoh of Egypt, who causes the sun to rise and the Nile to flow, and who blesses his fortunate people with all the good things of life! Oh great lord, from time immemorial your people lived on the banks of the Nile river, where they brought writing to the world, and advanced mathematics, sculpture, and architecture. Thousands of years ago they created the great monuments which still stand tall and proud.",
@@ -102,7 +112,8 @@
 		
 		"outerColor": [ 231, 213, 0],
 		"innerColor": [98,10,210],
-		"unique": "MONUMENT_BUILDERS",
+		"uniqueName": "Monument Builders",
+		"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",
@@ -127,7 +138,8 @@
 		"tradeRequest": "Would you be interested in a trade agreement with England?",
 		"outerColor": [ 114, 0, 0],
 		"innerColor": [255,255,255],
-		"unique": "SUN_NEVER_SETS",
+		"uniqueName": "Sun Never Sets",
+		"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",
@@ -150,7 +162,8 @@
 		"tradeRequest": "France offers you this exceptional proposition.",
 		"outerColor": [ 38, 98, 255],
 		"innerColor": [239,236,148],
-		"unique": "ANCIEN_REGIME",
+		"uniqueName": "Ancien Régime",
+		"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",
@@ -174,16 +187,19 @@
 		"tradeRequest": "How would you like it if I propose this kind of exchange?",
 		"outerColor": [ 236, 178, 0],
 		"innerColor": [0,0,0],
-		"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"],
 		"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",
-			"Voronezh","Pskov","Starayarussa","Kostoma","Nizhniy Novgorod","Sudzal","Magnitogorsk"]
+			"Voronezh","Pskov","Starayarussa","Kostoma","Nizhniy Novgorod","Suzdal","Magnitogorsk"]
 	},
 	{
 		"name": "Rome",
 		"leaderName": "Augustus Caesar",
 		"adjective": ["Roman"],
+		"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.",
@@ -197,7 +213,8 @@
 		"tradeRequest": "I offer this, for your consideration.",
 		"outerColor": [ 53,0,87],
 		"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"],
 		"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",
@@ -221,7 +238,8 @@
 		"tradeRequest": "Come forth, let's do business.",
 		"outerColor": [ 41,83,42],
 		"innerColor": [146,221,9],
-		"unique": "TRADE_CARAVANS",
+		"uniqueName": "Trade Caravans",
+		"uniques": ["[+1 Gold] from each Trade Route", "Double quantity of [Oil] produced"],
 		"cities": ["Mecca","Medina","Damascus","Baghdad","Najran","Kufah","Basra","Khurasan","Anjar","Fustat",
 			"Aden","Yamama","Muscat","Mansura","Bukhara","Fez","Shiraz","Merw","Balkh","Mosul",
 			"Aydab","Bayt","Suhar","Taif","Hama","Tabuk","Sana'a","Shihr","Tripoli","Tunis","Kairouan","Algiers","Oran"]
@@ -243,7 +261,8 @@
 		"tradeRequest": "Is the following trade of interest to you?",
 		"outerColor": [ 28,51,119],
 		"innerColor": [255,255,255],
-		"unique": "MANIFEST_DESTINY",
+		"uniqueName": "Manifest Destiny",
+		"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",
@@ -269,7 +288,8 @@
 		"tradeRequest": "I would be grateful if you agreed on the following proposal.",
 		"outerColor": [215,225,225],
 		"innerColor": [185,0,0],
-		"unique": "BUSHIDO",
+		"uniqueName": "Bushido",
+		"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",
@@ -293,7 +313,8 @@
 		"tradeRequest": "My friend, are you interested in this arrangement?",
 		"outerColor": [16,126,5],
 		"innerColor": [255,153,51],
-		"unique": "POPULATION_GROWTH",
+		"uniqueName": "Population Growth",
+		"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"]
@@ -315,7 +336,8 @@
 		"tradeRequest": "It would be in your best interest, to carefully consider this proposal.",
 		"outerColor": [150,150,150],
 		"innerColor": [60,60,60],
-		"unique": "FUROR_TEUTONICUS",
+		"uniqueName": "Furor Teutonicus",
+		"uniques": ["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",
 			"Hannover","Duisburg","Leipzig","Dresden","Bonn","Bochum","Bielefeld","Karlsruhe","Gelsenkirchen","Wiesbaden",
 			"Munster","Rostok","Chemnitz","Braunschweig","Halle","Mצnchengladbach","Kiel","Wuppertal","Freiburg","Hagen",
@@ -343,7 +365,8 @@
 		"tradeRequest": "Let us do business! Would you be interested?",
 		"outerColor": [245,248,185],
 		"innerColor": [18,84,30],
-		"unique": "BARBARY_CORSAIRS",
+		"uniqueName": "Barbary Corsairs",
+		"uniques": ["Pay only one third the usual cost for naval unit maintenance", "50% chance of capturing defeated Barbarian naval units and earning 25 Gold"],
 		"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",
@@ -368,7 +391,8 @@
 		"tradeRequest": "We have many things to discuss and have much to benefit from each other.",
 		"outerColor": [20,25,173],
 		"innerColor": [187,33,51],
-		"unique": "SCHOLARS_OF_THE_JADE_HALL",
+		"uniqueName": "Scholars of the Jade Hall",
+		"uniques": ["[+2 Science] from every specialist", "[+2 Science] from every [Great Improvement]"],
 		"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"]
@@ -392,7 +416,8 @@
 		"tradeRequest": "Does this trade work for you, my friend?",
 		"outerColor": [54,72,72],
 		"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."],
 		"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",
@@ -415,7 +440,8 @@
 		"tradeRequest": "In my endless magnanimity, I am making you this offer. You agree, of course?",
 		"outerColor": [153,5,3],
 		"innerColor": [244,232,54],
-		"unique": "ACHAEMENID_LEGACY",
+		"uniqueName": "Achaemenid Legacy",
+		"uniques": ["Golden Age length increased by [50]%", "+1 Movement for all units during Golden Age", "+10% Strength for all units during Golden Age"],
 		"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",
@@ -442,7 +468,8 @@
 		"tradeRequest": "Come, let our people feast together!",
 		"outerColor": [225,105,0],
 		"innerColor": [255,255,78],
-		"unique": "WAYFINDING",
+		"uniqueName": "Wayfinding",
+		"uniques": ["Can embark and move over Coasts and Oceans immediately", "+1 Sight when embarked", "+[10]% Strength if within 2 tiles of a [Moai]"],
 		"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",
@@ -452,7 +479,7 @@
 		"name": "Siam",
 		"leaderName": "Ramkhamhaeng",
 		"adjective": ["Siamese"],
-		"startBias": ["Avoid Forest"],
+		"startBias": ["Avoid [Forest]"],
 //		"preferredVictoryType":"Diplomatic",
 		
 		"startIntroPart1": "Greetings to you, Great King Ramkhamhaeng, leader of the glorious Siamese people! O mighty King, your people bow down before you in awe and fear! You are the ruler of Siam, an ancient country in the heart of Southeast Asia, a beautiful and mysterious land. Surrounded by foes, beset by bloody war and grinding poverty, the clever and loyal Siamese people have endured and trumphed. King Ramkhamhaeng, your empire was once part of the Khmer Empire, until the 13th century AD, when your ancestors revolted, forming the small Sukhothai kingdom. Through successful battle and cunning diplomacy, the tiny kingdom grew into a mighty empire, an empire which would dominate South East Asia for more than a century!",
@@ -466,7 +493,8 @@
 		"tradeRequest": "Greetings. I believe this is a fair proposal for both parties. What do you think?",
 		"outerColor": [228,208,43],
 		"innerColor": [193,21,17],
-		"unique": "FATHER_GOVERNS_CHILDREN",
+		"uniqueName": "Father Governs Children",
+		"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",
@@ -490,7 +518,9 @@
 		"tradeRequest": "I hope this deal will receive your blessing.",
 		"outerColor": [102,0,0],
 		"innerColor": [255,102,102],
-		"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"],
 		"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",
@@ -500,7 +530,7 @@
 		"name": "Songhai",
 		"leaderName": "Askia",
 		"adjective": ["Songhai"],
-		"startBias": ["Avoid Tundra"],
+		"startBias": ["Avoid [Tundra]"],
 		"preferredVictoryType": "Domination",
 
 		"startIntroPart1": "May the blessings of God, who is greatest of all, be upon you Askia, leader of the Songhai people! For many years your kingdom was a vassal of the mighty West African state of Mali, until the middle of the 14th century, when King Sunni Ali Ber wrested independence from the Mali, conquering much territory and fighting off numerous foes who sought to destroy him. Ultimately, his conquest of the wealthy cities of Timbuktu and Jenne gave the growing Songhai empire the economic power to survive for some 100 years, until the empire was destroyed by foes with advanced technology - muskets against spearmen.",
@@ -514,7 +544,8 @@
 		"tradeRequest": "Can I interest you in this deal?",
 		"outerColor": [214,145,19],
 		"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"],
 		"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"]
@@ -537,15 +568,14 @@
 		"tradeRequest": "I am not always this generous, but we hope you take this rare opportunity we give you.",
 		"outerColor": [81,0,9],
 		"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"],
 		"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",
 			"Har-Ayrag","Nalayh","Tes"]
 	},
-	/*
-	
-	{   // REQUIRES RIVERS
+	{
 		"name": "Aztecs",
 		"leaderName": "Montezuma I",
 		"adjective": ["Aztec"],
@@ -554,23 +584,26 @@
 		
 		"startIntroPart1": "Welcome, O divine Montezuma! We grovel in awe at your magnificence! May the heaven shower all manner of good things upon you all the days of your life! Your are the leader of the mighty Aztec people, wandering nomads from a lost home in the north who in the 12th century came to live in the mesa central in the heart of what would come to be call Mexico. Surrounded by many tribes fighting to control the rich land surrounding the sacred lakes of Texoco, Xaltocan and Zampango. Through cunning alliances and martial prowess, within a mere two hundred years, the Aztecs came to dominate the Central American basin, ruling a mighty empire stretching from sea to sea. But the empire fell soon under the assault of the accursed Spaniards, wielding fiendish weapons the likes of which your faithful warriors had never seen.",
 		"startIntroPart2": "O great king Montezuma, your people call upon you once more, to rise up and lead them to glory, bring them wealth and power, and give them dominion over their foes and rivals. Will you answer their call, glorious leader? Will you build a civilization that stands the test of time?",
+
 		"declaringWar": "Xi-miqa-can! Xi-miqa-can! Xi-miqa-can! (Die, die, die!)",
 		"attacked": "Excellent! Let the blood flow in raging torrents!",
-		"defeated": " Monster! Who are you to destroy my greatness?",
+		"defeated": "Monster! Who are you to destroy my greatness?",
 		"introduction": "What do I see before me? Another beating heart for my sacrificial fire.",
+
 		"neutralHello": "Welcome, friend.",
 		"hateHello": "What do you want?",
-		"tradeRequest": " Accept this agreement or suffer the consequences.",
-		"outerColor": [255,51,51],
-		"innerColor": [153,255,255],
-		"unique": "SACRIFICIAL_CAPTIVES",
+		"tradeRequest": "Accept this agreement or suffer the consequences.",
+
+		"outerColor": [139,32,23],
+		"innerColor": [134,238,214],
+		"uniqueName": "Sacrificial Captives",
+		"uniques": ["Gains culture 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"]
 	},
-	*/
 	{
 		"name": "Inca",
 		"leaderName": "Pachacuti",
@@ -601,7 +634,9 @@
 				
 		"outerColor": [253,245,155],
 		"innerColor": [4,144,95],
-		"unique": "GREAT_ANDEAN_ROAD",
+		"uniqueName": "Great Andean Road",
+		"uniques": ["Units ignore terrain costs when moving into any tile with Hills", "50% Maintenance costs reduction",
+			"No Maintenance costs for improvements in Hills"],
 		"cities": ["Cuzco","Tiwanaku","Machu","Ollantaytambo","Corihuayrachina","Huamanga","Rumicucho","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",
@@ -625,7 +660,9 @@
 		"tradeRequest": "This is a fine deal! Even a drunk beggar would agree!",
 		"outerColor": [51,25,0],
 		"innerColor": [255,255,102],
-		"unique": "VIKING_FURY",
+		"uniqueName": "Viking Fury",
+		"uniques": ["+1 Movement for all embarked units", "Units pay only 1 movement point to embark and disembark",
+			"Melee units pay no movement cost to pillage"], 
 		"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",
@@ -651,7 +688,6 @@
 		"hateHello": "Oh, it is you.",
 		"tradeRequest": "My friend, it is my belief that this settlement can benefit both our peoples.",
 		"innerColor": [194,97,255]
-		"unique": "LION_OF_THE_NORTH",
 		"cities": ["StockHolm","Malmo","Gothenburg","Visby","Upssala","Umea","Lund","Kiruna","Helsingborg",
 		"Orebro","Vasteras","Linkoping","Norrkoping","Gavle","Karlskrona","Halmstad","Karlstad","Vaxjo",
 		"Copenhagen","Jonkoping",Boras",]
@@ -660,7 +696,7 @@
 	
 	    
 
-	//City states
+	//City-States
 	{
 		"name": "Milan",
 		"adjective": ["Milanese"],
@@ -743,7 +779,7 @@
 		"startBias": ["Coast"],
 
 		"declaringWar": "I will enjoy hearing your last breath as you witness the destruction of your realm!",
-		"attacked": "Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians!",
+		"attacked": "Why do we fight? Because Inanna demands it. Now, witness the power of the Sumerians!",
 		"defeated": "What treachery has struck us? No, what evil?",
 		"outerColor": [0, 0, 0],
 		"innerColor": [255,69,0],
@@ -830,7 +866,7 @@
 
 		"declaringWar": "You shall stain this land no longer with your vileness! To arms, my countrymen - we ride to war!",
 		"attacked": "Traitorous man! The Celtic peoples will not stand for such wanton abuse and slander - I shall have your head!",
-		"defeated": "Vile ruler, kow that you 'won' this war in name only!",
+		"defeated": "Vile ruler, know that you 'won' this war in name only!",
 		"outerColor": [0, 0, 0],
 		"innerColor": [0,102,102],
 		"cities": ["Edinburgh"]
@@ -1002,7 +1038,7 @@
 		"attacked": "Very well, this shall not be forgotten.",
 		"defeated": "Congratulations, conquerer. This tribe serves you now.",
 		"outerColor": [0, 0, 0],
-		"innerColor": [153,204,255],
+		"innerColor": [224,224,224],
 		"cities": ["Mogadishu"]
 	},
 	
@@ -1014,5 +1050,5 @@
 		"outerColor": [0,0,0],
 		"innerColor": [182,0,0]
 	}
-	        	
+
 ]

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

@@ -0,0 +1,497 @@
+[
+	{
+		"name": "Tradition",
+		"era": "Ancient era",
+		"effect": "+3 culture in capital and increased rate of border expansion",
+		"uniques": ["[+3 Culture] in capital", "Increased rate of border expansion"],
+		"policies": [
+			{
+				"name": "Aristocracy",
+				"effect": "+15% production when constructing wonders, +1 happiness for every 10 citizens in a city",
+				"uniques": ["+[15]% Production when constructing [Wonders]", "[+1 Happiness] per [10] population in all cities"],
+				"row": 1,
+				"column": 1
+			},
+			{
+				"name": "Legalism",
+				"effect": "Immediately creates a cheapest available cultural building in each of your first 4 cities for free",
+				"uniques":["Immediately creates a cheapest available cultural building in each of your first 4 cities for free"],
+				"row": 1,
+				"column": 3
+			},
+			{
+				"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"],
+				"row": 1,
+				"column": 5
+			},
+			{
+				"name": "Landed Elite",
+				"effect": "+10% food growth and +2 food in capital",
+				"uniques": ["+[10]% growth in capital", "[+2 Food] in capital"],
+				"requires": ["Legalism"],
+				"row": 2,
+				"column": 2
+			},
+			{
+				"name": "Monarchy",
+				"effect": "+1 gold and -1 unhappiness for every 2 citizens in capital",
+				"uniques": ["+1 gold and -1 unhappiness for every 2 citizens in capital"],
+				"requires": ["Legalism"],
+				"row": 2,
+				"column": 4
+			},
+			{
+				"name": "Tradition Complete",
+				"effect": "+15% growth and +2 food in all cities",
+				"uniques": ["+[15]% growth in all cities","[+2 Food] in all cities"]
+			}
+		]
+	},
+	{
+		"name": "Liberty",
+		"era": "Ancient era",
+		"effect": "+1 culture in every city",
+		"uniques": ["[+1 Culture] in all cities"],
+		"policies": [
+			{
+				"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"],
+				"row": 1,
+				"column": 1
+			},
+			{
+				"name": "Citizenship",
+				"effect": "Tile improvement speed +25%, receive a free worker near the capital",
+				"uniques": ["Tile improvement speed +25%", "Free [Worker] appears"],
+				"row": 1,
+				"column": 4
+			},
+			{
+				"name": "Republic",
+				"effect": "+1 production in every city, +5% production when constructing buildings",
+				"uniques": ["[+1 Production] in all cities", "+[5]% Production when constructing [Buildings]"],
+				"requires": ["Collective Rule"],
+				"row": 2,
+				"column": 1
+			},
+			{
+				"name": "Representation",
+				"effect": "Each city founded increases culture cost of policies 33% less than normal. Starts a golden age.",
+				"uniques": ["Each city founded increases culture cost of policies 33% less than normal", "Empire enters golden age"],
+				"requires": ["Citizenship"],
+				"row": 2,
+				"column": 3
+			},
+			{
+				"name": "Meritocracy",
+				"effect": "+1 happiness for every city connected to capital, -5% unhappiness from citizens",
+				"uniques": ["+1 happiness for every city connected to capital", "Unhappiness from population decreased by [5]%"],
+				"requires": ["Citizenship"],
+				"row": 2,
+				"column": 5
+			},
+			{
+				"name": "Liberty Complete",
+				"effect": "Free Great Person of choice near capital",
+				"uniques": ["Free Great Person"]
+			}
+		]
+	},
+	{
+		"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"],
+		"policies": [
+			{
+				"name": "Warrior Code",
+				"effect": "+20% production when training melee units",
+				"uniques":["+[20]% Production when constructing [melee units]"],
+				"row": 1,
+				"column": 2
+			},
+			{
+				"name": "Discipline",
+				"effect": "+15% combat strength for melee units which have another military unit in an adjacent tile",
+				"uniques":["+15% combat strength for melee units which have another military unit in an adjacent tile"],
+				"row": 1,
+				"column": 4
+			},
+			{
+				"name": "Military Tradition",
+				"effect": "Military units gain 50% more Experience from combat",
+				"uniques":["Military units gain 50% more Experience from combat"],
+				"requires": ["Warrior Code"],
+				"row": 2,
+				"column": 2
+			},
+			{
+				"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"],
+				"requires": ["Discipline"],
+				"row": 2,
+				"column": 4
+			},
+			{
+				"name": "Professional Army",
+				"effect": "Gold cost of upgrading military units reduced by 33%",
+				"uniques": ["Gold cost of upgrading military units reduced by 33%"],
+				"requires": ["Military Caste"],
+				"row": 3,
+				"column": 4
+			},
+			{
+				"name": "Honor Complete",
+				"effect": "Gain gold for each unit killed",
+				"uniques": ["Gain gold for each unit killed"],
+			}
+		]
+	},{
+		"name": "Piety",
+		"era": "Classical era",
+		"effect": "Building time of culture buildings reduced by 15%",
+		"uniques": ["+[15]% Production when constructing [Culture] buildings"],
+		"policies": [
+			{
+				"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]"],
+				"row": 1,
+				"column": 2
+			},
+			{
+				"name": "Mandate Of Heaven",
+				"effect": "50% of excess happiness added to culture towards policies",
+				"uniques": ["50% of excess happiness added to culture towards policies"],
+				"row": 1,
+				"column": 5
+			},
+			{
+				"name": "Theocracy",
+				"effect": "Temples give +10% gold",
+				"uniques": ["+[10]% [Gold] from every [Temple]"],
+				"requires": ["Organized Religion"],
+				"row": 2,
+				"column": 1
+			},
+			{
+				"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"],
+				"requires": ["Organized Religion"],
+				"row": 2,
+				"column": 3
+			},
+			{
+				"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"],
+				"requires": ["Mandate Of Heaven","Reformation"],
+				"row": 3,
+				"column": 4
+			},
+			{
+				"name": "Piety Complete",
+				"effect": "Reduce culture cost of future policies by 10%",
+				"uniques": ["Culture cost of adopting new Policies reduced by 10%"]
+			}
+		]
+	},/*{
+		"name": "Patronage",
+		"era": "Classical era",
+		"effect": "Influence with City-States degrades 25% slower than normal",
+		"policies": [
+			{
+				"name": "Philantropy",
+				"effect": "Gifting Gold to a City-State generates 25% more Influence",
+				"row": 1,
+				"column": 2
+			},
+			{
+				"name": "Aesthetics",
+				"effect": "Resting point for Influence level with all City-States is increased by 20",
+				"row": 1,
+				"column": 4
+			},
+			{
+				"name": "Scholasticism",
+				"effect": "All Allied City-States provide a Science bonus equal to 25% of what they produce for themselves",
+				"requires": ["Philantropy"],
+				"row": 2,
+				"column": 2
+			},
+			{
+				"name": "Cultural Diplomacy",
+				"effect": "Happiness from gifted Luxuries increased by 50%",
+				"requires": ["Scholasticism"],
+				"row": 3,
+				"column": 2
+			},
+			{
+				"name": "Educated Elite",
+				"effect": "Allied City-States will occasionally gift you Great People",
+				"requires": ["Scholasticism","Aesthetics"],
+				"row": 3,
+				"column": 4
+			},
+			{
+				"name": "Patronage Complete",
+				"effect": "Influence with City-States degrades 25% slower than normal"
+			}
+		]
+	},*/
+	{
+		"name": "Commerce",
+		"effect": "+25% gold in capital",
+		"uniques": ["+25% gold in capital"],
+		"era": "Medieval era",
+		"policies": [
+			{
+				"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"],
+				"row": 1,
+				"column": 2
+			},
+			{
+				"name": "Mercantilism",
+				"effect": "-25% to purchasing items in cities",
+				"uniques": ["Cost of purchasing items in cities reduced by [25]%"],
+				"row": 1,
+				"column": 5
+			},
+			{
+				"name": "Entrepreneurship",
+				"effect": "Great Merchants are earned 25% faster, +1 Science from every Mint, Market, Bank and Stock Exchange.",
+				"uniques": ["[Great Merchant] is earned [25]% faster", "[+1 Science] from every [Mint]", "[+1 Science] from every [Market]",
+					"[+1 Science] from every [Bank]", "[+1 Science] from every [Stock Exchange]" ],
+				"requires": ["Trade Unions"],
+				"row": 2,
+				"column": 2
+			},
+			{
+				"name": "Patronage",
+				"effect": "Cost of purchasing culture buildings reduced by 50%",
+				"uniques": ["Cost of purchasing [Culture] buildings reduced by [50]%"],
+				"requires": ["Mercantilism"],
+				"row": 2,
+				"column": 5
+			},
+			{
+				"name": "Protectionism",
+				"effect": "+1 happiness from each luxury resource",
+				"uniques": ["+1 happiness from each luxury resource"],
+				"requires": ["Entrepreneurship","Patronage"],
+				"row": 3,
+				"column": 3
+			},
+			{
+				"name": "Commerce Complete",
+				"effect": "+1 gold from every trading post, double gold from Great Merchant trade missions",
+				"uniques": ["[+1 Gold] from every [Trading post]", "Double gold from Great Merchant trade missions"]
+			}
+		]
+	},
+	{
+		"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%"],
+		"policies": [
+			{
+				"name": "Secularism",
+				"effect": "+2 science from every specialist",
+				"uniques": ["[+2 Science] from every specialist"],
+				"row": 1,
+				"column": 2
+			},
+			{
+				"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]"],
+				"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]"],
+				"requires": ["Secularism"],
+				"row": 2,
+				"column": 1
+			},
+			{
+				"name": "Sovereignty",
+				"effect": "+15% science while empire is happy",
+				"uniques": ["+15% science while empire is happy"],
+				"requires": ["Humanism"],
+				"row": 2,
+				"column": 5
+			},
+			{
+				"name": "Scientific Revolution",
+				"effect": "Science gained from research agreements +50%",
+				"uniques": ["Science gained from research agreements +50%"],
+				"requires": ["Free Thought"],
+				"row": 3,
+				"column": 1
+			},
+			{
+				"name": "Rationalism Complete",
+				"effect": "+1 gold from all science buildings",
+				"uniques": ["[+1 Gold] from all [Science] buildings"]
+			}
+		]
+	},
+	/*{
+		"name": "Order",
+		"era": "Industrial era",
+		"effect": "+1 Happiness per City",
+		"policies": [
+			{
+				"name": "Nationalism",
+				"effect": "25% Attack bonus when fighting in friendly territory",
+				"row": 1,
+				"column": 1
+			},
+			{
+				"name": "United Front",
+				"effect": "Militaristic City-States grant units twice as often when you are at war with a common foe",
+				"row": 1,
+				"column": 3
+			},
+			{
+				"name": "Planned Economy",
+				"effect": "Factories increase a cities Science output by 25%",
+				"row": 2,
+				"column": 5
+			},
+			{
+				"name": "Socialism",
+				"effect": "Gold maintenance costs of Buildings reduced by 15%",
+				"requires": ["Planned Economy"],
+				"row": 2,
+				"column": 3
+			},
+			{
+				"name": "Communism",
+				"effect": "+2 Production per City and +10% Production when constructing buildings",
+				"requires": ["Socialism"],
+				"row": 3,
+				"column": 3
+			},
+			{
+				"name": "Order Complete",
+				"effect": "+1 Food, Production, Science, Gold and Culture per city"
+			}
+		]
+	},*/
+	{
+		"name": "Freedom",
+		"era": "Renaissance era",
+		"effect": "+25% great people rate",
+		"uniques": ["+[25]% great person generation in all cities"],
+		"policies": [
+			{
+				"name": "Constitution",
+				"effect": "+2 culture from each 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"],
+				"row": 1,
+				"column": 3
+			},
+			{
+				"name": "Civil Society",
+				"effect": "-50% food consumption by specialists",
+				"uniques": ["-50% food consumption by specialists"],
+				"row": 1,
+				"column": 5
+			},
+			{
+				"name": "Free Speech",
+				"effect": "+1 culture for every 2 citizens",
+				"uniques": ["[+1 Culture] per [2] population in all cities"],
+				"requires": ["Constitution"],
+				"row": 2,
+				"column": 1
+			},
+			{
+				"name": "Democracy",
+				"effect": "Specialists produce half normal unhappiness",
+				"uniques": ["Specialists produce half normal unhappiness"],
+				"requires": ["Civil Society"],
+				"row": 2,
+				"column": 5
+			},
+			{
+				"name": "Freedom Complete",
+				"effect": "Tile yield from great improvement +100%, golden ages increase by 50%",
+				"uniques": ["Tile yield from Great Improvements +100%", "Golden Age length increased by [50]%"]
+			}
+		]
+	},
+	{
+		"name": "Autocracy",
+		"era": "Industrial era",
+		"effect": "-33% unit upkeep costs",
+		"uniques": ["-33% unit upkeep costs"],
+		"policies": [
+			{
+				"name": "Populism",
+				"effect": "Wounded military units deal +25% damage",
+				"uniques": ["Wounded military units deal +25% damage"],
+				"row": 1,
+				"column": 1
+			},
+			{
+				"name": "Militarism",
+				"effect": "Gold cost of purchasing units -33%",
+				"uniques": ["Gold cost of purchasing units -33%"],
+				"row": 1,
+				"column": 5
+			},
+			{
+				"name": "Fascism",
+				"effect": "Quantity of strategic resources produced by the empire increased by 100%",
+				"uniques": ["Quantity of strategic resources produced by the empire increased by 100%"],
+				"requires": ["Populism","Militarism"],
+				"row": 2,
+				"column": 3
+			},
+			{
+				"name": "Police State",
+				"effect": "+3 Happiness from every Courthouse. Build Courthouses in half the usual time.",
+				"uniques": ["[+3 Happiness] from every [Courthouse]", "+[100]% Production when constructing [Courthouse]"],
+				"requires": ["Militarism"],
+				"row": 2,
+				"column": 5
+			},
+			{
+				"name": "Total War",
+				"effect": "+15% production when building military units and new military units start with 15 Experience",
+				"uniques": ["+[15]% Production when constructing [military units]", "New military units start with [15] Experience"],
+				"requires": ["Police State","Fascism"],
+				"row": 3,
+				"column": 4
+			},
+			{
+				"name": "Autocracy Complete",
+				"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/Techs.json

@@ -1,21 +1,21 @@
 [
 	{
 		"columnNumber": 0,
-		"era": "Ancient",
+		"era": "Ancient era",
 		"techCost": 20,
 		"buildingCost": 40,
 		"techs": [
 			{
 				"name": "Agriculture",
 				"row": 5,
-				"quote": "'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster"
+				"quote": "'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster",
+				"uniques": ["Starting tech"]
 			}
-			
 		]	
 	},
 	{
 		"columnNumber": 1,
-		"era": "Ancient",
+		"era": "Ancient era",
 		"techCost": 35, 
 		"buildingCost": 60,
 		"techs": [
@@ -48,7 +48,7 @@
 	},
 	{
 		"columnNumber": 2,
-		"era": "Ancient",
+		"era": "Ancient era",
 		"techCost": 55, 
 		"buildingCost": 75,
 		"wonderCost": 185,
@@ -99,7 +99,7 @@
 	},
 	{
 		"columnNumber": 3,
-		"era": "Classical",
+		"era": "Classical era",
 		"techCost": 105, 
 		"buildingCost": 100,
 		"wonderCost": 250,
@@ -134,7 +134,7 @@
 	},
 	{
 		"columnNumber": 4,
-		"era": "Classical",
+		"era": "Classical era",
 		"techCost": 175, 
 		"buildingCost": 120,
 		"wonderCost": 300,
@@ -155,6 +155,7 @@
 				"name": "Engineering",
 				"row": 8,
 				"prerequisites": ["Mathematics","Construction"],
+				"uniques": ["Roads connect tiles across rivers"],
 				"quote": "'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci"
 			},
 			{
@@ -167,7 +168,7 @@
 	},
 	{
 		"columnNumber": 5,
-		"era": "Medieval",
+		"era": "Medieval era",
 		"techCost": 275,
 		"buildingCost": 160,
 		"wonderCost": 400,
@@ -202,7 +203,7 @@
 	},
 	{
 		"columnNumber": 6,
-		"era": "Medieval",
+		"era": "Medieval era",
 		"techCost": 485, 
 		"buildingCost": 200,
 		"wonderCost": 500,
@@ -250,7 +251,7 @@
 	},
 	{
 		"columnNumber": 7,
-		"era": "Renaissance",
+		"era": "Renaissance era",
 		"techCost": 780, 
 		"buildingCost": 250,
 		"wonderCost": 625,
@@ -290,7 +291,7 @@
 	},
 	{
 		"columnNumber": 8,
-		"era": "Renaissance",
+		"era": "Renaissance era",
 		"techCost": 1150, 
 		"buildingCost": 300,
 		"wonderCost": 750,
@@ -329,7 +330,7 @@
 	},
 	{
 		"columnNumber": 9,
-		"era": "Industrial",
+		"era": "Industrial era",
 		"techCost": 1600,
 		"buildingCost": 360,
 		"wonderCost": 920,
@@ -374,7 +375,7 @@
 	},
 	{
 		"columnNumber": 10,
-		"era": "Industrial",
+		"era": "Industrial era",
 		"techCost": 2350,
 		"buildingCost": 500,
 		"wonderCost": 1060,
@@ -408,7 +409,7 @@
 	},
 	{
 		"columnNumber": 11,
-		"era": "Modern",
+		"era": "Modern era",
 		"techCost": 3100,
 		"buildingCost": 500,
 		"wonderCost": 1250,
@@ -447,7 +448,7 @@
 	},
 	{
 		"columnNumber": 12,
-		"era": "Modern",
+		"era": "Modern era",
 		"techCost": 4100,
 		"buildingCost": 500,
 		"wonderCost": 1250,
@@ -480,7 +481,7 @@
 	},
 	{
 		"columnNumber": 13,
-		"era": "Information",
+		"era": "Information era",
 		"techCost": 5100,
 		"buildingCost": 500,
 		"wonderCost": 1250,
@@ -513,7 +514,7 @@
 	},
 	{
 		"columnNumber": 14,
-		"era": "Information",
+		"era": "Information era",
 		"techCost": 6400,
 		"buildingCost": 750,
 		"wonderCost": 2000,
@@ -547,7 +548,7 @@
 	},
 	{
 		"columnNumber": 15,
-		"era": "Future",
+		"era": "Future era",
 		"techCost": 7700,
 		"buildingCost": 750,
 		"wonderCost": 1250,
@@ -581,7 +582,7 @@
 	
 	{
 		"columnNumber": 16,
-		"era": "Future",
+		"era": "Future era",
 		"techCost": 8800,
 		"buildingCost": 750,
 		"wonderCost": 1250,
@@ -602,7 +603,7 @@
 	},
 	{
 		"columnNumber": 17,
-		"era": "Future",
+		"era": "Future era",
 		"techCost": 9500,
 		"buildingCost": 750,
 		"wonderCost": 1250,
@@ -611,7 +612,7 @@
 				"name": "Future Tech",
 				"row": 5,
 				"prerequisites": ["Nanotechnology","Particle Physics","Satellites"],
-				"uniques": ["Who knows what the future holds?"],
+				"uniques": ["Who knows what the future holds?", "Can be continually researched"],
 				"quote": "'I think we agree, the past is over.' - George W. Bush"
 			}
 		]	

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

@@ -20,6 +20,7 @@
 		"type": "Land",
 		"food": 2,
 		"movementCost": 1,
+		"defenceBonus": -0.1,
 		"RGB": [109,139,53]
 	},
 	{
@@ -28,6 +29,7 @@
 		"food": 1,
 		"production": 1,
 		"movementCost": 1,
+		"defenceBonus": -0.1,
 		"RGB": [200,208,161]
 	},
 	{
@@ -51,7 +53,7 @@
 		"food": 2,
 		"gold": 1,
 		"RGB": [ 200, 200, 255],
-		"canHaveOverlay": false
+		"uniques": ["Fresh water"]
 	},
 	{
 		"name": "Hill",
@@ -87,7 +89,8 @@
 		"unbuildable": true,
 		"defenceBonus": 0.25,
 		"occursOn": ["Tundra","Plains","Grassland","Hill"],
-		"rough": true
+		"rough": true,
+		"uniques": ["Provides a one-time Production bonus to the closest city when cut down"]
 	},
 	{
 		"name": "Jungle",
@@ -106,8 +109,9 @@
 		"food": -1,
 		"movementCost": 3,
 		"unbuildable": true,
-		"defenceBonus": -0.1,
-		"occursOn": ["Grassland"]
+		"defenceBonus": -0.15,
+		"occursOn": ["Grassland"],
+		"uniques": ["Rare feature"]
 	},
 	{
 		"name": "Fallout",
@@ -127,7 +131,8 @@
 		"movementCost": 1,
 		"unbuildable": true,
 		"defenceBonus": -0.1,
-		"occursOn": ["Desert"]
+		"occursOn": ["Desert"],
+		"uniques": ["Fresh water", "Rare feature"]
 	},
 	{
 		"name": "Flood plains",
@@ -150,7 +155,8 @@
 		"movementCost": 1,
 		"food": 1,
 		"production": 1,
-		"occursOn": ["Coast"]
+		"occursOn": ["Coast"],
+		"uniques": ["Rare feature"]
 	},
  
 	// Natural Wonders
@@ -189,7 +195,7 @@
 		"uniques": ["Grants 500 Gold to the first civilization to discover it"],
 		"weight": 2
 	},
-	{
+	{ // This will count as "Fresh water" in civ 6
 		"name": "Fountain of Youth",
 		"type": "NaturalWonder",
 		"happiness": 10,
@@ -264,4 +270,17 @@
 		"unbuildable": true,
 		"weight": 10
 	}
+	/*
+	{// Will be introduced in Brave New World. Despite being a lake, it cannot be sailed on and it blocks line of sight like a mountain. 
+		"name": "Lake Victoria",
+		"type": "NaturalWonder",
+		"food": 6,
+		"occursOn": [Plains"],
+		"turnsInto": "Mountain",
+		"impassable": true,
+		"unbuildable": true,
+		"uniques": ["Fresh water"],
+		"weight": 5
+	}
+	*/
 ]	

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

@@ -0,0 +1,194 @@
+[
+
+	{
+		"name": "Farm",
+		"terrainsCanBeBuiltOn": ["Plains","Grassland","Desert","Flood plains"],
+		"food": 1,
+		"turnsToBuild": 7,
+		"techRequired": "Agriculture",
+		"uniques": ["Can also be built on tiles adjacent to fresh water", "[+1 Food] on [fresh water] tiles once [Civil Service] is discovered", "[+1 Food] on [non-fresh water] tiles once [Fertilizer] is discovered"],
+	},
+	{
+		"name": "Lumber mill",
+		"terrainsCanBeBuiltOn": ["Forest"],
+		"production": 1,
+		"turnsToBuild": 7,
+		"techRequired": "Construction",
+		"uniques": ["[+1 Production] once [Scientific Theory] is discovered"]
+	},
+	{
+		"name": "Mine",
+		"terrainsCanBeBuiltOn": ["Hill"],
+		"production": 1,
+		"turnsToBuild": 7,
+		"techRequired": "Mining",
+		"uniques": ["[+1 Production] once [Chemistry] is discovered"]
+	},
+	{
+		"name": "Trading post",
+		"terrainsCanBeBuiltOn": ["Plains","Grassland","Desert","Hill","Tundra","Forest","Jungle","Flood plains"],
+		"gold": 1,
+		"turnsToBuild": 7,
+		"techRequired": "Guilds",
+		"uniques": ["[+1 Gold] once [Economics] is discovered"]
+	},
+	
+	// Resource-specific
+	{
+		"name": "Camp",
+		"resourceTerrainAllow": ["Forest"],
+		"turnsToBuild": 7,
+		"techRequired": "Trapping",
+		"uniques": ["[+1 Gold] once [Economics] is discovered"]
+	},
+	{
+		"name": "Oil well",
+		"turnsToBuild": 9,
+		"techRequired": "Biology"
+	},
+	{
+		"name": "Pasture",
+		"turnsToBuild": 8,
+		"techRequired": "Animal Husbandry",
+		"uniques": ["[+1 Food] once [Fertilizer] is discovered"]
+	},
+	{
+		"name": "Plantation",
+		"turnsToBuild": 6,
+		"gold": 1,
+		"techRequired": "Calendar",
+		"uniques": ["[+1 Food] once [Fertilizer] is discovered"]
+	},
+	{
+		"name": "Quarry",
+		"turnsToBuild": 8,
+		"techRequired": "Masonry",
+		"uniques": ["[+1 Production] once [Chemistry] is discovered"]
+	},
+	{
+		"name": "Fishing Boats",
+		"terrainsCanBeBuiltOn": ["Coast"],
+		"food": 1,
+		"techRequired": "Sailing",
+		"uniques": ["[+1 Gold] once [Compass] is discovered"]
+	},
+
+	// Military improvement
+	{
+		"name": "Fort",
+		"terrainsCanBeBuiltOn": ["Plains","Grassland","Desert","Hill","Tundra","Snow","Forest","Jungle"],
+		"turnsToBuild": 6,
+		"techRequired": "Engineering",
+		"uniques": ["Gives a defensive bonus of [50]%", "Can be built outside your borders"]
+	},
+
+	// Transportation
+	{
+		"name": "Road",
+		"turnsToBuild": 4,
+		"techRequired": "The Wheel",
+		"uniques": ["Can be built outside your borders"]
+	},
+	{
+		"name": "Railroad",
+		"turnsToBuild": 4,
+		"techRequired": "Railroad",
+		"uniques": ["Can be built outside your borders"]
+	},
+	
+	// Removals
+	{
+		"name": "Remove Forest",
+		"turnsToBuild": 4,
+		"terrainsCanBeBuiltOn": ["Forest"],
+		"techRequired": "Mining",
+		"uniques": ["Can be built outside your borders"]
+	},
+	{
+		"name": "Remove Jungle",
+		"turnsToBuild": 7,
+		"terrainsCanBeBuiltOn": ["Jungle"],
+		"techRequired": "Bronze Working",
+		"uniques": ["Can be built outside your borders"]
+	},
+	{
+		"name": "Remove Fallout",
+		"turnsToBuild": 8,
+		"terrainsCanBeBuiltOn": ["Fallout"],
+		"techRequired": "Atomic Theory",
+		"uniques": ["Can be built outside your borders"]
+	},
+	{
+		"name": "Remove Marsh",
+		"turnsToBuild": 6,
+		"terrainsCanBeBuiltOn": ["Marsh"],
+		"techRequired": "Bronze Working",
+		"uniques": ["Can be built outside your borders"]
+	},
+
+	// These are unique and have unique in-game checks related to them
+	{
+		"name": "Remove Road",
+		"turnsToBuild": 2,
+		"uniques": ["Can be built outside your borders"]
+	},
+	{
+		"name": "Remove Railroad",
+		"turnsToBuild": 2,
+		"uniques": ["Can be built outside your borders"]
+	},
+	{
+		"name": "Cancel improvement order",
+		"uniques": ["Can be built outside your borders"]
+	},
+	
+	// Great Person improvements
+	{
+		"name": "Academy",
+		"science": 8,
+		"uniques": ["Great Improvement", "[+2 Science] once [Scientific Theory] is discovered"]
+		// in Gods & Kings academy will also have "[+2 Science] once [Atomic Theory] is discovered"
+	},
+	{
+		"name": "Landmark",
+		"culture": 6,
+		"uniques": ["Great Improvement"]
+	},
+	{
+		"name": "Manufactory",
+		"production": 4,
+		"uniques": ["Great Improvement", "[+1 Production] once [Chemistry] is discovered"]
+	},
+	{
+		"name": "Customs house",
+		"gold": 4,
+		"uniques": ["Great Improvement", "[+1 Gold] once [Economics] is discovered"]
+	},
+	{
+		"name": "Citadel",
+		"uniques": ["Gives a defensive bonus of [100]%", "Deal 30 damage to adjacent enemy units", "Great Improvement"]
+	},
+
+	//Civilization unique improvements
+	{
+		"name": "Moai",
+		"uniqueTo": "Polynesia",
+		"culture": 1,
+		"turnsToBuild": 4,
+		"uniques": ["[+1 Culture] for each adjacent [Moai]", "Can only be built on Coastal tiles", "[+1 Gold] once [Flight] is discovered"],
+		"techRequired": "Construction"
+	},
+	{
+		"name": "Terrace farm",
+		"uniqueTo": "Inca",
+		"terrainsCanBeBuiltOn": ["Hill"],
+		"food": 1,
+		"turnsToBuild": 7,
+		"uniques": ["[+1 Food] for each adjacent [Mountain]", "Cannot be built on bonus resource", "[+1 Food] on [fresh water] tiles once [Civil Service] is discovered", "[+1 Food] on [non-fresh water] tiles once [Fertilizer] is discovered"],
+		"techRequired": "Construction"
+	},
+	
+	{ "name": "Ancient ruins" },
+	{ "name": "City ruins" },
+	{ "name": "Barbarian encampment" }
+]

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"]
 	},
@@ -451,6 +451,6 @@
 	},
 	{
 		"name": "Slinger Withdraw", // only for Slinger and subsequent upgrades
-		"effect": "May withdraw before melee (133%)"
+		"effect": "May withdraw before melee ([133]%)"
 	}
 ]