diff --git a/android/Images/ResourceIcons/Citrus.png b/android/Images/ResourceIcons/Citrus.png new file mode 100644 index 0000000000..080dd509ba Binary files /dev/null and b/android/Images/ResourceIcons/Citrus.png differ diff --git a/android/Images/ResourceIcons/Copper.png b/android/Images/ResourceIcons/Copper.png new file mode 100644 index 0000000000..7e447d9cf4 Binary files /dev/null and b/android/Images/ResourceIcons/Copper.png differ diff --git a/android/Images/ResourceIcons/Crab.png b/android/Images/ResourceIcons/Crab.png new file mode 100644 index 0000000000..557feec9f8 Binary files /dev/null and b/android/Images/ResourceIcons/Crab.png differ diff --git a/android/Images/ResourceIcons/Salt.png b/android/Images/ResourceIcons/Salt.png new file mode 100644 index 0000000000..f3f1c0ef83 Binary files /dev/null and b/android/Images/ResourceIcons/Salt.png differ diff --git a/android/Images/ResourceIcons/Truffles.png b/android/Images/ResourceIcons/Truffles.png new file mode 100644 index 0000000000..1c868cd5e3 Binary files /dev/null and b/android/Images/ResourceIcons/Truffles.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Bison+Camp.png b/android/Images/TileSets/FantasyHex/Tiles/Bison+Camp.png new file mode 100644 index 0000000000..be91edcaaf Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Bison+Camp.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Bison.png b/android/Images/TileSets/FantasyHex/Tiles/Bison.png new file mode 100644 index 0000000000..e0d1e659ef Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Bison.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Citrus+Plantation.png b/android/Images/TileSets/FantasyHex/Tiles/Citrus+Plantation.png new file mode 100644 index 0000000000..e5033b74e4 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Citrus+Plantation.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Citrus.png b/android/Images/TileSets/FantasyHex/Tiles/Citrus.png new file mode 100644 index 0000000000..18b8c5cba4 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Citrus.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Cocoa+Plantation.png b/android/Images/TileSets/FantasyHex/Tiles/Cocoa+Plantation.png new file mode 100644 index 0000000000..9e92b2eff4 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Cocoa+Plantation.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Cocoa.png b/android/Images/TileSets/FantasyHex/Tiles/Cocoa.png new file mode 100644 index 0000000000..a7717bfd8a Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Cocoa.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Copper.png b/android/Images/TileSets/FantasyHex/Tiles/Copper.png new file mode 100644 index 0000000000..627794d60e Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Copper.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Crab.png b/android/Images/TileSets/FantasyHex/Tiles/Crab.png new file mode 100644 index 0000000000..ac565c2355 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Crab.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Truffles+Camp.png b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Truffles+Camp.png new file mode 100644 index 0000000000..9b8f9e31d0 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Forest+Truffles+Camp.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Salt.png b/android/Images/TileSets/FantasyHex/Tiles/Salt.png new file mode 100644 index 0000000000..3e13af8f9b Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Salt.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Truffles+Camp.png b/android/Images/TileSets/FantasyHex/Tiles/Truffles+Camp.png new file mode 100644 index 0000000000..37ad638c17 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Truffles+Camp.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Truffles.png b/android/Images/TileSets/FantasyHex/Tiles/Truffles.png new file mode 100644 index 0000000000..46217dd60b Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Truffles.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Truffles+Camp.png b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Truffles+Camp.png new file mode 100644 index 0000000000..3f06fcd3ec Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Forest+Truffles+Camp.png differ diff --git a/android/assets/jsons/Civ V - Vanilla/TileResources.json b/android/assets/jsons/Civ V - Vanilla/TileResources.json index ed9ae9ba58..685b34dc4f 100644 --- a/android/assets/jsons/Civ V - Vanilla/TileResources.json +++ b/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} }, - */ ] diff --git a/android/assets/jsons/TileSets/FantasyHex.json b/android/assets/jsons/TileSets/FantasyHex.json index 770b67f228..fa3f03c705 100644 --- a/android/assets/jsons/TileSets/FantasyHex.json +++ b/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"] } -} \ No newline at end of file +} diff --git a/docs/Credits.md b/docs/Credits.md index d756093f3a..172dcaaba7 100644 --- a/docs/Credits.md +++ b/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