diff --git a/android/Images/OtherIcons/CityStatus.png b/android/Images/OtherIcons/CityStatus.png new file mode 100644 index 0000000000..8c4fba4044 Binary files /dev/null and b/android/Images/OtherIcons/CityStatus.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 6d9eff66b2..a3a2684f1d 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,133 +6,140 @@ filter: MipMapLinearLinear, MipMapLinearLinear repeat: none CityStateIcons/Cultured rotate: false - xy: 427, 1745 + xy: 127, 1219 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Maritime rotate: false - xy: 1831, 1715 + xy: 1939, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Mercantile rotate: false - xy: 1939, 1715 + xy: 535, 1577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Militaristic rotate: false - xy: 535, 1577 + xy: 643, 1592 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 CityStateIcons/Religious rotate: false - xy: 1615, 1499 + xy: 1723, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +EmojiIcons/Automate + rotate: false + xy: 436, 432 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 EmojiIcons/Culture rotate: false - xy: 436, 418 + xy: 436, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Death rotate: false - xy: 436, 360 + xy: 436, 200 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Faith rotate: false - xy: 436, 302 + xy: 436, 142 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Food rotate: false - xy: 436, 244 + xy: 436, 84 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Gold rotate: false - xy: 436, 128 + xy: 494, 432 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Artist rotate: false - xy: 436, 70 + xy: 494, 374 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Engineer rotate: false - xy: 436, 12 + xy: 494, 316 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great General rotate: false - xy: 494, 534 + xy: 494, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Merchant rotate: false - xy: 494, 476 + xy: 494, 200 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Great Scientist rotate: false - xy: 494, 418 + xy: 494, 142 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Happiness rotate: false - xy: 494, 360 + xy: 494, 84 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Production rotate: false - xy: 527, 607 + xy: 552, 215 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Science rotate: false - xy: 552, 433 + xy: 552, 41 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 552, 317 + xy: 544, 1029 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -202,259 +209,259 @@ ImprovementIcons/City ruins index: -1 ImprovementIcons/Customs house rotate: false - xy: 127, 1219 + xy: 119, 1111 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 427, 1637 + xy: 535, 1793 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 535, 1685 + xy: 643, 1808 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fort rotate: false - xy: 643, 1700 + xy: 751, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Holy site rotate: false - xy: 967, 1715 + xy: 1075, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 1399, 1823 + xy: 1399, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1615, 1823 + xy: 1615, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1723, 1823 + xy: 1723, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 643, 1592 + xy: 751, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 751, 1607 + xy: 859, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Offshore Platform rotate: false - xy: 1507, 1607 + xy: 1615, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1723, 1607 + xy: 1831, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 1939, 1607 + xy: 412, 1529 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 514, 1253 + xy: 514, 1145 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Polder rotate: false - xy: 514, 1145 + xy: 643, 1484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1075, 1499 + xy: 1183, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1507, 1499 + xy: 1615, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Fallout rotate: false - xy: 1831, 1499 + xy: 1939, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Forest rotate: false - xy: 1939, 1499 + xy: 751, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Jungle rotate: false - xy: 1939, 1499 + xy: 751, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Marsh rotate: false - xy: 859, 1392 + xy: 967, 1392 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 ImprovementIcons/Remove Railroad rotate: false - xy: 967, 1391 + xy: 1075, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Remove Road rotate: false - xy: 1075, 1391 + xy: 1183, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Repair rotate: false - xy: 1183, 1391 + xy: 1291, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1507, 1391 + xy: 1615, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 328, 773 + xy: 328, 671 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 328, 557 + xy: 328, 455 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/EnhanceReligion rotate: false - xy: 112, 247 + xy: 112, 139 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundPantheon rotate: false - xy: 112, 247 + xy: 112, 139 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/FoundReligion rotate: false - xy: 112, 247 + xy: 112, 139 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/ReformReligion rotate: false - xy: 112, 247 + xy: 112, 139 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Faith rotate: false - xy: 112, 247 + xy: 112, 139 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/Loading rotate: false - xy: 1507, 1823 + xy: 1507, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/Working rotate: false - xy: 1507, 1823 + xy: 1507, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Loading rotate: false - xy: 1507, 1823 + xy: 1507, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/PickConstruction rotate: false - xy: 406, 1205 + xy: 520, 1469 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 406, 1205 + xy: 520, 1469 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -468,14 +475,14 @@ NotificationIcons/PickPolicy index: -1 NotificationIcons/PickTech rotate: false - xy: 520, 1469 + xy: 514, 1361 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 520, 1469 + xy: 514, 1361 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -524,7 +531,7 @@ StatIcons/Movement index: -1 OtherIcons/BackArrow rotate: false - xy: 436, 534 + xy: 436, 374 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -594,49 +601,56 @@ OtherIcons/Cities index: -1 OtherIcons/CityState rotate: false - xy: 436, 476 + xy: 436, 316 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -OtherIcons/Close +OtherIcons/CityStatus rotate: false xy: 1816, 1931 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +OtherIcons/Close + rotate: false + xy: 1924, 1931 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 OtherIcons/CrosshairB rotate: false - xy: 298, 1376 + xy: 298, 1268 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Diplomacy rotate: false - xy: 112, 1003 + xy: 112, 895 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DiplomacyW rotate: false - xy: 112, 895 + xy: 112, 787 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 112, 787 + xy: 112, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/ExclamationMark rotate: false - xy: 112, 139 + xy: 112, 31 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -650,7 +664,7 @@ OtherIcons/Fire index: -1 OtherIcons/ForwardArrow rotate: false - xy: 436, 186 + xy: 436, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -671,147 +685,147 @@ OtherIcons/HexagonOutline index: -1 OtherIcons/Improvements rotate: false - xy: 494, 302 + xy: 494, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Keyboard rotate: false - xy: 1291, 1715 + xy: 1399, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Link rotate: false - xy: 494, 186 + xy: 552, 447 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 1399, 1715 + xy: 1507, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/LockSmall rotate: false - xy: 494, 128 + xy: 552, 389 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 1723, 1715 + xy: 1831, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1939, 1823 + xy: 1939, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 859, 1607 + xy: 967, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 967, 1607 + xy: 1075, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/NationSwap rotate: false - xy: 1075, 1607 + xy: 1183, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Nations rotate: false - xy: 494, 70 + xy: 552, 331 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 1183, 1607 + xy: 1291, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Notifications rotate: false - xy: 1399, 1607 + xy: 1507, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 1831, 1607 + xy: 1939, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pause rotate: false - xy: 494, 12 + xy: 552, 273 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Pencil rotate: false - xy: 406, 1421 + xy: 406, 1313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 406, 1313 + xy: 406, 1205 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 514, 1361 + xy: 514, 1253 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Politics rotate: false - xy: 643, 1484 + xy: 751, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NotificationIcons/WorldCongressVote rotate: false - xy: 643, 1484 + xy: 751, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Present rotate: false - xy: 967, 1499 + xy: 1075, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -825,119 +839,119 @@ OtherIcons/Puppet index: -1 OtherIcons/Quest rotate: false - xy: 1183, 1499 + xy: 1291, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Question rotate: false - xy: 1291, 1499 + xy: 1399, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 1399, 1499 + xy: 1507, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Remove Heresy rotate: false - xy: 751, 1391 + xy: 859, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resources rotate: false - xy: 1291, 1391 + xy: 1399, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 1399, 1391 + xy: 1507, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Search rotate: false - xy: 1723, 1391 + xy: 1831, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/SecretOptions rotate: false - xy: 1831, 1391 + xy: 1939, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Settings rotate: false - xy: 1939, 1391 + xy: 227, 1111 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 220, 1003 + xy: 220, 895 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 220, 679 + xy: 220, 571 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Speaker rotate: false - xy: 220, 571 + xy: 220, 463 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy rotate: false - xy: 220, 247 + xy: 220, 139 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Spy_White rotate: false - xy: 220, 139 + xy: 220, 31 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 220, 37 + xy: 335, 1103 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 328, 881 + xy: 328, 779 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Timer rotate: false - xy: 328, 665 + xy: 328, 563 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -951,35 +965,35 @@ OtherIcons/Triangle index: -1 OtherIcons/Turn right rotate: false - xy: 328, 341 + xy: 328, 239 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Tyrannosaurus rotate: false - xy: 328, 233 + xy: 328, 131 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/WLTKD rotate: false - xy: 436, 592 + xy: 436, 490 size: 83, 65 orig: 83, 65 offset: 0, 0 index: -1 OtherIcons/Wait rotate: false - xy: 328, 17 + xy: 436, 995 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Wonders rotate: false - xy: 436, 665 + xy: 436, 563 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1021,217 +1035,217 @@ ResourceIcons/Citrus index: -1 ResourceIcons/Coal rotate: false - xy: 1924, 1931 + xy: 190, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Copper rotate: false - xy: 190, 1435 + xy: 190, 1327 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 190, 1327 + xy: 298, 1484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Crab rotate: false - xy: 298, 1484 + xy: 298, 1376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 119, 1111 + xy: 112, 1003 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 112, 355 + xy: 112, 247 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 535, 1793 + xy: 535, 1685 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 751, 1823 + xy: 751, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 751, 1715 + xy: 859, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold Ore rotate: false - xy: 859, 1715 + xy: 967, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 1075, 1823 + xy: 1075, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1075, 1715 + xy: 1183, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1183, 1823 + xy: 1183, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1183, 1715 + xy: 1291, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Jewelry rotate: false - xy: 1291, 1823 + xy: 1291, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1831, 1823 + xy: 1831, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1615, 1607 + xy: 1723, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 412, 1529 + xy: 406, 1421 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Porcelain rotate: false - xy: 859, 1499 + xy: 967, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Salt rotate: false - xy: 1615, 1391 + xy: 1723, 1391 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 227, 1111 + xy: 220, 1003 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 220, 895 + xy: 220, 787 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 220, 787 + xy: 220, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 220, 355 + xy: 220, 247 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 335, 1097 + xy: 328, 995 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 328, 989 + xy: 328, 887 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Truffles rotate: false - xy: 328, 449 + xy: 328, 347 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 328, 125 + xy: 328, 23 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 436, 989 + xy: 436, 887 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 436, 881 + xy: 436, 779 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 436, 773 + xy: 436, 671 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1252,77 +1266,77 @@ StatIcons/CityConnection index: -1 StatIcons/Culture rotate: false - xy: 298, 1268 + xy: 427, 1745 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 643, 1808 + xy: 643, 1700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 859, 1823 + xy: 859, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 967, 1823 + xy: 967, 1715 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/InterceptRange rotate: false - xy: 494, 244 + xy: 527, 505 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 1615, 1715 + xy: 1723, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 751, 1499 + xy: 859, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileIcons/Worked rotate: false - xy: 751, 1499 + xy: 859, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Range rotate: false - xy: 552, 549 + xy: 552, 157 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 552, 491 + xy: 552, 99 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/ReligiousStrength rotate: false - xy: 1723, 1499 + xy: 1831, 1499 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1336,14 +1350,14 @@ StatIcons/Resistance index: -1 StatIcons/Specialist rotate: false - xy: 220, 463 + xy: 220, 355 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 552, 375 + xy: 544, 1087 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1371,49 +1385,49 @@ TileIcons/CityCenter index: -1 TileIcons/Locked rotate: false - xy: 1507, 1715 + xy: 1615, 1823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileIcons/NotWorked rotate: false - xy: 1291, 1607 + xy: 1399, 1607 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UniqueIcons/Fallback rotate: false - xy: 112, 31 + xy: 427, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitTypeIcons/DomainAir rotate: false - xy: 112, 679 + xy: 112, 571 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitTypeIcons/DomainLand rotate: false - xy: 112, 571 + xy: 112, 463 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Terrains rotate: false - xy: 112, 571 + xy: 112, 463 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitTypeIcons/DomainWater rotate: false - xy: 112, 463 + xy: 112, 355 size: 100, 100 orig: 100, 100 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 50798b569b..0640b10729 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index a117216708..a692c05f5e 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -1414,6 +1414,7 @@ Civilization Info = Relations = Trade request = Garrisoned by unit = +Status\n(puppet, resistance or being razed) = # Victory diff --git a/core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTabColumn.kt b/core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTabColumn.kt index 965ed349ed..d23b443472 100644 --- a/core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTabColumn.kt +++ b/core/src/com/unciv/ui/screens/overviewscreen/CityOverviewTabColumn.kt @@ -25,9 +25,8 @@ import kotlin.math.roundToInt * This defines all behaviour of the [CityOverviewTab] columns through overridable parts */ -// This false positive of detekt is possibly fixed in https://github.com/detekt/detekt/pull/6367 -// (The getComparator overrides need the explicit City type on their lambda parameter) -@Suppress("ExplicitItLambdaParameter") // detekt is wrong +// Note: Using type hints on compareBy where explicitly typing the lambda `it` instead would be prettier. +// detekt would false-positive the typed `it`, see discussion in: https://github.com/detekt/detekt/pull/6367 enum class CityOverviewTabColumn : ISortableGridContentProvider { //region Enum Instances @@ -36,7 +35,7 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider it.name.tr(hideIcons = true) } + override fun getComparator() = compareBy(collator) { it.name.tr(hideIcons = true) } override fun getHeaderIcon(iconSize: Float) = ImageGetter.getUnitIcon("Settler") .surroundWithCircle(iconSize) @@ -50,6 +49,28 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider 3 + item.isInResistance() -> 2 + item.isPuppet -> 1 + else -> 0 + } + override fun getEntryActor(item: City, iconSize: Float, actionContext: EmpireOverviewScreen): Actor? { + val iconPath = when { + item.isBeingRazed -> "OtherIcons/Fire" + item.isInResistance() -> "StatIcons/Resistance" + item.isPuppet -> "OtherIcons/Puppet" + else -> return null + } + // getImage is an ImageWithCustomSize, but setting size here fails - width is not respected + return ImageGetter.getImage(iconPath).surroundWithCircle(iconSize * 0.7f, color = Color.CLEAR) + } + override fun getTotalsActor(items: Iterable) = null + }, + ConstructionIcon { override fun getHeaderIcon(iconSize: Float) = null override fun getEntryValue(item: City) = @@ -69,7 +90,7 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider it.cityConstructions.currentConstructionFromQueue.tr(hideIcons = true) } + compareBy(collator) { it.cityConstructions.currentConstructionFromQueue.tr(hideIcons = true) } override fun getHeaderIcon(iconSize: Float) = getCircledIcon("OtherIcons/Settings", iconSize) override fun getEntryValue(item: City) = 0 @@ -134,13 +155,13 @@ enum class CityOverviewTabColumn : ISortableGridContentProvider it.getCenterTile().militaryUnit?.name?.tr(hideIcons = true) ?: "" } + compareBy(collator) { it.getGarrison()?.name?.tr(hideIcons = true) ?: "" } override fun getHeaderIcon(iconSize: Float) = getCircledIcon("OtherIcons/Shield", iconSize) override fun getEntryValue(item: City) = - if (item.getCenterTile().militaryUnit != null) 1 else 0 + if (item.getGarrison() != null) 1 else 0 override fun getEntryActor(item: City, iconSize: Float, actionContext: EmpireOverviewScreen): Actor? { - val unit = item.getCenterTile().militaryUnit ?: return null + val unit = item.getGarrison() ?: return null val unitName = unit.displayName() val unitIcon = ImageGetter.getConstructionPortrait(unit.baseUnit.getIconName(), iconSize * 0.7f) unitIcon.addTooltip(unitName, 18f, tipAlign = Align.topLeft)