Merge remote-tracking branch 'origin/master'

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

@@ -154,7 +154,7 @@
 		"terrainsCanBeFoundOn": ["Jungle","Grassland","Plains","Desert","Tundra","Hill"],
 		"gold": 3,
 		"improvement": "Mine",
-		"improvementStats": {"gold": 1}
+		"improvementStats": {"production": 1}
 	},
 	{
 		"name": "Gold Ore", // Not called "Gold" in order to not conflict with siege type units for translations
@@ -162,7 +162,7 @@
 		"terrainsCanBeFoundOn": ["Grassland","Plains","Desert","Hill"],
 		"gold": 2,
 		"improvement": "Mine",
-		"improvementStats": {"gold": 1}
+		"improvementStats": {"production": 1}
 	},
 	{
 		"name": "Silver",
@@ -170,7 +170,7 @@
 		"terrainsCanBeFoundOn": ["Desert","Tundra","Hill"],
 		"gold": 2,
 		"improvement": "Mine",
-		"improvementStats": {"gold": 1}
+		"improvementStats": {"production": 1}
 	},
 	{
 		"name": "Incense",
@@ -226,7 +226,7 @@
 		"terrainsCanBeFoundOn": ["Desert","Plains","Tundra","Hill","Grassland"],
 		"gold": 2,
 		"improvement": "Quarry",
-		"improvementStats": {"gold": 1,"production": 1},
+		"improvementStats": {"production": 1},
 		"unique": "+15% production towards Wonder construction"
 	},
 	{
@@ -258,15 +258,14 @@
 		"gold": 2,
 		"unique": "Can only be created by Mercantile City-States"
 	}
-	/*
 	{
 		"name": "Citrus",
 		"resourceType": "Luxury",
-		"terrainsCanBeFoundOn": ["Plains","Grassland"],
+		"terrainsCanBeFoundOn": ["Jungle","Forest"],
 		"food": 1,
 		"gold": 1,
 		"improvement": "Plantation",
-		"improvementStats": {"food": 1,"gold": 1},
+		"improvementStats": {"gold": 1},
 	},
 	{
 		"name": "Copper",
@@ -274,8 +273,9 @@
 		"terrainsCanBeFoundOn": ["Plains","Grassland","Desert","Tundra","Snow"],
 		"gold": 2,
 		"improvement": "Mine",
-		"improvementStats": {"gold": 2}
+		"improvementStats": {"production": 2}
 	},
+	/* 
 	{
 		"name": "Cocoa",
 		"resourceType": "Luxury",
@@ -285,6 +285,7 @@
 		"improvement": "Plantation",
 		"improvementStats": {"food": 1,"gold": 1}
 	},
+	*/
 	{
 		"name": "Crab",
 		"resourceType": "Luxury",
@@ -292,7 +293,16 @@
 		"food": 1,
 		"gold": 1,
 		"improvement": "Fishing Boats",
-		"improvementStats": {"food": 1,"gold": 1},
+		"improvementStats": {"food": 1},
+	},
+	{
+		"name": "Salt",
+		"resourceType": "Luxury",
+		"terrainsCanBeFoundOn": ["Desert","Tundra","Plains"],
+		"gold": 1,
+		"food": 1,
+		"improvement": "Mine",
+		"improvementStats": {"food": 1,"production":1}
 	},
 	{
 		"name": "Truffles",
@@ -300,7 +310,6 @@
 		"terrainsCanBeFoundOn": ["Forest","Marsh","Jungle"],
 		"gold": 2,
 		"improvement": "Camp",
-		"improvementStats": {"gold": 2}
+		"improvementStats": {"gold": 1}
 	},
-	*/
 ]

android/assets/jsons/TileSets/FantasyHex.json

@@ -44,6 +44,7 @@
         "Grassland+Forest+Uranium": ["Grassland","Uranium","GrasslandForest"],
         "Grassland+Forest+Deer": ["Grassland","Deer","GrasslandForest"],
         "Grassland+Forest+Furs": ["Grassland","Furs","GrasslandForest"],
+	"Grassland+Forest+Truffles": ["Grassland","Truffles","GrasslandForest"],
         //Grassland+Hill
         "Grassland+Hill+Forest+Horses": ["Grassland","Hill","Horses","Forest"],
         "Grassland+Hill+Forest+Iron": ["Grassland","Hill","Iron","Forest"],
@@ -52,6 +53,7 @@
         "Grassland+Hill+Forest+Uranium": ["Grassland","Hill","Uranium","Forest"],
         "Grassland+Hill+Forest+Furs": ["Grassland","Hill","Furs","Forest"],
         "Grassland+Hill+Forest+Deer": ["Grassland","Hill","Deer","Forest"],
+	"Grassland+Hill+Forest+Truffles": ["Grassland","Hill","Truffles","Forest"],
         //Plains
         "Plains+Jungle+Oil": ["Plains","Oil","PlainsJungle"],
         "Plains+Forest+Horses": ["Plains","Horses","PlainsForest"],
@@ -61,6 +63,7 @@
         "Plains+Forest+Uranium": ["Plains","Uranium","PlainsForest"],
         "Plains+Forest+Deer": ["Plains","Deer","PlainsForest"],
         "Plains+Forest+Furs": ["Plains","Furs","PlainsForest"],
+	"Plains+Forest+Truffles": ["Plains","Truffles","PlainsForest"],
         "Plains+Wheat+Farm": ["Plains+Farm","Wheat"],
         //Plains+Hill
         "Plains+Hill+Forest+Horses": ["Plains","Hill","Horses","Forest"],
@@ -70,6 +73,7 @@
         "Plains+Hill+Forest+Uranium": ["Plains","Hill","Uranium","Forest"],
         "Plains+Hill+Forest+Furs": ["Plains","Hill","Furs","Forest"],
         "Plains+Hill+Forest+Deer": ["Plains","Hill","Deer","Forest"],
+	"Plains+Hill+Forest+Truffles": ["Plains","Hill","Truffles","Forest"],
         //Tundra
         "Tundra+Jungle+Oil": ["Tundra","Oil","TundraForest"],
         "Tundra+Forest+Horses": ["Tundra","Horses","TundraForest"],
@@ -96,4 +100,4 @@
         "Grassland+Sheep+Ancient ruins": ["Grassland","Ancient ruins","Sheep"],
         "Coast+Oil+Oil well": ["Coast","Offshore Platform"]
     }
-}
+}

docs/Credits.md

@@ -160,6 +160,11 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Joss Stick](https://thenounproject.com/search/?q=incense&i=583033) By Hea Poh Lin for Incense
 * [Pottery](https://thenounproject.com/term/pottery/2317144/) By Laymik, UA for Porcelain
 * [Jewelry](https://thenounproject.com/term/jewelry/3688098/) By Shocho, IN
+* [Lemons](https://thenounproject.com/search/?q=lemon&i=4147611) By sachin modgekar, IN for Citrus
+* [Pipes](https://thenounproject.com/search/?q=pipes&i=1637792) By Nibras@design for Copper
+* [Crab](https://thenounproject.com/search/?q=crab&i=246420) By YuguDesign
+* [Truffle](https://thenounproject.com/search/?q=Truffles&i=1576609) By parkjisun
+* [Salt](https://thenounproject.com/search/?q=salt&i=3614173) By HAMEL KHALED, DZ 
 
 ## Improvements