diff --git a/android/assets/Images/StatIcons/20xCulture5 - Copy.png b/android/assets/Images/StatIcons/20xCulture5 - Copy.png new file mode 100644 index 0000000000..bd8a5de900 Binary files /dev/null and b/android/assets/Images/StatIcons/20xCulture5 - Copy.png differ diff --git a/android/assets/Images/StatIcons/20xCulture5.png b/android/assets/Images/StatIcons/20xCulture5.png index ec7f6688cf..f5ac2ebb25 100644 Binary files a/android/assets/Images/StatIcons/20xCulture5.png and b/android/assets/Images/StatIcons/20xCulture5.png differ diff --git a/android/assets/Images/StatIcons/20xFood5 - Copy.png b/android/assets/Images/StatIcons/20xFood5 - Copy.png new file mode 100644 index 0000000000..312313b308 Binary files /dev/null and b/android/assets/Images/StatIcons/20xFood5 - Copy.png differ diff --git a/android/assets/Images/StatIcons/20xFood5.png b/android/assets/Images/StatIcons/20xFood5.png index 181807661f..095b7c2c5b 100644 Binary files a/android/assets/Images/StatIcons/20xFood5.png and b/android/assets/Images/StatIcons/20xFood5.png differ diff --git a/android/assets/Images/StatIcons/20xGold5 - Copy.png b/android/assets/Images/StatIcons/20xGold5 - Copy.png new file mode 100644 index 0000000000..a297c5bda6 Binary files /dev/null and b/android/assets/Images/StatIcons/20xGold5 - Copy.png differ diff --git a/android/assets/Images/StatIcons/20xGold5.png b/android/assets/Images/StatIcons/20xGold5.png index 63e3e773a2..33cd1e0b31 100644 Binary files a/android/assets/Images/StatIcons/20xGold5.png and b/android/assets/Images/StatIcons/20xGold5.png differ diff --git a/android/assets/Images/StatIcons/20xHappiness5 - Copy.png b/android/assets/Images/StatIcons/20xHappiness5 - Copy.png new file mode 100644 index 0000000000..ec0762a318 Binary files /dev/null and b/android/assets/Images/StatIcons/20xHappiness5 - Copy.png differ diff --git a/android/assets/Images/StatIcons/20xHappiness5.png b/android/assets/Images/StatIcons/20xHappiness5.png index 86d9f9bb7e..6602ecaa37 100644 Binary files a/android/assets/Images/StatIcons/20xHappiness5.png and b/android/assets/Images/StatIcons/20xHappiness5.png differ diff --git a/android/assets/Images/StatIcons/20xPopulation5 - Copy.png b/android/assets/Images/StatIcons/20xPopulation5 - Copy.png new file mode 100644 index 0000000000..155b6d2ff9 Binary files /dev/null and b/android/assets/Images/StatIcons/20xPopulation5 - Copy.png differ diff --git a/android/assets/Images/StatIcons/20xPopulation5.png b/android/assets/Images/StatIcons/20xPopulation5.png index 990fddba82..33f9dea931 100644 Binary files a/android/assets/Images/StatIcons/20xPopulation5.png and b/android/assets/Images/StatIcons/20xPopulation5.png differ diff --git a/android/assets/Images/StatIcons/20xProduction5 - Copy.png b/android/assets/Images/StatIcons/20xProduction5 - Copy.png new file mode 100644 index 0000000000..8bf6681147 Binary files /dev/null and b/android/assets/Images/StatIcons/20xProduction5 - Copy.png differ diff --git a/android/assets/Images/StatIcons/20xProduction5.png b/android/assets/Images/StatIcons/20xProduction5.png index 73c7d2261f..8e675a708c 100644 Binary files a/android/assets/Images/StatIcons/20xProduction5.png and b/android/assets/Images/StatIcons/20xProduction5.png differ diff --git a/android/assets/Images/StatIcons/20xScience5 - Copy.png b/android/assets/Images/StatIcons/20xScience5 - Copy.png new file mode 100644 index 0000000000..0fdcda82d9 Binary files /dev/null and b/android/assets/Images/StatIcons/20xScience5 - Copy.png differ diff --git a/android/assets/Images/StatIcons/20xScience5.png b/android/assets/Images/StatIcons/20xScience5.png index b233bf0168..f7067033e9 100644 Binary files a/android/assets/Images/StatIcons/20xScience5.png and b/android/assets/Images/StatIcons/20xScience5.png differ diff --git a/android/assets/Images/StatIcons/CultureSpecialist.png b/android/assets/Images/StatIcons/CultureSpecialist.png deleted file mode 100644 index 01a46e525b..0000000000 Binary files a/android/assets/Images/StatIcons/CultureSpecialist.png and /dev/null differ diff --git a/android/assets/Images/StatIcons/GoldSpecialist.png b/android/assets/Images/StatIcons/GoldSpecialist.png deleted file mode 100644 index e3029bd2e0..0000000000 Binary files a/android/assets/Images/StatIcons/GoldSpecialist.png and /dev/null differ diff --git a/android/assets/Images/StatIcons/ProductionSpecialist.png b/android/assets/Images/StatIcons/ProductionSpecialist.png deleted file mode 100644 index 4ef8581044..0000000000 Binary files a/android/assets/Images/StatIcons/ProductionSpecialist.png and /dev/null differ diff --git a/android/assets/Images/StatIcons/ScienceSpecialist.png b/android/assets/Images/StatIcons/ScienceSpecialist.png deleted file mode 100644 index 81bc0ea6d3..0000000000 Binary files a/android/assets/Images/StatIcons/ScienceSpecialist.png and /dev/null differ diff --git a/android/assets/Images/game.atlas b/android/assets/Images/game.atlas index 7251bf9ddd..62956ffecc 100644 --- a/android/assets/Images/game.atlas +++ b/android/assets/Images/game.atlas @@ -6,1155 +6,1176 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none FlagIcons/Dutch rotate: false - xy: 1178, 1501 + xy: 810, 504 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 810, 955 + xy: 1012, 722 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 994, 1181 + xy: 1756, 1514 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 1308, 1501 + xy: 810, 374 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 810, 825 + xy: 1886, 1514 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 1568, 1501 + xy: 1012, 592 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 1698, 1501 + xy: 406, 48 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 1828, 1501 + xy: 536, 48 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy_(Civ5) rotate: false - xy: 406, 119 + xy: 1618, 1460 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Camp_(Civ5) rotate: false - xy: 719, 1592 + xy: 940, 588 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Customs_house_(Civ5) rotate: false - xy: 994, 1135 + xy: 720, 1605 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Farm_(Civ5) rotate: false - xy: 2, 2 + xy: 856, 198 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Landmark_(Civ5) rotate: false - xy: 940, 993 + xy: 1756, 1468 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Lumber_mill_(Civ5) rotate: false - xy: 994, 1089 + xy: 1142, 714 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Manufactory_(Civ5) rotate: false - xy: 1040, 1135 + xy: 940, 496 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Mine_(Civ5) rotate: false - xy: 1958, 1539 + xy: 48, 63 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Oil_well_(Civ5) rotate: false - xy: 1962, 1894 + xy: 758, 132 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Pasture_(Civ5) rotate: false - xy: 498, 119 + xy: 1962, 1862 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Plantation_(Civ5) rotate: false - xy: 700, 175 + xy: 1802, 1468 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Quarry_(Civ5) rotate: false - xy: 1132, 1311 + xy: 1142, 668 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Railroad_(Civ5) rotate: false - xy: 1124, 1265 + xy: 940, 450 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Road_(Civ5) rotate: false - xy: 1178, 1363 + xy: 140, 2 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Trading_post_(Civ5) rotate: false - xy: 544, 119 + xy: 140, 63 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 1154, 1833 + xy: 204, 109 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 2, 702 + xy: 850, 1644 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 1558, 1833 + xy: 1456, 1644 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 2, 298 + xy: 1658, 1644 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 1760, 1833 + xy: 269, 1604 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1438, 1501 + xy: 810, 244 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 406, 1377 + xy: 810, 1442 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 406, 569 + xy: 1012, 1240 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 673, 1638 + xy: 673, 1651 size: 150, 141 orig: 150, 141 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 406, 165 + xy: 810, 836 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 548, 1781 + xy: 548, 1794 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 1860, 1631 + xy: 1860, 1644 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 847, 1778 + xy: 847, 1791 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy_(Civ5) rotate: false - xy: 940, 855 + xy: 246, 48 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Citizenship_(Civ5) rotate: false - xy: 1224, 1374 + xy: 1940, 1479 size: 28, 33 orig: 28, 33 offset: 0, 0 index: -1 PolicyIcons/Civil_Society_(Civ5) rotate: false - xy: 1316, 1468 + xy: 696, 53 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Collective_Rule_(Civ5) rotate: false - xy: 940, 914 + xy: 216, 76 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Constitution_(Civ5) rotate: false - xy: 252, 67 + xy: 306, 80 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Democracy_(Civ5) rotate: false - xy: 2004, 1549 + xy: 246, 77 size: 28, 30 orig: 28, 30 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship_(Civ5) rotate: false - xy: 1962, 1986 + xy: 673, 1602 size: 45, 47 orig: 45, 47 offset: 0, 0 index: -1 PolicyIcons/Free_Religion_(Civ5) rotate: false - xy: 1086, 1112 + xy: 756, 55 size: 28, 29 orig: 28, 29 offset: 0, 0 index: -1 PolicyIcons/Free_Speech_(Civ5) rotate: false - xy: 1086, 1143 + xy: 902, 206 size: 28, 36 orig: 28, 36 offset: 0, 0 index: -1 PolicyIcons/Free_Thought_(Civ5) rotate: false - xy: 1346, 1471 + xy: 276, 48 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Humanism_(Civ5) rotate: false - xy: 1406, 1472 + xy: 306, 51 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Landed_Elite_(Civ5) rotate: false - xy: 192, 63 + xy: 1970, 1481 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Legalism_(Civ5) rotate: false - xy: 940, 884 + xy: 1142, 592 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Mandate_Of_Heaven_(Civ5) rotate: false - xy: 1958, 1502 + xy: 186, 72 size: 28, 35 orig: 28, 35 offset: 0, 0 index: -1 PolicyIcons/Mercantilism_(Civ5) rotate: false - xy: 2009, 1996 + xy: 2014, 2009 size: 28, 37 orig: 28, 37 offset: 0, 0 index: -1 PolicyIcons/Meritocracy_(Civ5) rotate: false - xy: 940, 826 + xy: 336, 80 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Monarchy_(Civ5) rotate: false - xy: 902, 787 + xy: 666, 48 size: 28, 36 orig: 28, 36 offset: 0, 0 index: -1 PolicyIcons/Oligarchy_(Civ5) rotate: false - xy: 1270, 1421 + xy: 940, 274 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 PolicyIcons/Organized_Religion_(Civ5) rotate: false - xy: 1224, 1317 + xy: 278, 22 size: 28, 24 orig: 28, 24 offset: 0, 0 index: -1 PolicyIcons/Patronage_(Civ5) rotate: false - xy: 2, 48 + xy: 1962, 2000 size: 50, 46 orig: 50, 46 offset: 0, 0 index: -1 PolicyIcons/Protectionism_(Civ5) rotate: false - xy: 282, 68 + xy: 216, 48 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Reformation_(Civ5) rotate: false - xy: 222, 66 + xy: 940, 244 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Representation_(Civ5) rotate: false - xy: 1124, 1186 + xy: 726, 53 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Republic_(Civ5) rotate: false - xy: 1436, 1473 + xy: 336, 52 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Scientific_Revolution_(Civ5) rotate: false - xy: 312, 68 + xy: 366, 81 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Secularism_(Civ5) rotate: false - xy: 1224, 1343 + xy: 276, 78 size: 28, 29 orig: 28, 29 offset: 0, 0 index: -1 PolicyIcons/Sovereignty_(Civ5) rotate: false - xy: 1466, 1474 + xy: 366, 54 size: 28, 25 orig: 28, 25 offset: 0, 0 index: -1 PolicyIcons/Theocracy_(Civ5) rotate: false - xy: 765, 1599 + xy: 766, 1612 size: 28, 37 orig: 28, 37 offset: 0, 0 index: -1 PolicyIcons/Trade_Unions_(Civ5) rotate: false - xy: 1376, 1471 + xy: 932, 214 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Universal_Suffrage_(Civ5) rotate: false - xy: 2004, 1581 + xy: 940, 308 size: 28, 48 orig: 28, 48 offset: 0, 0 index: -1 ResourceIcons/Aluminum_(Civ5) rotate: false - xy: 608, 175 + xy: 1142, 806 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Bananas_(Civ5) rotate: false - xy: 673, 1592 + xy: 810, 198 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Cattle_(Civ5) rotate: false - xy: 1132, 1403 + xy: 2, 2 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Coal_(Civ5) rotate: false - xy: 1178, 1455 + xy: 666, 132 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Cotton_(Civ5) rotate: false - xy: 940, 1039 + xy: 1962, 1954 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Deer_(Civ5) rotate: false - xy: 810, 779 + xy: 1664, 1460 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Dyes_(Civ5) rotate: false - xy: 1958, 1585 + xy: 1142, 760 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Furs_(Civ5) rotate: false - xy: 54, 50 + xy: 940, 542 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Gems_(Civ5) rotate: false - xy: 1962, 1940 + xy: 48, 2 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Gold_(Civ5) rotate: false - xy: 452, 119 + xy: 2, 63 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Horses_(Civ5) rotate: false - xy: 654, 175 + xy: 666, 86 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Incense_(Civ5) rotate: false - xy: 1132, 1357 + xy: 712, 132 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Iron_(Civ5) rotate: false - xy: 1178, 1409 + xy: 1962, 1908 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Ivory_(Civ5) rotate: false - xy: 1224, 1455 + xy: 1710, 1460 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Marble_(Civ5) rotate: false - xy: 856, 779 + xy: 94, 2 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Oil_(Civ5) rotate: false - xy: 100, 50 + xy: 712, 86 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Sheep_(Civ5) rotate: false - xy: 1224, 1409 + xy: 94, 63 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Silk_(Civ5) rotate: false - xy: 1270, 1455 + xy: 758, 86 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Silver_(Civ5) rotate: false - xy: 940, 947 + xy: 1848, 1468 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Spices_(Civ5) rotate: false - xy: 1040, 1089 + xy: 1142, 622 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Stone_(Civ5) rotate: false - xy: 146, 50 + xy: 940, 404 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Sugar_(Civ5) rotate: false - xy: 1962, 1848 + xy: 186, 2 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Uranium_(Civ5) rotate: false - xy: 746, 175 + xy: 1894, 1468 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Wheat_(Civ5) rotate: false - xy: 1124, 1219 + xy: 940, 358 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Wine_(Civ5) rotate: false - xy: 1178, 1317 + xy: 232, 2 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 StatIcons/20xCityConnection5 rotate: false - xy: 825, 1759 + xy: 825, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xCulture5 rotate: false - xy: 406, 97 - size: 20, 20 - orig: 20, 20 + xy: 548, 1846 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/20xCulture5 - Copy + rotate: false + xy: 2, 1321 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xFood5 rotate: false - xy: 1086, 1090 - size: 20, 20 - orig: 20, 20 + xy: 750, 1846 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/20xFood5 - Copy + rotate: false + xy: 2, 1119 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xGold5 rotate: false - xy: 342, 74 - size: 20, 20 - orig: 20, 20 + xy: 952, 1846 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/20xGold5 - Copy + rotate: false + xy: 2, 917 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xHappiness5 rotate: false - xy: 1496, 1479 - size: 20, 20 - orig: 20, 20 + xy: 1154, 1846 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/20xHappiness5 - Copy + rotate: false + xy: 2, 715 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xMalcontent5 rotate: false - xy: 825, 1737 + xy: 2016, 1622 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xMovement5 rotate: false - xy: 428, 97 + xy: 986, 612 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xPopulation5 rotate: false - xy: 364, 74 - size: 20, 20 - orig: 20, 20 + xy: 1356, 1846 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/20xPopulation5 - Copy + rotate: false + xy: 2, 513 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xProduction5 rotate: false - xy: 1518, 1479 - size: 20, 20 - orig: 20, 20 + xy: 1558, 1846 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/20xProduction5 - Copy + rotate: false + xy: 2, 311 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xRangedStrength5 rotate: false - xy: 825, 1715 + xy: 825, 1750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xScience5 rotate: false - xy: 450, 97 - size: 20, 20 - orig: 20, 20 + xy: 1760, 1846 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/20xScience5 - Copy + rotate: false + xy: 2, 109 + size: 200, 200 + orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xStrength5 rotate: false - xy: 1540, 1479 + xy: 2016, 1600 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 2, 1768 + xy: 2, 1781 size: 265, 265 orig: 265, 265 offset: 0, 0 index: -1 -StatIcons/CultureSpecialist - rotate: false - xy: 608, 403 - size: 182, 180 - orig: 182, 180 - offset: 0, 0 - index: -1 -StatIcons/GoldSpecialist - rotate: false - xy: 608, 221 - size: 182, 180 - orig: 182, 180 - offset: 0, 0 - index: -1 -StatIcons/ProductionSpecialist - rotate: false - xy: 810, 1449 - size: 182, 180 - orig: 182, 180 - offset: 0, 0 - index: -1 -StatIcons/ScienceSpecialist - rotate: false - xy: 810, 1267 - size: 182, 180 - orig: 182, 180 - offset: 0, 0 - index: -1 StatIcons/populationGray rotate: false - xy: 994, 1449 + xy: 1214, 1058 size: 182, 180 orig: 182, 180 offset: 0, 0 index: -1 StatIcons/populationGreen rotate: false - xy: 810, 1085 + xy: 1416, 1260 size: 182, 180 orig: 182, 180 offset: 0, 0 index: -1 TerrainIcons/Flood plains rotate: false - xy: 2, 96 + xy: 471, 1592 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Fog rotate: false - xy: 2, 1510 + xy: 2, 1523 size: 256, 256 orig: 256, 256 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 204, 1308 + xy: 406, 1390 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Hexagon rotate: false - xy: 269, 1793 + xy: 269, 1806 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 204, 96 + xy: 406, 178 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1658, 1631 + xy: 608, 582 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 269, 1591 + xy: 608, 380 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 673, 1579 + xy: 720, 1592 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 548, 1833 + xy: 204, 1321 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 2, 1308 + xy: 204, 1119 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 750, 1833 + xy: 204, 917 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 2, 1106 + xy: 204, 715 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 952, 1833 + xy: 204, 513 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 2, 904 + xy: 204, 311 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 994, 1311 + xy: 1618, 1506 size: 136, 136 orig: 136, 136 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 1356, 1833 + xy: 1052, 1644 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 2, 500 + xy: 1254, 1644 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 204, 1106 + xy: 406, 1188 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 204, 904 + xy: 406, 986 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 204, 702 + xy: 406, 784 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 204, 500 + xy: 406, 582 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 204, 298 + xy: 406, 380 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 850, 1631 + xy: 608, 1390 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1052, 1631 + xy: 608, 1188 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1254, 1631 + xy: 608, 986 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1456, 1631 + xy: 608, 784 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 608, 585 + xy: 1012, 852 size: 185, 184 orig: 185, 184 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 471, 1579 + xy: 608, 178 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 406, 1175 + xy: 810, 1240 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 406, 973 + xy: 1012, 1442 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 406, 771 + xy: 810, 1038 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 406, 367 + xy: 1214, 1442 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 608, 1377 + xy: 1012, 1038 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 608, 1175 + xy: 1214, 1240 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 608, 973 + xy: 1416, 1442 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 608, 771 + xy: 810, 634 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 825, 1693 + xy: 986, 590 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 472, 97 + xy: 825, 1728 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 1562, 1479 + xy: 2016, 1578 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 825, 1671 + xy: 986, 568 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 494, 97 + xy: 825, 1706 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 1584, 1479 + xy: 2016, 1556 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 825, 1649 + xy: 986, 546 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 516, 97 + xy: 825, 1684 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1606, 1479 + xy: 2016, 1534 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 538, 97 + xy: 986, 524 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 1628, 1479 + xy: 825, 1662 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 560, 97 + xy: 986, 502 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1650, 1479 + xy: 986, 480 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1672, 1479 + xy: 986, 458 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1694, 1479 + xy: 986, 436 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1716, 1479 + xy: 986, 414 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1738, 1479 + xy: 986, 392 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1760, 1479 + xy: 986, 370 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1782, 1479 + xy: 1214, 1036 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/Images/game.png b/android/assets/Images/game.png index 8c6fea71a7..b7d9f83f1f 100644 Binary files a/android/assets/Images/game.png and b/android/assets/Images/game.png differ diff --git a/android/build.gradle b/android/build.gradle index 41de77409b..f4c7a94cd2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 117 - versionName "2.7.5" + versionCode 118 + versionName "2.7.6" } buildTypes { release { diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 1aa7b17a1a..f1791187df 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -259,7 +259,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { tileTable.row() for (entry in stats.toHashMap().filterNot { it.value==0f }) { - tileTable.add(ImageGetter.getStatIcon(entry.key.toString())).align(Align.right) + tileTable.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f).align(Align.right) tileTable.add(Label(Math.round(entry.value).toString() + "", CameraStageBaseScreen.skin)).align(Align.left) tileTable.row() } diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt index a7a4b95c99..d8097be1da 100644 --- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt @@ -38,7 +38,7 @@ class CityStatsTable(val cityScreen: CityScreen) : Table(){ cityStatsValues["Happiness"] = city.cityStats.getCityHappiness().values.sum().toInt().toString() for (key in cityStatsValues.keys) { - add(ImageGetter.getStatIcon(key)).align(Align.right) + add(ImageGetter.getStatIcon(key)).size(20f).align(Align.right) add(Label(cityStatsValues[key], CameraStageBaseScreen.skin)).align(Align.left) row() } diff --git a/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt b/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt index 3915d35491..148282b6c6 100644 --- a/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt +++ b/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt @@ -25,6 +25,8 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo) : TileGroup( updatePopulationImage() if (improvementImage != null) improvementImage!!.setColor(1f, 1f, 1f, 0.5f) if (resourceImage != null) resourceImage!!.setColor(1f, 1f, 1f, 0.5f) + if (cityImage != null) cityImage!!.setColor(1f, 1f, 1f, 0.5f) + if (terrainFeatureImage!= null) terrainFeatureImage!!.setColor(1f, 1f, 1f, 0.5f) updateYieldGroup() } @@ -43,9 +45,13 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo) : TileGroup( populationImage!!.setPosition(width / 2 - populationImage!!.width / 2, height * 0.85f - populationImage!!.height / 2) - if (tileInfo.isWorked()|| tileInfo.isCityCenter()) + if (tileInfo.isWorked()) { populationImage!!.color = Color.WHITE - else populationImage!!.color = Color.GRAY + } + else if(!tileInfo.isCityCenter()){ + populationImage!!.color = Color.GRAY.cpy().apply { a=0.5f } + } + populationImage!!.toFront() } } diff --git a/core/src/com/unciv/ui/cityscreen/YieldGroup.kt b/core/src/com/unciv/ui/cityscreen/YieldGroup.kt index fffc1e5a34..9781f1e5eb 100644 --- a/core/src/com/unciv/ui/cityscreen/YieldGroup.kt +++ b/core/src/com/unciv/ui/cityscreen/YieldGroup.kt @@ -18,21 +18,21 @@ class YieldGroup : HorizontalGroup() { private fun getStatIconsTable(statName: String, number: Int): Table { val table = Table() when (number) { - 1 -> table.add(ImageGetter.getStatIcon(statName)) + 1 -> table.add(ImageGetter.getStatIcon(statName)).size(20f) 2 -> { - table.add(ImageGetter.getStatIcon(statName)).row() - table.add(ImageGetter.getStatIcon(statName)) + table.add(ImageGetter.getStatIcon(statName)).size(20f).row() + table.add(ImageGetter.getStatIcon(statName)).size(20f) } 3 -> { - table.add(ImageGetter.getStatIcon(statName)).colspan(2).row() - table.add(ImageGetter.getStatIcon(statName)) - table.add(ImageGetter.getStatIcon(statName)) + table.add(ImageGetter.getStatIcon(statName)).size(20f).colspan(2).row() + table.add(ImageGetter.getStatIcon(statName)).size(20f) + table.add(ImageGetter.getStatIcon(statName)).size(20f) } 4 -> { - table.add(ImageGetter.getStatIcon(statName)) - table.add(ImageGetter.getStatIcon(statName)).row() - table.add(ImageGetter.getStatIcon(statName)) - table.add(ImageGetter.getStatIcon(statName)) + table.add(ImageGetter.getStatIcon(statName)).size(20f) + table.add(ImageGetter.getStatIcon(statName)).size(20f).row() + table.add(ImageGetter.getStatIcon(statName)).size(20f) + table.add(ImageGetter.getStatIcon(statName)).size(20f) } else -> { val largeImage = ImageGetter.getStatIcon(statName) diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index dd65ed4c3f..fff08db79f 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -86,8 +86,9 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { } fun addPopulationIcon() { - populationImage = ImageGetter.getImage("StatIcons/populationGreen.png") + populationImage = ImageGetter.getImage("StatIcons/20xPopulation5") populationImage!!.run { + color= Color.GREEN.cpy().lerp(Color.BLACK,0.5f) setSize(20f, 20f) center(this@TileGroup) x += 20 // right diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index b56f4db550..d611caaa8a 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -3,13 +3,12 @@ package com.unciv.ui.utils import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.TextureAtlas import com.badlogic.gdx.graphics.g2d.TextureRegion +import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.utils.Drawable import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable -import java.util.* object ImageGetter { - private var textureRegionByFileName = HashMap() const val WhiteDot = "OtherIcons/whiteDot.png" // When we used to load images directly from different files, without using a texture atlas, @@ -42,16 +41,29 @@ object ImageGetter { return region } catch (ex: Exception) { return getTextureRegion(WhiteDot) - throw Exception("File $fileName not found!",ex) } - - return textureRegionByFileName[fileName]!! + } + class IconGroup(statName:String): Group() { + init{ + val circleSize = 20f + val statSize = 17f + setSize(circleSize ,circleSize) +// addActor(ImageGetter.getImage("OtherIcons/Circle") +// .apply { setSize(circleSize,circleSize )} ) + val iconImage = ImageGetter.getImage("StatIcons/20x" + statName + "5.png") + .apply { setSize(statSize,statSize); center(this@IconGroup)} + if(statName=="Population") iconImage.color= Color.GREEN.cpy().lerp(Color.BLACK,0.5f) + addActor(iconImage) + } } - fun getStatIcon(name: String): Image { - return getImage("StatIcons/20x" + name + "5.png") + fun getStatIcon(statName: String): Image { + return ImageGetter.getImage("StatIcons/20x" + statName + "5.png") + .apply { setSize(20f,20f)} +// return IconGroup(name) } + fun getUnitIcon(unitName:String):Image{ return getImage("UnitIcons/$unitName.png") } diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt index e8fa18a030..9cd359962b 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt @@ -1,6 +1,7 @@ package com.unciv.ui.worldscreen import com.badlogic.gdx.graphics.Color +import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table @@ -27,12 +28,12 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() { private val cultureLabel = Label("Culture:", labelSkin).setFontColor(colorFromRGB(210, 94, 210) ) private val resourceLabels = HashMap() private val resourceImages = HashMap() - private val happinessImage = ImageGetter.getStatIcon("Happiness") + private val happinessImage = Group() // These are all to improve performance IE recude update time (was 150 ms on my phone, which is a lot!) private val malcontentColor = Color.valueOf("ef5350") val happinessColor = colorFromRGB(92, 194, 77) - val malcontentDrawable = ImageGetter.getStatIcon("Malcontent").drawable - val happinessDrawable = ImageGetter.getStatIcon("Happiness").drawable + val malcontentGroup = ImageGetter.getStatIcon("Malcontent") + val happinessGroup = ImageGetter.getStatIcon("Happiness") init { background = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK, 0.5f)) @@ -74,15 +75,15 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() { statsTable.defaults().pad(3f)//.align(Align.top) statsTable.add(turnsLabel).padRight(20f) statsTable.add(goldLabel) - statsTable.add(ImageGetter.getStatIcon("Gold")).padRight(20f) + statsTable.add(ImageGetter.getStatIcon("Gold")).padRight(20f).size(20f) statsTable.add(scienceLabel) //.apply { setAlignment(Align.center) }).align(Align.top) - statsTable.add(ImageGetter.getStatIcon("Science")).padRight(20f) + statsTable.add(ImageGetter.getStatIcon("Science")).padRight(20f).size(20f) - statsTable.add(happinessImage) + statsTable.add(happinessImage).size(20f) statsTable.add(happinessLabel).padRight(20f)//.apply { setAlignment(Align.center) }).align(Align.top) statsTable.add(cultureLabel)//.apply { setAlignment(Align.center) }).align(Align.top) - statsTable.add(ImageGetter.getStatIcon("Culture")) + statsTable.add(ImageGetter.getStatIcon("Culture")).size(20f) statsTable.pack() statsTable.width = screen.stage.width - 20 return statsTable @@ -140,10 +141,12 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() { if (civInfo.happiness < 0) { happinessLabel.setFontColor(malcontentColor) - happinessImage.drawable = malcontentDrawable + happinessImage.clearChildren() + happinessImage.addActor(malcontentGroup) } else { happinessLabel.setFontColor(happinessColor) - happinessImage.drawable = happinessDrawable + happinessImage.clearChildren() + happinessImage.addActor(happinessGroup) } cultureLabel.setText(getCultureText(civInfo, nextTurnStats)) diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt index f656ece142..5ad95b48c8 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt +++ b/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt @@ -31,10 +31,10 @@ class TileInfoTable(private val worldScreen: WorldScreen) : Table() { fun getStatsTable(tile: TileInfo):Table{ val table=Table() - + table.pad(10f) for (entry in tile.getTileStats(worldScreen.civInfo).toHashMap().filterNot { it.value == 0f }) { - table.add(ImageGetter.getStatIcon(entry.key.toString())).align(Align.right) + table.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f).align(Align.right) table.add(Label(entry.value.toInt().toString(), skin)).align(Align.left) table.row() } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index d7ac759ea6..c616b46e09 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -18,8 +18,8 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ return ImageGetter.getUnitIcon(unitToUpgradeTo) } when(unitAction){ - "Move unit" -> return ImageGetter.getStatIcon("Movement") - "Stop movement"-> return ImageGetter.getStatIcon("Movement").apply { color= Color.RED } + "Move unit" -> return ImageGetter.getImage("StatIcons/20xMovement5") + "Stop movement"-> return ImageGetter.getImage("StatIcons/20xMovement5").apply { color= Color.RED } "Fortify" -> return ImageGetter.getImage("OtherIcons/Shield.png").apply { color= Color.BLACK } "Promote" -> return ImageGetter.getImage("OtherIcons/Star.png").apply { color= Color.GOLD } "Construct improvement" -> return ImageGetter.getUnitIcon("Worker")