diff --git a/Credits.md b/Credits.md index 2920c8e98a..149383149d 100644 --- a/Credits.md +++ b/Credits.md @@ -61,4 +61,21 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Leather](https://thenounproject.com/term/leather/16499/) By Alen Krummenacher * [Gem](https://thenounproject.com/term/gem/948920/) By Lluisa Iborra * [Joss Stick](https://thenounproject.com/search/?q=incense&i=583033) By Hea Poh Lin +* [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery + + +* [Arrow](https://thenounproject.com/term/arrow/18123/) By Joe Mortell +* [Woodcutting axe](https://thenounproject.com/term/woodcutting-axe/1060560/) By Chanut is Industries +* [Monument](https://thenounproject.com/term/monument/1175928/) By Setyo Ari Wibowo +* [Farm](https://thenounproject.com/term/farm/25362/) By Bonnie Beach +* [Unhappy](https://thenounproject.com/term/unhappy/116793/) By Daryl Vandermont +* [Bank](https://thenounproject.com/term/bank/1648569/) By Scott Dunlap +* [Academy](https://thenounproject.com/term/academy/1689703/) By CJS +* [Factory](https://thenounproject.com/term/factory/1049531/) By RULI +* [Mine](https://thenounproject.com/term/mine/543/) By Edward Boatman +* [Corral](https://thenounproject.com/term/corral/1340751/) By Luis Prado +* [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery +* [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery +* [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery +* [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery * [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery \ No newline at end of file diff --git a/android/Images/ImprovementIcons/Academy.png b/android/Images/ImprovementIcons/Academy.png new file mode 100644 index 0000000000..e91d129314 Binary files /dev/null and b/android/Images/ImprovementIcons/Academy.png differ diff --git a/android/Images/ImprovementIcons/Academy_(Civ5).png b/android/Images/ImprovementIcons/Academy_(Civ5).png deleted file mode 100644 index f081dc841d..0000000000 Binary files a/android/Images/ImprovementIcons/Academy_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Camp.png b/android/Images/ImprovementIcons/Camp.png new file mode 100644 index 0000000000..3ef5317f8a Binary files /dev/null and b/android/Images/ImprovementIcons/Camp.png differ diff --git a/android/Images/ImprovementIcons/Camp_(Civ5).png b/android/Images/ImprovementIcons/Camp_(Civ5).png deleted file mode 100644 index a8d896978f..0000000000 Binary files a/android/Images/ImprovementIcons/Camp_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Customs_house.png b/android/Images/ImprovementIcons/Customs_house.png new file mode 100644 index 0000000000..5d4c7e33e7 Binary files /dev/null and b/android/Images/ImprovementIcons/Customs_house.png differ diff --git a/android/Images/ImprovementIcons/Customs_house_(Civ5).png b/android/Images/ImprovementIcons/Customs_house_(Civ5).png deleted file mode 100644 index 2f9297e452..0000000000 Binary files a/android/Images/ImprovementIcons/Customs_house_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Farm.png b/android/Images/ImprovementIcons/Farm.png new file mode 100644 index 0000000000..a2c5b9c13a Binary files /dev/null and b/android/Images/ImprovementIcons/Farm.png differ diff --git a/android/Images/ImprovementIcons/Farm_(Civ5).png b/android/Images/ImprovementIcons/Farm_(Civ5).png deleted file mode 100644 index 4dd3568c14..0000000000 Binary files a/android/Images/ImprovementIcons/Farm_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Landmark.png b/android/Images/ImprovementIcons/Landmark.png new file mode 100644 index 0000000000..e55dc6f728 Binary files /dev/null and b/android/Images/ImprovementIcons/Landmark.png differ diff --git a/android/Images/ImprovementIcons/Landmark_(Civ5).png b/android/Images/ImprovementIcons/Landmark_(Civ5).png deleted file mode 100644 index 629a242419..0000000000 Binary files a/android/Images/ImprovementIcons/Landmark_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Lumber mill.png b/android/Images/ImprovementIcons/Lumber mill.png new file mode 100644 index 0000000000..80c1be6519 Binary files /dev/null and b/android/Images/ImprovementIcons/Lumber mill.png differ diff --git a/android/Images/ImprovementIcons/Lumber_mill_(Civ5).png b/android/Images/ImprovementIcons/Lumber_mill_(Civ5).png deleted file mode 100644 index bd5894c24e..0000000000 Binary files a/android/Images/ImprovementIcons/Lumber_mill_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Manufactory.png b/android/Images/ImprovementIcons/Manufactory.png new file mode 100644 index 0000000000..a711d7d9cd Binary files /dev/null and b/android/Images/ImprovementIcons/Manufactory.png differ diff --git a/android/Images/ImprovementIcons/Manufactory_(Civ5).png b/android/Images/ImprovementIcons/Manufactory_(Civ5).png deleted file mode 100644 index afc3ae6352..0000000000 Binary files a/android/Images/ImprovementIcons/Manufactory_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Mine.png b/android/Images/ImprovementIcons/Mine.png new file mode 100644 index 0000000000..5164a7229b Binary files /dev/null and b/android/Images/ImprovementIcons/Mine.png differ diff --git a/android/Images/ImprovementIcons/Mine_(Civ5).png b/android/Images/ImprovementIcons/Mine_(Civ5).png deleted file mode 100644 index d230fd1d41..0000000000 Binary files a/android/Images/ImprovementIcons/Mine_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Oil well.png b/android/Images/ImprovementIcons/Oil well.png new file mode 100644 index 0000000000..f7ce4ca8a9 Binary files /dev/null and b/android/Images/ImprovementIcons/Oil well.png differ diff --git a/android/Images/ImprovementIcons/Oil_well_(Civ5).png b/android/Images/ImprovementIcons/Oil_well_(Civ5).png deleted file mode 100644 index 3f66fca23f..0000000000 Binary files a/android/Images/ImprovementIcons/Oil_well_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Pasture.png b/android/Images/ImprovementIcons/Pasture.png new file mode 100644 index 0000000000..4585a93eda Binary files /dev/null and b/android/Images/ImprovementIcons/Pasture.png differ diff --git a/android/Images/ImprovementIcons/Pasture_(Civ5).png b/android/Images/ImprovementIcons/Pasture_(Civ5).png deleted file mode 100644 index fe5f4c3001..0000000000 Binary files a/android/Images/ImprovementIcons/Pasture_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Plantation.png b/android/Images/ImprovementIcons/Plantation.png new file mode 100644 index 0000000000..758b4c3787 Binary files /dev/null and b/android/Images/ImprovementIcons/Plantation.png differ diff --git a/android/Images/ImprovementIcons/Plantation_(Civ5).png b/android/Images/ImprovementIcons/Plantation_(Civ5).png deleted file mode 100644 index ec611c61a2..0000000000 Binary files a/android/Images/ImprovementIcons/Plantation_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Quarry.png b/android/Images/ImprovementIcons/Quarry.png new file mode 100644 index 0000000000..1709364c99 Binary files /dev/null and b/android/Images/ImprovementIcons/Quarry.png differ diff --git a/android/Images/ImprovementIcons/Quarry_(Civ5).png b/android/Images/ImprovementIcons/Quarry_(Civ5).png deleted file mode 100644 index f175c8d309..0000000000 Binary files a/android/Images/ImprovementIcons/Quarry_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Railroad.png b/android/Images/ImprovementIcons/Railroad.png new file mode 100644 index 0000000000..12453b2913 Binary files /dev/null and b/android/Images/ImprovementIcons/Railroad.png differ diff --git a/android/Images/ImprovementIcons/Railroad_(Civ5).png b/android/Images/ImprovementIcons/Railroad_(Civ5).png deleted file mode 100644 index 96a5607f76..0000000000 Binary files a/android/Images/ImprovementIcons/Railroad_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Road.png b/android/Images/ImprovementIcons/Road.png new file mode 100644 index 0000000000..8621d22c1f Binary files /dev/null and b/android/Images/ImprovementIcons/Road.png differ diff --git a/android/Images/ImprovementIcons/Road_(Civ5).png b/android/Images/ImprovementIcons/Road_(Civ5).png deleted file mode 100644 index 614672dbcb..0000000000 Binary files a/android/Images/ImprovementIcons/Road_(Civ5).png and /dev/null differ diff --git a/android/Images/ImprovementIcons/Trading post.png b/android/Images/ImprovementIcons/Trading post.png new file mode 100644 index 0000000000..6617a8cd99 Binary files /dev/null and b/android/Images/ImprovementIcons/Trading post.png differ diff --git a/android/Images/ImprovementIcons/Trading_post_(Civ5).png b/android/Images/ImprovementIcons/Trading_post_(Civ5).png deleted file mode 100644 index cc49706a36..0000000000 Binary files a/android/Images/ImprovementIcons/Trading_post_(Civ5).png and /dev/null differ diff --git a/android/Images/OtherIcons/Circle.png b/android/Images/OtherIcons/Circle.png index 545455b1e0..3fef82bfcb 100644 Binary files a/android/Images/OtherIcons/Circle.png and b/android/Images/OtherIcons/Circle.png differ diff --git a/android/Images/OtherIcons/City.png b/android/Images/OtherIcons/City.png index 62d35beff9..8af843ff5a 100644 Binary files a/android/Images/OtherIcons/City.png and b/android/Images/OtherIcons/City.png differ diff --git a/android/Images/OtherIcons/Crosshair.png b/android/Images/OtherIcons/Crosshair.png index bf35e244da..198144a6dc 100644 Binary files a/android/Images/OtherIcons/Crosshair.png and b/android/Images/OtherIcons/Crosshair.png differ diff --git a/android/Images/OtherIcons/DisbandUnit.png b/android/Images/OtherIcons/DisbandUnit.png index ef89fd0f1f..f7df7d9c79 100644 Binary files a/android/Images/OtherIcons/DisbandUnit.png and b/android/Images/OtherIcons/DisbandUnit.png differ diff --git a/android/Images/OtherIcons/Fire.png b/android/Images/OtherIcons/Fire.png index 83740abe6e..f68b8f97a5 100644 Binary files a/android/Images/OtherIcons/Fire.png and b/android/Images/OtherIcons/Fire.png differ diff --git a/android/Images/OtherIcons/MenuIcon.png b/android/Images/OtherIcons/MenuIcon.png index fed299db64..3726d0e0c9 100644 Binary files a/android/Images/OtherIcons/MenuIcon.png and b/android/Images/OtherIcons/MenuIcon.png differ diff --git a/android/Images/OtherIcons/Railroad.png b/android/Images/OtherIcons/Railroad.png index c932d8f3d8..12453b2913 100644 Binary files a/android/Images/OtherIcons/Railroad.png and b/android/Images/OtherIcons/Railroad.png differ diff --git a/android/Images/OtherIcons/Shield.png b/android/Images/OtherIcons/Shield.png index 97d840f252..44ed4a6bb5 100644 Binary files a/android/Images/OtherIcons/Shield.png and b/android/Images/OtherIcons/Shield.png differ diff --git a/android/Images/OtherIcons/Star.png b/android/Images/OtherIcons/Star.png index 2c5c326644..02520822f8 100644 Binary files a/android/Images/OtherIcons/Star.png and b/android/Images/OtherIcons/Star.png differ diff --git a/android/Images/OtherIcons/Stop.png b/android/Images/OtherIcons/Stop.png index 11e8562a64..0fe42953fb 100644 Binary files a/android/Images/OtherIcons/Stop.png and b/android/Images/OtherIcons/Stop.png differ diff --git a/android/Images/ResourceIcons/Aluminum.png b/android/Images/ResourceIcons/Aluminum.png index 444c263a7a..499022b642 100644 Binary files a/android/Images/ResourceIcons/Aluminum.png and b/android/Images/ResourceIcons/Aluminum.png differ diff --git a/android/Images/ResourceIcons/Aluminum_(Civ5).png b/android/Images/ResourceIcons/Aluminum_(Civ5).png deleted file mode 100644 index a812326d30..0000000000 Binary files a/android/Images/ResourceIcons/Aluminum_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Bananas.png b/android/Images/ResourceIcons/Bananas.png index 2f105ce79a..2217923122 100644 Binary files a/android/Images/ResourceIcons/Bananas.png and b/android/Images/ResourceIcons/Bananas.png differ diff --git a/android/Images/ResourceIcons/Bananas_(Civ5).png b/android/Images/ResourceIcons/Bananas_(Civ5).png deleted file mode 100644 index e4f329df0f..0000000000 Binary files a/android/Images/ResourceIcons/Bananas_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Cattle.png b/android/Images/ResourceIcons/Cattle.png index ccbae4dcbc..e16be3ff6a 100644 Binary files a/android/Images/ResourceIcons/Cattle.png and b/android/Images/ResourceIcons/Cattle.png differ diff --git a/android/Images/ResourceIcons/Cattle_(Civ5).png b/android/Images/ResourceIcons/Cattle_(Civ5).png deleted file mode 100644 index 670b0736ad..0000000000 Binary files a/android/Images/ResourceIcons/Cattle_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Coal.png b/android/Images/ResourceIcons/Coal.png index b4a06fdc5f..f53df2d94a 100644 Binary files a/android/Images/ResourceIcons/Coal.png and b/android/Images/ResourceIcons/Coal.png differ diff --git a/android/Images/ResourceIcons/Coal_(Civ5).png b/android/Images/ResourceIcons/Coal_(Civ5).png deleted file mode 100644 index 3f480e99c2..0000000000 Binary files a/android/Images/ResourceIcons/Coal_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Cotton.png b/android/Images/ResourceIcons/Cotton.png index 408e73829d..fe94ae07ff 100644 Binary files a/android/Images/ResourceIcons/Cotton.png and b/android/Images/ResourceIcons/Cotton.png differ diff --git a/android/Images/ResourceIcons/Cotton_(Civ5).png b/android/Images/ResourceIcons/Cotton_(Civ5).png deleted file mode 100644 index 766a52a8b9..0000000000 Binary files a/android/Images/ResourceIcons/Cotton_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Deer.png b/android/Images/ResourceIcons/Deer.png index 1018dc1361..216b53bf74 100644 Binary files a/android/Images/ResourceIcons/Deer.png and b/android/Images/ResourceIcons/Deer.png differ diff --git a/android/Images/ResourceIcons/Deer_(Civ5).png b/android/Images/ResourceIcons/Deer_(Civ5).png deleted file mode 100644 index e8a74f50cd..0000000000 Binary files a/android/Images/ResourceIcons/Deer_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Dyes.png b/android/Images/ResourceIcons/Dyes.png index cdf82c60ff..2e067944da 100644 Binary files a/android/Images/ResourceIcons/Dyes.png and b/android/Images/ResourceIcons/Dyes.png differ diff --git a/android/Images/ResourceIcons/Dyes_(Civ5).png b/android/Images/ResourceIcons/Dyes_(Civ5).png deleted file mode 100644 index f626d68122..0000000000 Binary files a/android/Images/ResourceIcons/Dyes_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Furs.png b/android/Images/ResourceIcons/Furs.png index 300cf8f964..191b3515e6 100644 Binary files a/android/Images/ResourceIcons/Furs.png and b/android/Images/ResourceIcons/Furs.png differ diff --git a/android/Images/ResourceIcons/Furs_(Civ5).png b/android/Images/ResourceIcons/Furs_(Civ5).png deleted file mode 100644 index 531b0de8b8..0000000000 Binary files a/android/Images/ResourceIcons/Furs_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Gems.png b/android/Images/ResourceIcons/Gems.png index e68330da61..1fa0ac8ac1 100644 Binary files a/android/Images/ResourceIcons/Gems.png and b/android/Images/ResourceIcons/Gems.png differ diff --git a/android/Images/ResourceIcons/Gems_(Civ5).png b/android/Images/ResourceIcons/Gems_(Civ5).png deleted file mode 100644 index 33fef35d39..0000000000 Binary files a/android/Images/ResourceIcons/Gems_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Gold.png b/android/Images/ResourceIcons/Gold.png index 8d68c7943e..329285c948 100644 Binary files a/android/Images/ResourceIcons/Gold.png and b/android/Images/ResourceIcons/Gold.png differ diff --git a/android/Images/ResourceIcons/Gold_(Civ5).png b/android/Images/ResourceIcons/Gold_(Civ5).png deleted file mode 100644 index fd0ed618d7..0000000000 Binary files a/android/Images/ResourceIcons/Gold_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Horses.png b/android/Images/ResourceIcons/Horses.png index bded87929b..b42ca8fcc1 100644 Binary files a/android/Images/ResourceIcons/Horses.png and b/android/Images/ResourceIcons/Horses.png differ diff --git a/android/Images/ResourceIcons/Horses_(Civ5).png b/android/Images/ResourceIcons/Horses_(Civ5).png deleted file mode 100644 index fdd4226cb4..0000000000 Binary files a/android/Images/ResourceIcons/Horses_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Incense.png b/android/Images/ResourceIcons/Incense.png index 64051689f1..a29ae32d15 100644 Binary files a/android/Images/ResourceIcons/Incense.png and b/android/Images/ResourceIcons/Incense.png differ diff --git a/android/Images/ResourceIcons/Incense_(Civ5).png b/android/Images/ResourceIcons/Incense_(Civ5).png deleted file mode 100644 index baf097ea7a..0000000000 Binary files a/android/Images/ResourceIcons/Incense_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Iron.png b/android/Images/ResourceIcons/Iron.png index b5f97ae424..a92d708806 100644 Binary files a/android/Images/ResourceIcons/Iron.png and b/android/Images/ResourceIcons/Iron.png differ diff --git a/android/Images/ResourceIcons/Iron_(Civ5).png b/android/Images/ResourceIcons/Iron_(Civ5).png deleted file mode 100644 index 0bee70ab73..0000000000 Binary files a/android/Images/ResourceIcons/Iron_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Ivory.png b/android/Images/ResourceIcons/Ivory.png index 5eeb4434f3..32f96a7040 100644 Binary files a/android/Images/ResourceIcons/Ivory.png and b/android/Images/ResourceIcons/Ivory.png differ diff --git a/android/Images/ResourceIcons/Ivory_(Civ5).png b/android/Images/ResourceIcons/Ivory_(Civ5).png deleted file mode 100644 index a304f360c3..0000000000 Binary files a/android/Images/ResourceIcons/Ivory_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Marble.png b/android/Images/ResourceIcons/Marble.png index 680abb675e..58efa5903e 100644 Binary files a/android/Images/ResourceIcons/Marble.png and b/android/Images/ResourceIcons/Marble.png differ diff --git a/android/Images/ResourceIcons/Marble_(Civ5).png b/android/Images/ResourceIcons/Marble_(Civ5).png deleted file mode 100644 index c9b08996a8..0000000000 Binary files a/android/Images/ResourceIcons/Marble_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Oil.png b/android/Images/ResourceIcons/Oil.png index d0a9946302..7fbb5d87c8 100644 Binary files a/android/Images/ResourceIcons/Oil.png and b/android/Images/ResourceIcons/Oil.png differ diff --git a/android/Images/ResourceIcons/Oil_(Civ5).png b/android/Images/ResourceIcons/Oil_(Civ5).png deleted file mode 100644 index 3ae009333a..0000000000 Binary files a/android/Images/ResourceIcons/Oil_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Sheep.png b/android/Images/ResourceIcons/Sheep.png index 568473efbc..6b4371031e 100644 Binary files a/android/Images/ResourceIcons/Sheep.png and b/android/Images/ResourceIcons/Sheep.png differ diff --git a/android/Images/ResourceIcons/Sheep_(Civ5).png b/android/Images/ResourceIcons/Sheep_(Civ5).png deleted file mode 100644 index eb81917619..0000000000 Binary files a/android/Images/ResourceIcons/Sheep_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Silk.png b/android/Images/ResourceIcons/Silk.png index 22548773ad..97d913531b 100644 Binary files a/android/Images/ResourceIcons/Silk.png and b/android/Images/ResourceIcons/Silk.png differ diff --git a/android/Images/ResourceIcons/Silk_(Civ5).png b/android/Images/ResourceIcons/Silk_(Civ5).png deleted file mode 100644 index 61e32c5be9..0000000000 Binary files a/android/Images/ResourceIcons/Silk_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Silver.png b/android/Images/ResourceIcons/Silver.png index 3ca5f3d0e8..25bfc26daf 100644 Binary files a/android/Images/ResourceIcons/Silver.png and b/android/Images/ResourceIcons/Silver.png differ diff --git a/android/Images/ResourceIcons/Silver_(Civ5).png b/android/Images/ResourceIcons/Silver_(Civ5).png deleted file mode 100644 index 9f842ae7a2..0000000000 Binary files a/android/Images/ResourceIcons/Silver_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Spices.png b/android/Images/ResourceIcons/Spices.png index ea92343dab..af7179a176 100644 Binary files a/android/Images/ResourceIcons/Spices.png and b/android/Images/ResourceIcons/Spices.png differ diff --git a/android/Images/ResourceIcons/Spices_(Civ5).png b/android/Images/ResourceIcons/Spices_(Civ5).png deleted file mode 100644 index 88b40b3d09..0000000000 Binary files a/android/Images/ResourceIcons/Spices_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Stone.png b/android/Images/ResourceIcons/Stone.png index 73ab17db69..ae3deb266f 100644 Binary files a/android/Images/ResourceIcons/Stone.png and b/android/Images/ResourceIcons/Stone.png differ diff --git a/android/Images/ResourceIcons/Stone_(Civ5).png b/android/Images/ResourceIcons/Stone_(Civ5).png deleted file mode 100644 index 6ade1d8e09..0000000000 Binary files a/android/Images/ResourceIcons/Stone_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Sugar.png b/android/Images/ResourceIcons/Sugar.png index f7916b9e51..f1adb06d87 100644 Binary files a/android/Images/ResourceIcons/Sugar.png and b/android/Images/ResourceIcons/Sugar.png differ diff --git a/android/Images/ResourceIcons/Sugar_(Civ5).png b/android/Images/ResourceIcons/Sugar_(Civ5).png deleted file mode 100644 index 8f4c84ab7b..0000000000 Binary files a/android/Images/ResourceIcons/Sugar_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Uranium.png b/android/Images/ResourceIcons/Uranium.png index c72a686ab6..63dd374360 100644 Binary files a/android/Images/ResourceIcons/Uranium.png and b/android/Images/ResourceIcons/Uranium.png differ diff --git a/android/Images/ResourceIcons/Uranium_(Civ5).png b/android/Images/ResourceIcons/Uranium_(Civ5).png deleted file mode 100644 index eec574e7da..0000000000 Binary files a/android/Images/ResourceIcons/Uranium_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Wheat.png b/android/Images/ResourceIcons/Wheat.png index 2d8b04f340..6d94eecf94 100644 Binary files a/android/Images/ResourceIcons/Wheat.png and b/android/Images/ResourceIcons/Wheat.png differ diff --git a/android/Images/ResourceIcons/Wheat_(Civ5).png b/android/Images/ResourceIcons/Wheat_(Civ5).png deleted file mode 100644 index a77354b839..0000000000 Binary files a/android/Images/ResourceIcons/Wheat_(Civ5).png and /dev/null differ diff --git a/android/Images/ResourceIcons/Wine.png b/android/Images/ResourceIcons/Wine.png index 1bce83cef5..63c230a038 100644 Binary files a/android/Images/ResourceIcons/Wine.png and b/android/Images/ResourceIcons/Wine.png differ diff --git a/android/Images/ResourceIcons/Wine_(Civ5).png b/android/Images/ResourceIcons/Wine_(Civ5).png deleted file mode 100644 index 451d44fc9d..0000000000 Binary files a/android/Images/ResourceIcons/Wine_(Civ5).png and /dev/null differ diff --git a/android/Images/StatIcons/20xCityConnection5.png b/android/Images/StatIcons/20xCityConnection5.png index 1ac2a5f31f..7287f7a252 100644 Binary files a/android/Images/StatIcons/20xCityConnection5.png and b/android/Images/StatIcons/20xCityConnection5.png differ diff --git a/android/Images/StatIcons/20xMalcontent5.png b/android/Images/StatIcons/20xMalcontent5.png index 6756fad8ef..d050e6a874 100644 Binary files a/android/Images/StatIcons/20xMalcontent5.png and b/android/Images/StatIcons/20xMalcontent5.png differ diff --git a/android/Images/StatIcons/20xMovement5.png b/android/Images/StatIcons/20xMovement5.png index b99fff7c54..4006b8407c 100644 Binary files a/android/Images/StatIcons/20xMovement5.png and b/android/Images/StatIcons/20xMovement5.png differ diff --git a/android/Images/StatIcons/City_Center_(Civ6).png b/android/Images/StatIcons/City_Center_(Civ6).png index 08353bcad6..96575ea2ef 100644 Binary files a/android/Images/StatIcons/City_Center_(Civ6).png and b/android/Images/StatIcons/City_Center_(Civ6).png differ diff --git a/android/Images/StatIcons/populationGray.png b/android/Images/StatIcons/populationGray.png deleted file mode 100644 index bc6eb6eede..0000000000 Binary files a/android/Images/StatIcons/populationGray.png and /dev/null differ diff --git a/android/Images/StatIcons/populationGreen.png b/android/Images/StatIcons/populationGreen.png deleted file mode 100644 index 161b0302c2..0000000000 Binary files a/android/Images/StatIcons/populationGreen.png and /dev/null differ diff --git a/android/Images/UnitIcons/Archer.png b/android/Images/UnitIcons/Archer.png index 6a9f490797..13d45f9312 100644 Binary files a/android/Images/UnitIcons/Archer.png and b/android/Images/UnitIcons/Archer.png differ diff --git a/android/Images/UnitIcons/Artillery.png b/android/Images/UnitIcons/Artillery.png index 2aa3b6b6ae..a58e7ae6a6 100644 Binary files a/android/Images/UnitIcons/Artillery.png and b/android/Images/UnitIcons/Artillery.png differ diff --git a/android/Images/UnitIcons/Bowman.png b/android/Images/UnitIcons/Bowman.png index dee542a35a..e6c387ff87 100644 Binary files a/android/Images/UnitIcons/Bowman.png and b/android/Images/UnitIcons/Bowman.png differ diff --git a/android/Images/UnitIcons/Cannon.png b/android/Images/UnitIcons/Cannon.png index 6f66a0b7ac..01c5ff551a 100644 Binary files a/android/Images/UnitIcons/Cannon.png and b/android/Images/UnitIcons/Cannon.png differ diff --git a/android/Images/UnitIcons/Catapult.png b/android/Images/UnitIcons/Catapult.png index 98dcef74cb..3ffe304249 100644 Binary files a/android/Images/UnitIcons/Catapult.png and b/android/Images/UnitIcons/Catapult.png differ diff --git a/android/Images/UnitIcons/Cavalry.png b/android/Images/UnitIcons/Cavalry.png index 65d005fc83..03fdba9470 100644 Binary files a/android/Images/UnitIcons/Cavalry.png and b/android/Images/UnitIcons/Cavalry.png differ diff --git a/android/Images/UnitIcons/Chariot Archer.png b/android/Images/UnitIcons/Chariot Archer.png index fe26df8c5e..9c8a0356e8 100644 Binary files a/android/Images/UnitIcons/Chariot Archer.png and b/android/Images/UnitIcons/Chariot Archer.png differ diff --git a/android/Images/UnitIcons/Companion Cavalry.png b/android/Images/UnitIcons/Companion Cavalry.png index 1224baf03c..38b8a458f3 100644 Binary files a/android/Images/UnitIcons/Companion Cavalry.png and b/android/Images/UnitIcons/Companion Cavalry.png differ diff --git a/android/Images/UnitIcons/Crossbowman.png b/android/Images/UnitIcons/Crossbowman.png index 87aa611d90..85931f8d7a 100644 Binary files a/android/Images/UnitIcons/Crossbowman.png and b/android/Images/UnitIcons/Crossbowman.png differ diff --git a/android/Images/UnitIcons/Great Artist.png b/android/Images/UnitIcons/Great Artist.png index 8c3d7840d3..b91ac85987 100644 Binary files a/android/Images/UnitIcons/Great Artist.png and b/android/Images/UnitIcons/Great Artist.png differ diff --git a/android/Images/UnitIcons/Great Engineer.png b/android/Images/UnitIcons/Great Engineer.png index a38866302f..e1cd7eba6d 100644 Binary files a/android/Images/UnitIcons/Great Engineer.png and b/android/Images/UnitIcons/Great Engineer.png differ diff --git a/android/Images/UnitIcons/Great Merchant.png b/android/Images/UnitIcons/Great Merchant.png index d4d37df617..435d265978 100644 Binary files a/android/Images/UnitIcons/Great Merchant.png and b/android/Images/UnitIcons/Great Merchant.png differ diff --git a/android/Images/UnitIcons/Great Scientist.png b/android/Images/UnitIcons/Great Scientist.png index 7951d3b25b..21550fbaa0 100644 Binary files a/android/Images/UnitIcons/Great Scientist.png and b/android/Images/UnitIcons/Great Scientist.png differ diff --git a/android/Images/UnitIcons/Horseman.png b/android/Images/UnitIcons/Horseman.png index bded87929b..b42ca8fcc1 100644 Binary files a/android/Images/UnitIcons/Horseman.png and b/android/Images/UnitIcons/Horseman.png differ diff --git a/android/Images/UnitIcons/Knight.png b/android/Images/UnitIcons/Knight.png index 237d220aee..78a4b28a71 100644 Binary files a/android/Images/UnitIcons/Knight.png and b/android/Images/UnitIcons/Knight.png differ diff --git a/android/Images/UnitIcons/Lancer.png b/android/Images/UnitIcons/Lancer.png index fac2b08d7f..86d5f8ac27 100644 Binary files a/android/Images/UnitIcons/Lancer.png and b/android/Images/UnitIcons/Lancer.png differ diff --git a/android/Images/UnitIcons/Longbowman.png b/android/Images/UnitIcons/Longbowman.png index 7f61324ee9..5ba9d4fa6c 100644 Binary files a/android/Images/UnitIcons/Longbowman.png and b/android/Images/UnitIcons/Longbowman.png differ diff --git a/android/Images/UnitIcons/Longswordsman.png b/android/Images/UnitIcons/Longswordsman.png index 0a765d3243..9494b00dda 100644 Binary files a/android/Images/UnitIcons/Longswordsman.png and b/android/Images/UnitIcons/Longswordsman.png differ diff --git a/android/Images/UnitIcons/Musketeer.png b/android/Images/UnitIcons/Musketeer.png index 37c681b2ec..301c6b27ee 100644 Binary files a/android/Images/UnitIcons/Musketeer.png and b/android/Images/UnitIcons/Musketeer.png differ diff --git a/android/Images/UnitIcons/Musketman.png b/android/Images/UnitIcons/Musketman.png index 6467d897c9..eddb5b29a2 100644 Binary files a/android/Images/UnitIcons/Musketman.png and b/android/Images/UnitIcons/Musketman.png differ diff --git a/android/Images/UnitIcons/Pikeman.png b/android/Images/UnitIcons/Pikeman.png index 8ae347f130..d8a8d82df9 100644 Binary files a/android/Images/UnitIcons/Pikeman.png and b/android/Images/UnitIcons/Pikeman.png differ diff --git a/android/Images/UnitIcons/Rifleman.png b/android/Images/UnitIcons/Rifleman.png index 7f5e3f20f2..e21961a997 100644 Binary files a/android/Images/UnitIcons/Rifleman.png and b/android/Images/UnitIcons/Rifleman.png differ diff --git a/android/Images/UnitIcons/Scout.png b/android/Images/UnitIcons/Scout.png index f124da6498..3e9e662435 100644 Binary files a/android/Images/UnitIcons/Scout.png and b/android/Images/UnitIcons/Scout.png differ diff --git a/android/Images/UnitIcons/Settler.png b/android/Images/UnitIcons/Settler.png index 625fb6ca3b..6ea4703384 100644 Binary files a/android/Images/UnitIcons/Settler.png and b/android/Images/UnitIcons/Settler.png differ diff --git a/android/Images/UnitIcons/Spearman.png b/android/Images/UnitIcons/Spearman.png index 5ec1aa9e8b..79d92c801d 100644 Binary files a/android/Images/UnitIcons/Spearman.png and b/android/Images/UnitIcons/Spearman.png differ diff --git a/android/Images/UnitIcons/Swordsman.png b/android/Images/UnitIcons/Swordsman.png index 408132eb57..474f80653a 100644 Binary files a/android/Images/UnitIcons/Swordsman.png and b/android/Images/UnitIcons/Swordsman.png differ diff --git a/android/Images/UnitIcons/Trebuchet.png b/android/Images/UnitIcons/Trebuchet.png index 96a01ec44d..33aa566579 100644 Binary files a/android/Images/UnitIcons/Trebuchet.png and b/android/Images/UnitIcons/Trebuchet.png differ diff --git a/android/Images/UnitIcons/Warrior.png b/android/Images/UnitIcons/Warrior.png index 2c6500ece3..4d995dbe9f 100644 Binary files a/android/Images/UnitIcons/Warrior.png and b/android/Images/UnitIcons/Warrior.png differ diff --git a/android/Images/UnitIcons/Worker.png b/android/Images/UnitIcons/Worker.png index 16f9c9ea3f..13457e5678 100644 Binary files a/android/Images/UnitIcons/Worker.png and b/android/Images/UnitIcons/Worker.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 744a328885..86f8cb2470 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -1,1342 +1,1153 @@ game.png -size: 2048,2048 +size: 2048,1024 format: RGBA8888 filter: MipMapLinearLinear,MipMapLinearLinear repeat: none FlagIcons/Dutch rotate: false - xy: 1618, 722 + xy: 1897, 894 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 1618, 592 + xy: 1452, 692 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 406, 48 + xy: 1582, 692 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 536, 48 + xy: 1712, 692 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 666, 48 + xy: 1897, 764 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 1398, 236 + xy: 1452, 562 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 1748, 722 + xy: 1582, 562 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 1748, 592 + xy: 1712, 562 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -ImprovementIcons/Academy_(Civ5) +ImprovementIcons/Academy rotate: false - xy: 810, 184 - size: 44, 44 - orig: 44, 44 + xy: 104, 18 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Camp_(Civ5) +ImprovementIcons/Camp rotate: false - xy: 1962, 1954 - size: 44, 44 - orig: 44, 44 + xy: 306, 364 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Customs_house_(Civ5) +ImprovementIcons/Customs_house rotate: false - xy: 48, 2 - size: 44, 44 - orig: 44, 44 + xy: 664, 518 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Farm_(Civ5) +ImprovementIcons/Farm rotate: false - xy: 902, 184 - size: 44, 44 - orig: 44, 44 + xy: 1072, 518 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Landmark_(Civ5) +ImprovementIcons/Landmark rotate: false - xy: 140, 2 - size: 44, 44 - orig: 44, 44 + xy: 918, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Lumber_mill_(Civ5) +ImprovementIcons/Lumber mill rotate: false - xy: 94, 63 - size: 44, 44 - orig: 44, 44 + xy: 1020, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Manufactory_(Civ5) +ImprovementIcons/Manufactory rotate: false - xy: 994, 184 - size: 44, 44 - orig: 44, 44 + xy: 1122, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Mine_(Civ5) +ImprovementIcons/Mine rotate: false - xy: 140, 63 - size: 44, 44 - orig: 44, 44 + xy: 1224, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Oil_well_(Civ5) +ImprovementIcons/Oil well rotate: false - xy: 232, 2 - size: 44, 44 - orig: 44, 44 + xy: 1326, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Pasture_(Civ5) +ImprovementIcons/Pasture rotate: false - xy: 186, 63 - size: 44, 44 - orig: 44, 44 + xy: 1326, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Plantation_(Civ5) +ImprovementIcons/Plantation rotate: false - xy: 1086, 184 - size: 44, 44 - orig: 44, 44 + xy: 716, 110 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Quarry_(Civ5) +ImprovementIcons/Quarry rotate: false - xy: 278, 2 - size: 44, 44 - orig: 44, 44 + xy: 818, 110 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Railroad_(Civ5) +ImprovementIcons/Railroad rotate: false - xy: 232, 63 - size: 44, 44 - orig: 44, 44 - offset: 0, 0 - index: -1 -ImprovementIcons/Road_(Civ5) - rotate: false - xy: 1132, 184 - size: 44, 44 - orig: 44, 44 - offset: 0, 0 - index: -1 -ImprovementIcons/Trading_post_(Civ5) - rotate: false - xy: 600, 2 - size: 44, 44 - orig: 44, 44 - offset: 0, 0 - index: -1 -OtherIcons/Circle - rotate: false - xy: 204, 715 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -OtherIcons/City - rotate: false - xy: 204, 513 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -OtherIcons/Crosshair - rotate: false - xy: 1254, 1644 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -OtherIcons/DisbandUnit - rotate: false - xy: 1658, 1644 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -OtherIcons/Fire - rotate: false - xy: 471, 1592 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -OtherIcons/MenuIcon - rotate: false - xy: 1416, 366 - size: 128, 128 - orig: 128, 128 + xy: 920, 110 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 810, 634 - size: 200, 200 - orig: 200, 200 + xy: 920, 110 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Road + rotate: false + xy: 1124, 110 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Trading post + rotate: false + xy: 1944, 662 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Circle + rotate: false + xy: 408, 262 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/City + rotate: false + xy: 510, 364 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Crosshair + rotate: false + xy: 512, 58 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/DisbandUnit + rotate: false + xy: 868, 518 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Fire + rotate: false + xy: 1174, 518 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/MenuIcon + rotate: false + xy: 1122, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 810, 432 - size: 200, 200 - orig: 200, 200 + xy: 818, 8 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 673, 1651 - size: 150, 141 - orig: 150, 141 + xy: 204, 122 + size: 100, 94 + orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 810, 230 - size: 200, 200 - orig: 200, 200 + xy: 1842, 662 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 548, 1794 + xy: 281, 770 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 1860, 1644 + xy: 1270, 620 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 847, 1791 + xy: 583, 770 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy_(Civ5) rotate: false - xy: 1528, 232 + xy: 1662, 501 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Citizenship_(Civ5) rotate: false - xy: 308, 74 + xy: 1530, 323 size: 28, 33 orig: 28, 33 offset: 0, 0 index: -1 PolicyIcons/Civil_Society_(Civ5) rotate: false - xy: 338, 76 + xy: 1408, 587 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Collective_Rule_(Civ5) rotate: false - xy: 1528, 261 + xy: 1378, 548 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Constitution_(Civ5) rotate: false - xy: 320, 1575 + xy: 1692, 533 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Democracy_(Civ5) rotate: false - xy: 2008, 1933 + xy: 1662, 530 size: 28, 30 orig: 28, 30 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship_(Civ5) rotate: false - xy: 673, 1602 + xy: 583, 773 size: 45, 47 orig: 45, 47 offset: 0, 0 index: -1 PolicyIcons/Free_Religion_(Civ5) rotate: false - xy: 2008, 1902 + xy: 1458, 225 size: 28, 29 orig: 28, 29 offset: 0, 0 index: -1 PolicyIcons/Free_Speech_(Civ5) rotate: false - xy: 1546, 366 + xy: 308, 20 size: 28, 36 orig: 28, 36 offset: 0, 0 index: -1 PolicyIcons/Free_Thought_(Civ5) rotate: false - xy: 260, 1574 + xy: 1378, 518 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Humanism_(Civ5) rotate: false - xy: 320, 1546 + xy: 1488, 227 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Landed_Elite_(Civ5) rotate: false - xy: 368, 76 + xy: 338, 25 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Legalism_(Civ5) rotate: false - xy: 260, 1544 + xy: 1560, 328 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Mandate_Of_Heaven_(Civ5) rotate: false - xy: 1178, 193 + xy: 1428, 219 size: 28, 35 orig: 28, 35 offset: 0, 0 index: -1 PolicyIcons/Mercantilism_(Civ5) rotate: false - xy: 766, 1612 + xy: 260, 529 size: 28, 37 orig: 28, 37 offset: 0, 0 index: -1 PolicyIcons/Meritocracy_(Civ5) rotate: false - xy: 350, 1575 + xy: 1530, 263 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Monarchy_(Civ5) rotate: false - xy: 1528, 328 + xy: 1632, 524 size: 28, 36 orig: 28, 36 offset: 0, 0 index: -1 PolicyIcons/Oligarchy_(Civ5) rotate: false - xy: 1528, 294 + xy: 630, 788 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 PolicyIcons/Organized_Religion_(Civ5) rotate: false - xy: 308, 48 + xy: 368, 2 size: 28, 24 orig: 28, 24 offset: 0, 0 index: -1 PolicyIcons/Patronage_(Civ5) rotate: false - xy: 1962, 2000 + xy: 612, 520 size: 50, 46 orig: 50, 46 offset: 0, 0 index: -1 PolicyIcons/Protectionism_(Civ5) rotate: false - xy: 338, 48 + xy: 1560, 300 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Reformation_(Civ5) rotate: false - xy: 290, 1574 + xy: 368, 28 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Representation_(Civ5) rotate: false - xy: 2008, 1965 + xy: 1632, 491 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Republic_(Civ5) rotate: false - xy: 368, 48 + xy: 1590, 330 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Scientific_Revolution_(Civ5) rotate: false - xy: 350, 1547 + xy: 398, 30 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Secularism_(Civ5) rotate: false - xy: 2008, 1871 + xy: 1530, 292 size: 28, 29 orig: 28, 29 offset: 0, 0 index: -1 PolicyIcons/Sovereignty_(Civ5) rotate: false - xy: 1214, 223 + xy: 1632, 434 size: 28, 25 orig: 28, 25 offset: 0, 0 index: -1 PolicyIcons/Theocracy_(Civ5) rotate: false - xy: 278, 70 + xy: 1378, 581 size: 28, 37 orig: 28, 37 offset: 0, 0 index: -1 PolicyIcons/Trade_Unions_(Civ5) rotate: false - xy: 290, 1544 + xy: 1632, 461 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Universal_Suffrage_(Civ5) rotate: false - xy: 2014, 1998 + xy: 1842, 772 size: 28, 48 orig: 28, 48 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1356, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Aluminum_(Civ5) - rotate: false - xy: 1554, 588 - size: 44, 44 - orig: 44, 44 + xy: 204, 422 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 2, 311 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Bananas_(Civ5) - rotate: false - xy: 2, 2 - size: 44, 44 - orig: 44, 44 + xy: 206, 20 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 204, 1119 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Cattle_(Civ5) - rotate: false - xy: 720, 1605 - size: 44, 44 - orig: 44, 44 + xy: 408, 364 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 204, 311 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Coal_(Civ5) - rotate: false - xy: 856, 184 - size: 44, 44 - orig: 44, 44 + xy: 510, 262 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 850, 1644 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Cotton_(Civ5) - rotate: false - xy: 1554, 542 - size: 44, 44 - orig: 44, 44 + xy: 308, 58 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 1456, 1644 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Deer_(Civ5) - rotate: false - xy: 2, 63 - size: 44, 44 - orig: 44, 44 + xy: 766, 518 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 269, 1604 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Dyes_(Civ5) - rotate: false - xy: 1962, 1908 - size: 44, 44 - orig: 44, 44 + xy: 970, 518 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 406, 986 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Furs_(Civ5) - rotate: false - xy: 1554, 496 - size: 44, 44 - orig: 44, 44 + xy: 1276, 518 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 406, 784 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Gems_(Civ5) - rotate: false - xy: 1546, 450 - size: 44, 44 - orig: 44, 44 + xy: 612, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 406, 582 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Gold_(Civ5) - rotate: false - xy: 94, 2 - size: 44, 44 - orig: 44, 44 - offset: 0, 0 - index: -1 -ResourceIcons/Horses_(Civ5) - rotate: false - xy: 48, 63 - size: 44, 44 - orig: 44, 44 + xy: 612, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 608, 784 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Incense_(Civ5) - rotate: false - xy: 1962, 1862 - size: 44, 44 - orig: 44, 44 + xy: 816, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 608, 582 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Iron_(Civ5) - rotate: false - xy: 948, 184 - size: 44, 44 - orig: 44, 44 + xy: 918, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 608, 380 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Ivory_(Civ5) - rotate: false - xy: 1546, 404 - size: 44, 44 - orig: 44, 44 + xy: 816, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1012, 1240 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Marble_(Civ5) - rotate: false - xy: 186, 2 - size: 44, 44 - orig: 44, 44 + xy: 1224, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1214, 1240 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Oil_(Civ5) - rotate: false - xy: 1040, 184 - size: 44, 44 - orig: 44, 44 + xy: 1326, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1618, 1442 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Sheep_(Civ5) - rotate: false - xy: 324, 2 - size: 44, 44 - orig: 44, 44 + xy: 716, 8 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1012, 634 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Silk_(Civ5) - rotate: false - xy: 370, 2 - size: 44, 44 - orig: 44, 44 + xy: 920, 8 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1214, 836 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Silver_(Civ5) - rotate: false - xy: 416, 2 - size: 44, 44 - orig: 44, 44 + xy: 1022, 8 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1618, 1240 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Spices_(Civ5) - rotate: false - xy: 462, 2 - size: 44, 44 - orig: 44, 44 + xy: 1226, 8 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1820, 1442 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Stone_(Civ5) - rotate: false - xy: 508, 2 - size: 44, 44 - orig: 44, 44 + xy: 1328, 8 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1012, 432 + xy: 1068, 620 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 -ResourceIcons/Sugar_(Civ5) - rotate: false - xy: 554, 2 - size: 44, 44 - orig: 44, 44 - offset: 0, 0 - index: -1 ResourceIcons/Uranium rotate: false - xy: 1618, 1038 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Uranium_(Civ5) - rotate: false - xy: 646, 2 - size: 44, 44 - orig: 44, 44 + xy: 1428, 460 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1012, 230 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Wheat_(Civ5) - rotate: false - xy: 692, 2 - size: 44, 44 - orig: 44, 44 + xy: 1530, 460 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1214, 432 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -ResourceIcons/Wine_(Civ5) - rotate: false - xy: 738, 2 - size: 44, 44 - orig: 44, 44 + xy: 1428, 256 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 StatIcons/20xCityConnection5 rotate: false - xy: 548, 1846 - size: 200, 200 - orig: 200, 200 + xy: 2, 18 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 StatIcons/20xCulture5 rotate: false - xy: 2, 1321 + xy: 281, 822 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xFood5 rotate: false - xy: 750, 1846 + xy: 2, 322 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xGold5 rotate: false - xy: 2, 1119 + xy: 483, 822 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xHappiness5 rotate: false - xy: 952, 1846 + xy: 2, 120 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xMalcontent5 rotate: false - xy: 278, 48 - size: 20, 20 - orig: 20, 20 + xy: 685, 822 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xMovement5 rotate: false - xy: 825, 1772 - size: 20, 20 - orig: 20, 20 + xy: 887, 822 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xPopulation5 rotate: false - xy: 2, 917 + xy: 1089, 822 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xProduction5 rotate: false - xy: 1154, 1846 + xy: 1291, 822 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xRangedStrength5 rotate: false - xy: 380, 1582 + xy: 1872, 800 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xScience5 rotate: false - xy: 2, 715 + xy: 1493, 822 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xStrength5 rotate: false - xy: 1244, 228 + xy: 1408, 565 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 2, 1781 - size: 265, 265 - orig: 265, 265 - offset: 0, 0 - index: -1 -StatIcons/populationGray - rotate: false - xy: 1820, 1058 - size: 182, 180 - orig: 182, 180 - offset: 0, 0 - index: -1 -StatIcons/populationGreen - rotate: false - xy: 1214, 250 - size: 182, 180 - orig: 182, 180 + xy: 408, 160 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Flood plains rotate: false - xy: 406, 1390 + xy: 1695, 822 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Fog rotate: false - xy: 2, 1523 + xy: 2, 524 size: 256, 256 orig: 256, 256 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 406, 1188 + xy: 260, 568 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Hexagon rotate: false - xy: 269, 1806 + xy: 2, 782 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 608, 178 + xy: 462, 568 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1214, 1442 + xy: 664, 620 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 1012, 1038 + xy: 866, 620 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 720, 1592 + xy: 2, 5 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 2, 513 - size: 200, 200 - orig: 200, 200 + xy: 204, 320 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 1558, 1846 - size: 200, 200 - orig: 200, 200 + xy: 204, 218 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 1760, 1846 - size: 200, 200 - orig: 200, 200 + xy: 306, 466 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 2, 109 - size: 200, 200 - orig: 200, 200 + xy: 408, 466 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 204, 1321 - size: 200, 200 - orig: 200, 200 + xy: 306, 262 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 204, 917 - size: 200, 200 - orig: 200, 200 + xy: 510, 466 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 1416, 496 - size: 136, 136 - orig: 136, 136 + xy: 306, 160 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 204, 109 - size: 200, 200 - orig: 200, 200 + xy: 510, 160 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 1052, 1644 - size: 200, 200 - orig: 200, 200 + xy: 410, 58 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 406, 380 - size: 200, 200 - orig: 200, 200 + xy: 714, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 406, 178 - size: 200, 200 - orig: 200, 200 + xy: 612, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 608, 1390 - size: 200, 200 - orig: 200, 200 + xy: 714, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 608, 1188 - size: 200, 200 - orig: 200, 200 + xy: 816, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 608, 986 - size: 200, 200 - orig: 200, 200 + xy: 714, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 608, 986 - size: 200, 200 - orig: 200, 200 + xy: 714, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 810, 1442 - size: 200, 200 - orig: 200, 200 + xy: 918, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 810, 1240 - size: 200, 200 - orig: 200, 200 + xy: 1020, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1012, 1442 - size: 200, 200 - orig: 200, 200 + xy: 1020, 314 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 810, 1038 - size: 200, 200 - orig: 200, 200 + xy: 1122, 416 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 810, 836 - size: 200, 200 - orig: 200, 200 + xy: 1224, 212 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1618, 852 - size: 185, 184 - orig: 185, 184 + xy: 614, 9 + size: 100, 99 + orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1416, 1442 - size: 200, 200 - orig: 200, 200 + xy: 614, 110 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1012, 836 - size: 200, 200 - orig: 200, 200 + xy: 1022, 110 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1214, 1038 - size: 200, 200 - orig: 200, 200 + xy: 1226, 110 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1416, 1240 - size: 200, 200 - orig: 200, 200 + xy: 1328, 110 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1416, 1038 - size: 200, 200 - orig: 200, 200 + xy: 1124, 8 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1214, 634 - size: 200, 200 - orig: 200, 200 + xy: 1842, 560 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1416, 836 - size: 200, 200 - orig: 200, 200 + xy: 1944, 560 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1820, 1240 - size: 200, 200 - orig: 200, 200 + xy: 1428, 358 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1416, 634 - size: 200, 200 - orig: 200, 200 + xy: 1530, 358 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 825, 1750 + xy: 1430, 565 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 380, 1560 + xy: 1662, 479 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 1266, 228 + xy: 1692, 511 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 825, 1728 + xy: 1722, 540 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 1288, 228 + xy: 1560, 278 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 825, 1706 + xy: 1590, 308 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1310, 228 + xy: 398, 8 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 825, 1684 + xy: 428, 36 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1332, 228 + xy: 1632, 412 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 825, 1662 + xy: 1872, 778 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 1354, 228 + xy: 1662, 457 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1376, 228 + xy: 1744, 540 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 2022, 1622 + xy: 450, 36 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 2022, 1600 + xy: 1632, 390 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 2022, 1578 + xy: 1662, 435 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 2022, 1556 + xy: 1766, 540 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 2022, 1534 + xy: 472, 36 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 2022, 1512 + xy: 1632, 368 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 2022, 1490 + xy: 1788, 540 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 2022, 1468 + xy: 494, 36 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 2022, 1446 + xy: 1810, 540 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 2022, 1424 + xy: 516, 36 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 2022, 1402 + xy: 538, 36 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index bb97184ae2..511f003cc0 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/build.gradle b/android/build.gradle index c8faa12ed2..96bcfb17a3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 129 - versionName "2.7.13" + versionCode 130 + versionName "2.7.14" } buildTypes { release { diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 26e18224f7..731d0aab22 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -196,7 +196,7 @@ class CityInfo { // Remove all national wonders for(building in cityConstructions.getBuiltBuildings().filter { it.requiredBuildingInAllCities!=null }) cityConstructions.builtBuildings.remove(building.name) - + isBeingRazed=false } //endregion } \ No newline at end of file diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt index f419988ea0..ab13753c82 100644 --- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt @@ -34,7 +34,7 @@ class ImprovementPickerScreen(tileInfo: TileInfo) : PickerScreen() { if(improvement.name.startsWith("Remove")) improvementButton.add(ImageGetter.getImage("OtherIcons/Stop.png")).size(30f).pad(10f) - else improvementButton.add(ImageGetter.getImprovementIcon(improvement.name)).size(30f).pad(10f) + else improvementButton.add(ImageGetter.getImprovementIcon(improvement.name,30f)).pad(10f) improvementButton.add(Label(improvement.name + " - " + improvement.getTurnsToBuild(civInfo) + " {turns}".tr(),skin) .setFontColor(Color.WHITE)).pad(10f) diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index e3e5be56b5..0b0d333421 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -22,10 +22,10 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { protected var cityImage:Image?=null protected var resourceImage: Actor? = null - protected var improvementImage: Image? =null + protected var improvementImage: Actor? =null var populationImage: Image? = null private val roadImages = HashMap() - private val borderImages = HashMap>() // map of neiboring tile to border images + private val borderImages = HashMap>() // map of neighboring tile to border images protected var civilianUnitImage: Group? = null protected var militaryUnitImage: Group? = null private val circleImage = ImageGetter.getImage("OtherIcons/Circle.png") // for blue and red circles on the tile @@ -288,7 +288,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { } } if(improvementImage!=null){ - if(!viewable) improvementImage!!.color= Color.WHITE.cpy().apply { a=0.7f } + improvementImage!!.color= Color.WHITE.cpy().apply { a=0.7f } } } diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index e855317c98..39051154a9 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -56,8 +56,25 @@ object ImageGetter { return getImage("UnitIcons/$unitName.png") } - fun getImprovementIcon(improvementName:String):Image{ - return getImage("ImprovementIcons/" + improvementName.replace(' ', '_') + "_(Civ5).png") + fun getImprovementIcon(improvementName:String, size:Float=20f):Actor{ + val group= Group() + val circle = getImage("OtherIcons/Circle").apply { setSize(size,size) } + + val improvement = GameBasics.TileImprovements[improvementName]!! + when { + improvement.food>0 -> circle.color= Color.GREEN.cpy().lerp(Color.WHITE,0.5f) + improvement.production>0 -> circle.color= Color.BROWN.cpy().lerp(Color.WHITE,0.5f) + improvement.gold>0 -> circle.color= Color.GOLD.cpy().lerp(Color.WHITE,0.5f) + improvement.science>0 -> circle.color= Color.GOLD.cpy().lerp(Color.BLUE,0.5f) + improvement.culture>0 -> circle.color= Color.GOLD.cpy().lerp(Color.PURPLE,0.5f) + } + + + group.setSize(size,size) + group.addActor(circle) + group.addActor(getImage("ImprovementIcons/$improvementName") + .apply { setSize(size*0.8f,size*0.8f); center(group) }) + return group } fun getPromotionIcon(promotionName:String):Image{ diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index c616b46e09..4175fecbf8 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -1,8 +1,8 @@ package com.unciv.ui.worldscreen.unit import com.badlogic.gdx.graphics.Color +import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.ui.Button -import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UnCivGame @@ -12,7 +12,7 @@ import com.unciv.ui.worldscreen.WorldScreen class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ - fun getIconForUnitAction(unitAction:String): Image { + fun getIconForUnitAction(unitAction:String): Actor { if(unitAction.startsWith("Upgrade to")){ val unitToUpgradeTo = Regex("""Upgrade to \[(\S*)\]""").find(unitAction)!!.groups[1]!!.value return ImageGetter.getUnitIcon(unitToUpgradeTo)