diff --git a/android/Images.Icons/OtherIcons/Discord.png b/android/Images.Icons/OtherIcons/Discord.png new file mode 100644 index 0000000000..79fcff7054 Binary files /dev/null and b/android/Images.Icons/OtherIcons/Discord.png differ diff --git a/android/assets/Icons.atlas b/android/assets/Icons.atlas index 05a169d69d..19294bb8e4 100644 --- a/android/assets/Icons.atlas +++ b/android/assets/Icons.atlas @@ -6,1561 +6,1568 @@ filter: MipMapLinearLinear, Linear repeat: none CityStateIcons/Cultured rotate: false - xy: 235, 1001 + xy: 119, 896 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/HiddenTutorialTask rotate: false - xy: 235, 1001 + xy: 119, 896 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Score rotate: false - xy: 235, 1001 + xy: 119, 896 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Maritime rotate: false - xy: 1015, 1698 + xy: 1015, 1593 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Mercantile rotate: false - xy: 1015, 1482 + xy: 1123, 1701 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Militaristic rotate: false - xy: 1123, 1712 + xy: 1123, 1593 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Religious rotate: false - xy: 682, 1359 + xy: 900, 1362 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 EmojiIcons/Automate rotate: false - xy: 589, 65 + xy: 1626, 1118 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Culture rotate: false - xy: 1987, 1705 + xy: 1800, 1118 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Death rotate: false - xy: 1987, 1647 + xy: 1858, 1118 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Faith rotate: false - xy: 1987, 1589 + xy: 1916, 1118 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Food rotate: false - xy: 1987, 1531 + xy: 1987, 1766 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Gold rotate: false - xy: 652, 759 + xy: 1987, 1650 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Artist rotate: false - xy: 652, 701 + xy: 1987, 1592 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Engineer rotate: false - xy: 652, 643 + xy: 1987, 1534 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great General rotate: false - xy: 652, 585 + xy: 1987, 1476 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Merchant rotate: false - xy: 652, 527 + xy: 1987, 1418 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Scientist rotate: false - xy: 652, 469 + xy: 1987, 1360 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Happiness rotate: false - xy: 652, 411 + xy: 1987, 1302 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Production rotate: false - xy: 1987, 1473 + xy: 1224, 1016 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Science rotate: false - xy: 883, 919 + xy: 343, 1054 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 710, 817 + xy: 335, 938 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 4, 941 + xy: 1123, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 4, 725 + xy: 1339, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Barbarian encampment rotate: false - xy: 1439, 1929 + xy: 4, 494 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 1655, 1929 + xy: 4, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Cancel improvement order rotate: false - xy: 4, 293 + xy: 1771, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 4, 293 + xy: 1771, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Citadel rotate: false - xy: 1871, 1929 + xy: 4, 62 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City center rotate: false - xy: 142, 1325 + xy: 475, 1668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 475, 1665 + xy: 475, 1560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 112, 893 + xy: 227, 896 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 220, 245 + xy: 220, 140 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 112, 29 + xy: 220, 32 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fort rotate: false - xy: 847, 1791 + xy: 955, 1809 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Holy site rotate: false - xy: 799, 1683 + xy: 1603, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 955, 1806 + xy: 691, 1686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1495, 1821 + xy: 799, 1470 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1711, 1821 + xy: 907, 1578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1123, 1604 + xy: 1123, 1485 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 1123, 1496 + xy: 1231, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Offshore Platform rotate: false - xy: 1339, 1497 + xy: 1447, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1555, 1713 + xy: 1447, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 1555, 1605 + xy: 1663, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1879, 1713 + xy: 1771, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Polder rotate: false - xy: 1771, 1497 + xy: 1879, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 358, 1233 + xy: 468, 1236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 574, 1203 + xy: 792, 1362 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Fallout rotate: false - xy: 790, 1359 + xy: 684, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Forest rotate: false - xy: 790, 1251 + xy: 792, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Jungle rotate: false - xy: 790, 1251 + xy: 792, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Marsh rotate: false - xy: 898, 1252 + xy: 684, 1147 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 ImprovementIcons/Remove Railroad rotate: false - xy: 682, 1143 + xy: 792, 1146 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Road rotate: false - xy: 790, 1143 + xy: 900, 1146 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Repair rotate: false - xy: 898, 1144 + xy: 360, 1128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 466, 1095 + xy: 684, 1039 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 544, 771 + xy: 1663, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 544, 663 + xy: 1879, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/Bobot rotate: false - xy: 1547, 1929 + xy: 4, 386 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/DollarSign rotate: false - xy: 112, 569 + xy: 220, 680 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/EnhanceReligion rotate: false - xy: 220, 461 + xy: 112, 248 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundPantheon rotate: false - xy: 220, 461 + xy: 112, 248 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundReligion rotate: false - xy: 220, 461 + xy: 112, 248 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/ReformReligion rotate: false - xy: 220, 461 + xy: 112, 248 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Faith rotate: false - xy: 220, 461 + xy: 112, 248 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/PickConstruction rotate: false - xy: 1771, 1713 + xy: 1663, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 1771, 1713 + xy: 1663, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/PickPolicy rotate: false - xy: 691, 1810 + xy: 691, 1813 size: 33, 33 orig: 33, 33 offset: 0, 0 index: -1 NotificationIcons/PickTech rotate: false - xy: 1663, 1497 + xy: 1771, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 1663, 1497 + xy: 1771, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/RobotArm rotate: false - xy: 436, 28 + xy: 1440, 1081 size: 87, 87 orig: 87, 87 offset: 0, 0 index: -1 NotificationIcons/RobotHeadRect rotate: false - xy: 574, 1095 + xy: 792, 1038 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/RobotHeadSquare rotate: false - xy: 451, 987 + xy: 900, 1038 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/ServerRack rotate: false - xy: 343, 909 + xy: 1447, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/AirSweep rotate: false - xy: 4, 833 + xy: 1231, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 1979, 1979 + xy: 4, 4 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/ArrowRight rotate: false - xy: 531, 65 + xy: 1987, 1982 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 NotificationIcons/MoveAutomatedUnits rotate: false - xy: 531, 65 + xy: 1987, 1982 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 NotificationIcons/NextUnit rotate: false - xy: 531, 65 + xy: 1987, 1982 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 531, 65 + xy: 1987, 1982 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 667, 875 + xy: 1684, 1118 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Banner rotate: false - xy: 4, 617 + xy: 1447, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitTypeIcons/UnitTypes rotate: false - xy: 4, 617 + xy: 1447, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Blockade rotate: false - xy: 4, 1295 + xy: 739, 1902 size: 130, 130 orig: 130, 130 offset: 0, 0 index: -1 OtherIcons/Camera rotate: false - xy: 316, 1446 + xy: 316, 1449 size: 25, 25 orig: 25, 25 offset: 0, 0 index: -1 OtherIcons/Capital rotate: false - xy: 1000, 1928 + xy: 4, 926 size: 107, 101 orig: 107, 101 offset: 0, 0 index: -1 OtherIcons/Checkmark rotate: false - xy: 4, 185 + xy: 1879, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/NextTurn rotate: false - xy: 4, 185 + xy: 1879, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 289, 1587 + xy: 289, 1590 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/Cities rotate: false - xy: 4, 77 + xy: 208, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/CityState rotate: false - xy: 1987, 1763 + xy: 1742, 1118 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/CityStatus rotate: false - xy: 250, 1325 + xy: 316, 1482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Close rotate: false - xy: 316, 1479 + xy: 739, 1794 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/CrosshairB rotate: false - xy: 235, 1109 + xy: 127, 1004 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Diplomacy rotate: false - xy: 220, 893 + xy: 112, 680 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DiplomacyW rotate: false - xy: 112, 677 + xy: 220, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 220, 785 + xy: 112, 572 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +OtherIcons/Discord + rotate: false + xy: 4, 1296 + size: 132, 132 + orig: 132, 132 + offset: 0, 0 + index: -1 OtherIcons/Espionage rotate: false - xy: 112, 245 + xy: 220, 356 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/MoveSpies rotate: false - xy: 112, 245 + xy: 220, 356 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy_White rotate: false - xy: 112, 245 + xy: 220, 356 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/EspionageTutorial rotate: false - xy: 4, 1433 + xy: 4, 1436 size: 196, 100 orig: 196, 100 offset: 0, 0 index: -1 OtherIcons/ExclamationMark rotate: false - xy: 220, 353 + xy: 112, 140 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 4, 1172 + xy: 877, 1917 size: 115, 115 orig: 115, 115 offset: 0, 0 index: -1 OtherIcons/ForwardArrow rotate: false - xy: 652, 817 + xy: 1987, 1708 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Hexagon rotate: false - xy: 4, 1789 + xy: 4, 1792 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 OtherIcons/HexagonOutline rotate: false - xy: 4, 1541 + xy: 4, 1544 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 OtherIcons/Improvements rotate: false - xy: 652, 353 + xy: 1535, 1045 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Keyboard rotate: false - xy: 907, 1467 + xy: 583, 1530 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Link rotate: false - xy: 1063, 1820 + xy: 691, 1578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 1171, 1821 + xy: 799, 1686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Loading rotate: false - xy: 1279, 1821 + xy: 799, 1578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/Loading rotate: false - xy: 1279, 1821 + xy: 799, 1578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/Working rotate: false - xy: 1279, 1821 + xy: 799, 1578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/LockSmall rotate: false - xy: 652, 237 + xy: 1651, 1060 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 1819, 1821 + xy: 907, 1470 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1015, 1590 + xy: 1015, 1485 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 1231, 1713 + xy: 1231, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 1231, 1605 + xy: 1339, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/NationSwap rotate: false - xy: 1339, 1713 + xy: 1231, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Nations rotate: false - xy: 589, 7 + xy: 1941, 1060 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 1231, 1497 + xy: 1339, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Notifications rotate: false - xy: 1447, 1713 + xy: 1339, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 1447, 1497 + xy: 1555, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pause rotate: false - xy: 647, 5 + xy: 1974, 1118 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Pencil rotate: false - xy: 1555, 1497 + xy: 1663, 1608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1663, 1605 + xy: 1771, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 1771, 1605 + xy: 1879, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Policies rotate: false - xy: 1879, 1605 + xy: 1879, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Politics rotate: false - xy: 1879, 1497 + xy: 424, 1452 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/WorldCongressVote rotate: false - xy: 1879, 1497 + xy: 424, 1452 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Politics-diagram-bg rotate: false - xy: 289, 1773 + xy: 289, 1776 size: 256, 256 orig: 256, 256 offset: 0, 0 index: -1 OtherIcons/Present rotate: false - xy: 358, 1341 + xy: 468, 1344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 877, 1914 + xy: 4, 1035 size: 115, 115 orig: 115, 115 offset: 0, 0 index: -1 OtherIcons/Quest rotate: false - xy: 466, 1311 + xy: 576, 1422 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Question rotate: false - xy: 466, 1203 + xy: 576, 1314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 574, 1311 + xy: 684, 1362 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Remove Heresy rotate: false - xy: 898, 1359 + xy: 900, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resources rotate: false - xy: 358, 1125 + xy: 468, 1128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 343, 1017 + xy: 576, 1098 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Undo rotate: false - xy: 343, 1017 + xy: 576, 1098 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Scenarios rotate: false - xy: 682, 1035 + xy: 1123, 1377 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Search rotate: false - xy: 790, 1035 + xy: 1231, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/SecretOptions rotate: false - xy: 898, 1036 + xy: 1339, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Settings rotate: false - xy: 328, 801 + xy: 1555, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 328, 585 + xy: 1771, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 328, 261 + xy: 1008, 1161 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Speaker rotate: false - xy: 328, 153 + xy: 1116, 1269 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy rotate: false - xy: 559, 879 + xy: 1116, 1053 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 667, 933 + xy: 1231, 1290 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 436, 663 + xy: 1555, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Timer rotate: false - xy: 436, 555 + xy: 1771, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Triangle rotate: false - xy: 553, 1851 + xy: 553, 1854 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/Turn right rotate: false - xy: 544, 555 + xy: 1224, 1074 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Tyrannosaurus rotate: false - xy: 436, 339 + xy: 1332, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/WLTKD rotate: false - xy: 4, 4 + xy: 1535, 1103 size: 83, 65 orig: 83, 65 offset: 0, 0 index: -1 OtherIcons/Wait rotate: false - xy: 436, 231 + xy: 1548, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Wonders rotate: false - xy: 544, 123 + xy: 1332, 1068 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 289, 1578 + xy: 289, 1581 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1223, 1929 + xy: 4, 710 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 1331, 1929 + xy: 4, 602 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 1763, 1929 + xy: 4, 170 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Citrus rotate: false - xy: 208, 1433 + xy: 144, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 739, 1791 + xy: 144, 1220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Copper rotate: false - xy: 142, 1217 + xy: 252, 1220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 250, 1217 + xy: 142, 1112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Crab rotate: false - xy: 127, 1109 + xy: 250, 1112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 112, 785 + xy: 112, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 112, 353 + xy: 220, 464 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 220, 137 + xy: 112, 32 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 583, 1743 + xy: 1063, 1809 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 583, 1635 + xy: 1171, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold Ore rotate: false - xy: 691, 1683 + xy: 1387, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 799, 1575 + xy: 1711, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 691, 1467 + xy: 1819, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 799, 1467 + xy: 1927, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 907, 1683 + xy: 583, 1746 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Jewelry rotate: false - xy: 907, 1575 + xy: 583, 1638 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1927, 1821 + xy: 1015, 1701 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1447, 1605 + xy: 1555, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1663, 1713 + xy: 1555, 1500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Porcelain rotate: false - xy: 532, 1419 + xy: 360, 1236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Salt rotate: false - xy: 559, 987 + xy: 1015, 1377 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 328, 693 + xy: 1663, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 328, 477 + xy: 1879, 1392 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 328, 369 + xy: 1008, 1269 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 451, 879 + xy: 1116, 1161 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 775, 927 + xy: 1339, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 436, 771 + xy: 1447, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Truffles rotate: false - xy: 436, 447 + xy: 1224, 1182 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 544, 447 + xy: 1440, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 544, 339 + xy: 1656, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 436, 123 + xy: 1764, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 544, 231 + xy: 1872, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Acquire rotate: false - xy: 1115, 1929 + xy: 4, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 739, 1899 + xy: 4, 1158 size: 130, 130 orig: 130, 130 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 127, 1001 + xy: 235, 1004 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 220, 29 + xy: 847, 1794 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 583, 1527 + xy: 1279, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 691, 1575 + xy: 1495, 1824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/InterceptRange rotate: false - xy: 652, 295 + xy: 1593, 1045 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 1603, 1821 + xy: 907, 1686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 424, 1449 + xy: 360, 1344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileIcons/Worked rotate: false - xy: 424, 1449 + xy: 360, 1344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Range rotate: false - xy: 883, 977 + xy: 1987, 1244 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 941, 978 + xy: 1980, 1186 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/ReligiousStrength rotate: false - xy: 682, 1251 + xy: 576, 1206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 4, 1049 + xy: 1000, 1917 size: 115, 115 orig: 115, 115 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 328, 45 + xy: 1008, 1053 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 941, 920 + xy: 343, 996 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 TileIcons/Blockaded rotate: false - xy: 4, 509 + xy: 1555, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileIcons/Buy rotate: false - xy: 4, 401 + xy: 1663, 1932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileIcons/CityCenter rotate: false - xy: 475, 1557 + xy: 252, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileIcons/Locked rotate: false - xy: 1387, 1821 + xy: 691, 1470 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileIcons/MapOverlayToggleMovement rotate: false - xy: 652, 179 + xy: 1709, 1060 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 TileIcons/MapOverlayToggleResources rotate: false - xy: 652, 121 + xy: 1767, 1060 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 TileIcons/MapOverlayToggleWorkedTiles rotate: false - xy: 647, 63 + xy: 1825, 1060 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 TileIcons/MapOverlayToggleYields rotate: false - xy: 531, 7 + xy: 1883, 1060 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 TileIcons/NotWorked rotate: false - xy: 1339, 1605 + xy: 1447, 1716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UniqueIcons/Fallback rotate: false - xy: 112, 137 + xy: 220, 248 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitTypeIcons/DomainAir rotate: false - xy: 220, 677 + xy: 112, 464 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitTypeIcons/DomainLand rotate: false - xy: 112, 461 + xy: 220, 572 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Terrains rotate: false - xy: 112, 461 + xy: 220, 572 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitTypeIcons/DomainWater rotate: false - xy: 220, 569 + xy: 112, 356 size: 100, 100 orig: 100, 100 offset: 0, 0 diff --git a/android/assets/Icons.png b/android/assets/Icons.png index 8a01cac1a8..74c889f396 100644 Binary files a/android/assets/Icons.png and b/android/assets/Icons.png differ diff --git a/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt b/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt index 4121991a7d..3c9233c189 100644 --- a/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt +++ b/core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt @@ -526,7 +526,6 @@ class UnitMovement(val unit: MapUnit) { /** * Swaps this unit with the unit on the given tile - * Limited to neighboring tiles only * Precondition: this unit can swap-move to the given tile, as determined by canUnitSwapTo */ fun swapMoveToTile(destination: Tile) { diff --git a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt index cb22c872c3..85cc1e136d 100644 --- a/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt +++ b/core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt @@ -1,5 +1,6 @@ package com.unciv.ui.screens.mainmenuscreen +import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.actions.Actions @@ -27,6 +28,7 @@ import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.components.UncivTooltip.Companion.addTooltip import com.unciv.ui.components.extensions.center import com.unciv.ui.components.extensions.surroundWithCircle +import com.unciv.ui.components.extensions.surroundWithThinCircle import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.input.KeyShortcutDispatcherVeto import com.unciv.ui.components.input.KeyboardBinding @@ -193,18 +195,25 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize { game.popScreen() } - val helpButton = "?".toLabel(fontSize = 48) + val civilopediaButton = "?".toLabel(fontSize = 48) .apply { setAlignment(Align.center) } .surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor) .apply { actor.y -= 2.5f } // compensate font baseline (empirical) .surroundWithCircle(64f, resizeActor = false) - helpButton.touchable = Touchable.enabled + civilopediaButton.touchable = Touchable.enabled // Passing the binding directly to onActivation gives you a size 26 tooltip... - helpButton.onActivation { openCivilopedia() } - helpButton.keyShortcuts.add(KeyboardBinding.Civilopedia) - helpButton.addTooltip(KeyboardBinding.Civilopedia, 30f) - helpButton.setPosition(30f, 30f) - stage.addActor(helpButton) + civilopediaButton.onActivation { openCivilopedia() } + civilopediaButton.keyShortcuts.add(KeyboardBinding.Civilopedia) + civilopediaButton.addTooltip(KeyboardBinding.Civilopedia, 30f) + civilopediaButton.setPosition(30f, 30f) + stage.addActor(civilopediaButton) + + val discordButton = ImageGetter.getImage("OtherIcons/Discord") + .surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor) + .surroundWithThinCircle(Color.WHITE) + .onActivation { Gdx.net.openURI("https://discord.gg/bjrB4Xw") } + discordButton.setPosition(stage.width-30f-discordButton.width, 30f) + stage.addActor(discordButton) val versionLabel = "{Version} ${UncivGame.VERSION.text}".toLabel()