diff --git a/android/Images/OtherIcons/Fire.png b/android/Images/OtherIcons/Fire.png index fb85dcca76..b56e6a3419 100644 Binary files a/android/Images/OtherIcons/Fire.png and b/android/Images/OtherIcons/Fire.png differ diff --git a/android/Images/OtherIcons/Puppet.png b/android/Images/OtherIcons/Puppet.png index 6f38cd4614..7978e459d5 100644 Binary files a/android/Images/OtherIcons/Puppet.png and b/android/Images/OtherIcons/Puppet.png differ diff --git a/android/Images/StatIcons/CityConnection.png b/android/Images/StatIcons/CityConnection.png index 91a7dddaf3..b53d4751a0 100644 Binary files a/android/Images/StatIcons/CityConnection.png and b/android/Images/StatIcons/CityConnection.png differ diff --git a/android/Images/StatIcons/Resistance.png b/android/Images/StatIcons/Resistance.png index 280d8fb1fb..ae24b141ab 100644 Binary files a/android/Images/StatIcons/Resistance.png and b/android/Images/StatIcons/Resistance.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index ad35d1126f..c4b07217db 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,1568 +6,1568 @@ filter: MipMapLinearLinear, MipMapLinearLinear repeat: none CityStateIcons/Cultured rotate: false - xy: 298, 1751 + xy: 514, 1748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Maritime rotate: false - xy: 406, 779 + xy: 514, 776 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Mercantile rotate: false - xy: 622, 995 + xy: 730, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Militaristic rotate: false - xy: 730, 1103 + xy: 622, 776 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Religious rotate: false - xy: 443, 455 + xy: 343, 344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 EmojiIcons/Culture rotate: false - xy: 946, 1755 + xy: 991, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Faith rotate: false - xy: 946, 1697 + xy: 991, 504 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Food rotate: false - xy: 946, 1639 + xy: 941, 369 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Gold rotate: false - xy: 946, 1581 + xy: 941, 311 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Artist rotate: false - xy: 946, 1523 + xy: 941, 253 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Engineer rotate: false - xy: 946, 1465 + xy: 974, 442 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great General rotate: false - xy: 946, 1407 + xy: 999, 384 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Merchant rotate: false - xy: 946, 1349 + xy: 999, 326 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Scientist rotate: false - xy: 946, 1291 + xy: 999, 268 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Happiness rotate: false - xy: 946, 1233 + xy: 760, 178 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Production rotate: false - xy: 946, 827 + xy: 818, 10 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Science rotate: false - xy: 946, 653 + xy: 1054, 1695 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 1120, 1771 + xy: 1112, 1637 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 971, 1937 + xy: 4, 229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 4, 153 + xy: 1439, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Barbarian encampment rotate: false - xy: 1511, 1937 + xy: 1871, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 1619, 1937 + xy: 190, 1686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Citadel rotate: false - xy: 1943, 1937 + xy: 190, 1362 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City center rotate: false - xy: 190, 1473 + xy: 190, 1038 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 190, 1365 + xy: 190, 930 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 298, 1643 + xy: 298, 1424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 406, 1427 + xy: 406, 1316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 730, 1751 + xy: 622, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fort rotate: false - xy: 406, 1319 + xy: 298, 1100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Holy site rotate: false - xy: 730, 1535 + xy: 622, 1316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 406, 995 + xy: 298, 776 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 298, 779 + xy: 730, 1208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 514, 995 + xy: 514, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 514, 779 + xy: 730, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 622, 887 + xy: 730, 776 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Offshore Platform rotate: false - xy: 838, 1705 + xy: 838, 1256 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 838, 1489 + xy: 838, 1040 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 838, 1165 + xy: 298, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 622, 671 + xy: 127, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Polder rotate: false - xy: 730, 671 + xy: 127, 367 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 601, 563 + xy: 235, 452 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 335, 455 + xy: 235, 344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Fallout rotate: false - xy: 659, 455 + xy: 559, 344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Forest rotate: false - xy: 119, 370 + xy: 127, 259 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Jungle rotate: false - xy: 119, 370 + xy: 127, 259 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Marsh rotate: false - xy: 112, 155 + xy: 112, 44 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 ImprovementIcons/Remove Railroad rotate: false - xy: 112, 47 + xy: 235, 236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Road rotate: false - xy: 227, 347 + xy: 343, 236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Repair rotate: false - xy: 443, 347 + xy: 559, 236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 220, 131 + xy: 436, 128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 983, 409 + xy: 946, 836 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 976, 193 + xy: 946, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/EnhanceReligion rotate: false - xy: 406, 1535 + xy: 514, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundPantheon rotate: false - xy: 406, 1535 + xy: 514, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundReligion rotate: false - xy: 406, 1535 + xy: 514, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/ReformReligion rotate: false - xy: 406, 1535 + xy: 514, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Faith rotate: false - xy: 406, 1535 + xy: 514, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/Loading rotate: false - xy: 622, 1211 + xy: 514, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/Working rotate: false - xy: 622, 1211 + xy: 514, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Loading rotate: false - xy: 622, 1211 + xy: 514, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/PickConstruction rotate: false - xy: 298, 671 + xy: 730, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 298, 671 + xy: 730, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/PickPolicy rotate: false - xy: 4, 4 + xy: 1979, 1943 size: 33, 33 orig: 33, 33 offset: 0, 0 index: -1 NotificationIcons/PickTech rotate: false - xy: 406, 671 + xy: 838, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 406, 671 + xy: 838, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/AirSweep rotate: false - xy: 4, 261 + xy: 1331, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/AirSweep rotate: false - xy: 4, 261 + xy: 1331, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 851, 27 + xy: 1979, 1984 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/ArrowRight rotate: false - xy: 909, 27 + xy: 883, 369 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 NotificationIcons/MoveAutomatedUnits rotate: false - xy: 909, 27 + xy: 883, 369 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 NotificationIcons/NextUnit rotate: false - xy: 909, 27 + xy: 883, 369 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 909, 27 + xy: 883, 369 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 967, 27 + xy: 883, 311 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Banner rotate: false - xy: 1403, 1937 + xy: 1763, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Camera rotate: false - xy: 767, 530 + xy: 1054, 1546 size: 25, 25 orig: 25, 25 offset: 0, 0 index: -1 OtherIcons/Capital rotate: false - xy: 4, 477 + xy: 1108, 1933 size: 107, 101 orig: 107, 101 offset: 0, 0 index: -1 OtherIcons/Checkmark rotate: false - xy: 1835, 1937 + xy: 190, 1470 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/NextTurn rotate: false - xy: 1835, 1937 + xy: 190, 1470 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 4, 1611 + xy: 4, 1608 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlag rotate: false - xy: 4, 1611 + xy: 4, 1608 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/Cities rotate: false - xy: 190, 1689 + xy: 190, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/CityState rotate: false - xy: 1025, 27 + xy: 883, 253 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Close rotate: false - xy: 190, 1257 + xy: 190, 822 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/CrosshairB rotate: false - xy: 169, 609 + xy: 298, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Diplomacy rotate: false - xy: 298, 1535 + xy: 514, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DiplomacyW rotate: false - xy: 406, 1643 + xy: 622, 1748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 514, 1751 + xy: 298, 1316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/DisbandUnit rotate: false - xy: 514, 1751 + xy: 298, 1316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/ExclamationMark rotate: false - xy: 622, 1751 + xy: 730, 1748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 514, 1535 - size: 100, 100 - orig: 100, 100 + xy: 4, 460 + size: 115, 115 + orig: 115, 115 offset: 0, 0 index: -1 OtherIcons/Hexagon rotate: false - xy: 4, 1797 + xy: 4, 1794 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 OtherIcons/Improvements rotate: false - xy: 946, 1117 + xy: 760, 62 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Link rotate: false - xy: 946, 1001 + xy: 818, 126 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 514, 1103 + xy: 406, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Lock rotate: false - xy: 730, 1319 + xy: 622, 1100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/LockSmall rotate: false - xy: 946, 943 + xy: 818, 68 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 622, 1103 + xy: 622, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 514, 887 + xy: 622, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 730, 995 + xy: 838, 1688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 622, 779 + xy: 838, 1580 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Nations rotate: false - xy: 946, 885 + xy: 760, 4 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 730, 887 + xy: 838, 1472 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Notifications rotate: false - xy: 730, 779 + xy: 838, 1364 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 838, 1381 + xy: 838, 932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pencil rotate: false - xy: 838, 949 + xy: 514, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 838, 841 + xy: 622, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 514, 671 + xy: 838, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Pillage rotate: false - xy: 514, 671 + xy: 838, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Politics rotate: false - xy: 838, 733 + xy: 277, 560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/WorldCongressVote rotate: false - xy: 838, 733 + xy: 277, 560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Present rotate: false - xy: 385, 563 + xy: 601, 560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Present rotate: false - xy: 385, 563 + xy: 601, 560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 1943, 1835 - size: 94, 94 - orig: 94, 94 + xy: 985, 1919 + size: 115, 115 + orig: 115, 115 offset: 0, 0 index: -1 OtherIcons/Quest rotate: false - xy: 709, 563 + xy: 343, 452 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Question rotate: false - xy: 817, 517 + xy: 451, 452 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 227, 455 + xy: 559, 452 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Remove Heresy rotate: false - xy: 112, 262 + xy: 112, 151 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resources rotate: false - xy: 659, 347 + xy: 220, 128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 220, 239 + xy: 328, 128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Search rotate: false - xy: 328, 131 + xy: 220, 20 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/SecretOptions rotate: false - xy: 436, 239 + xy: 328, 20 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Settings rotate: false - xy: 544, 239 + xy: 544, 20 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 652, 239 + xy: 667, 344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 328, 23 + xy: 652, 20 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Sleep rotate: false - xy: 328, 23 + xy: 652, 20 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Speaker rotate: false - xy: 436, 23 + xy: 775, 458 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy rotate: false - xy: 767, 409 + xy: 955, 1796 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy_White rotate: false - xy: 767, 301 + xy: 946, 1688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 760, 199 + xy: 946, 1586 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 868, 193 + xy: 946, 1160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Stop rotate: false - xy: 868, 193 + xy: 946, 1160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/StopMove rotate: false - xy: 868, 193 + xy: 946, 1160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 925, 517 + xy: 946, 944 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Swap rotate: false - xy: 925, 517 + xy: 946, 944 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Terrains rotate: false - xy: 1004, 1713 + xy: 1054, 1579 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Timer rotate: false - xy: 983, 301 + xy: 946, 728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Triangle rotate: false - xy: 289, 1859 + xy: 289, 1856 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/Turn right rotate: false - xy: 971, 1829 + xy: 1171, 1825 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Tyrannosaurus rotate: false - xy: 1079, 1829 + xy: 1279, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Unique rotate: false - xy: 1187, 1829 + xy: 1387, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/WLTKD rotate: false - xy: 760, 24 + xy: 883, 427 size: 83, 65 orig: 83, 65 offset: 0, 0 index: -1 OtherIcons/Wait rotate: false - xy: 1403, 1829 + xy: 1603, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Wait rotate: false - xy: 1403, 1829 + xy: 1603, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Wonders rotate: false - xy: 1835, 1829 + xy: 883, 500 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 289, 1850 + xy: 289, 1847 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1187, 1937 + xy: 4, 13 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 4, 45 + xy: 1655, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 1727, 1937 + xy: 190, 1578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Citrus rotate: false - xy: 190, 1581 + xy: 190, 1146 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 190, 1149 + xy: 190, 714 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Copper rotate: false - xy: 190, 825 + xy: 298, 1748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 847, 1813 + xy: 298, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Crab rotate: false - xy: 190, 717 + xy: 406, 1748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 406, 1751 + xy: 406, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 298, 1427 + xy: 406, 1424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 622, 1643 + xy: 514, 1424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 730, 1643 + xy: 622, 1424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 298, 1103 + xy: 730, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold Ore rotate: false - xy: 514, 1319 + xy: 406, 1100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 298, 995 + xy: 730, 1424 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 514, 1211 + xy: 406, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 622, 1319 + xy: 514, 1100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 730, 1427 + xy: 622, 1208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Jewelry rotate: false - xy: 298, 887 + xy: 730, 1316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 730, 1211 + xy: 730, 1100 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 838, 1597 + xy: 838, 1148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 838, 1057 + xy: 406, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Porcelain rotate: false - xy: 277, 563 + xy: 493, 560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Salt rotate: false - xy: 328, 239 + xy: 544, 128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 544, 131 + xy: 667, 452 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 652, 131 + xy: 667, 236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 220, 23 + xy: 652, 128 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 652, 23 + xy: 775, 242 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 875, 301 + xy: 946, 1268 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 868, 85 + xy: 946, 1052 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Truffles rotate: false - xy: 976, 85 + xy: 1063, 1811 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1295, 1829 + xy: 1495, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1511, 1829 + xy: 1711, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1619, 1829 + xy: 1819, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1727, 1829 + xy: 1927, 1826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Acquire rotate: false - xy: 4, 369 + xy: 1223, 1934 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, 1904 + size: 130, 130 + orig: 130, 130 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 119, 478 + xy: 406, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 298, 1211 + xy: 730, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 406, 1211 + xy: 298, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 622, 1427 + xy: 514, 1208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/InterceptRange rotate: false - xy: 946, 1059 + xy: 818, 184 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 406, 887 + xy: 406, 776 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 838, 625 + xy: 385, 560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Range rotate: false - xy: 946, 769 + xy: 1063, 1753 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 946, 711 + xy: 1121, 1753 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/ReligiousStrength rotate: false - xy: 551, 455 + xy: 451, 344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 551, 347 - size: 100, 100 - orig: 100, 100 + xy: 4, 337 + size: 115, 115 + orig: 115, 115 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 544, 23 + xy: 775, 350 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1062, 1771 + xy: 1112, 1695 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitActionIcons/AddInCapital rotate: false - xy: 1079, 1937 + xy: 4, 121 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Automate rotate: false - xy: 1295, 1937 + xy: 1547, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/HurryConstruction rotate: false - xy: 1295, 1937 + xy: 1547, 1934 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/ConductTradeMission rotate: false - xy: 190, 1041 + xy: 169, 606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/ConstructImprovement rotate: false - xy: 190, 933 + xy: 847, 1796 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Repair rotate: false - xy: 190, 933 + xy: 847, 1796 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/EnhanceReligion rotate: false - xy: 514, 1643 + xy: 622, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FoundReligion rotate: false - xy: 514, 1643 + xy: 622, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Explore rotate: false - xy: 298, 1319 + xy: 298, 1208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Fortify rotate: false - xy: 514, 1427 + xy: 406, 1208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FortifyUntilHealed rotate: false - xy: 514, 1427 + xy: 406, 1208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/FoundCity rotate: false - xy: 622, 1535 + xy: 514, 1316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/HideMore rotate: false - xy: 946, 1175 + xy: 760, 120 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitActionIcons/HurryResearch rotate: false - xy: 406, 1103 + xy: 298, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Paradrop rotate: false - xy: 838, 1273 + xy: 838, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/Promote rotate: false - xy: 493, 569 + xy: 709, 566 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/Upgrade rotate: false - xy: 493, 569 + xy: 709, 566 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/RemoveHeresy rotate: false - xy: 335, 347 + xy: 451, 236 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/SetUp rotate: false - xy: 436, 131 + xy: 436, 20 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitActionIcons/ShowMore rotate: false - xy: 1004, 1771 + xy: 1054, 1637 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitActionIcons/Star rotate: false - xy: 760, 97 + xy: 946, 1484 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitActionIcons/StartGoldenAge rotate: false - xy: 875, 409 + xy: 946, 1376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagCivilian rotate: false - xy: 4, 1386 + xy: 4, 1383 size: 178, 217 orig: 178, 217 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagEmbark rotate: false - xy: 4, 1168 + xy: 4, 1165 size: 178, 210 orig: 178, 210 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagFortify rotate: false - xy: 475, 1859 + xy: 475, 1856 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelection rotate: false - xy: 4, 982 + xy: 4, 979 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionCivilian rotate: false - xy: 4, 586 + xy: 4, 583 size: 157, 170 orig: 157, 170 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionEmbark rotate: false - xy: 4, 764 + xy: 4, 761 size: 178, 210 orig: 178, 210 offset: 0, 0 index: -1 UnitFlagIcons/UnitFlagSelectionFortify rotate: false - xy: 661, 1859 + xy: 661, 1856 size: 178, 178 orig: 178, 178 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 4359b1eca8..f82955c770 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index 99ddfb0e61..620d24a953 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -248,27 +248,27 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab if (belongsToViewingCiv() && city.isConnectedToCapital() && !city.isCapital()) { val connectionImage = ImageGetter.getStatIcon("CityConnection") - table.add(connectionImage).size(16f) + table.add(connectionImage).size(18f) } if (city.isInResistance()) { val resistanceImage = ImageGetter.getImage("StatIcons/Resistance") - table.add(resistanceImage).size(16f).padLeft(2f) + table.add(resistanceImage).size(18f).padLeft(2f) } if (city.isPuppet) { val puppetImage = ImageGetter.getImage("OtherIcons/Puppet") - table.add(puppetImage).size(16f).padLeft(2f) + table.add(puppetImage).size(18f).padLeft(2f) } if (city.isBeingRazed) { val fireImage = ImageGetter.getImage("OtherIcons/Fire") - table.add(fireImage).size(16f).padLeft(2f) + table.add(fireImage).size(18f).padLeft(2f) } if (belongsToViewingCiv() && city.isWeLoveTheKingDayActive()) { val wtlkdImage = ImageGetter.getImage("OtherIcons/WLTKD") - table.add(wtlkdImage).size(16f).padLeft(2f) + table.add(wtlkdImage).size(18f).padLeft(2f) } return table