diff --git a/Credits.md b/Credits.md index a44fa2a7f6..966cbc7bc3 100644 --- a/Credits.md +++ b/Credits.md @@ -389,8 +389,8 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [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 * [Replace](https://thenounproject.com/search/?q=replace&i=17858) By Mike Rowe, AU -* [Resistance](https://thenounproject.com/term/revolution/1315305/) By By HeadsOfBirds, GB - +* [Resistance](https://thenounproject.com/term/revolution/1315305/) By HeadsOfBirds +* [Viking Hat](https://thenounproject.com/search/?q=pillage&i=185405) By my name is mud # Sound credits diff --git a/android/Images/OtherIcons/Pillage.png b/android/Images/OtherIcons/Pillage.png new file mode 100644 index 0000000000..dfa9e31dd0 Binary files /dev/null and b/android/Images/OtherIcons/Pillage.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index f80da642bd..1cb04a2e28 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,2625 +6,2632 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 281, 1744 + xy: 383, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 485, 1744 + xy: 587, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 587, 1744 + xy: 689, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 1097, 1744 + xy: 277, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 685, 1642 + xy: 787, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 991, 1642 + xy: 1093, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 1199, 1744 + xy: 1195, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 1403, 1764 + xy: 1833, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 1531, 1844 + xy: 143, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 1709, 1742 + xy: 234, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 334, 1540 + xy: 1811, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 436, 1540 + xy: 306, 813 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 334, 1336 + xy: 306, 711 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 334, 1132 + xy: 334, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 538, 1234 + xy: 640, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 640, 1132 + xy: 844, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 1048, 1540 + xy: 640, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 640, 928 + xy: 844, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 844, 1132 + xy: 1048, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 1150, 1336 + xy: 742, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 1150, 1030 + xy: 946, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 1150, 928 + xy: 1048, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 408, 826 + xy: 1150, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 408, 724 + xy: 1048, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 714, 724 + xy: 510, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 816, 826 + xy: 612, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1122, 826 + xy: 918, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1252, 1336 + xy: 1122, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 1224, 826 + xy: 1252, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 1224, 724 + xy: 1252, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1297, 1642 + xy: 1252, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 1807, 1640 + xy: 1399, 1659 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1354, 1438 + xy: 1705, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1456, 1538 + xy: 1354, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1558, 1436 + xy: 1456, 1557 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1456, 1232 + xy: 1558, 1557 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1558, 1334 + xy: 1456, 1353 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1456, 1130 + xy: 1558, 1353 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1762, 1436 + xy: 1456, 1047 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1456, 1028 + xy: 1456, 945 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1660, 1232 + xy: 1558, 945 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1864, 1436 + xy: 1660, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1762, 1232 + xy: 1762, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1660, 1028 + xy: 1660, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1762, 1130 + xy: 1762, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1864, 1232 + xy: 1864, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1530, 824 + xy: 1762, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1836, 824 + xy: 1428, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 284, 611 + xy: 1734, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 132, 172 + xy: 1938, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 132, 70 + xy: 1938, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 245, 305 + xy: 286, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 347, 305 + xy: 286, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 386, 612 + xy: 388, 609 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 998, 622 + xy: 592, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1202, 622 + xy: 694, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1304, 622 + xy: 898, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1712, 620 + xy: 1102, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1814, 620 + xy: 1000, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 449, 408 + xy: 1306, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 551, 520 + xy: 1408, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 653, 520 + xy: 1306, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 653, 316 + xy: 1918, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 755, 418 + xy: 1510, 435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 959, 520 + xy: 1612, 414 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 755, 316 + xy: 1714, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 857, 418 + xy: 1816, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1061, 520 + xy: 1918, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 857, 316 + xy: 449, 405 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 959, 418 + xy: 551, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 959, 316 + xy: 755, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1163, 316 + xy: 1265, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1265, 316 + xy: 438, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1469, 518 + xy: 653, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1673, 518 + xy: 1061, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 FlagIcons/Dutch rotate: false - xy: 1271, 1866 + xy: 2, 303 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 2, 328 + xy: 2, 173 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 1401, 1866 + xy: 2, 43 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 2, 198 + xy: 1471, 1863 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 2, 68 + xy: 1601, 1863 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Portuguese rotate: false - xy: 204, 1438 + xy: 204, 1435 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 204, 1308 + xy: 204, 1305 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 204, 1178 + xy: 204, 1175 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Simplified_Chinese rotate: false - xy: 204, 1048 + xy: 204, 1045 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 204, 918 + xy: 204, 915 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 204, 713 + xy: 204, 710 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 1879, 1946 + xy: 281, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 1837, 1844 + xy: 132, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 538, 1540 + xy: 334, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 334, 928 + xy: 538, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 538, 928 + xy: 742, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 946, 1336 + xy: 538, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 1252, 1030 + xy: 1252, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1603, 1640 + xy: 1224, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1909, 1640 + xy: 1501, 1659 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1558, 1538 + xy: 1326, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1660, 1130 + xy: 1660, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1428, 825 + xy: 1864, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1530, 722 + xy: 1530, 843 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1734, 722 + xy: 1632, 822 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1734, 722 + xy: 1632, 822 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 347, 407 + xy: 1734, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1265, 520 + xy: 959, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 277, 1590 + xy: 234, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Banner rotate: false - xy: 889, 1642 + xy: 991, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 2, 580 + xy: 1291, 1865 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 436, 1438 + xy: 334, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 742, 1438 + xy: 334, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 640, 1234 + xy: 844, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 742, 1132 + xy: 946, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1354, 928 + xy: 1354, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1864, 1028 + xy: 1864, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +OtherIcons/Pillage + rotate: false + xy: 2, 959 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 OtherIcons/Shield rotate: false - xy: 692, 622 + xy: 592, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1100, 622 + xy: 796, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 234, 5 + xy: 132, 2 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 551, 418 + xy: 1408, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 1271, 1996 + xy: 1471, 1993 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 1089, 1846 + xy: 2, 555 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 182, 713 + xy: 184, 754 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1981, 1996 + xy: 1977, 1993 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 2, 16 + xy: 277, 1587 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 336, 49 + xy: 1265, 363 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1469, 364 + xy: 286, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1775, 568 + xy: 1317, 363 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 54, 16 + xy: 338, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1521, 364 + xy: 1369, 363 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1775, 516 + xy: 390, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1827, 568 + xy: 442, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1573, 364 + xy: 1265, 311 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1775, 464 + xy: 1317, 311 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1827, 516 + xy: 1369, 311 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1879, 568 + xy: 1421, 363 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1625, 364 + xy: 1421, 311 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1827, 464 + xy: 494, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1879, 516 + xy: 1966, 1585 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1931, 568 + xy: 1966, 1533 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1677, 364 + xy: 1966, 1481 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1879, 464 + xy: 1966, 1429 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1931, 516 + xy: 1966, 1377 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1931, 464 + xy: 1966, 1325 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 388, 49 + xy: 1966, 1273 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1469, 312 + xy: 1966, 1221 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1521, 312 + xy: 1966, 1169 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1573, 312 + xy: 1966, 1117 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1625, 312 + xy: 1966, 1065 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1677, 312 + xy: 1966, 1013 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1775, 412 + xy: 1966, 961 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1827, 412 + xy: 540, 261 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1879, 412 + xy: 540, 209 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1931, 412 + xy: 592, 261 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1966, 1588 + xy: 540, 157 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1966, 1536 + xy: 592, 209 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1966, 1484 + xy: 644, 261 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1966, 1432 + xy: 540, 105 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1966, 1380 + xy: 592, 157 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1966, 1328 + xy: 644, 209 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1966, 1276 + xy: 696, 261 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1966, 1224 + xy: 592, 105 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1966, 1172 + xy: 644, 157 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1777, 1946 + xy: 1875, 1943 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 583, 1642 + xy: 685, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 1939, 1844 + xy: 1403, 1761 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 640, 1540 + xy: 538, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 436, 1132 + xy: 538, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 436, 1030 + xy: 640, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 742, 1336 + xy: 334, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 844, 1234 + xy: 1048, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 1048, 1336 + xy: 640, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 946, 1132 + xy: 1048, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 1048, 1234 + xy: 1150, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 714, 826 + xy: 510, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 816, 724 + xy: 612, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 918, 724 + xy: 714, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1122, 724 + xy: 918, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1354, 1540 + xy: 1603, 1659 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1558, 1028 + xy: 1762, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1864, 1130 + xy: 1762, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 590, 622 + xy: 490, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 794, 622 + xy: 490, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 896, 622 + xy: 694, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1610, 620 + xy: 898, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 449, 306 + xy: 1204, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 653, 418 + xy: 1714, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1265, 418 + xy: 1367, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1367, 417 + xy: 438, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1367, 315 + xy: 551, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1469, 416 + xy: 755, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Acquire rotate: false - xy: 1573, 1946 + xy: 184, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 334, 1234 + xy: 436, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 436, 1336 + xy: 334, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 281, 1846 + xy: 281, 1843 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 2, 1366 + xy: 2, 1363 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 483, 1846 + xy: 483, 1843 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 2, 1164 + xy: 2, 1161 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 685, 1846 + xy: 685, 1843 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 1762, 1538 + xy: 1456, 1251 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 2, 962 + xy: 887, 1843 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 887, 1846 + xy: 2, 757 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1836, 722 + xy: 1632, 720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 245, 509 + xy: 1836, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 2, 760 + xy: 1089, 1843 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 1508, 620 + xy: 1000, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 755, 520 + xy: 1510, 537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Acoustics rotate: false - xy: 182, 611 + xy: 184, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Agriculture rotate: false - xy: 1675, 1946 + xy: 1773, 1943 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Animal Husbandry rotate: false - xy: 383, 1744 + xy: 485, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 383, 1744 + xy: 485, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archaeology rotate: false - xy: 689, 1744 + xy: 791, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archery rotate: false - xy: 893, 1744 + xy: 995, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Architecture rotate: false - xy: 995, 1744 + xy: 1097, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Astronomy rotate: false - xy: 379, 1642 + xy: 481, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 787, 1642 + xy: 889, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 1195, 1642 + xy: 1301, 1763 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 143, 478 + xy: 1935, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 1633, 1844 + xy: 132, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 306, 714 + xy: 1709, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 306, 714 + xy: 1709, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 334, 1438 + xy: 1913, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 538, 1438 + xy: 436, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 436, 1234 + xy: 436, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 640, 1438 + xy: 640, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 742, 1540 + xy: 334, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 334, 1030 + xy: 436, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 844, 1540 + xy: 436, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 844, 1438 + xy: 436, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ecology rotate: false - xy: 946, 1540 + xy: 538, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 436, 928 + xy: 640, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 538, 1030 + xy: 742, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 742, 1234 + xy: 946, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electronics rotate: false - xy: 844, 1336 + xy: 436, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 946, 1438 + xy: 538, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 640, 1030 + xy: 844, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 1048, 1438 + xy: 640, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 1150, 1438 + xy: 742, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 1150, 1132 + xy: 1048, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 1048, 928 + xy: 1150, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 612, 826 + xy: 408, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 918, 826 + xy: 714, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1020, 826 + xy: 816, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1705, 1640 + xy: 1297, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1354, 1234 + xy: 1909, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 1354, 1132 + xy: 1354, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1354, 1030 + xy: 1354, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1326, 826 + xy: 1354, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1326, 724 + xy: 1354, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1456, 1436 + xy: 1354, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1456, 1334 + xy: 1326, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1660, 1334 + xy: 1558, 1251 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1864, 1538 + xy: 1558, 1149 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1558, 1130 + xy: 1558, 1047 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1864, 1334 + xy: 1864, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1762, 1028 + xy: 1660, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1558, 926 + xy: 1660, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1660, 926 + xy: 1762, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1762, 926 + xy: 1864, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1428, 723 + xy: 1864, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1632, 824 + xy: 1864, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1734, 824 + xy: 1428, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1632, 722 + xy: 1530, 741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1938, 824 + xy: 1734, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replacable Parts rotate: false - xy: 1938, 722 + xy: 1836, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 245, 407 + xy: 1632, 618 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 143, 376 + xy: 1836, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 132, 274 + xy: 1938, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 234, 203 + xy: 347, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 234, 101 + xy: 336, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 336, 203 + xy: 336, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1916, 620 + xy: 1204, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 449, 510 + xy: 1102, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1163, 520 + xy: 653, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1061, 418 + xy: 857, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1061, 316 + xy: 1061, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1673, 416 + xy: 1163, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/CrosshatchHexagon rotate: false - xy: 2, 1568 + xy: 2, 1565 size: 273, 236 orig: 273, 236 offset: 0, 0 index: -1 TerrainIcons/Flood plains rotate: false - xy: 1150, 1540 + xy: 742, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 742, 1030 + xy: 946, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Hexagon rotate: false - xy: 2, 1806 + xy: 2, 1803 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TerrainIcons/HexagonBorder rotate: false - xy: 2, 458 + xy: 2, 433 size: 139, 120 orig: 139, 120 offset: 0, 0 index: -1 TerrainIcons/Hill rotate: false - xy: 510, 826 + xy: 1150, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 1252, 1540 + xy: 1020, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Lakes rotate: false - xy: 1252, 1234 + xy: 1122, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1354, 1336 + xy: 1807, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Mountain rotate: false - xy: 1660, 1436 + xy: 1558, 1455 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 1762, 1334 + xy: 1660, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 182, 598 + xy: 2, 30 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 791, 1744 + xy: 893, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 277, 1642 + xy: 379, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 481, 1642 + xy: 583, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Battleship rotate: false - xy: 1093, 1642 + xy: 1199, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 1301, 1764 + xy: 1731, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Camel Archer rotate: false - xy: 1735, 1844 + xy: 132, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 1505, 1742 + xy: 245, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 1607, 1742 + xy: 234, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 1811, 1742 + xy: 234, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 1913, 1742 + xy: 1505, 1761 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 306, 816 + xy: 1607, 1761 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 538, 1336 + xy: 538, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 640, 1336 + xy: 742, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Destroyer rotate: false - xy: 538, 1132 + xy: 742, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 946, 1234 + xy: 1150, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 742, 928 + xy: 844, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 844, 1030 + xy: 946, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 844, 928 + xy: 844, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 946, 1030 + xy: 946, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great General rotate: false - xy: 1048, 1132 + xy: 1048, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 1150, 1234 + xy: 1150, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 946, 928 + xy: 844, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Infantry rotate: false - xy: 1048, 1030 + xy: 946, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hoplite rotate: false - xy: 510, 724 + xy: 1150, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 612, 724 + xy: 408, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1020, 724 + xy: 816, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1252, 1438 + xy: 1020, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1252, 1132 + xy: 1252, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 1252, 928 + xy: 1252, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1399, 1662 + xy: 1252, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1501, 1640 + xy: 1224, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1660, 1538 + xy: 1456, 1455 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1558, 1232 + xy: 1456, 1149 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1456, 927 + xy: 1660, 924 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1864, 926 + xy: 1762, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 347, 509 + xy: 1530, 639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 336, 101 + xy: 336, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 488, 622 + xy: 388, 507 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1406, 621 + xy: 796, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 551, 316 + xy: 1612, 516 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 857, 520 + xy: 1816, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1163, 418 + xy: 1163, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 204, 815 + xy: 204, 812 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1367, 519 + xy: 438, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1571, 518 + xy: 857, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1571, 416 + xy: 959, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 182, 738 + xy: 1709, 1841 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 1505, 1844 + xy: 1301, 1741 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 277, 1568 + xy: 1660, 1637 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 182, 716 + xy: 277, 1565 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 299, 1568 + xy: 1323, 1741 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 1456, 1640 + xy: 1682, 1637 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 1478, 1640 + xy: 299, 1565 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 1531, 1974 + xy: 1345, 1741 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 2018, 700 + xy: 1367, 1741 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 1981, 1974 + xy: 1731, 1971 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 336, 27 + xy: 143, 533 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 106, 46 + xy: 1977, 1971 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 1983, 598 + xy: 234, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1729, 394 + xy: 1469, 495 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 2015, 1822 + xy: 2015, 1819 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 1966, 1150 + xy: 1966, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1531, 1952 + xy: 696, 239 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 2018, 678 + xy: 748, 291 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1981, 1952 + xy: 644, 135 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 2003, 1974 + xy: 2, 8 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 336, 5 + xy: 1731, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 358, 27 + xy: 143, 511 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 106, 24 + xy: 1977, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 106, 2 + xy: 1999, 1971 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1983, 576 + xy: 234, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1729, 372 + xy: 256, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1751, 394 + xy: 1469, 473 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 2015, 1800 + xy: 2015, 1797 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1966, 1128 + xy: 1988, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1988, 1150 + xy: 696, 217 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 2018, 656 + xy: 718, 239 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 2003, 1952 + xy: 748, 269 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 358, 5 + xy: 770, 291 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 380, 27 + xy: 644, 113 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1983, 554 + xy: 666, 135 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1729, 350 + xy: 24, 8 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1751, 372 + xy: 1999, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 2015, 1778 + xy: 256, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1966, 1106 + xy: 278, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1988, 1128 + xy: 1469, 451 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 2018, 634 + xy: 2015, 1775 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 380, 5 + xy: 696, 195 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 402, 27 + xy: 718, 217 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 1983, 532 + xy: 770, 269 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index a5d4ce0175..c50ceba397 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index 8b436f980b..20947d14ac 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -47,7 +47,7 @@ name:"France", mainColor:[ 38, 98, 255], secondaryColor:[239,236,148], - unique:"+2 Culture per turn from Cities before discovering Steam Power" + unique:"+2 Culture per turn from cities before discovering Steam Power", cities:["Paris","Orleans","Lyon","Troyes","Tours","Marseille","Chartres","Avignon","Rouen","Grenoble", "Dijon","Amiens","Cherbourg","Poitiers","Toulouse","Bayonne","Strasbourg","Brest","Bordeaux","Rennes", "Nice","Saint Etienne","Nantes","Reims","Le Mans","Montpellier","Limoges","Nancy","Lille","Caen"] diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 8c52ab4e40..72c63ceeb2 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -255,6 +255,8 @@ Spanish:"Explorar" } + "Pillage":{} + "Do you really want to disband this unit?":{ Italian:"Vuoi davvero sciogliere questa unità?" Russian:"Вы действительно хотите распустить этот юнит?" @@ -285,7 +287,6 @@ Simplified_Chinese:"不" Portuguese:"Sim" } - // Stats "Gold":{ diff --git a/android/build.gradle b/android/build.gradle index fce2b63135..ce0039609f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 187 - versionName "2.11.5" + versionCode 188 + versionName "2.11.6" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 6b28a76394..20b435fb38 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -136,7 +136,7 @@ class UnitAutomation{ class AttackableTile(val tileToAttackFrom:TileInfo, val tileToAttack:TileInfo) - fun getAttackableEnemies(unit: MapUnit, unitDistanceToTiles: HashMap, minMovBeforeAtaack: Float = 0.1f): ArrayList { + fun getAttackableEnemies(unit: MapUnit, unitDistanceToTiles: HashMap, minMovementBeforeAttack: Float = 0.1f): ArrayList { val tilesWithEnemies = unit.civInfo.viewableTiles .filter { containsAttackableEnemy(it,unit) } @@ -149,7 +149,7 @@ class UnitAutomation{ // So the poor unit thought it could attack from the tile, but when it comes to do so it has no movement points! // Silly floats, basically var tilesToAttackFrom = unitDistanceToTiles.asSequence() - .filter { unit.currentMovement - it.value >= minMovBeforeAtaack } + .filter { unit.currentMovement - it.value >= minMovementBeforeAttack } .map { it.key } .filter { unit.canMoveTo(it) || it==unit.getTile() } diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index ead96b1ec8..d3aa99e27b 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -6,7 +6,6 @@ import com.unciv.logic.city.CityInfo import com.unciv.logic.map.TileInfo import com.unciv.models.gamebasics.unit.UnitType import java.util.* -import kotlin.math.max /** * Damage calculations according to civ v wiki and https://steamcommunity.com/sharedfiles/filedetails/?id=170194443 @@ -80,7 +79,7 @@ class Battle(val gameInfo:GameInfo) { if (unit.hasUnique("Can move after attacking") || (unit.hasUnique("1 additional attack per turn") && unit.attacksThisTurn==0)){ if(!attacker.getUnitType().isMelee() || !defender.isDefeated()) // if it was a melee attack and we won, then the unit ALREADY got movement points deducted, for the movement to the enemie's tile! - unit.currentMovement = max(0f, unit.currentMovement - 1) + unit.useMovementPoints(1f) } else unit.currentMovement = 0f unit.attacksThisTurn+=1 diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 2eedf27f96..42b88b6253 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -121,7 +121,7 @@ class CityStats { if(civUnique == "+2 Culture per turn from cities before discovering Steam Power") stats.culture += 2 - + return stats } diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index de7c67c132..27e4988a78 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -212,6 +212,12 @@ class MapUnit { baseUnit=GameBasics.Units[name]!! updateUniques() } + + fun useMovementPoints(amount:Float){ + currentMovement -= amount + if(currentMovement<0) currentMovement = 0f + } + fun doPreTurnAction() { val currentTile = getTile() if (currentMovement == 0f) return // We've already done stuff this turn, and can't do any more stuff @@ -232,7 +238,7 @@ class MapUnit { if(gotTo==currentTile) // We didn't move at all return if (gotTo.position == destinationVector) action = null - if (currentMovement != 0f) doPreTurnAction() + if (currentMovement >0) doPreTurnAction() return } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index e8784e62bc..c49e90fc44 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -15,7 +15,7 @@ import com.unciv.ui.pickerscreens.TechPickerScreen import com.unciv.ui.worldscreen.WorldScreen import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable import java.util.* -import kotlin.math.max +import kotlin.math.min class UnitAction(var name: String, var canAct:Boolean, var action:()->Unit){ var sound="click" @@ -39,24 +39,24 @@ class UnitActions { if(!unit.type.isCivilian() && !unit.isEmbarked() && !unit.type.isWaterUnit() && !unit.hasUnique("No defensive terrain bonus") && !unit.isFortified()) { - actionList += UnitAction("Fortify", unit.currentMovement != 0f) + actionList += UnitAction("Fortify", unit.currentMovement >0) { unit.action = "Fortify 0" }.sound("fortify") } if(!unit.isFortified() && actionList.none{it.name=="Fortify"} && unit.action!="Sleep") { - actionList += UnitAction("Sleep",unit.currentMovement != 0f) { unit.action = "Sleep" } + actionList += UnitAction("Sleep",unit.currentMovement >0) { unit.action = "Sleep" } } if(unit.type == UnitType.Scout){ if(unit.action != "explore") - actionList += UnitAction("Explore",unit.currentMovement != 0f) + actionList += UnitAction("Explore",unit.currentMovement >0) { UnitAutomation().automatedExplore(unit); unit.action = "explore" } else actionList += UnitAction("Stop exploration", true) { unit.action = null } } if(!unit.type.isCivilian() && unit.promotions.canBePromoted()) { - actionList += UnitAction("Promote", unit.currentMovement != 0f) + actionList += UnitAction("Promote", unit.currentMovement >0) { UnCivGame.Current.screen = PromotionPickerScreen(unit) }.sound("promote") } @@ -96,13 +96,24 @@ class UnitActions { } } + if(!unit.type.isCivilian() && tile.improvement !=null && unit.health<100){ + actionList += UnitAction("Pillage", unit.currentMovement>0) + { + tile.improvementInProgress = tile.improvement + tile.turnsToImprovement = 2 + tile.improvement = null + unit.useMovementPoints(1f) + unit.health = min(100,unit.health+25) + } + } + if(unit.hasUnique("Must set up to ranged attack") && unit.action != "Set Up" && !unit.isEmbarked()) - actionList+=UnitAction("Set up",unit.currentMovement != 0f) - {unit.action="Set Up"; unit.currentMovement = max(0f, unit.currentMovement-1)}.sound("setup") + actionList+=UnitAction("Set up",unit.currentMovement >0) + {unit.action="Set Up"; unit.useMovementPoints(1f)}.sound("setup") if (unit.hasUnique("Founds a new city") && !unit.isEmbarked()) { actionList += UnitAction("Found city", - unit.currentMovement != 0f && + unit.currentMovement >0 && !tile.getTilesInDistance(3).any { it.isCityCenter() }) { worldScreen.displayTutorials("CityFounded") @@ -116,7 +127,7 @@ class UnitActions { if (unit.hasUnique("Can build improvements on tiles") && !unit.isEmbarked()) { actionList += UnitAction("Construct improvement", - unit.currentMovement != 0f + unit.currentMovement >0 && !tile.isCityCenter() && GameBasics.TileImprovements.values.any { tile.canBuildImprovement(it, unit.civInfo) } ) { worldScreen.game.screen = ImprovementPickerScreen(tile) } @@ -125,7 +136,7 @@ class UnitActions { actionList += UnitAction("Stop automation",true) {unit.action = null} } else { - actionList += UnitAction("Automate", unit.currentMovement != 0f) + actionList += UnitAction("Automate", unit.currentMovement >0) { unit.action = "automation" WorkerAutomation(unit).automateWorkerAction() @@ -139,7 +150,7 @@ class UnitActions { && tile.getTileResource().improvement == improvement && unit.civInfo.tech.isResearched(GameBasics.TileImprovements[improvement]!!.techRequired!!) ) - actionList += UnitAction("Create [$improvement]", unit.currentMovement != 0f) { + actionList += UnitAction("Create [$improvement]", unit.currentMovement >0) { tile.improvement = improvement unit.destroy() } @@ -148,7 +159,7 @@ class UnitActions { for(unique in unit.getUniques().filter { it.startsWith("Can build improvement: ") }){ val improvementName = unique.replace("Can build improvement: ","") actionList += UnitAction("Create [$improvementName]", - unit.currentMovement != 0f && !tile.isCityCenter() + unit.currentMovement >0f && !tile.isCityCenter() ) { unit.getTile().terrainFeature=null // remove forest/jungle/marsh unit.getTile().improvement = improvementName @@ -160,7 +171,7 @@ class UnitActions { if (unit.name == "Great Scientist" && !unit.isEmbarked()) { - actionList += UnitAction( "Discover Technology",unit.currentMovement != 0f + actionList += UnitAction( "Discover Technology",unit.currentMovement >0 ) { unit.civInfo.tech.freeTechs += 1 unit.destroy() @@ -169,7 +180,7 @@ class UnitActions { } if (unit.hasUnique("Can start an 8-turn golden age") && !unit.isEmbarked()) { - actionList += UnitAction( "Start Golden Age",unit.currentMovement != 0f + actionList += UnitAction( "Start Golden Age",unit.currentMovement >0 ) { unit.civInfo.goldenAges.enterGoldenAge() unit.destroy() @@ -178,7 +189,7 @@ class UnitActions { if (unit.name == "Great Engineer" && !unit.isEmbarked()) { actionList += UnitAction( "Hurry Wonder", - unit.currentMovement != 0f && + unit.currentMovement >0 && tile.isCityCenter() && tile.getCity()!!.cityConstructions.getCurrentConstruction() is Building && (tile.getCity()!!.cityConstructions.getCurrentConstruction() as Building).isWonder @@ -189,7 +200,7 @@ class UnitActions { } if (unit.name == "Great Merchant" && !unit.isEmbarked()) { - actionList += UnitAction("Conduct Trade Mission", unit.currentMovement != 0f + actionList += UnitAction("Conduct Trade Mission", unit.currentMovement >0 ) { // http://civilization.wikia.com/wiki/Great_Merchant_(Civ5) val goldGained = 350 + 50 * unit.civInfo.getEra().ordinal @@ -199,7 +210,7 @@ class UnitActions { }.sound("chimes") } - actionList += UnitAction("Disband unit",unit.currentMovement != 0f + actionList += UnitAction("Disband unit",unit.currentMovement >0 ) { YesNoPopupTable("Do you really want to disband this unit?".tr(), {unit.destroy(); worldScreen.shouldUpdate=true} ) diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index c08a6b8c91..e5e9afcb7b 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -23,11 +23,11 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ when(unitAction){ "Move unit" -> return ImageGetter.getStatIcon("Movement") "Stop movement"-> return ImageGetter.getStatIcon("Movement").apply { color= Color.RED } - "Fortify" -> return ImageGetter.getImage("OtherIcons/Shield.png").apply { color= Color.BLACK } - "Promote" -> return ImageGetter.getImage("OtherIcons/Star.png").apply { color= Color.GOLD } + "Fortify" -> return ImageGetter.getImage("OtherIcons/Shield").apply { color= Color.BLACK } + "Promote" -> return ImageGetter.getImage("OtherIcons/Star").apply { color= Color.GOLD } "Construct improvement" -> return ImageGetter.getUnitIcon("Worker") "Automate" -> return ImageGetter.getUnitIcon("Great Engineer") - "Stop automation" -> return ImageGetter.getImage("OtherIcons/Stop.png") + "Stop automation" -> return ImageGetter.getImage("OtherIcons/Stop") "Found city" -> return ImageGetter.getUnitIcon("Settler") "Discover Technology" -> return ImageGetter.getUnitIcon("Great Scientist") "Construct Academy" -> return ImageGetter.getImprovementIcon("Academy") @@ -38,13 +38,14 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ "Conduct Trade Mission" -> return ImageGetter.getUnitIcon("Great Merchant") "Construct Customs House" -> return ImageGetter.getImprovementIcon("Customs house") "Set up" -> return ImageGetter.getUnitIcon("Catapult") - "Disband unit" -> return ImageGetter.getImage("OtherIcons/DisbandUnit.png") - "Sleep" -> return ImageGetter.getImage("OtherIcons/Sleep.png") + "Disband unit" -> return ImageGetter.getImage("OtherIcons/DisbandUnit") + "Sleep" -> return ImageGetter.getImage("OtherIcons/Sleep") "Explore" -> return ImageGetter.getUnitIcon("Scout") "Stop exploration" -> return ImageGetter.getImage("OtherIcons/Stop.png") "Create Fishing Boats" -> return ImageGetter.getImprovementIcon("Fishing Boats") "Create Oil well" -> return ImageGetter.getImprovementIcon("Oil well") - else -> return ImageGetter.getImage("OtherIcons/Star.png") + "Pillage" -> return ImageGetter.getImage("OtherIcons/Pillage") + else -> return ImageGetter.getImage("OtherIcons/Star") } }