diff --git a/android/Images/UnitActionIcons/MoveTo.png b/android/Images/UnitActionIcons/MoveTo.png new file mode 100644 index 0000000000..631bcdc729 Binary files /dev/null and b/android/Images/UnitActionIcons/MoveTo.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index a162f5663d..761bdf17e7 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,1575 +6,1582 @@ filter: MipMapLinearLinear, MipMapLinearLinear repeat: none CityStateIcons/Cultured rotate: false - xy: 298, 1643 + xy: 298, 1431 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Maritime rotate: false - xy: 622, 995 + xy: 730, 999 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Mercantile rotate: false - xy: 514, 779 + xy: 730, 891 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Militaristic rotate: false - xy: 622, 887 + xy: 730, 783 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Religious rotate: false - xy: 767, 461 + xy: 451, 351 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 EmojiIcons/Culture rotate: false - xy: 946, 1024 + xy: 610, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Faith rotate: false - xy: 946, 966 + xy: 668, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Food rotate: false - xy: 946, 908 + xy: 726, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Gold rotate: false - xy: 946, 850 + xy: 784, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Artist rotate: false - xy: 946, 792 + xy: 436, 127 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Engineer rotate: false - xy: 946, 734 + xy: 494, 127 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great General rotate: false - xy: 946, 676 + xy: 552, 127 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Merchant rotate: false - xy: 868, 27 + xy: 610, 127 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Scientist rotate: false - xy: 926, 27 + xy: 668, 127 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Happiness rotate: false - xy: 1054, 1771 + xy: 726, 127 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Production rotate: false - xy: 1112, 1655 + xy: 767, 69 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Science rotate: false - xy: 1054, 1539 + xy: 444, 11 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 1112, 1539 + xy: 618, 11 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 971, 1937 + xy: 4, 236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 4, 153 + xy: 1439, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Barbarian encampment rotate: false - xy: 1511, 1937 + xy: 1871, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 1619, 1937 + xy: 190, 1693 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Cancel improvement order rotate: false - xy: 1727, 1937 + xy: 190, 1585 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1727, 1937 + xy: 190, 1585 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Stop rotate: false - xy: 1727, 1937 + xy: 190, 1585 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/StopMove rotate: false - xy: 1727, 1937 + xy: 190, 1585 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Citadel rotate: false - xy: 190, 1689 + xy: 190, 1261 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City center rotate: false - xy: 190, 1365 + xy: 190, 937 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 190, 1257 + xy: 190, 829 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 406, 1751 + xy: 406, 1539 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 622, 1643 + xy: 622, 1539 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 406, 1319 + xy: 298, 1107 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fort rotate: false - xy: 622, 1535 + xy: 514, 1323 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Holy site rotate: false - xy: 406, 1103 + xy: 298, 891 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 622, 1211 + xy: 514, 999 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 514, 995 + xy: 514, 891 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 730, 1211 + xy: 730, 1107 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 730, 995 + xy: 838, 1695 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 622, 779 + xy: 838, 1587 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Offshore Platform rotate: false - xy: 838, 1489 + xy: 838, 1047 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 838, 1273 + xy: 838, 831 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 838, 949 + xy: 514, 675 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 838, 733 + xy: 277, 567 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Polder rotate: false - xy: 838, 625 + xy: 385, 567 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 227, 455 + xy: 451, 459 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 659, 455 + xy: 343, 357 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Fallout rotate: false - xy: 112, 262 + xy: 667, 351 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Forest rotate: false - xy: 112, 154 + xy: 127, 266 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Jungle rotate: false - xy: 112, 154 + xy: 127, 266 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Marsh rotate: false - xy: 227, 348 + xy: 112, 51 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 ImprovementIcons/Remove Railroad rotate: false - xy: 335, 347 + xy: 235, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Road rotate: false - xy: 443, 347 + xy: 343, 249 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Repair rotate: false - xy: 659, 347 + xy: 559, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 328, 239 + xy: 220, 27 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 1943, 1829 + xy: 883, 195 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 875, 409 + xy: 1063, 1818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/EnhanceReligion rotate: false - xy: 514, 1643 + xy: 730, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundPantheon rotate: false - xy: 514, 1643 + xy: 730, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundReligion rotate: false - xy: 514, 1643 + xy: 730, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/ReformReligion rotate: false - xy: 514, 1643 + xy: 730, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Faith rotate: false - xy: 514, 1643 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -NotificationIcons/Loading - rotate: false - xy: 298, 779 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -NotificationIcons/Working - rotate: false - xy: 298, 779 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Loading - rotate: false - xy: 298, 779 + xy: 730, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/PickConstruction rotate: false - xy: 514, 671 + xy: 838, 615 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 514, 671 + xy: 838, 615 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/PickPolicy rotate: false - xy: 4, 4 + xy: 842, 202 size: 33, 33 orig: 33, 33 offset: 0, 0 index: -1 NotificationIcons/PickTech rotate: false - xy: 622, 671 + xy: 127, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 622, 671 + xy: 127, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/AirSweep rotate: false - xy: 4, 261 + xy: 1331, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/AirSweep rotate: false - xy: 4, 261 + xy: 1331, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 946, 1256 + xy: 1979, 1991 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/ArrowRight rotate: false - xy: 946, 1198 + xy: 436, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 NotificationIcons/MoveAutomatedUnits rotate: false - xy: 946, 1198 + xy: 436, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 NotificationIcons/NextUnit rotate: false - xy: 946, 1198 + xy: 436, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 946, 1198 + xy: 436, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 946, 1140 + xy: 494, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Banner rotate: false - xy: 1403, 1937 + xy: 1763, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Camera rotate: false - xy: 1004, 1281 + xy: 1979, 1958 size: 25, 25 orig: 25, 25 offset: 0, 0 index: -1 OtherIcons/Capital rotate: false - xy: 4, 477 + xy: 1108, 1940 size: 107, 101 orig: 107, 101 offset: 0, 0 index: -1 OtherIcons/Checkmark rotate: false - xy: 1943, 1937 + xy: 190, 1369 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/NextTurn rotate: false - xy: 1943, 1937 + xy: 190, 1369 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 4, 1611 + xy: 4, 1615 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlag rotate: false - xy: 4, 1611 + xy: 4, 1615 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/Cities rotate: false - xy: 190, 1581 + xy: 190, 1153 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/CityState rotate: false - xy: 946, 1082 + xy: 552, 185 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Close rotate: false - xy: 190, 1149 + xy: 190, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/CrosshairB rotate: false - xy: 119, 478 + xy: 406, 1647 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Diplomacy rotate: false - xy: 406, 1643 + xy: 622, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DiplomacyW rotate: false - xy: 514, 1751 + xy: 298, 1323 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 298, 1427 + xy: 406, 1431 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/DisbandUnit rotate: false - xy: 298, 1427 + xy: 406, 1431 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/ExclamationMark rotate: false - xy: 298, 1319 + xy: 298, 1215 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 730, 1751 - size: 100, 100 - orig: 100, 100 + xy: 4, 467 + size: 115, 115 + orig: 115, 115 offset: 0, 0 index: -1 OtherIcons/Hexagon rotate: false - xy: 4, 1797 + xy: 4, 1801 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 OtherIcons/Improvements rotate: false - xy: 1112, 1771 + xy: 419, 69 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Link rotate: false - xy: 1112, 1713 + xy: 535, 69 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 730, 1319 + xy: 622, 1107 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Loading + rotate: false + xy: 730, 1215 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +NotificationIcons/Loading + rotate: false + xy: 730, 1215 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +NotificationIcons/Working + rotate: false + xy: 730, 1215 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Lock rotate: false - xy: 406, 887 + xy: 406, 783 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/LockSmall rotate: false - xy: 1170, 1771 + xy: 593, 69 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 406, 779 + xy: 514, 783 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 730, 1103 + xy: 622, 783 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 730, 887 + xy: 838, 1479 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 730, 779 + xy: 838, 1371 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Nations rotate: false - xy: 1054, 1597 + xy: 709, 69 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 838, 1705 + xy: 838, 1263 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Notifications rotate: false - xy: 838, 1597 + xy: 838, 1155 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 838, 1165 + xy: 298, 675 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pencil rotate: false - xy: 298, 671 + xy: 730, 675 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 406, 671 + xy: 838, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 730, 671 + xy: 127, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Pillage rotate: false - xy: 730, 671 + xy: 127, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Politics rotate: false - xy: 277, 563 + xy: 493, 567 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/WorldCongressVote rotate: false - xy: 277, 563 + xy: 493, 567 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Present rotate: false - xy: 601, 563 + xy: 235, 459 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Present rotate: false - xy: 601, 563 + xy: 235, 459 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 946, 1387 - size: 94, 94 - orig: 94, 94 + xy: 985, 1926 + size: 115, 115 + orig: 115, 115 offset: 0, 0 index: -1 OtherIcons/Quest rotate: false - xy: 335, 455 + xy: 559, 459 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Question rotate: false - xy: 443, 455 + xy: 667, 459 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 551, 455 + xy: 235, 351 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Remove Heresy rotate: false - xy: 112, 46 + xy: 112, 158 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resources rotate: false - xy: 220, 240 + xy: 667, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 220, 132 + xy: 220, 135 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Search rotate: false - xy: 544, 239 + xy: 775, 351 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/SecretOptions rotate: false - xy: 652, 239 + xy: 775, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Settings rotate: false - xy: 436, 131 + xy: 946, 1695 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 652, 131 + xy: 946, 1479 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 436, 23 + xy: 946, 1155 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Sleep rotate: false - xy: 436, 23 + xy: 946, 1155 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Speaker rotate: false - xy: 544, 23 + xy: 946, 1047 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy rotate: false - xy: 1079, 1829 + xy: 946, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy_White rotate: false - xy: 1187, 1829 + xy: 946, 615 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1295, 1835 + xy: 883, 513 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 1835, 1829 + xy: 991, 291 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Swap rotate: false - xy: 1835, 1829 + xy: 991, 291 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Terrains rotate: false - xy: 1228, 1713 + xy: 560, 11 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Timer rotate: false - xy: 875, 517 + xy: 991, 183 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Triangle rotate: false - xy: 289, 1859 + xy: 289, 1863 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/Turn right rotate: false - xy: 767, 245 + xy: 1279, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Tyrannosaurus rotate: false - xy: 760, 137 + xy: 1387, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/WLTKD rotate: false - xy: 946, 1314 + xy: 328, 62 size: 83, 65 orig: 83, 65 offset: 0, 0 index: -1 OtherIcons/Wait rotate: false - xy: 875, 193 + xy: 1603, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Wait rotate: false - xy: 875, 193 + xy: 1603, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Wonders rotate: false - xy: 946, 1489 + xy: 328, 135 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 289, 1850 + xy: 289, 1854 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1187, 1937 + xy: 4, 20 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 4, 45 + xy: 1655, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 1835, 1937 + xy: 190, 1477 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Citrus rotate: false - xy: 190, 1473 + xy: 190, 1045 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 190, 1041 + xy: 169, 613 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Copper rotate: false - xy: 847, 1813 + xy: 298, 1647 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 190, 717 + xy: 406, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Crab rotate: false - xy: 169, 609 + xy: 298, 1539 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 298, 1535 + xy: 514, 1647 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 406, 1535 + xy: 514, 1539 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 298, 1211 + xy: 730, 1647 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 406, 1211 + xy: 298, 999 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 514, 1319 + xy: 406, 1107 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold Ore rotate: false - xy: 730, 1535 + xy: 622, 1323 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 514, 1211 + xy: 406, 999 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 730, 1427 + xy: 622, 1215 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 298, 887 + xy: 730, 1323 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 406, 995 + xy: 298, 783 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Jewelry rotate: false - xy: 514, 1103 + xy: 406, 891 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 514, 887 + xy: 622, 891 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 838, 1381 + xy: 838, 939 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 838, 841 + xy: 622, 675 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Porcelain rotate: false - xy: 493, 563 + xy: 709, 567 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Salt rotate: false - xy: 436, 239 + xy: 775, 459 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 544, 131 + xy: 946, 1587 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 220, 24 + xy: 946, 1371 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 328, 23 + xy: 946, 1263 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 971, 1829 + xy: 946, 831 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1619, 1829 + xy: 991, 507 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1727, 1829 + xy: 991, 399 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Truffles rotate: false - xy: 875, 301 + xy: 1171, 1832 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 760, 29 + xy: 1495, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 868, 85 + xy: 1711, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 946, 1705 + xy: 1819, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 946, 1597 + xy: 1927, 1833 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Acquire rotate: false - xy: 4, 369 + xy: 1223, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 847, 1921 - size: 116, 116 - orig: 116, 116 + xy: 847, 1911 + size: 130, 130 + orig: 130, 130 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 298, 1751 + xy: 514, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 514, 1427 + xy: 406, 1215 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 622, 1427 + xy: 514, 1215 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 298, 995 + xy: 730, 1431 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/InterceptRange rotate: false - xy: 1054, 1655 + xy: 477, 69 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 622, 1103 + xy: 622, 999 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 385, 563 + xy: 601, 567 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Range rotate: false - xy: 1170, 1713 + xy: 328, 4 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1228, 1771 + xy: 386, 4 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/ReligiousStrength rotate: false - xy: 119, 370 + xy: 559, 351 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 767, 353 - size: 100, 100 - orig: 100, 100 + xy: 4, 344 + size: 115, 115 + orig: 115, 115 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 652, 23 + xy: 946, 939 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1170, 1655 + xy: 502, 11 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UniqueIcons/Fallback rotate: false - xy: 514, 1535 + xy: 514, 1431 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/AddInCapital rotate: false - xy: 1079, 1937 + xy: 4, 128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Automate rotate: false - xy: 1295, 1937 + xy: 1547, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/HurryConstruction rotate: false - xy: 1295, 1937 + xy: 1547, 1941 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/ConductTradeMission rotate: false - xy: 190, 933 + xy: 847, 1803 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/ConstructImprovement rotate: false - xy: 190, 825 + xy: 298, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Repair rotate: false - xy: 190, 825 + xy: 298, 1755 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/EnhanceReligion rotate: false - xy: 622, 1751 + xy: 622, 1647 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FoundReligion rotate: false - xy: 622, 1751 + xy: 622, 1647 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Explore rotate: false - xy: 406, 1427 + xy: 406, 1323 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Fortify rotate: false - xy: 730, 1643 + xy: 622, 1431 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FortifyUntilHealed rotate: false - xy: 730, 1643 + xy: 622, 1431 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FoundCity rotate: false - xy: 298, 1103 + xy: 730, 1539 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/HideMore rotate: false - xy: 1054, 1713 + xy: 784, 127 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitActionIcons/HurryResearch rotate: false - xy: 622, 1319 + xy: 514, 1107 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +UnitActionIcons/MoveTo + rotate: false + xy: 651, 69 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitActionIcons/ShowMore + rotate: false + xy: 651, 69 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 UnitActionIcons/Paradrop rotate: false - xy: 838, 1057 + xy: 406, 675 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Promote rotate: false - xy: 709, 569 + xy: 343, 465 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/Upgrade rotate: false - xy: 709, 569 + xy: 343, 465 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/RemoveHeresy rotate: false - xy: 551, 347 + xy: 451, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/SetUp rotate: false - xy: 328, 131 + xy: 955, 1803 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitActionIcons/ShowMore - rotate: false - xy: 1112, 1597 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 UnitActionIcons/Star rotate: false - xy: 1403, 1835 + xy: 883, 411 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/StartGoldenAge rotate: false - xy: 1511, 1829 + xy: 883, 303 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagCivilian rotate: false - xy: 4, 1386 + xy: 4, 1390 size: 178, 217 orig: 178, 217 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagEmbark rotate: false - xy: 4, 1168 + xy: 4, 1172 size: 178, 210 orig: 178, 210 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagFortify rotate: false - xy: 475, 1859 + xy: 475, 1863 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelection rotate: false - xy: 4, 982 + xy: 4, 986 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionCivilian rotate: false - xy: 4, 586 + xy: 4, 590 size: 157, 170 orig: 157, 170 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionEmbark rotate: false - xy: 4, 764 + xy: 4, 768 size: 178, 210 orig: 178, 210 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionFortify rotate: false - xy: 661, 1859 + xy: 661, 1863 size: 178, 178 orig: 178, 178 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 971527e4a8..00cfc52dfd 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/ui/utils/UnitGroup.kt b/core/src/com/unciv/ui/utils/UnitGroup.kt index 8d1bd6a552..969dae674d 100644 --- a/core/src/com/unciv/ui/utils/UnitGroup.kt +++ b/core/src/com/unciv/ui/utils/UnitGroup.kt @@ -1,6 +1,5 @@ package com.unciv.ui.utils -import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.actions.Actions @@ -12,7 +11,6 @@ import com.unciv.logic.map.MapUnit import com.unciv.ui.images.ImageGetter import com.unciv.ui.utils.extensions.center import com.unciv.ui.utils.extensions.surroundWithCircle -import com.unciv.utils.Log class UnitGroup(val unit: MapUnit, val size: Float): Group() { var actionGroup :Group? = null @@ -77,6 +75,7 @@ class UnitGroup(val unit: MapUnit, val size: Float): Group() { actionCircle.setPosition(size / 2, 0f) addActor(actionCircle) actionGroup = actionCircle + actionCircle.toFront() } if (unit.health < 100) { // add health bar @@ -122,7 +121,7 @@ class UnitGroup(val unit: MapUnit, val size: Float): Group() { return when { unit.isFortified() -> ImageGetter.getImage("UnitActionIcons/Fortify") unit.isSleeping() -> ImageGetter.getImage("UnitActionIcons/Sleep") - unit.isMoving() -> ImageGetter.getStatIcon("Movement") + unit.isMoving() -> ImageGetter.getImage("UnitActionIcons/MoveTo") unit.isExploring() -> ImageGetter.getImage("UnitActionIcons/Explore") unit.isAutomated() -> ImageGetter.getImage("UnitActionIcons/Automate") unit.isSetUpForSiege() -> ImageGetter.getImage("UnitActionIcons/SetUp")