diff --git a/Credits.md b/Credits.md index 582b4aab2e..78c49f779c 100644 --- a/Credits.md +++ b/Credits.md @@ -352,11 +352,13 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc ## Others * [Circle](https://thenounproject.com/term/circle/1841891/) By Aybige -* [Arrow](https://thenounproject.com/term/arrow/18123/) By Joe Mortell +* [Arrow](https://thenounproject.com/term/arrow/18123/) By Joe Mortell for movement +* https://thenounproject.com/term/arrow/2032227/ * [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery -* [Skull](https://thenounproject.com/search/?q=Skull&i=1030702) By Vladimir Belochkin +* [Skull](https://thenounproject.com/search/?q=Skull&i=1030702) By Vladimir Belochkin for disbanding units * [Crosshair](https://thenounproject.com/search/?q=crosshairs&i=916030) By Bakunetsu Kaito * [City](https://thenounproject.com/search/?q=city&i=571332) By Felix Westphal -* [Fire](https://thenounproject.com/search/?q=Fire&i=96564) By Lloyd Humphreys +* [Fire](https://thenounproject.com/search/?q=Fire&i=96564) By Lloyd Humphreys for * [Sleep](https://thenounproject.com/search/?q=sleep&i=1760085) By Saeful Muslim * [Banner](https://thenounproject.com/term/banner/866282/) By Emir Palavan for embarked units +* [Arrow](https://thenounproject.com/term/arrow/18123/) By uzeir syarief for moving between idle units \ No newline at end of file diff --git a/android/Images/StatIcons/Food.png b/android/Images/StatIcons/Food.png index 095b7c2c5b..5f088a39b6 100644 Binary files a/android/Images/StatIcons/Food.png and b/android/Images/StatIcons/Food.png differ diff --git a/android/Images/TerrainIcons/Hill.png b/android/Images/TerrainIcons/Hill.png new file mode 100644 index 0000000000..515b02a8ab Binary files /dev/null and b/android/Images/TerrainIcons/Hill.png differ diff --git a/android/Images/TerrainIcons/Mountain.png b/android/Images/TerrainIcons/Mountain.png new file mode 100644 index 0000000000..15aec8753e Binary files /dev/null and b/android/Images/TerrainIcons/Mountain.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 399352b4c7..f43cecc654 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,2450 +6,2464 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 204, 644 + xy: 945, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 204, 440 + xy: 1149, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 204, 338 + xy: 1251, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 583, 1727 + xy: 204, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 1093, 1727 + xy: 204, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 1399, 1727 + xy: 204, 438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 1501, 1727 + xy: 204, 336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 1807, 1749 + xy: 306, 1482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 537, 1523 + xy: 306, 1278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 843, 1625 + xy: 306, 768 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 1149, 1625 + xy: 306, 156 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 1251, 1625 + xy: 1557, 1633 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 1251, 1523 + xy: 1659, 1634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 566, 1421 + xy: 408, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 1280, 1421 + xy: 408, 258 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 1790, 1443 + xy: 510, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 306, 1155 + xy: 816, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 306, 441 + xy: 1020, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 306, 339 + xy: 510, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 408, 571 + xy: 510, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 510, 775 + xy: 1224, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 510, 673 + xy: 510, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 510, 571 + xy: 612, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 510, 469 + xy: 714, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 306, 237 + xy: 1122, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 286, 135 + xy: 1224, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1892, 1391 + xy: 918, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 653, 61 + xy: 1428, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 566, 1319 + xy: 510, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 1076, 1319 + xy: 1020, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1382, 1319 + xy: 1326, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 714, 1217 + xy: 1020, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 612, 911 + xy: 1428, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 918, 1217 + xy: 510, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 816, 1115 + xy: 612, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 612, 809 + xy: 816, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 816, 1013 + xy: 1122, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 612, 707 + xy: 1326, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1020, 1115 + xy: 510, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 918, 1013 + xy: 612, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 612, 605 + xy: 918, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1122, 1115 + xy: 1122, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1020, 1013 + xy: 1224, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 918, 911 + xy: 1326, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 714, 605 + xy: 1428, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1326, 1115 + xy: 918, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 816, 605 + xy: 1428, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1224, 911 + xy: 1326, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1122, 809 + xy: 1428, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1020, 707 + xy: 918, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 918, 605 + xy: 1020, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1428, 1013 + xy: 1020, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 816, 401 + xy: 1224, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1632, 1115 + xy: 1428, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1530, 1013 + xy: 1224, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1122, 605 + xy: 1428, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1020, 503 + xy: 1428, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1632, 1013 + xy: 347, 54 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1428, 809 + xy: 551, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1326, 707 + xy: 653, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1632, 911 + xy: 1163, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1530, 809 + xy: 1265, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1428, 707 + xy: 1367, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1326, 605 + xy: 1469, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1224, 503 + xy: 1659, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1122, 401 + xy: 1761, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1020, 299 + xy: 1530, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1632, 809 + xy: 1632, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1428, 605 + xy: 1734, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1530, 605 + xy: 1530, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1326, 401 + xy: 1632, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1428, 401 + xy: 1530, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1428, 299 + xy: 1734, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 FlagIcons/Dutch rotate: false - xy: 1875, 1901 + xy: 1897, 1910 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 277, 1647 + xy: 639, 1708 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 407, 1647 + xy: 769, 1708 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 277, 1517 + xy: 899, 1708 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 407, 1517 + xy: 1029, 1708 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 204, 1387 + xy: 1159, 1708 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 204, 1257 + xy: 1289, 1708 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 334, 1387 + xy: 1419, 1708 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 334, 1285 + xy: 639, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 204, 746 + xy: 843, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 639, 1523 + xy: 306, 1074 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 1353, 1523 + xy: 408, 1482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 1909, 1799 + xy: 612, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 306, 1053 + xy: 918, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 306, 645 + xy: 816, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 551, 61 + xy: 1326, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 872, 1319 + xy: 816, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1178, 1319 + xy: 1122, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 816, 1217 + xy: 1224, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 714, 809 + xy: 816, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 918, 809 + xy: 1224, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1224, 1013 + xy: 1020, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1020, 809 + xy: 1224, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1020, 809 + xy: 1224, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1530, 1217 + xy: 1020, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1224, 401 + xy: 1530, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 1734, 1215 + xy: 1734, 868 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Banner rotate: false - xy: 1297, 1727 + xy: 204, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 1695, 1851 + xy: 459, 1606 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 1353, 1625 + xy: 1761, 1634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 1484, 1421 + xy: 510, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 1659, 1625 + xy: 612, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 306, 849 + xy: 612, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1790, 1239 + xy: 714, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 612, 503 + xy: 714, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1122, 707 + xy: 1326, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 714, 299 + xy: 1326, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1632, 305 + xy: 1530, 722 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1224, 605 + xy: 755, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 281, 1777 + xy: 281, 1786 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 2, 137 + xy: 277, 1584 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 143, 134 + xy: 277, 1795 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1734, 1267 + xy: 583, 1786 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 1734, 1163 + xy: 1632, 766 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 1734, 1111 + xy: 1530, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1734, 1059 + xy: 1530, 618 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1734, 1007 + xy: 1530, 566 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1734, 955 + xy: 1530, 514 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1734, 903 + xy: 1530, 462 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1734, 851 + xy: 1530, 410 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1734, 799 + xy: 1530, 358 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1734, 747 + xy: 1530, 306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1734, 695 + xy: 1530, 254 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1734, 643 + xy: 1530, 202 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1734, 591 + xy: 1734, 816 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1734, 539 + xy: 1786, 868 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1734, 487 + xy: 1786, 816 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1734, 435 + xy: 1582, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1734, 383 + xy: 1582, 618 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1734, 331 + xy: 1582, 566 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1892, 1237 + xy: 1582, 514 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1944, 1237 + xy: 1582, 462 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1786, 1187 + xy: 1582, 410 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1786, 1135 + xy: 1582, 358 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1838, 1187 + xy: 1582, 306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1786, 1083 + xy: 1582, 254 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1838, 1135 + xy: 1582, 202 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1786, 1031 + xy: 1571, 150 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1838, 1083 + xy: 1571, 98 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1786, 979 + xy: 1836, 1480 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1838, 1031 + xy: 1836, 1428 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1786, 927 + xy: 1836, 1376 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1838, 979 + xy: 1836, 1324 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1786, 875 + xy: 1836, 1272 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1838, 927 + xy: 1836, 1220 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1786, 823 + xy: 1836, 1168 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1838, 875 + xy: 1836, 1116 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1786, 771 + xy: 1836, 1064 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1838, 823 + xy: 1836, 1012 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1786, 719 + xy: 1836, 960 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1838, 771 + xy: 347, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1786, 667 + xy: 399, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 204, 848 + xy: 1753, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 991, 1727 + xy: 204, 846 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 945, 1625 + xy: 306, 564 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 1557, 1523 + xy: 408, 1074 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 1178, 1421 + xy: 408, 360 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 1909, 1697 + xy: 510, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 1659, 1523 + xy: 714, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 306, 747 + xy: 714, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 408, 1081 + xy: 714, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 408, 775 + xy: 1020, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 408, 673 + xy: 1122, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 510, 265 + xy: 1020, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 347, 33 + xy: 1326, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 490, 163 + xy: 612, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1790, 1341 + xy: 1020, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1280, 1319 + xy: 1224, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 816, 911 + xy: 714, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 714, 707 + xy: 612, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1224, 809 + xy: 1224, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1020, 605 + xy: 1428, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 918, 503 + xy: 1122, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1224, 707 + xy: 1326, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1530, 911 + xy: 449, 54 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1020, 401 + xy: 959, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1428, 503 + xy: 1734, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1632, 605 + xy: 1734, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1530, 503 + xy: 1632, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1326, 299 + xy: 1734, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 1455, 1625 + xy: 408, 1380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 1455, 1523 + xy: 408, 1278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 281, 1829 + xy: 281, 1838 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 483, 1829 + xy: 483, 1838 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 685, 1829 + xy: 685, 1838 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 2, 945 + xy: 2, 954 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 2, 743 + xy: 1089, 1838 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 714, 1013 + xy: 714, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 1291, 1829 + xy: 1493, 1838 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 2, 339 + xy: 2, 146 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 918, 707 + xy: 1326, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 1493, 1829 + xy: 1695, 1838 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 1326, 809 + xy: 1428, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1122, 503 + xy: 857, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Acoustics rotate: false - xy: 204, 1052 + xy: 1651, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Agriculture rotate: false - xy: 204, 950 + xy: 741, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Animal Husbandry rotate: false - xy: 204, 542 + xy: 1047, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 204, 542 + xy: 1047, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archaeology rotate: false - xy: 184, 236 + xy: 1353, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archery rotate: false - xy: 464, 1415 + xy: 204, 1458 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Architecture rotate: false - xy: 143, 32 + xy: 204, 1356 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Astronomy rotate: false - xy: 787, 1727 + xy: 204, 1050 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 1195, 1727 + xy: 204, 642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 1603, 1727 + xy: 204, 234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 537, 1625 + xy: 306, 1380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 639, 1625 + xy: 306, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 1047, 1523 + xy: 306, 258 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 1047, 1523 + xy: 306, 258 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 1149, 1523 + xy: 1897, 1808 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 1557, 1625 + xy: 408, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 668, 1421 + xy: 408, 870 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 872, 1421 + xy: 408, 666 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 974, 1421 + xy: 408, 564 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 1076, 1421 + xy: 408, 462 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 1586, 1421 + xy: 510, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 1761, 1647 + xy: 510, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ecology rotate: false - xy: 1761, 1545 + xy: 612, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 1688, 1421 + xy: 714, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 1863, 1595 + xy: 816, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 245, 32 + xy: 612, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 436, 1285 + xy: 714, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 306, 951 + xy: 510, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 306, 543 + xy: 918, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 408, 979 + xy: 816, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 510, 979 + xy: 1020, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 510, 877 + xy: 1122, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 510, 367 + xy: 816, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 388, 135 + xy: 510, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 449, 33 + xy: 714, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 974, 1319 + xy: 918, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1484, 1319 + xy: 1428, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 1586, 1319 + xy: 510, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1688, 1319 + xy: 612, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 612, 1217 + xy: 816, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 612, 1115 + xy: 918, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 612, 1013 + xy: 1122, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 714, 1115 + xy: 1326, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 918, 1115 + xy: 1020, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 714, 911 + xy: 1224, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1122, 1217 + xy: 1428, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1224, 1217 + xy: 1020, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 816, 809 + xy: 1428, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1326, 1217 + xy: 816, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1224, 1115 + xy: 918, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1122, 1013 + xy: 1020, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 816, 707 + xy: 1326, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 612, 401 + xy: 714, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1428, 1217 + xy: 816, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1122, 911 + xy: 1122, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 612, 299 + xy: 918, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1428, 1115 + xy: 1122, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1326, 1013 + xy: 1224, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 816, 503 + xy: 1122, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 714, 401 + xy: 1224, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1632, 1217 + xy: 1326, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 918, 401 + xy: 143, 30 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 816, 299 + xy: 245, 30 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1530, 707 + xy: 1530, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1326, 503 + xy: 1632, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1122, 299 + xy: 1734, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1632, 401 + xy: 1632, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/CrosshatchHexagon rotate: false - xy: 2, 1551 + xy: 2, 1560 size: 273, 236 orig: 273, 236 offset: 0, 0 index: -1 TerrainIcons/Flood plains rotate: false - xy: 2, 1349 + xy: 2, 1358 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 2, 1147 + xy: 2, 1156 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Hexagon rotate: false - xy: 2, 1789 + xy: 2, 1798 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TerrainIcons/HexagonBorder rotate: false - xy: 2, 15 + xy: 2, 24 size: 139, 120 orig: 139, 120 offset: 0, 0 index: -1 +TerrainIcons/Hill + rotate: false + xy: 887, 1838 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 TerrainIcons/Jungle rotate: false - xy: 887, 1829 + xy: 2, 752 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1089, 1829 + xy: 2, 550 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +TerrainIcons/Mountain + rotate: false + xy: 1291, 1838 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 2, 541 + xy: 2, 348 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 2, 2 + xy: 551, 63 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 184, 134 + xy: 1455, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 685, 1727 + xy: 204, 1152 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 889, 1727 + xy: 204, 948 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 1705, 1749 + xy: 204, 132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 741, 1625 + xy: 306, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 741, 1523 + xy: 306, 870 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 843, 1523 + xy: 306, 666 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 945, 1523 + xy: 306, 462 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 1047, 1625 + xy: 306, 360 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 770, 1421 + xy: 408, 768 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 1382, 1421 + xy: 408, 156 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 408, 1183 + xy: 612, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 408, 877 + xy: 918, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 408, 469 + xy: 612, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 408, 367 + xy: 714, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 510, 1183 + xy: 816, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 510, 1081 + xy: 918, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 408, 265 + xy: 918, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1892, 1493 + xy: 816, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1892, 1289 + xy: 1122, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 592, 163 + xy: 1224, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 668, 1319 + xy: 612, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 770, 1319 + xy: 714, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1020, 1217 + xy: 918, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1530, 300 + xy: 1557, 1532 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1020, 911 + xy: 1122, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 714, 503 + xy: 816, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1530, 1115 + xy: 1428, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1326, 911 + xy: 1122, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1428, 911 + xy: 1326, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 918, 299 + xy: 1061, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1632, 707 + xy: 1632, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 204, 1154 + xy: 1549, 1735 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1224, 299 + xy: 1530, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1632, 503 + xy: 1632, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1530, 401 + xy: 1530, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 1705, 1727 + xy: 459, 1584 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 1761, 1523 + xy: 510, 156 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 1727, 1727 + xy: 481, 1584 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 204, 1529 + xy: 277, 1562 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 537, 1755 + xy: 1999, 1888 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 2005, 2009 + xy: 1855, 1816 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 1875, 1879 + xy: 306, 134 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 1863, 1727 + xy: 1530, 1584 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 334, 1263 + xy: 1684, 796 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 408, 243 + xy: 1632, 744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 1965, 1675 + xy: 1632, 722 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1863, 1573 + xy: 1530, 180 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 490, 141 + xy: 1571, 76 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 551, 39 + xy: 1836, 938 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 464, 1393 + xy: 2, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 612, 277 + xy: 451, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1734, 309 + xy: 1999, 1866 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1838, 749 + xy: 1855, 1794 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1786, 645 + xy: 1530, 1562 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 226, 1529 + xy: 1684, 774 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 537, 1733 + xy: 1706, 796 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 559, 1755 + xy: 1654, 744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 2005, 1987 + xy: 1593, 76 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1875, 1857 + xy: 1858, 938 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1863, 1705 + xy: 24, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1885, 1727 + xy: 451, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 356, 1263 + xy: 473, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 430, 243 + xy: 1999, 1844 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1965, 1653 + xy: 1855, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1987, 1675 + xy: 1530, 1540 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1863, 1551 + xy: 1706, 774 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 512, 141 + xy: 1654, 722 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 573, 39 + xy: 1634, 700 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 486, 1393 + xy: 46, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 634, 277 + xy: 473, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1756, 309 + xy: 495, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1838, 727 + xy: 1999, 1822 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 1860, 749 + xy: 1855, 1750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1786, 623 + xy: 1634, 678 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1808, 645 + xy: 68, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 248, 1529 + xy: 495, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 05049c9362..9bb7549e9b 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json index 35695ac306..63663ab40c 100644 --- a/android/assets/jsons/Terrains.json +++ b/android/assets/jsons/Terrains.json @@ -59,6 +59,12 @@ defenceBonus: 0.25, RGB: [74,81,40] }, + { + name:"Mountain", + type:"Land", + impassable:true, + RGB: [89, 45, 0] + }, // Terrain features { diff --git a/core/src/com/unciv/GameSettings.kt b/core/src/com/unciv/GameSettings.kt index b48d2ff239..aeeb829960 100644 --- a/core/src/com/unciv/GameSettings.kt +++ b/core/src/com/unciv/GameSettings.kt @@ -3,7 +3,7 @@ package com.unciv import com.unciv.logic.GameSaver class GameSettings { - var showWorkedTiles: Boolean = true + var showWorkedTiles: Boolean = false var showResourcesAndImprovements: Boolean = true var language: String = "English" var resolution: String = "1050x700" diff --git a/core/src/com/unciv/logic/automation/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/WorkerAutomation.kt index 3b4c133dc0..5aabb99bb8 100644 --- a/core/src/com/unciv/logic/automation/WorkerAutomation.kt +++ b/core/src/com/unciv/logic/automation/WorkerAutomation.kt @@ -94,6 +94,7 @@ class WorkerAutomation(val unit: MapUnit) { (it.civilianUnit== null || it == currentTile) && it.improvement == null && it.isLand() + && !it.getBaseTerrain().impassable && it.canBuildImprovement(chooseImprovement(it), unit.civInfo) && {val city=it.getCity(); city==null || it.getCity()?.civInfo == unit.civInfo}() // don't work tiles belonging to another civ }.sortedByDescending { getPriority(it, unit.civInfo) }.toMutableList() diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 3a5910a5b0..c6b7751754 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -113,6 +113,7 @@ class MapUnit { fun canPassThrough(tile: TileInfo):Boolean{ val tileOwner = tile.getOwner() + if(tile.getBaseTerrain().impassable) return false val isOcean = tile.baseTerrain == "Ocean" // profiling showed that 3.5% of all nextTurn time is taken up by string equals in this function =| if(tile.isWater() && type.isLandUnit()){ val techUniques = civInfo.tech.getUniques() diff --git a/core/src/com/unciv/logic/map/RandomMapGenerator.kt b/core/src/com/unciv/logic/map/RandomMapGenerator.kt index d9d896def2..037bb9e9e1 100644 --- a/core/src/com/unciv/logic/map/RandomMapGenerator.kt +++ b/core/src/com/unciv/logic/map/RandomMapGenerator.kt @@ -290,8 +290,12 @@ open class RandomMapGenerator { } fun randomizeTile(tileInfo: TileInfo){ - RandomMapGenerator().addRandomTerrainFeature(tileInfo) - RandomMapGenerator().addRandomResourceToTile(tileInfo) - RandomMapGenerator().maybeAddAncientRuins(tileInfo) + if(tileInfo.getBaseTerrain().type==TerrainType.Land && Math.random()<0.05f){ + tileInfo.baseTerrain = "Mountain" + tileInfo.setTransients() + } + addRandomTerrainFeature(tileInfo) + addRandomResourceToTile(tileInfo) + maybeAddAncientRuins(tileInfo) } } \ No newline at end of file diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 7708aff06e..c5e5ef7cfe 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -13,7 +13,7 @@ import kotlin.math.abs open class TileInfo { @Transient lateinit var tileMap: TileMap @Transient var owningCity:CityInfo?=null - @Transient lateinit var baseTerrainObject:Terrain + @Transient private lateinit var baseTerrainObject:Terrain var militaryUnit:MapUnit?=null var civilianUnit:MapUnit?=null @@ -253,6 +253,7 @@ open class TileInfo { if(!defencePercentString.startsWith("-")) defencePercentString = "+$defencePercentString" SB.appendln("[$defencePercentString] to unit defence".tr()) } + if(getBaseTerrain().impassable) SB.appendln("Impassible") return SB.toString().trim() } diff --git a/core/src/com/unciv/models/gamebasics/tile/Terrain.kt b/core/src/com/unciv/models/gamebasics/tile/Terrain.kt index 559009d694..86255783ab 100644 --- a/core/src/com/unciv/models/gamebasics/tile/Terrain.kt +++ b/core/src/com/unciv/models/gamebasics/tile/Terrain.kt @@ -51,7 +51,7 @@ class Terrain : NamedStats(), ICivilopedia { var RGB: List? = null var movementCost = 1 var defenceBonus:Float = 0f - var impassible = false + var impassable = false fun getColor(): Color = colorFromRGB(RGB!![0], RGB!![1], RGB!![2]) } \ No newline at end of file diff --git a/core/src/com/unciv/ui/cityscreen/YieldGroup.kt b/core/src/com/unciv/ui/cityscreen/YieldGroup.kt index 9781f1e5eb..5283ca2c3b 100644 --- a/core/src/com/unciv/ui/cityscreen/YieldGroup.kt +++ b/core/src/com/unciv/ui/cityscreen/YieldGroup.kt @@ -1,9 +1,11 @@ package com.unciv.ui.cityscreen +import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.models.stats.Stats import com.unciv.ui.utils.ImageGetter +import com.unciv.ui.utils.surroundWithCircle class YieldGroup : HorizontalGroup() { @@ -15,24 +17,28 @@ class YieldGroup : HorizontalGroup() { pack() } + fun getIcon(statName: String) = + ImageGetter.getStatIcon(statName).surroundWithCircle(20f) + .apply { circle.color= Color.BLACK;circle.color.a=0.5f } + private fun getStatIconsTable(statName: String, number: Int): Table { val table = Table() when (number) { - 1 -> table.add(ImageGetter.getStatIcon(statName)).size(20f) + 1 -> table.add(getIcon(statName)) 2 -> { - table.add(ImageGetter.getStatIcon(statName)).size(20f).row() - table.add(ImageGetter.getStatIcon(statName)).size(20f) + table.add(getIcon(statName)).row() + table.add(getIcon(statName)) } 3 -> { - table.add(ImageGetter.getStatIcon(statName)).size(20f).colspan(2).row() - table.add(ImageGetter.getStatIcon(statName)).size(20f) - table.add(ImageGetter.getStatIcon(statName)).size(20f) + table.add(getIcon(statName)).colspan(2).row() + table.add(getIcon(statName)) + table.add(getIcon(statName)) } 4 -> { - table.add(ImageGetter.getStatIcon(statName)).size(20f) - table.add(ImageGetter.getStatIcon(statName)).size(20f).row() - table.add(ImageGetter.getStatIcon(statName)).size(20f) - table.add(ImageGetter.getStatIcon(statName)).size(20f) + table.add(getIcon(statName)) + table.add(getIcon(statName)).row() + table.add(getIcon(statName)) + table.add(getIcon(statName)) } else -> { val largeImage = ImageGetter.getStatIcon(statName) diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index c0d7dbdab2..29d763cd4e 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -17,6 +17,7 @@ import com.unciv.ui.utils.center open class TileGroup(var tileInfo: TileInfo) : Group() { protected val hexagon = ImageGetter.getImage("TerrainIcons/Hexagon.png") + protected var baseTerrainImage: Image? = null protected var terrainFeatureImage: Image? = null protected var cityImage: Image? = null @@ -44,9 +45,22 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { addCircleImage() addFogImage(groupSize) addCrosshairImage() + addBaseTerrainImage() isTransform = false } + private fun addBaseTerrainImage() { + val imagePath = "TerrainIcons/"+tileInfo.baseTerrain + if(!ImageGetter.imageExists(imagePath)) return + baseTerrainImage = ImageGetter.getImage(imagePath) + baseTerrainImage!!.run { + color.a=0.25f + setSize(40f,40f) + center(this@TileGroup) + } + addActor(baseTerrainImage) + } + private fun addCircleImage() { circleImage.width = 50f circleImage.height = 50f diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index 480d2555f4..c4c3d86106 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -53,8 +53,12 @@ object ImageGetter { } } + fun imageExists(fileName:String): Boolean { + return atlas.findRegion(fileName)!=null + } + fun techIconExists(techName:String): Boolean { - return atlas.findRegion("TechIcons/$techName")!=null + return imageExists("TechIcons/$techName") } fun getStatIcon(statName: String): Image { diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 9c88f29162..058d2bbc64 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -268,9 +268,9 @@ class WorldScreen : CameraStageBaseScreen() { && civInfo.viewableTiles.any { it.getUnits().any { unit -> unit.civInfo.isBarbarianCivilization() } }) displayTutorials("BarbarianEncountered") if(civInfo.cities.size > 2) displayTutorials("SecondCity") - if(civInfo.happiness<0) displayTutorials("Unhappiness") + if(civInfo.happiness < 0) displayTutorials("Unhappiness") if(civInfo.goldenAges.isGoldenAge()) displayTutorials("GoldenAge") - if(gameInfo.turns>=100) displayTutorials("ContactMe") + if(gameInfo.turns >= 100) displayTutorials("ContactMe") val resources = civInfo.getCivResources() if(resources.keys.any { it.resourceType==ResourceType.Luxury }) displayTutorials("LuxuryResource") if(resources.keys.any { it.resourceType==ResourceType.Strategic}) displayTutorials("StrategicResource")