diff --git a/android/Images.ConstructionIcons/UnitIcons/Great Admiral.png b/android/Images.ConstructionIcons/UnitIcons/Great Admiral.png new file mode 100644 index 0000000000..244bbbda6c Binary files /dev/null and b/android/Images.ConstructionIcons/UnitIcons/Great Admiral.png differ diff --git a/android/assets/ConstructionIcons.atlas b/android/assets/ConstructionIcons.atlas index 82d4112629..9ec96900b8 100644 --- a/android/assets/ConstructionIcons.atlas +++ b/android/assets/ConstructionIcons.atlas @@ -6,2338 +6,2345 @@ filter: MipMapLinearLinear, Linear repeat: none BuildingIcons/Alhambra rotate: false - xy: 1176, 1912 + xy: 1176, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Amphitheater rotate: false - xy: 1284, 1912 + xy: 1284, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Angkor Wat rotate: false - xy: 1392, 1912 + xy: 1392, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 1716, 1912 + xy: 1716, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 1824, 1912 + xy: 1824, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 848, 1800 + xy: 848, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Arsenal rotate: false - xy: 112, 4 + xy: 112, 28 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 320, 1596 + xy: 320, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 428, 1596 + xy: 428, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 752, 1618 + xy: 752, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Big Ben rotate: false - xy: 320, 1488 + xy: 320, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bomb Shelter rotate: false - xy: 428, 1488 + xy: 428, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Brandenburg Gate rotate: false - xy: 752, 1510 + xy: 752, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 190, 1380 + xy: 190, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 298, 1380 + xy: 298, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/CN Tower rotate: false - xy: 190, 1164 + xy: 190, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 190, 948 + xy: 190, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cathedral rotate: false - xy: 190, 840 + xy: 190, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ceilidh Hall rotate: false - xy: 406, 1056 + xy: 406, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 298, 840 + xy: 298, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 190, 624 + xy: 190, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 298, 732 + xy: 298, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Coffee House rotate: false - xy: 406, 840 + xy: 406, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colosseum rotate: false - xy: 190, 516 + xy: 190, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colossus rotate: false - xy: 298, 624 + xy: 298, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Constabulary rotate: false - xy: 190, 300 + xy: 190, 324 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Courthouse rotate: false - xy: 860, 1476 + xy: 860, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 536, 1402 + xy: 536, 1426 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 622, 1294 + xy: 622, 1318 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 514, 970 + xy: 514, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Fallback rotate: false - xy: 622, 1078 + xy: 622, 1102 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Floating Gardens rotate: false - xy: 514, 862 + xy: 514, 886 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 622, 970 + xy: 622, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 514, 754 + xy: 514, 778 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Garden rotate: false - xy: 514, 538 + xy: 514, 562 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 514, 430 + xy: 514, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Grand Temple rotate: false - xy: 622, 538 + xy: 622, 562 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Great Firewall rotate: false - xy: 622, 430 + xy: 730, 562 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Great Mosque of Djenne rotate: false - xy: 730, 436 + xy: 730, 346 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Great Wall rotate: false - xy: 838, 1260 + xy: 838, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 838, 828 + xy: 838, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 838, 612 + xy: 838, 528 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanse rotate: false - xy: 838, 504 + xy: 838, 420 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 838, 396 + xy: 838, 312 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 730, 220 + xy: 946, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Heroic Epic rotate: false - xy: 838, 180 + xy: 946, 1068 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Himeji Castle rotate: false - xy: 169, 112 + xy: 946, 960 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 385, 112 + xy: 946, 528 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hubble Space Telescope rotate: false - xy: 436, 4 + xy: 946, 420 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 652, 4 + xy: 838, 204 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 946, 1044 + xy: 385, 216 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Kremlin rotate: false - xy: 946, 288 + xy: 1604, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 946, 180 + xy: 1712, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 1064, 1804 + xy: 968, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 1280, 1804 + xy: 968, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1388, 1804 + xy: 1076, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Longhouse rotate: false - xy: 1604, 1804 + xy: 1184, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Picchu rotate: false - xy: 1928, 1804 + xy: 1292, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Manhattan Project rotate: false - xy: 968, 1584 + xy: 1184, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1184, 1696 + xy: 1292, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mausoleum of Halicarnassus rotate: false - xy: 1076, 1588 + xy: 1400, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 1184, 1588 + xy: 1292, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1400, 1696 + xy: 1508, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Base rotate: false - xy: 1292, 1588 + xy: 1616, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1184, 1480 + xy: 1400, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1508, 1588 + xy: 1832, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1400, 1480 + xy: 1616, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mosque rotate: false - xy: 1292, 1372 + xy: 1724, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mud Pyramid Mosque rotate: false - xy: 1724, 1696 + xy: 1832, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mughal Fort rotate: false - xy: 1616, 1588 + xy: 1724, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1508, 1480 + xy: 1832, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1616, 1480 + xy: 1940, 1505 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National Epic rotate: false - xy: 1508, 1372 + xy: 1940, 1397 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National Intelligence Agency rotate: false - xy: 1832, 1589 + xy: 1054, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National Treasury rotate: false - xy: 1724, 1480 + xy: 1054, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 1616, 1372 + xy: 1054, 1068 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1724, 1372 + xy: 1054, 852 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1940, 1696 + xy: 1054, 636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1940, 1480 + xy: 1054, 420 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1940, 1372 + xy: 1054, 312 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1054, 1260 + xy: 1054, 204 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pagoda rotate: false - xy: 1054, 1152 + xy: 1162, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1054, 1044 + xy: 1162, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1054, 828 + xy: 1162, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1054, 504 + xy: 1162, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Petra rotate: false - xy: 1054, 288 + xy: 1378, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Police Station rotate: false - xy: 1270, 1264 + xy: 1378, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1162, 1048 + xy: 1486, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1162, 940 + xy: 1378, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pyramid rotate: false - xy: 1270, 1048 + xy: 1486, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Recycling Center rotate: false - xy: 1486, 1264 + xy: 1702, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1270, 940 + xy: 1270, 754 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Satrap's Court rotate: false - xy: 1702, 1264 + xy: 1486, 856 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1378, 832 + xy: 1810, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Shrine rotate: false - xy: 1162, 508 + xy: 1486, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1378, 724 + xy: 1702, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1270, 508 + xy: 1486, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1378, 616 + xy: 1594, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1594, 832 + xy: 1810, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1702, 940 + xy: 1162, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 1270, 400 + xy: 1486, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Zeus rotate: false - xy: 1378, 508 + xy: 1594, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stele rotate: false - xy: 1594, 724 + xy: 1810, 856 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1702, 832 + xy: 1270, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1162, 184 + xy: 1378, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1270, 292 + xy: 1486, 424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1270, 184 + xy: 1594, 424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1378, 292 + xy: 1702, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1594, 508 + xy: 1594, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple of Artemis rotate: false - xy: 1702, 616 + xy: 1702, 424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Terracotta Army rotate: false - xy: 1486, 292 + xy: 1702, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1594, 400 + xy: 1810, 424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1702, 508 + xy: 1810, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1486, 184 + xy: 1378, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1594, 292 + xy: 1486, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1702, 400 + xy: 1594, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1594, 184 + xy: 1702, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/United Nations rotate: false - xy: 1300, 76 + xy: 1486, 100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1408, 76 + xy: 1594, 100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Utopia Project rotate: false - xy: 1516, 76 + xy: 1702, 100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1810, 1156 + xy: 1918, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls of Babylon rotate: false - xy: 1810, 1048 + xy: 1918, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Wat rotate: false - xy: 1810, 616 + xy: 1918, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Water Mill rotate: false - xy: 268, 1812 + xy: 268, 1836 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1810, 508 + xy: 1918, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1810, 184 + xy: 1918, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 MayaCalendar/0 rotate: false - xy: 1042, 14 + xy: 1984, 42 size: 25, 50 orig: 25, 50 offset: 0, 0 index: -1 MayaCalendar/1 rotate: false - xy: 817, 162 + xy: 493, 266 size: 13, 50 orig: 13, 50 offset: 0, 0 index: -1 MayaCalendar/10 rotate: false - xy: 1951, 916 + xy: 275, 148 size: 21, 50 orig: 21, 50 offset: 0, 0 index: -1 MayaCalendar/11 rotate: false - xy: 1966, 1090 + xy: 1812, 42 size: 35, 50 orig: 35, 50 offset: 0, 0 index: -1 MayaCalendar/12 rotate: false - xy: 2009, 1090 + xy: 1855, 42 size: 35, 50 orig: 35, 50 offset: 0, 0 index: -1 MayaCalendar/13 rotate: false - xy: 1918, 974 + xy: 1898, 42 size: 35, 50 orig: 35, 50 offset: 0, 0 index: -1 MayaCalendar/14 rotate: false - xy: 1966, 1032 + xy: 1941, 42 size: 35, 50 orig: 35, 50 offset: 0, 0 index: -1 MayaCalendar/15 rotate: false - xy: 808, 1776 + xy: 808, 1800 size: 30, 50 orig: 30, 50 offset: 0, 0 index: -1 MayaCalendar/16 rotate: false - xy: 1976, 1206 + xy: 227, 148 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 MayaCalendar/17 rotate: false - xy: 1918, 1090 + xy: 1668, 42 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 MayaCalendar/18 rotate: false - xy: 1976, 1148 + xy: 1716, 42 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 MayaCalendar/19 rotate: false - xy: 1918, 1032 + xy: 1764, 42 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 MayaCalendar/2 rotate: false - xy: 190, 1490 + xy: 493, 208 size: 13, 50 orig: 13, 50 offset: 0, 0 index: -1 MayaCalendar/3 rotate: false - xy: 514, 1430 + xy: 190, 1514 size: 13, 50 orig: 13, 50 offset: 0, 0 index: -1 MayaCalendar/4 rotate: false - xy: 169, 232 + xy: 514, 1454 size: 13, 50 orig: 13, 50 offset: 0, 0 index: -1 MayaCalendar/5 rotate: false - xy: 190, 242 + xy: 286, 90 size: 10, 50 orig: 10, 50 offset: 0, 0 index: -1 MayaCalendar/6 rotate: false - xy: 1918, 916 + xy: 220, 90 size: 25, 50 orig: 25, 50 offset: 0, 0 index: -1 MayaCalendar/7 rotate: false - xy: 1961, 974 + xy: 220, 32 size: 25, 50 orig: 25, 50 offset: 0, 0 index: -1 MayaCalendar/8 rotate: false - xy: 2009, 1032 + xy: 253, 90 size: 25, 50 orig: 25, 50 offset: 0, 0 index: -1 MayaCalendar/9 rotate: false - xy: 1918, 858 + xy: 253, 32 size: 25, 50 orig: 25, 50 offset: 0, 0 index: -1 MayaCalendar/Baktun rotate: false - xy: 868, 14 + xy: 169, 148 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 MayaCalendar/Katun rotate: false - xy: 1918, 1206 + xy: 1436, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 MayaCalendar/Maya rotate: false - xy: 926, 14 + xy: 1494, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 MayaCalendar/Tun rotate: false - xy: 984, 14 + xy: 1610, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/ConvertCulture rotate: false - xy: 406, 516 + xy: 406, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/ConvertFaith rotate: false - xy: 298, 300 + xy: 298, 324 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/ConvertGold rotate: false - xy: 406, 408 + xy: 406, 432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/ConvertNothing rotate: false - xy: 406, 300 + xy: 406, 324 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/ConvertScience rotate: false - xy: 860, 1692 + xy: 860, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/WLTK 1 rotate: false - xy: 1624, 76 + xy: 1810, 100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/WLTK 2 rotate: false - xy: 1732, 76 + xy: 1270, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/WLTK LR rotate: false - xy: 1810, 1264 + xy: 1918, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/AddInCapital rotate: false - xy: 4, 4 + xy: 4, 28 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/AirSweep rotate: false - xy: 1068, 1912 + xy: 1068, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Automate rotate: false - xy: 592, 1726 + xy: 592, 1750 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/HurryConstruction rotate: false - xy: 592, 1726 + xy: 592, 1750 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/ConductTradeMission rotate: false - xy: 298, 516 + xy: 298, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/ConstructImprovement rotate: false - xy: 298, 408 + xy: 298, 432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Repair rotate: false - xy: 298, 408 + xy: 298, 432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/DisbandUnit rotate: false - xy: 514, 1294 + xy: 514, 1318 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/EnhanceReligion rotate: false - xy: 514, 1078 + xy: 514, 1102 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FoundReligion rotate: false - xy: 514, 1078 + xy: 514, 1102 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Escort rotate: false - xy: 622, 1186 + xy: 622, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Explore rotate: false - xy: 730, 1294 + xy: 730, 1318 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Fortify rotate: false - xy: 622, 862 + xy: 622, 886 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FortifyUntilHealed rotate: false - xy: 622, 862 + xy: 622, 886 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Guard rotate: false - xy: 622, 862 + xy: 622, 886 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FoundCity rotate: false - xy: 730, 970 + xy: 730, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/HideMore rotate: false - xy: 1840, 126 + xy: 1378, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitActionIcons/HurryPolicy rotate: false - xy: 493, 112 + xy: 946, 312 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/HurryResearch rotate: false - xy: 544, 4 + xy: 514, 238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/MoveTo rotate: false - xy: 1918, 1148 + xy: 1552, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitActionIcons/ShowMore rotate: false - xy: 1918, 1148 + xy: 1552, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitActionIcons/Paradrop rotate: false - xy: 1054, 720 + xy: 1270, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Pillage rotate: false - xy: 1162, 1156 + xy: 1270, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Present rotate: false - xy: 1270, 1156 + xy: 1594, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Promote rotate: false - xy: 514, 220 + xy: 1270, 862 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/Upgrade rotate: false - xy: 514, 220 + xy: 1270, 862 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/RemoveHeresy rotate: false - xy: 1162, 832 + xy: 1162, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/RoadConnection rotate: false - xy: 1486, 1156 + xy: 1486, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/SetUp rotate: false - xy: 1486, 940 + xy: 1162, 424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Skip rotate: false - xy: 1486, 832 + xy: 1810, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Sleep rotate: false - xy: 1702, 1048 + xy: 1270, 430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Star rotate: false - xy: 622, 220 + xy: 1270, 328 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/StartGoldenAge rotate: false - xy: 1162, 292 + xy: 1378, 424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Stop rotate: false - xy: 1378, 400 + xy: 1594, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/StopEscort rotate: false - xy: 1378, 400 + xy: 1594, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/StopMove rotate: false - xy: 1378, 400 + xy: 1594, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Swap rotate: false - xy: 1594, 616 + xy: 1810, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Transform rotate: false - xy: 4, 1548 + xy: 4, 1572 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlag rotate: false - xy: 4, 1756 + xy: 4, 1780 size: 256, 256 orig: 256, 256 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagCivilian rotate: false - xy: 4, 1137 + xy: 4, 1161 size: 178, 217 orig: 178, 217 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagCivilianInner rotate: false - xy: 4, 912 + xy: 4, 936 size: 178, 217 orig: 178, 217 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagEmbark rotate: false - xy: 4, 694 + xy: 4, 718 size: 178, 210 orig: 178, 210 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagFortify rotate: false - xy: 476, 1834 + xy: 476, 1858 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelection rotate: false - xy: 4, 508 + xy: 4, 532 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionCivilian rotate: false - xy: 4, 112 + xy: 4, 136 size: 157, 170 orig: 157, 170 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionEmbark rotate: false - xy: 4, 290 + xy: 4, 314 size: 178, 210 orig: 178, 210 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionFortify rotate: false - xy: 662, 1834 + xy: 662, 1858 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitIcons/African Forest Elephant rotate: false - xy: 960, 1912 + xy: 960, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Anti-Aircraft Gun rotate: false - xy: 1500, 1912 + xy: 1500, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Anti-Tank Gun rotate: false - xy: 1608, 1912 + xy: 1608, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 1932, 1912 + xy: 1932, 1936 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 268, 1704 + xy: 268, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Atlatlist rotate: false - xy: 376, 1704 + xy: 376, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Atomic Bomb rotate: false - xy: 484, 1726 + xy: 484, 1750 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/B17 rotate: false - xy: 700, 1726 + xy: 700, 1750 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 212, 1596 + xy: 212, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Battering Ram rotate: false - xy: 536, 1618 + xy: 536, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Battleship rotate: false - xy: 644, 1618 + xy: 644, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Berserker rotate: false - xy: 212, 1488 + xy: 212, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bomber rotate: false - xy: 536, 1510 + xy: 536, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 644, 1510 + xy: 644, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Brute rotate: false - xy: 190, 1272 + xy: 190, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Camel Archer rotate: false - xy: 298, 1272 + xy: 298, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 406, 1380 + xy: 406, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 190, 1056 + xy: 190, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Carolean rotate: false - xy: 298, 1164 + xy: 298, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Carrier rotate: false - xy: 406, 1272 + xy: 406, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cataphract rotate: false - xy: 298, 1056 + xy: 298, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 406, 1164 + xy: 406, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 298, 948 + xy: 298, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 190, 732 + xy: 190, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chu-Ko-Nu rotate: false - xy: 406, 948 + xy: 406, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Circle rotate: false - xy: 4, 1362 + xy: 4, 1386 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/ConstructionCircle rotate: false - xy: 4, 1362 + xy: 4, 1386 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 406, 732 + xy: 406, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Composite Bowman rotate: false - xy: 190, 408 + xy: 190, 432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Conquistador rotate: false - xy: 406, 624 + xy: 406, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cossack rotate: false - xy: 860, 1584 + xy: 860, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 644, 1402 + xy: 644, 1426 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Destroyer rotate: false - xy: 752, 1402 + xy: 752, 1426 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Dromon rotate: false - xy: 514, 1186 + xy: 514, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Fighter rotate: false - xy: 730, 1186 + xy: 730, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Foreign Legion rotate: false - xy: 730, 1078 + xy: 730, 1102 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 514, 646 + xy: 514, 670 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 622, 754 + xy: 622, 778 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galley rotate: false - xy: 730, 862 + xy: 730, 886 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 622, 646 + xy: 622, 670 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Giant Death Robot rotate: false - xy: 730, 754 + xy: 730, 778 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Great Admiral + rotate: false + xy: 730, 670 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 730, 646 + xy: 514, 346 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 514, 322 + xy: 622, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great General rotate: false - xy: 730, 544 + xy: 622, 352 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 622, 322 + xy: 730, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Prophet rotate: false - xy: 730, 328 + xy: 860, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 860, 1368 + xy: 838, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Bomber rotate: false - xy: 838, 1152 + xy: 838, 1068 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Infantry rotate: false - xy: 838, 1044 + xy: 838, 960 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Guided Missile rotate: false - xy: 838, 936 + xy: 838, 852 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hakkapeliitta rotate: false - xy: 838, 720 + xy: 838, 636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Helicopter Gunship rotate: false - xy: 838, 288 + xy: 946, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hoplite rotate: false - xy: 220, 4 + xy: 946, 852 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horse Archer rotate: false - xy: 277, 112 + xy: 946, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 328, 4 + xy: 946, 636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hussar rotate: false - xy: 601, 112 + xy: 622, 244 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hwach'a rotate: false - xy: 709, 112 + xy: 730, 238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Infantry rotate: false - xy: 760, 4 + xy: 946, 204 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Inquisitor rotate: false - xy: 946, 1260 + xy: 169, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 946, 1152 + xy: 277, 216 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Jaguar rotate: false - xy: 946, 936 + xy: 956, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Janissary rotate: false - xy: 946, 828 + xy: 1064, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Jet Fighter rotate: false - xy: 946, 720 + xy: 1172, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Keshik rotate: false - xy: 946, 612 + xy: 1280, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Khan rotate: false - xy: 946, 504 + xy: 1388, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 946, 396 + xy: 1496, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 868, 72 + xy: 1820, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 976, 72 + xy: 1928, 1828 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landsknecht rotate: false - xy: 956, 1800 + xy: 968, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Legion rotate: false - xy: 1172, 1804 + xy: 968, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1496, 1804 + xy: 1076, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1712, 1804 + xy: 1076, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 1820, 1804 + xy: 1184, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mandekalu Cavalry rotate: false - xy: 968, 1692 + xy: 1076, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Maori Warrior rotate: false - xy: 968, 1476 + xy: 1292, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Marauder rotate: false - xy: 968, 1368 + xy: 1400, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Marine rotate: false - xy: 1076, 1696 + xy: 1184, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 1292, 1696 + xy: 1508, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mehal Sefari rotate: false - xy: 1076, 1480 + xy: 1400, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1076, 1372 + xy: 1508, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Missile Cruiser rotate: false - xy: 1508, 1696 + xy: 1616, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Missionary rotate: false - xy: 1400, 1588 + xy: 1724, 1720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mobile SAM rotate: false - xy: 1292, 1480 + xy: 1508, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 1184, 1372 + xy: 1616, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mohawk Warrior rotate: false - xy: 1616, 1696 + xy: 1724, 1612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1400, 1372 + xy: 1832, 1396 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1832, 1697 + xy: 1940, 1721 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Naresuan's Elephant rotate: false - xy: 1724, 1588 + xy: 1940, 1613 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Norwegian Ski Infantry rotate: false - xy: 1832, 1481 + xy: 1054, 960 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Nuclear Missile rotate: false - xy: 1832, 1373 + xy: 1054, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Nuclear Submarine rotate: false - xy: 1940, 1588 + xy: 1054, 528 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Panzer rotate: false - xy: 1054, 936 + xy: 1270, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Paratrooper rotate: false - xy: 1054, 612 + xy: 1378, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Persian Immortal rotate: false - xy: 1054, 396 + xy: 1270, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pictish Warrior rotate: false - xy: 1054, 180 + xy: 1486, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1162, 1264 + xy: 1162, 856 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Privateer rotate: false - xy: 1378, 1264 + xy: 1162, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Quinquereme rotate: false - xy: 1378, 1156 + xy: 1594, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1378, 1048 + xy: 1378, 856 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 1594, 1264 + xy: 1594, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/SS Booster rotate: false - xy: 1162, 724 + xy: 1702, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/SS Cockpit rotate: false - xy: 1270, 832 + xy: 1810, 1288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/SS Engine rotate: false - xy: 1378, 940 + xy: 1162, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/SS Stasis Chamber rotate: false - xy: 1486, 1048 + xy: 1270, 646 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1594, 1156 + xy: 1378, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1162, 616 + xy: 1594, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sea Beggar rotate: false - xy: 1270, 724 + xy: 1702, 1072 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1594, 1048 + xy: 1270, 538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ship of the Line rotate: false - xy: 1702, 1156 + xy: 1378, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sipahi rotate: false - xy: 1270, 616 + xy: 1594, 856 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Skirmisher rotate: false - xy: 1594, 940 + xy: 1162, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Slinger rotate: false - xy: 1162, 400 + xy: 1378, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1486, 724 + xy: 1702, 856 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Stealth Bomber rotate: false - xy: 1486, 616 + xy: 1702, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 1486, 508 + xy: 1702, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1702, 724 + xy: 1486, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 1486, 400 + xy: 1810, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tercio rotate: false - xy: 1378, 184 + xy: 1810, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1702, 292 + xy: 1810, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Triplane rotate: false - xy: 1702, 184 + xy: 1270, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 1084, 71 + xy: 1162, 99 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Turtle Ship rotate: false - xy: 1192, 76 + xy: 1378, 100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Chariot rotate: false - xy: 1810, 940 + xy: 1918, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Elephant rotate: false - xy: 1810, 832 + xy: 1918, 856 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1810, 724 + xy: 1918, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1810, 400 + xy: 1918, 424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1810, 292 + xy: 1918, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Zero rotate: false - xy: 1918, 1264 + xy: 1918, 100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 pp_firework rotate: false - xy: 848, 1908 + xy: 848, 1932 size: 104, 104 orig: 104, 104 offset: 0, 0 diff --git a/android/assets/ConstructionIcons.png b/android/assets/ConstructionIcons.png index 763973342a..0d6394aebc 100644 Binary files a/android/assets/ConstructionIcons.png and b/android/assets/ConstructionIcons.png differ diff --git a/android/assets/jsons/Civ V - Gods & Kings/GlobalUniques.json b/android/assets/jsons/Civ V - Gods & Kings/GlobalUniques.json index 04c02fc4be..098f9977be 100644 --- a/android/assets/jsons/Civ V - Gods & Kings/GlobalUniques.json +++ b/android/assets/jsons/Civ V - Gods & Kings/GlobalUniques.json @@ -9,6 +9,7 @@ "Cannot build [Settler] units ", "Rebel units may spawn ", "[-1] Sight ", + "Enables [Great Admiral] units to enter ocean tiles", // TODO: Implement the uniques below // "[+20]% [Culture] [in all cities] ", diff --git a/android/assets/jsons/Civ V - Gods & Kings/Units.json b/android/assets/jsons/Civ V - Gods & Kings/Units.json index 024a9c6723..5462dd68a4 100644 --- a/android/assets/jsons/Civ V - Gods & Kings/Units.json +++ b/android/assets/jsons/Civ V - Gods & Kings/Units.json @@ -1658,6 +1658,17 @@ "Great Person - [War]", "Unbuildable", "Uncapturable"], "movement": 5 }, + { + "name": "Great Admiral", + "unitType": "Civilian Water", + "uniques": [ + "[+15]% Strength bonus for [{Military} {Water}] units within [2] tiles", + "[Target Unit] heals [100] HP ", + "Can be earned through combat", + "Is part of Great Person group [Admiral]", + "Great Person - [War]", "Unbuildable", "Uncapturable"], + "movement": 4 + }, /* Religious units */ diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt index 2c0264891d..b88580f588 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt @@ -87,7 +87,8 @@ object UniqueTriggerActivation { unit: MapUnit? = null, tile: Tile? = city?.getCenterTile() ?: unit?.currentTile, notification: String? = null, - triggerNotificationText: String? = null + triggerNotificationText: String? = null, + ignoreMultiModifiers: Boolean = false ): (()->Boolean)? { val relevantCity by lazy { @@ -119,6 +120,27 @@ object UniqueTriggerActivation { else Random(-550) // Very random indeed val ruleset = civInfo.gameInfo.ruleset + // Modifier trigger to iterate through multiple units + if (unique.hasModifier(UniqueType.TargetingUnitsWithinTiles) && !ignoreMultiModifiers) { + val modifiers = unique.getModifiers(UniqueType.TargetingUnitsWithinTiles) + if (tile != null) { + val triggerFunctions = modifiers.flatMap { + val mapUnitFilter = it.params[0] + tile.getTilesInDistance(it.params[1].toInt()) + .flatMap { it.getUnits() } + .filter { it.matchesFilter(mapUnitFilter) } + .mapNotNull { getTriggerFunction(unique, civInfo, city, it, it.getTile(), notification, triggerNotificationText, true) } + } + if (triggerFunctions.none()) return null + return { + for (triggerFunction in triggerFunctions) { + triggerFunction.invoke() + } + true + } + } else return null + } + when (unique.type) { UniqueType.TriggerEvent -> { val event = ruleset.events[unique.params[0]] ?: return null diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 1132a97ed8..9f5144afcf 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -969,6 +969,9 @@ enum class UniqueType( ///////////////////////////////////////////// region 90 META ///////////////////////////////////////////// + TargetingUnitsWithinTiles("targeting [mapUnitFilter] units within [positiveAmount] tiles", UniqueTarget.MetaModifier, + docDescription = "Modifies this unique to activate on each of the given units within the certain amount of tiles"), + ConditionalTimedUnique("for [nonNegativeAmount] turns", UniqueTarget.MetaModifier, docDescription = "Turns this unique into a trigger, activating this unique as a *global* unique for a number of turns"), diff --git a/docs/Credits.md b/docs/Credits.md index 764c49687d..7d69d3f831 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -160,6 +160,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: - [General](https://thenounproject.com/icon/general-933566) By anbileru adaleru for Great General - [Religion](https://thenounproject.com/icon/preach-53064) by Bruno Gätjens González adapted for Missionary - [invisibility cloak ](https://thenounproject.com/term/invisibility-cloak/1419648/) by Locad for Inquisitor +- [Anchor](https://thenounproject.com/icon/anchor-7764100/) by M. Adebadal for Great Admiral ### Units - AbsoluteUnits unitset images diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index 09e940f20b..7167a42f77 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -3848,6 +3848,13 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Modifiers that can be added to other uniques changing user experience, not their behavior +??? example "<targeting [mapUnitFilter] units within [positiveAmount] tiles>" + Modifies this unique to activate on each of the given units within the certain amount of tiles + + Example: "<targeting [Wounded] units within [3] tiles>" + + Applicable to: MetaModifier + ??? example "<for [nonNegativeAmount] turns>" Turns this unique into a trigger, activating this unique as a *global* unique for a number of turns