diff --git a/android/Images/StatIcons/Acquire.png b/android/Images/StatIcons/Acquire.png index 3447cf8329..52211234a7 100644 Binary files a/android/Images/StatIcons/Acquire.png and b/android/Images/StatIcons/Acquire.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 9529086009..4d05fb693a 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,2499 +6,2499 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 143, 447 + xy: 1879, 1946 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 383, 1735 + xy: 383, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 485, 1735 + xy: 485, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 995, 1735 + xy: 995, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 583, 1633 + xy: 583, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 889, 1633 + xy: 889, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 991, 1633 + xy: 991, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 1195, 1633 + xy: 1195, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 1731, 1835 + xy: 1403, 1764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 1607, 1755 + xy: 1837, 1844 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 306, 863 + xy: 1913, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 334, 1531 + xy: 306, 974 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 334, 1429 + xy: 306, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 538, 1429 + xy: 538, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 640, 1327 + xy: 640, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 946, 1327 + xy: 946, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 946, 1225 + xy: 946, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 510, 1123 + xy: 1150, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 510, 1021 + xy: 408, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 714, 1021 + xy: 714, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 918, 1021 + xy: 918, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 1020, 1123 + xy: 714, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 816, 817 + xy: 816, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 918, 919 + xy: 918, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 1122, 1021 + xy: 1122, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 1020, 817 + xy: 918, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 714, 715 + xy: 408, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 184, 556 + xy: 1122, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 408, 613 + xy: 306, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 918, 613 + xy: 714, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 306, 557 + xy: 1020, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1122, 511 + xy: 918, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1252, 1225 + xy: 1252, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1224, 1123 + xy: 1252, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1224, 1021 + xy: 1252, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1224, 715 + xy: 1224, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1297, 1633 + xy: 1224, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1501, 1653 + xy: 1297, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1807, 1631 + xy: 1603, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1354, 1531 + xy: 1807, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1354, 1225 + xy: 1354, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1326, 1021 + xy: 1354, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1326, 919 + xy: 1326, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Paper maker +BuildingIcons/Paper Maker rotate: false - xy: 1326, 817 + xy: 1326, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1558, 1347 + xy: 1428, 1131 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1660, 1428 + xy: 1428, 825 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1762, 1325 + xy: 1660, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1428, 1123 + xy: 1864, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1428, 1021 + xy: 1762, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1428, 919 + xy: 1864, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1428, 817 + xy: 1864, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1530, 1041 + xy: 1530, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1632, 1122 + xy: 1530, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1632, 918 + xy: 1734, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1632, 816 + xy: 1836, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1734, 1121 + xy: 1836, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1734, 1019 + xy: 1530, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1836, 1019 + xy: 1836, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1836, 917 + xy: 1734, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1734, 713 + xy: 1836, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1734, 509 + xy: 1632, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1836, 509 + xy: 1734, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1632, 408 + xy: 1836, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1734, 407 + xy: 1938, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1836, 407 + xy: 1938, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1938, 1121 + xy: 1938, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1938, 1019 + xy: 1938, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1938, 917 + xy: 1938, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1938, 713 + xy: 1938, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 245, 352 + xy: 132, 70 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 132, 141 + xy: 234, 164 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 551, 409 + xy: 551, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 959, 409 + xy: 959, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 FlagIcons/Dutch rotate: false - xy: 2, 297 + xy: 1271, 1866 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 2, 167 + xy: 2, 328 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 2, 37 + xy: 1401, 1866 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 1471, 1857 + xy: 2, 198 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 1601, 1857 + xy: 2, 68 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 204, 1429 + xy: 204, 1438 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 204, 1299 + xy: 204, 1308 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 204, 1169 + xy: 204, 1178 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 204, 964 + xy: 204, 973 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 1875, 1937 + xy: 1777, 1946 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 1935, 1835 + xy: 1531, 1844 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 334, 1327 + xy: 334, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 742, 1327 + xy: 742, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 1048, 1327 + xy: 1048, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 1150, 1225 + xy: 1150, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 306, 659 + xy: 918, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 714, 613 + xy: 510, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1020, 613 + xy: 816, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1252, 1429 + xy: 1122, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1354, 1327 + xy: 1354, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1558, 1449 + xy: 1456, 1335 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1660, 1326 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Road - rotate: false - xy: 1762, 1223 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Trading post - rotate: false - xy: 1938, 509 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/BackArrow - rotate: false - xy: 277, 1581 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -OtherIcons/Banner - rotate: false - xy: 787, 1633 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Circle - rotate: false - xy: 1291, 1859 - size: 178, 178 - orig: 178, 178 - offset: 0, 0 - index: -1 -OtherIcons/City - rotate: false - xy: 436, 1531 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Crosshair - rotate: false - xy: 844, 1531 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/DisbandUnit - rotate: false - xy: 946, 1531 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Fire - rotate: false - xy: 1048, 1225 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/MenuIcon - rotate: false - xy: 816, 511 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Pentagon - rotate: false - xy: 1326, 511 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Railroad - rotate: false - xy: 1762, 1529 + xy: 1428, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1762, 1529 + xy: 1428, 519 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Railroad + rotate: false + xy: 1428, 519 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Road + rotate: false + xy: 1762, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Trading post + rotate: false + xy: 245, 368 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/BackArrow + rotate: false + xy: 277, 1590 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +OtherIcons/Banner + rotate: false + xy: 787, 1642 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Circle + rotate: false + xy: 2, 580 + size: 178, 178 + orig: 178, 178 + offset: 0, 0 + index: -1 +OtherIcons/City + rotate: false + xy: 306, 770 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Crosshair + rotate: false + xy: 538, 1234 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/DisbandUnit + rotate: false + xy: 640, 1234 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Fire + rotate: false + xy: 946, 1234 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/MenuIcon + rotate: false + xy: 612, 520 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Pentagon + rotate: false + xy: 1326, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1530, 735 + xy: 1530, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1632, 1020 + xy: 1632, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1530, 435 + xy: 245, 470 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1836, 815 + xy: 1734, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 1471, 1987 + xy: 1271, 1996 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 2, 549 + xy: 1089, 1846 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 1527, 508 + xy: 277, 1803 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1977, 1987 + xy: 1981, 1996 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 334, 1173 + xy: 334, 1182 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 347, 357 + xy: 2, 16 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1163, 459 + xy: 1163, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 399, 357 + xy: 54, 16 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1215, 459 + xy: 1215, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 451, 357 + xy: 1267, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1267, 459 + xy: 1319, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 503, 357 + xy: 1371, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1319, 459 + xy: 347, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 555, 357 + xy: 399, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1371, 459 + xy: 451, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 607, 357 + xy: 503, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1423, 459 + xy: 555, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 659, 357 + xy: 607, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1475, 459 + xy: 659, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 711, 357 + xy: 711, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 763, 357 + xy: 763, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 815, 357 + xy: 815, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 867, 357 + xy: 867, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 919, 357 + xy: 919, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 971, 357 + xy: 971, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1023, 357 + xy: 1023, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1075, 357 + xy: 1075, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1163, 407 + xy: 1163, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1215, 407 + xy: 1215, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1267, 407 + xy: 1267, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1319, 407 + xy: 1319, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1371, 407 + xy: 1371, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1423, 407 + xy: 1423, 467 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1475, 407 + xy: 1475, 467 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1966, 1579 + xy: 1423, 415 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1966, 1527 + xy: 1475, 415 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1966, 1475 + xy: 1527, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1966, 1423 + xy: 1579, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1966, 1371 + xy: 1631, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1966, 1319 + xy: 1683, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1966, 1267 + xy: 1735, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1527, 383 + xy: 1787, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1579, 383 + xy: 1839, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1773, 1937 + xy: 1675, 1946 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 481, 1633 + xy: 481, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 1811, 1733 + xy: 1607, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 436, 1327 + xy: 436, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 538, 1225 + xy: 538, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 844, 1429 + xy: 844, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 742, 1225 + xy: 742, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 1150, 1327 + xy: 1048, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 408, 817 + xy: 408, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 510, 817 + xy: 510, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 612, 919 + xy: 612, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 1020, 919 + xy: 1020, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1122, 919 + xy: 1020, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 408, 715 + xy: 1020, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 816, 715 + xy: 510, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1122, 613 + xy: 918, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1354, 1429 + xy: 1909, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1326, 613 + xy: 1326, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1530, 837 + xy: 1632, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1530, 633 + xy: 1632, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1530, 531 + xy: 1734, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1632, 510 + xy: 1734, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1734, 815 + xy: 1632, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1836, 713 + xy: 1836, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 132, 243 + xy: 234, 266 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 347, 409 + xy: 347, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 449, 409 + xy: 449, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 653, 409 + xy: 653, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Acquire rotate: false - xy: 281, 1837 - size: 200, 200 - orig: 200, 200 + xy: 204, 769 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 436, 1429 + xy: 334, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 538, 1531 + xy: 436, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 2, 1357 + xy: 281, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 483, 1837 + xy: 2, 1366 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 2, 1155 + xy: 483, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 685, 1837 + xy: 2, 1164 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 2, 953 + xy: 685, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 1224, 817 + xy: 1224, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 887, 1837 + xy: 2, 962 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 2, 751 + xy: 887, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1762, 1427 + xy: 1558, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 1089, 1837 + xy: 2, 760 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 1632, 612 + xy: 1632, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1734, 611 + xy: 1836, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Acoustics rotate: false - xy: 204, 862 + xy: 204, 871 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Agriculture rotate: false - xy: 204, 760 + xy: 1573, 1946 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Animal Husbandry rotate: false - xy: 281, 1735 + xy: 281, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 281, 1735 + xy: 281, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archaeology rotate: false - xy: 587, 1735 + xy: 587, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archery rotate: false - xy: 791, 1735 + xy: 791, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Architecture rotate: false - xy: 893, 1735 + xy: 893, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Astronomy rotate: false - xy: 277, 1633 + xy: 277, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 685, 1633 + xy: 685, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 1093, 1633 + xy: 1093, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 1301, 1757 + xy: 1301, 1764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 1833, 1835 + xy: 143, 478 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 306, 965 + xy: 1939, 1844 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 306, 965 + xy: 1939, 1844 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 306, 761 + xy: 306, 1076 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 334, 1225 + xy: 334, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 640, 1531 + xy: 334, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 538, 1327 + xy: 538, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 640, 1429 + xy: 640, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 742, 1531 + xy: 436, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 640, 1225 + xy: 640, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 844, 1327 + xy: 844, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ecology rotate: false - xy: 946, 1429 + xy: 946, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 1048, 1531 + xy: 742, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 844, 1225 + xy: 844, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 1048, 1429 + xy: 1048, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 1150, 1531 + xy: 844, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 1150, 1429 + xy: 1150, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 408, 1123 + xy: 1048, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 510, 919 + xy: 510, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 714, 817 + xy: 714, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 816, 919 + xy: 816, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 1122, 1123 + xy: 816, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 1122, 817 + xy: 1122, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 510, 715 + xy: 1122, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 816, 613 + xy: 612, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 510, 511 + xy: 306, 566 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 612, 511 + xy: 408, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 714, 511 + xy: 510, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 918, 511 + xy: 714, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1020, 511 + xy: 816, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1252, 1531 + xy: 1020, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1252, 1327 + xy: 1252, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1224, 511 + xy: 1224, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1399, 1653 + xy: 1224, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1603, 1653 + xy: 1399, 1662 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1326, 1123 + xy: 1354, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1326, 715 + xy: 1326, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1456, 1551 + xy: 1326, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1558, 1551 + xy: 1326, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1456, 1449 + xy: 1456, 1539 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1456, 1245 + xy: 1456, 1233 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1558, 1245 + xy: 1428, 1029 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1660, 1530 + xy: 1428, 927 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1660, 1224 + xy: 1428, 621 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replacable Parts rotate: false - xy: 1864, 1529 + xy: 1558, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1864, 1325 + xy: 1660, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1864, 1223 + xy: 1660, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 245, 454 + xy: 1762, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1428, 715 + xy: 1558, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1428, 613 + xy: 1660, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1428, 511 + xy: 1762, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1836, 1121 + xy: 1632, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1734, 917 + xy: 1734, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1938, 815 + xy: 1938, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1938, 611 + xy: 143, 376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1938, 407 + xy: 132, 274 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1061, 409 + xy: 1061, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/CrosshatchHexagon rotate: false - xy: 2, 1559 + xy: 2, 1568 size: 273, 236 orig: 273, 236 offset: 0, 0 index: -1 TerrainIcons/Flood plains rotate: false - xy: 408, 1021 + xy: 1150, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 408, 919 + xy: 408, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Hexagon rotate: false - xy: 2, 1797 + xy: 2, 1806 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TerrainIcons/HexagonBorder rotate: false - xy: 2, 427 + xy: 2, 458 size: 139, 120 orig: 139, 120 offset: 0, 0 index: -1 TerrainIcons/Hill rotate: false - xy: 1020, 1021 + xy: 1020, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 918, 715 + xy: 612, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 408, 511 + xy: 1122, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Mountain rotate: false - xy: 1224, 919 + xy: 1224, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 1909, 1631 + xy: 1705, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 2, 24 + xy: 1301, 1751 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 689, 1735 + xy: 689, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 1097, 1735 + xy: 1097, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 379, 1633 + xy: 379, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 1199, 1735 + xy: 1199, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 1403, 1755 + xy: 1633, 1844 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 1505, 1755 + xy: 1735, 1844 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 1709, 1733 + xy: 1505, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 1913, 1733 + xy: 1709, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 306, 1067 + xy: 1811, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 436, 1225 + xy: 436, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 742, 1429 + xy: 742, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 612, 1123 + xy: 510, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 612, 1021 + xy: 612, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 714, 1123 + xy: 408, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 816, 1123 + xy: 510, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 612, 817 + xy: 612, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 714, 919 + xy: 714, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 816, 1021 + xy: 816, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Infantry rotate: false - xy: 918, 1123 + xy: 612, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 918, 817 + xy: 918, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 612, 715 + xy: 1122, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1020, 715 + xy: 714, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1122, 715 + xy: 816, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 204, 658 + xy: 1020, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 510, 613 + xy: 204, 667 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 612, 613 + xy: 408, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1224, 613 + xy: 1224, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1705, 1632 + xy: 1501, 1641 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1456, 1347 + xy: 1456, 1437 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1864, 1427 + xy: 1558, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1530, 1143 + xy: 1864, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1530, 939 + xy: 1530, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1632, 714 + xy: 1530, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1836, 611 + xy: 1530, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 143, 345 + xy: 132, 172 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 204, 1066 + xy: 204, 1075 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 132, 39 + xy: 234, 62 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 755, 409 + xy: 755, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 857, 409 + xy: 857, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 1709, 1835 + xy: 1505, 1844 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 1301, 1735 + xy: 182, 738 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 277, 1559 + xy: 277, 1568 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 386, 1203 + xy: 386, 1212 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 1323, 1735 + xy: 182, 716 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 299, 1559 + xy: 299, 1568 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 386, 1181 + xy: 386, 1190 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 1345, 1735 + xy: 182, 694 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 1367, 1735 + xy: 182, 672 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 1731, 1965 + xy: 182, 650 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 1977, 1965 + xy: 1531, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1127, 387 + xy: 2015, 1822 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 2015, 1813 + xy: 1966, 1618 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1966, 1245 + xy: 347, 544 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 1966, 1223 + xy: 1981, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 2, 2 + xy: 106, 46 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1731, 1943 + xy: 1127, 396 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1977, 1943 + xy: 1527, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1999, 1965 + xy: 1891, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 1127, 365 + xy: 182, 628 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 2015, 1791 + xy: 204, 645 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1988, 1245 + xy: 1531, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1988, 1223 + xy: 2015, 1800 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 24, 2 + xy: 1966, 1596 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1999, 1943 + xy: 1988, 1618 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 2015, 1769 + xy: 347, 522 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 2015, 1747 + xy: 369, 544 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 347, 535 + xy: 1981, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 347, 513 + xy: 2003, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 369, 535 + xy: 106, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 369, 513 + xy: 106, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1631, 386 + xy: 1127, 374 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1653, 386 + xy: 1527, 422 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1675, 386 + xy: 1549, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1697, 386 + xy: 1891, 474 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 46, 2 + xy: 1913, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 2015, 1725 + xy: 182, 606 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 2011, 1703 + xy: 204, 623 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 2011, 1681 + xy: 226, 645 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 2011, 1659 + xy: 2015, 1778 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 2011, 1637 + xy: 1966, 1574 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 78fd0fc503..934f358042 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 3ccea1709a..0b25e70486 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -347,6 +347,8 @@ Spanish:"Cargar datos copiados" } + "Could not load game from clipboard!":{} + // New game screen "Start game!":{ @@ -2751,10 +2753,14 @@ French:"Peut créer des améliorations de ressources maritimes" } + "Create [improvementName]":{ // for unit action button - also used for "create fishing boats" and "create oil well" + } + "Can start an 8-turn golden age":{ Italian:"Può avviare un'Età dell'Oro di 8 turni" French:"Peut commencer un âge d'or de 8 tours" } + "Start Golden Age":{} // for unit action button "Can build improvement: Landmark":{ Italian:"Può costruire il miglioramento: Punto di Riferimento" French:"Peut construire l'amélioration suivante: Point de repère" @@ -2763,6 +2769,7 @@ Italian:"Può scoprire una tecnologia" French:"Peut découvrir une technologie" } + "Discover Technology":{} // for unit action button "Can build improvement: Academy":{ Italian:"Può costruire il miglioramento: Accademia" French:"Peut construire l'amélioration suivante: Académie" @@ -2771,6 +2778,8 @@ Italian:"Può compiere missioni commerciali, donando grandi quantità di Oro" French:"Peut entreprendre une mission commerciale qui donne une large somme en or" } + "Conduct Trade Mission":{} // for unit action button + "Your trade mission has earned you [goldGained] gold!":{} "Can build improvement: Customs House":{ Italian:"Può costruire il miglioramento: Dogana" French:"Peut construire l'amélioration suivante: Douanes" @@ -2779,6 +2788,7 @@ Italian:"Può accelerare la costruzione di una Meraviglia" French:"Peut accélérer la construction d'une Merveille" } + "Hurry Wonder":{} // for unit action button "Can build improvement: Manufactory":{ Italian:"Può costruire il miglioramento: Manifattura" French:"Peut construire l'amélioration suivante: Manufacture" diff --git a/core/src/com/unciv/logic/automation/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/WorkerAutomation.kt index 7515618df8..bd95a395b3 100644 --- a/core/src/com/unciv/logic/automation/WorkerAutomation.kt +++ b/core/src/com/unciv/logic/automation/WorkerAutomation.kt @@ -43,8 +43,9 @@ class WorkerAutomation(val unit: MapUnit) { fun tryConnectingCities():Boolean{ // returns whether we actually did anything - val citiesThatNeedConnecting = unit.civInfo.cities.filter { it.population.population>3 && !it.isCapital() - && !it.cityStats.isConnectedToCapital(RoadStatus.Road) } + val citiesThatNeedConnecting = unit.civInfo.cities + .filter { it.population.population>3 && !it.isCapital() + && !it.cityStats.isConnectedToCapital(RoadStatus.Road) } if(citiesThatNeedConnecting.isEmpty()) return false // do nothing. val citiesThatNeedConnectingBfs = citiesThatNeedConnecting @@ -147,22 +148,19 @@ class WorkerAutomation(val unit: MapUnit) { // Either generalize or delete fun constructRoadTo(destination:TileInfo) { val currentTile = unit.getTile() - if (currentTile.roadStatus == RoadStatus.None) { - currentTile.startWorkingOnImprovement(GameBasics.TileImprovements["Road"]!!, unit.civInfo) - return - } + if (currentTile.roadStatus == RoadStatus.None) + return currentTile.startWorkingOnImprovement(GameBasics.TileImprovements["Road"]!!, unit.civInfo) + val pathToDestination = unit.movementAlgs().getShortestPath(destination) val destinationThisTurn = pathToDestination.first() val fullPathToCurrentDestination = unit.movementAlgs().getFullPathToCloseTile(destinationThisTurn) val firstTileWithoutRoad = fullPathToCurrentDestination.firstOrNull { it.roadStatus == RoadStatus.None && unit.canMoveTo(it) } - if (firstTileWithoutRoad == null) { - unit.moveToTile(destinationThisTurn) - return - } + if (firstTileWithoutRoad == null) + return unit.moveToTile(destinationThisTurn) + unit.moveToTile(firstTileWithoutRoad) if (unit.currentMovement > 0) firstTileWithoutRoad.startWorkingOnImprovement(GameBasics.TileImprovements["Road"]!!, unit.civInfo) } - } \ No newline at end of file diff --git a/core/src/com/unciv/logic/city/IConstruction.kt b/core/src/com/unciv/logic/city/IConstruction.kt index 21fab51616..9665731384 100644 --- a/core/src/com/unciv/logic/city/IConstruction.kt +++ b/core/src/com/unciv/logic/city/IConstruction.kt @@ -37,19 +37,19 @@ open class SpecialConstruction(override var name: String, override val descripti override fun getProductionCost(adoptedPolicies: HashSet): Int { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + throw Exception("Impossible!") } override fun getGoldCost(adoptedPolicies: HashSet): Int { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + throw Exception("Impossible!") } override fun isBuildable(construction: CityConstructions): Boolean { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + throw Exception("Impossible!") } override fun postBuildEvent(construction: CityConstructions) { - TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + throw Exception("Impossible!") } } \ No newline at end of file diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index 8fe86bdecb..fba938e135 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -97,7 +97,7 @@ class TechManager { .firstOrNull { it.isCityCenter() } if (closestCityTile != null) { civInfo.addNotification("{"+revealedResource.name + "} {revealed near} " - + closestCityTile.getCity()!!.name, tileInfo.position, Color.BLUE) + + closestCityTile.getCity()!!.name, tileInfo.position, Color.BLUE) // todo change to [] notation break } } diff --git a/core/src/com/unciv/ui/LoadScreen.kt b/core/src/com/unciv/ui/LoadScreen.kt index ab995e4efe..2775831958 100644 --- a/core/src/com/unciv/ui/LoadScreen.kt +++ b/core/src/com/unciv/ui/LoadScreen.kt @@ -66,7 +66,7 @@ class LoadScreen : PickerScreen() { loadedGame.setTransients() UnCivGame.Current.loadGame(loadedGame) }catch (ex:Exception){ - errorLabel.setText("Could not load game from clipboard!") + errorLabel.setText("Could not load game from clipboard!".tr()) } } diff --git a/core/src/com/unciv/ui/utils/UnitGroup.kt b/core/src/com/unciv/ui/utils/UnitGroup.kt new file mode 100644 index 0000000000..973aaa0ff6 --- /dev/null +++ b/core/src/com/unciv/ui/utils/UnitGroup.kt @@ -0,0 +1,35 @@ +package com.unciv.ui.utils + +import com.badlogic.gdx.scenes.scene2d.Group +import com.badlogic.gdx.scenes.scene2d.ui.Image +import com.unciv.logic.map.MapUnit + +class UnitImage(val unit: MapUnit, val size: Float): Group() { + init { + val unitBaseImage = ImageGetter.getUnitIcon(unit.name, unit.civInfo.getNation().getSecondaryColor()) + .apply { setSize(size * 0.75f, size * 0.75f) } + + val background = getBackgroundImageForUnit(unit) + background.apply { + this.color = unit.civInfo.getNation().getColor() + setSize(size, size) + } + setSize(size, size) + addActor(background) + unitBaseImage.center(this) + addActor(unitBaseImage) + + + if (unit.health < 100) { // add health bar + addActor(ImageGetter.getHealthBar(unit.health.toFloat(), 100f, size)) + } + } + + fun getBackgroundImageForUnit(unit: MapUnit): Image { + return when { + unit.isEmbarked() -> ImageGetter.getImage("OtherIcons/Banner") + unit.isFortified() -> ImageGetter.getImage("OtherIcons/Shield.png") + else -> ImageGetter.getCircle() + } + } +} \ No newline at end of file diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index ffff87043f..f0748656de 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -1,5 +1,6 @@ package com.unciv.ui.worldscreen.unit +import com.badlogic.gdx.graphics.Color import com.unciv.UnCivGame import com.unciv.logic.automation.UnitAutomation import com.unciv.logic.automation.WorkerAutomation @@ -131,7 +132,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 != 0f) { tile.improvement = improvement unit.destroy() } @@ -139,7 +140,7 @@ class UnitActions { for(unique in unit.getUniques().filter { it.startsWith("Can build improvement: ") }){ val improvementName = unique.replace("Can build improvement: ","") - actionList += UnitAction("Construct $improvementName", + actionList += UnitAction("Create [$improvementName]", unit.currentMovement != 0f && !tile.isCityCenter(), constructImprovementAndDestroyUnit(unit, improvementName)) } @@ -177,7 +178,10 @@ class UnitActions { if (unit.name == "Great Merchant" && !unit.isEmbarked()) { actionList += UnitAction("Conduct Trade Mission", unit.currentMovement != 0f ) { - unit.civInfo.gold += 350 // + 50 * era_number - todo! + // http://civilization.wikia.com/wiki/Great_Merchant_(Civ5) + val goldGained = 350 + 50 * unit.civInfo.getEra().ordinal + unit.civInfo.gold += goldGained + unit.civInfo.addNotification("Your trade mission has earned you [$goldGained] gold!",null, Color.GOLD) unit.destroy() } }