diff --git a/android/Images/TerrainIcons/CrosshatchHexagon.png b/android/Images/TerrainIcons/CrosshatchHexagon.png new file mode 100644 index 0000000000..65f5551cbe Binary files /dev/null and b/android/Images/TerrainIcons/CrosshatchHexagon.png differ diff --git a/android/Images/TerrainIcons/CrosshatchHexagon1.png b/android/Images/TerrainIcons/CrosshatchHexagon1.png new file mode 100644 index 0000000000..f1f0882ffc Binary files /dev/null and b/android/Images/TerrainIcons/CrosshatchHexagon1.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 0b854f32a2..2b8879ddf4 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,1771 +6,1785 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 204, 814 + xy: 1439, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 204, 712 + xy: 1541, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 204, 610 + xy: 1643, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 204, 406 + xy: 1847, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 334, 1278 + xy: 334, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 334, 1176 + xy: 334, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 306, 1074 + xy: 334, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 306, 870 + xy: 334, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 306, 768 + xy: 260, 1704 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 306, 462 + xy: 464, 1708 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 685, 1742 + xy: 566, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 889, 1742 + xy: 406, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 991, 1742 + xy: 406, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 1603, 1742 + xy: 712, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 672, 1640 + xy: 610, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 1386, 1640 + xy: 488, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 1488, 1640 + xy: 590, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 390, 1510 + xy: 486, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 262, 54 + xy: 588, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 408, 870 + xy: 538, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 408, 360 + xy: 538, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 408, 258 + xy: 640, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 408, 156 + xy: 436, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 436, 1306 + xy: 436, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 436, 1204 + xy: 538, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1896, 1582 + xy: 538, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 510, 694 + xy: 538, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 510, 286 + xy: 742, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 612, 1538 + xy: 742, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 714, 1538 + xy: 742, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 918, 1538 + xy: 742, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1122, 1538 + xy: 844, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastary rotate: false - xy: 1224, 1538 + xy: 844, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1326, 1538 + xy: 844, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1530, 1538 + xy: 844, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1734, 1538 + xy: 844, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 538, 1436 + xy: 844, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 640, 1436 + xy: 770, 1692 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 538, 1334 + xy: 872, 1692 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 640, 1334 + xy: 640, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 844, 1436 + xy: 742, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 742, 1334 + xy: 844, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper maker rotate: false - xy: 640, 1232 + xy: 794, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1048, 1436 + xy: 946, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 946, 1334 + xy: 946, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 946, 1232 + xy: 946, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1048, 1232 + xy: 262, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1354, 1436 + xy: 814, 1590 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1252, 1334 + xy: 814, 1488 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Statis Chamber rotate: false - xy: 1150, 1232 + xy: 916, 1590 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1660, 1436 + xy: 1120, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1456, 1232 + xy: 1222, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1660, 1232 + xy: 1324, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 612, 1130 + xy: 1222, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 612, 1028 + xy: 1324, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 612, 926 + xy: 1324, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 714, 1028 + xy: 1426, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 816, 1028 + xy: 1630, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 918, 1130 + xy: 1528, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 612, 722 + xy: 1630, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 714, 824 + xy: 1732, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 816, 926 + xy: 1630, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 918, 1028 + xy: 1732, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1020, 1130 + xy: 1834, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 816, 824 + xy: 1834, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1020, 1028 + xy: 1324, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 714, 620 + xy: 1630, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1020, 926 + xy: 896, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 FlagIcons/Dutch rotate: false - xy: 2, 2 + xy: 2, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 1877, 1916 + xy: 204, 834 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 440, 1662 + xy: 204, 704 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 132, 2 + xy: 204, 574 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 1877, 1786 + xy: 204, 444 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 260, 1482 + xy: 204, 314 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 204, 1352 + xy: 204, 184 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 204, 1222 + xy: 132, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 204, 1120 + xy: 1133, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 204, 916 + xy: 1337, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 306, 666 + xy: 260, 1602 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 1195, 1742 + xy: 508, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 978, 1640 + xy: 488, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 1590, 1640 + xy: 692, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 510, 796 + xy: 640, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 510, 388 + xy: 742, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 510, 184 + xy: 742, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1020, 1538 + xy: 792, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 538, 1232 + xy: 538, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 946, 1436 + xy: 794, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 742, 1232 + xy: 946, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 844, 1232 + xy: 946, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1150, 1436 + xy: 946, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1150, 1436 + xy: 946, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1150, 1334 + xy: 946, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 612, 620 + xy: 1732, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 260, 1612 + xy: 204, 964 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/CircleOld rotate: false - xy: 787, 1742 + xy: 668, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 1093, 1742 + xy: 508, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 876, 1640 + xy: 386, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 1182, 1640 + xy: 692, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 1692, 1640 + xy: 384, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 816, 1538 + xy: 742, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1558, 1436 + xy: 1018, 1590 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1558, 1334 + xy: 1120, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1122, 1034 + xy: 1120, 1342 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 816, 1130 + xy: 1528, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 281, 1792 + xy: 831, 1794 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 1695, 1844 + xy: 204, 1144 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 260, 1801 + xy: 2043, 2045 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 204, 1494 + xy: 1949, 1794 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 204, 150 + xy: 260, 1550 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 262, 2 + xy: 364, 96 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1807, 1792 + xy: 814, 1334 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 314, 2 + xy: 998, 1334 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 366, 2 + xy: 896, 1232 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Dicipline rotate: false - xy: 418, 2 + xy: 1050, 1334 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 470, 2 + xy: 896, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1836, 1588 + xy: 896, 1128 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1836, 1536 + xy: 1949, 1742 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1762, 1486 + xy: 312, 1550 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1224, 1180 + xy: 364, 44 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 612, 466 + xy: 998, 1282 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 714, 568 + xy: 1050, 1282 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 816, 670 + xy: 1936, 1690 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 918, 772 + xy: 1936, 1638 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1020, 874 + xy: 1936, 1586 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1122, 982 + xy: 1936, 1534 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1762, 1434 + xy: 1936, 1482 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1224, 1128 + xy: 1936, 1430 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1276, 1180 + xy: 1936, 1378 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 612, 414 + xy: 1936, 1326 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1122, 930 + xy: 1102, 1290 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1762, 1382 + xy: 1154, 1290 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1224, 1076 + xy: 1206, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1276, 1128 + xy: 1258, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1328, 1180 + xy: 1310, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 612, 362 + xy: 1362, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1762, 1330 + xy: 1414, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1276, 1076 + xy: 1466, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1328, 1128 + xy: 1518, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1380, 1180 + xy: 1570, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 612, 310 + xy: 1622, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1762, 1278 + xy: 1674, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1328, 1076 + xy: 1726, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1380, 1128 + xy: 1778, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1432, 1180 + xy: 1830, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 612, 258 + xy: 1882, 1284 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1380, 1076 + xy: 1934, 1274 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1432, 1128 + xy: 416, 25 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 204, 1018 + xy: 1235, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 334, 1380 + xy: 334, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 306, 258 + xy: 566, 1708 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 1501, 1742 + xy: 712, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 570, 1640 + xy: 508, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 1080, 1640 + xy: 590, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 1284, 1640 + xy: 386, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 364, 54 + xy: 690, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 408, 1074 + xy: 436, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 408, 972 + xy: 436, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 436, 1408 + xy: 640, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1794, 1640 + xy: 640, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1896, 1684 + xy: 436, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 510, 1102 + xy: 640, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 568, 82 + xy: 742, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 742, 1436 + xy: 974, 1692 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1252, 1232 + xy: 916, 1386 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1456, 1334 + xy: 1018, 1488 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1354, 1232 + xy: 1018, 1386 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1558, 1232 + xy: 1222, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 714, 1130 + xy: 1426, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 2, 132 + xy: 204, 1346 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 918, 926 + xy: 1222, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 612, 518 + xy: 1528, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 816, 722 + xy: 1732, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 1297, 1742 + xy: 610, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 1399, 1742 + xy: 610, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 281, 1844 + xy: 2, 1346 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 483, 1844 + xy: 2, 1144 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 685, 1844 + xy: 2, 942 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 2, 940 + xy: 1235, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 2, 738 + xy: 1437, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 1428, 1538 + xy: 844, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 1291, 1844 + xy: 2, 336 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 2, 334 + xy: 1841, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1048, 1334 + xy: 946, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 1493, 1844 + xy: 2, 134 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 612, 824 + xy: 1426, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +TerrainIcons/CrosshatchHexagon + rotate: false + xy: 281, 1810 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 +TerrainIcons/CrosshatchHexagon1 + rotate: false + xy: 556, 1810 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 TerrainIcons/Flood plains rotate: false - xy: 2, 1344 + xy: 831, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Fog rotate: false - xy: 2, 1546 + xy: 2, 1548 size: 256, 256 orig: 256, 256 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 2, 1142 + xy: 1033, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Hexagon rotate: false - xy: 2, 1804 + xy: 2, 1806 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 887, 1844 + xy: 2, 740 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1089, 1844 + xy: 2, 538 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 2, 536 + xy: 1639, 1846 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 440, 1649 + xy: 204, 171 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 204, 508 + xy: 1745, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 204, 304 + xy: 334, 862 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 204, 202 + xy: 334, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 306, 972 + xy: 334, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 306, 564 + xy: 362, 1708 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 306, 360 + xy: 362, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 306, 156 + xy: 464, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 583, 1742 + xy: 668, 1708 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 1705, 1742 + xy: 406, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 774, 1640 + xy: 712, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 408, 768 + xy: 436, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 408, 666 + xy: 538, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 408, 564 + xy: 640, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 408, 462 + xy: 436, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 466, 54 + xy: 538, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 510, 1000 + xy: 436, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 510, 898 + xy: 538, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 510, 592 + xy: 640, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 510, 490 + xy: 640, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1632, 1538 + xy: 844, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1888, 1481 + xy: 436, 77 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 844, 1334 + xy: 894, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1252, 1436 + xy: 946, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1456, 1436 + xy: 814, 1386 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1354, 1334 + xy: 916, 1488 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1660, 1334 + xy: 1120, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 714, 926 + xy: 1528, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 714, 722 + xy: 1834, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1122, 1130 + xy: 1426, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 918, 824 + xy: 1834, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 1814, 1516 + xy: 384, 972 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 2007, 2024 + xy: 770, 1670 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 306, 1200 + xy: 792, 1670 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 390, 1488 + xy: 1076, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 256, 180 + xy: 2001, 1824 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 1807, 1770 + xy: 814, 1312 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 522, 32 + xy: 866, 1364 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 436, 1182 + xy: 896, 1106 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 510, 162 + xy: 262, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 568, 60 + xy: 262, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 538, 1210 + xy: 948, 1262 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 664, 496 + xy: 204, 149 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 714, 546 + xy: 468, 55 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 766, 598 + xy: 406, 972 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 816, 648 + xy: 770, 1648 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 868, 700 + xy: 792, 1648 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 918, 750 + xy: 1076, 1750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 970, 802 + xy: 1098, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1020, 852 + xy: 2001, 1802 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1072, 904 + xy: 836, 1312 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1174, 1012 + xy: 866, 1342 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1224, 1054 + xy: 918, 1106 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1762, 1256 + xy: 284, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1484, 1210 + xy: 284, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 612, 236 + xy: 970, 1262 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1432, 1106 + xy: 948, 1240 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 440, 1627 + xy: 226, 149 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1814, 1494 + xy: 468, 33 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1836, 1514 + xy: 490, 55 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index fb33918325..66e73acb20 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/build.gradle b/android/build.gradle index 543a510acf..784da4eace 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 139 - versionName "2.8.7" + versionCode 140 + versionName "2.8.8" } buildTypes { release { diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt index 10f6f6508e..81a6fd7e5f 100644 --- a/core/src/com/unciv/logic/trade/TradeLogic.kt +++ b/core/src/com/unciv/logic/trade/TradeLogic.kt @@ -17,7 +17,7 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci fun getAvailableOffers(civInfo: CivilizationInfo, otherCivilization: CivilizationInfo): TradeOffersList { val offers = TradeOffersList() if(civInfo.isAtWarWith(otherCivilization)) - offers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20, 0)) + offers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20)) for(entry in civInfo.getCivResources().filterNot { it.key.resourceType == ResourceType.Bonus }) { val resourceTradeType = if(entry.key.resourceType== ResourceType.Luxury) TradeType.Luxury_Resource else TradeType.Strategic_Resource @@ -26,18 +26,18 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci for(entry in civInfo.tech.techsResearched .filterNot { otherCivilization.tech.isResearched(it) } .filter { otherCivilization.tech.canBeResearched(it) }){ - offers.add(TradeOffer(entry, TradeType.Technology, 0, 1)) + offers.add(TradeOffer(entry, TradeType.Technology, 0)) } offers.add(TradeOffer("Gold".tr(), TradeType.Gold, 0, civInfo.gold)) offers.add(TradeOffer("Gold per turn".tr(), TradeType.Gold_Per_Turn, 30, civInfo.getStatsForNextTurn().gold.toInt())) for(city in civInfo.cities.filterNot { it.isCapital() }) - offers.add(TradeOffer(city.name, TradeType.City, 0, 1)) + offers.add(TradeOffer(city.name, TradeType.City, 0)) val civsWeKnowAndTheyDont = civInfo.diplomacy.values.map { it.otherCiv() } .filter { !otherCivilization.diplomacy.containsKey(it.civName) && it != otherCivilization && !it.isBarbarianCivilization() } for(thirdCiv in civsWeKnowAndTheyDont){ - offers.add(TradeOffer("Introduction to " + thirdCiv.civName, TradeType.Introduction, 0,1)) + offers.add(TradeOffer("Introduction to " + thirdCiv.civName, TradeType.Introduction, 0)) } return offers diff --git a/core/src/com/unciv/logic/trade/TradeOffer.kt b/core/src/com/unciv/logic/trade/TradeOffer.kt index 2b742ed084..c27c5fc267 100644 --- a/core/src/com/unciv/logic/trade/TradeOffer.kt +++ b/core/src/com/unciv/logic/trade/TradeOffer.kt @@ -1,6 +1,6 @@ package com.unciv.logic.trade -data class TradeOffer(var name:String, var type: TradeType, var duration:Int, var amount:Int) { +data class TradeOffer(var name:String, var type: TradeType, var duration:Int, var amount:Int=1) { constructor() : this("", TradeType.Gold,0,0) // so that the json deserializer can work diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 027417afe5..89ce3a4528 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -30,7 +30,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { protected var militaryUnitImage: Group? = null private val circleImage = ImageGetter.getImage("OtherIcons/Circle.png") // for blue and red circles on the tile private val crosshairImage = ImageGetter.getImage("OtherIcons/Crosshair.png") // for blue and red circles on the tile - private val fogImage = ImageGetter.getImage("TerrainIcons/Fog.png") + protected val fogImage = ImageGetter.getImage("TerrainIcons/CrosshatchHexagon") var yieldGroup = YieldGroup() class RoadImage { @@ -43,7 +43,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { this.setSize(groupSize, groupSize) addHexagon(groupSize) addCircleImage() - addFogImage() + addFogImage(groupSize) addCrosshairImage() isTransform = false } @@ -56,11 +56,12 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { circleImage.isVisible = false } - private fun addFogImage() { - fogImage.width = 70f - fogImage.height = 70f + private fun addFogImage(groupSize: Float) { + val imageScale = groupSize * 1.5f / fogImage.width + fogImage.setScale(imageScale) + fogImage.setOrigin(Align.center) fogImage.center(this) - fogImage.color = Color.WHITE.cpy().apply { a = 0.5f } + fogImage.color = Color.WHITE.cpy().apply { a = 0.2f } addActor(fogImage) } @@ -87,6 +88,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { } fun addPopulationIcon() { + this. populationImage = ImageGetter.getStatIcon("Population") populationImage!!.run { color = Color.GREEN.cpy().lerp(Color.BLACK, 0.5f) diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt index c2cc8c00fd..3c438708f4 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt @@ -65,6 +65,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) { cityButton?.toFront() civilianUnitImage?.toFront() militaryUnitImage?.toFront() + fogImage.toFront() } private fun updateCityButton(city: CityInfo?, viewable: Boolean) { diff --git a/core/src/com/unciv/ui/trade/OffersList.kt b/core/src/com/unciv/ui/trade/OffersList.kt index 634385a078..3ca2c7ff90 100644 --- a/core/src/com/unciv/ui/trade/OffersList.kt +++ b/core/src/com/unciv/ui/trade/OffersList.kt @@ -6,8 +6,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.unciv.logic.trade.TradeOffersList import com.unciv.logic.trade.TradeType import com.unciv.ui.utils.CameraStageBaseScreen -import com.unciv.ui.utils.onClick import com.unciv.ui.utils.disable +import com.unciv.ui.utils.onClick import com.unciv.ui.utils.tr import kotlin.math.min @@ -24,7 +24,7 @@ class OffersList(val offers: TradeOffersList, val correspondingOffers: TradeOffe table.clear() for(offer in offers.sortedBy { it.type }) { var buttonText = offer.name.tr() - if(offer.type !in listOf(TradeType.Technology, TradeType.City, TradeType.Introduction)) buttonText+=" ("+offer.amount+")" + if(offer.type !in listOf(TradeType.Technology, TradeType.City, TradeType.Introduction, TradeType.Treaty)) buttonText+=" ("+offer.amount+")" if(offer.duration>1) buttonText+="\n"+offer.duration+" {turns}".tr() val tb = TextButton(buttonText, CameraStageBaseScreen.skin) val amountPerClick =