diff --git a/android/Images/ImprovementIcons/Fishing Boats.png b/android/Images/ImprovementIcons/Fishing Boats.png new file mode 100644 index 00000000..097b1e2a Binary files /dev/null and b/android/Images/ImprovementIcons/Fishing Boats.png differ diff --git a/android/Images/ResourceIcons/Fish.png b/android/Images/ResourceIcons/Fish.png index e443b29f..6fdd0afc 100644 Binary files a/android/Images/ResourceIcons/Fish.png and b/android/Images/ResourceIcons/Fish.png differ diff --git a/android/Images/ResourceIcons/Pearls.png b/android/Images/ResourceIcons/Pearls.png index 6b112e51..604115ab 100644 Binary files a/android/Images/ResourceIcons/Pearls.png and b/android/Images/ResourceIcons/Pearls.png differ diff --git a/android/Images/ResourceIcons/Whales.png b/android/Images/ResourceIcons/Whales.png index 3b662a94..f21cd574 100644 Binary files a/android/Images/ResourceIcons/Whales.png and b/android/Images/ResourceIcons/Whales.png differ diff --git a/android/Images/TechIcons/Sailing.png b/android/Images/TechIcons/Sailing.png new file mode 100644 index 00000000..9b8de656 Binary files /dev/null and b/android/Images/TechIcons/Sailing.png differ diff --git a/android/Images/UnitIcons/Work Boats.png b/android/Images/UnitIcons/Work Boats.png new file mode 100644 index 00000000..028eb12f Binary files /dev/null and b/android/Images/UnitIcons/Work Boats.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 928143f6..89f93aea 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,469 +6,469 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 334, 456 + xy: 1439, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 334, 252 + xy: 1643, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 334, 150 + xy: 1745, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 1931, 1640 + xy: 334, 1062 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 362, 1604 + xy: 334, 552 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 464, 1604 + xy: 334, 348 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 668, 1706 + xy: 260, 1702 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 406, 1502 + xy: 464, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 508, 1502 + xy: 566, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 406, 1196 + xy: 668, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 406, 992 + xy: 590, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 508, 992 + xy: 386, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 610, 1094 + xy: 488, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 712, 992 + xy: 436, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 488, 788 + xy: 640, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 436, 380 + xy: 640, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 538, 380 + xy: 640, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 538, 176 + xy: 742, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 640, 278 + xy: 742, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 742, 176 + xy: 844, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 872, 1690 + xy: 770, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 974, 1690 + xy: 872, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 436, 74 + xy: 974, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 844, 74 + xy: 742, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 794, 788 + xy: 844, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 946, 278 + xy: 816, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 916, 1588 + xy: 846, 74 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 814, 1180 + xy: 896, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 916, 1180 + xy: 896, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1018, 1282 + xy: 1100, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1120, 1612 + xy: 1304, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastary rotate: false - xy: 1222, 1612 + xy: 1406, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1120, 1510 + xy: 1304, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1120, 1408 + xy: 1508, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1222, 1408 + xy: 1610, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1324, 1510 + xy: 1508, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1222, 1306 + xy: 1712, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1324, 1408 + xy: 1610, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1324, 1306 + xy: 1712, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1120, 1000 + xy: 1814, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1222, 1102 + xy: 1814, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper maker rotate: false - xy: 1324, 1204 + xy: 1202, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 896, 772 + xy: 1916, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1202, 796 + xy: 996, 1282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1406, 796 + xy: 1506, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1404, 592 + xy: 946, 1078 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1048, 491 + xy: 946, 976 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1048, 389 + xy: 946, 874 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Statis Chamber rotate: false - xy: 1048, 287 + xy: 946, 772 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1150, 184 + xy: 1048, 621 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1354, 388 + xy: 1048, 417 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1354, 184 + xy: 1150, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1150, 82 + xy: 1252, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1456, 490 + xy: 1354, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1456, 286 + xy: 1252, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1456, 184 + xy: 1354, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1558, 286 + xy: 1456, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1558, 184 + xy: 1558, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1558, 82 + xy: 1150, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 262, 48 + xy: 1252, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1426, 1538 + xy: 1354, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1426, 1436 + xy: 1456, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1426, 1334 + xy: 1660, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1630, 1436 + xy: 1558, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1426, 1130 + xy: 1762, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1630, 1334 + xy: 1456, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1834, 1436 + xy: 1864, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -482,245 +482,252 @@ FlagIcons/Dutch index: -1 FlagIcons/English rotate: false - xy: 204, 428 + xy: 204, 1034 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 204, 298 + xy: 204, 904 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 204, 168 + xy: 204, 774 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 132, 2 + xy: 204, 644 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 1133, 1714 + xy: 204, 514 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 1263, 1714 + xy: 204, 384 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 1393, 1714 + xy: 204, 254 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 1523, 1742 + xy: 204, 152 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 1931, 1742 + xy: 1337, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 508, 1400 + xy: 668, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 712, 1502 + xy: 692, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 488, 686 + xy: 538, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 640, 482 + xy: 538, 380 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Fishing Boats + rotate: false + xy: 742, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 814, 1486 + xy: 744, 74 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 814, 1282 + xy: 794, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 916, 1282 + xy: 794, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1018, 1078 + xy: 1304, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1222, 1204 + xy: 1814, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 896, 874 + xy: 1916, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1304, 796 + xy: 1098, 1233 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1202, 694 + xy: 1302, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1202, 694 + xy: 1302, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1098, 593 + xy: 1812, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1528, 1436 + xy: 1252, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 204, 558 + xy: 204, 1164 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/CircleOld rotate: false - xy: 610, 1196 + xy: 692, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 610, 992 + xy: 590, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 692, 788 + xy: 436, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 692, 686 + xy: 640, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 538, 278 + xy: 742, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1018, 1588 + xy: 1100, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1150, 286 + xy: 1048, 927 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1252, 286 + xy: 1048, 519 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1630, 1238 + xy: 1150, 320 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1456, 82 + xy: 1456, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -734,7 +741,7 @@ OtherIcons/civTableBackground index: -1 OtherIcons/tileTableBackground rotate: false - xy: 204, 738 + xy: 204, 1344 size: 180, 200 orig: 180, 200 offset: 0, 0 @@ -748,490 +755,490 @@ OtherIcons/whiteDot index: -1 PolicyIcons/Aristocracy rotate: false - xy: 260, 1548 + xy: 894, 1230 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 1076, 1740 + xy: 260, 1548 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 814, 924 + xy: 334, 296 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 896, 720 + xy: 1949, 1792 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 996, 618 + xy: 794, 1332 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 364, 98 + xy: 946, 312 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Dicipline rotate: false - xy: 1426, 1662 + xy: 1354, 568 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1936, 1588 + xy: 1456, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1528, 1180 + xy: 1558, 772 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1426, 976 + xy: 1660, 874 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1834, 1384 + xy: 1762, 976 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1732, 1282 + xy: 1864, 1078 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1936, 1536 + xy: 1252, 364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1528, 1128 + xy: 1354, 516 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1426, 924 + xy: 1354, 464 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1936, 1484 + xy: 1966, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1528, 1076 + xy: 312, 1548 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 312, 1548 + xy: 1406, 568 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 364, 46 + xy: 1406, 516 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1580, 1180 + xy: 1406, 464 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1580, 1128 + xy: 1508, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1580, 1076 + xy: 1610, 772 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1478, 976 + xy: 1712, 874 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1478, 924 + xy: 1814, 976 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1834, 1332 + xy: 1916, 1078 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1886, 1384 + xy: 1304, 364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1886, 1332 + xy: 1252, 312 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1632, 1186 + xy: 1304, 312 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1632, 1134 + xy: 438, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1632, 1082 + xy: 490, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1684, 1186 + xy: 542, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1684, 1134 + xy: 594, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1684, 1082 + xy: 646, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1988, 1588 + xy: 698, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1988, 1536 + xy: 750, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1988, 1484 + xy: 802, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1048, 31 + xy: 854, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 416, 22 + xy: 906, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 468, 22 + xy: 958, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 520, 22 + xy: 1010, 22 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1829, 1742 + xy: 1235, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 464, 1706 + xy: 334, 654 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 610, 1400 + xy: 488, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 712, 1094 + xy: 690, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 386, 788 + xy: 436, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 590, 686 + xy: 436, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 384, 584 + xy: 538, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 831, 1844 - size: 200, 200 - orig: 200, 200 + xy: 742, 992 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 640, 176 + xy: 742, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 742, 380 + xy: 792, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 742, 278 + xy: 844, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 742, 74 + xy: 640, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 794, 686 + xy: 408, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 946, 482 + xy: 612, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 946, 176 + xy: 438, 74 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 814, 1078 + xy: 896, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1120, 1102 + xy: 1712, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1841, 1844 - size: 200, 200 - orig: 200, 200 + xy: 1406, 1334 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1252, 490 + xy: 1048, 1029 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1252, 388 + xy: 1048, 825 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1354, 490 + xy: 1048, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1354, 286 + xy: 1150, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1456, 388 + xy: 1150, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1558, 490 + xy: 1252, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1528, 1334 + xy: 1660, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 204, 940 - size: 200, 200 - orig: 200, 200 + xy: 1252, 518 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1732, 1436 + xy: 1354, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1528, 1232 + xy: 1558, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 712, 1400 + xy: 384, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 712, 1298 + xy: 486, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1245,231 +1252,231 @@ StatIcons/Culture index: -1 StatIcons/Food rotate: false - xy: 1033, 1844 + xy: 2, 1142 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 1235, 1844 + xy: 2, 940 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 2, 738 + xy: 1235, 1844 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 2, 536 + xy: 1437, 1844 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 1324, 1612 + xy: 1406, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 2, 132 + xy: 2, 334 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 204, 1344 + xy: 1841, 1844 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1304, 694 + xy: 1404, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 204, 1142 + xy: 2, 132 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1506, 592 + xy: 1150, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Acoustics rotate: false - xy: 1625, 1742 + xy: 132, 30 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Agriculture rotate: false - xy: 1727, 1742 + xy: 1133, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Animal Husbandry rotate: false - xy: 334, 354 + xy: 1541, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 334, 354 + xy: 1541, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archaeology rotate: false - xy: 1523, 1640 + xy: 1847, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archery rotate: false - xy: 1727, 1640 + xy: 306, 152 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Architecture rotate: false - xy: 1829, 1640 + xy: 336, 50 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Astronomy rotate: false - xy: 260, 1600 + xy: 334, 858 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 566, 1706 + xy: 334, 450 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 566, 1604 + xy: 260, 1600 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 406, 1400 + xy: 362, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 406, 1298 + xy: 464, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 610, 1298 + xy: 488, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 610, 1298 + xy: 488, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 508, 1094 + xy: 692, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 712, 1196 + xy: 588, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 406, 890 + xy: 538, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 610, 890 + xy: 640, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 712, 890 + xy: 538, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 386, 686 + xy: 640, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 486, 584 + xy: 436, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Eccology rotate: false - xy: 588, 584 + xy: 640, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 690, 584 + xy: 538, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1490,266 +1497,273 @@ TechIcons/Electricity index: -1 TechIcons/Engineering rotate: false - xy: 436, 278 + xy: 436, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 436, 176 + xy: 640, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 640, 380 + xy: 742, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 742, 482 + xy: 742, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 844, 176 + xy: 844, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 770, 1690 + xy: 844, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 538, 74 + xy: 436, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 894, 584 + xy: 510, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 946, 380 + xy: 714, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 916, 1384 + xy: 794, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 814, 976 + xy: 998, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 916, 1078 + xy: 998, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 916, 976 + xy: 998, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1018, 1486 + xy: 1100, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1018, 1384 + xy: 1202, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1018, 1180 + xy: 1202, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1018, 976 + xy: 1202, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1120, 1306 + xy: 1508, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1120, 1204 + xy: 1610, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1222, 1000 + xy: 1304, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1324, 1102 + xy: 1508, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1324, 1000 + xy: 1610, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1222, 898 + xy: 1712, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 998, 874 + xy: 1916, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 998, 772 + xy: 1916, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1100, 797 + xy: 894, 1282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1100, 695 + xy: 1200, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 996, 670 + xy: 1710, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1200, 592 + xy: 1914, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1302, 592 + xy: 946, 1180 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Sailing + rotate: false + xy: 946, 670 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1048, 185 + xy: 946, 568 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1048, 83 + xy: 946, 466 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1252, 82 + xy: 1150, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1354, 82 + xy: 1252, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1528, 1538 + xy: 1558, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1630, 1538 + xy: 1150, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1426, 1232 + xy: 1354, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1732, 1334 + xy: 1252, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1770,7 +1784,7 @@ TerrainIcons/CrosshatchHexagon1 index: -1 TerrainIcons/Flood plains rotate: false - xy: 2, 1142 + xy: 831, 1844 size: 200, 200 orig: 200, 200 offset: 0, 0 @@ -1784,7 +1798,7 @@ TerrainIcons/Fog index: -1 TerrainIcons/Forest rotate: false - xy: 2, 940 + xy: 1033, 1844 size: 200, 200 orig: 200, 200 offset: 0, 0 @@ -1798,266 +1812,273 @@ TerrainIcons/Hexagon index: -1 TerrainIcons/Jungle rotate: false - xy: 1437, 1844 + xy: 2, 738 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1639, 1844 + xy: 2, 536 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 2, 334 + xy: 1639, 1844 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 204, 155 + xy: 1456, 657 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 1625, 1640 + xy: 234, 50 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 260, 1702 + xy: 334, 960 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 362, 1706 + xy: 334, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 668, 1604 + xy: 362, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 610, 1502 + xy: 566, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 508, 1298 + xy: 386, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 406, 1094 + xy: 386, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 508, 1196 + xy: 590, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 508, 890 + xy: 436, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 590, 788 + xy: 538, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 792, 584 + xy: 844, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 844, 482 + xy: 844, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 844, 380 + xy: 844, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 844, 278 + xy: 844, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 640, 74 + xy: 538, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 946, 74 + xy: 540, 74 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 814, 1588 + xy: 642, 74 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 814, 1384 + xy: 918, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 916, 1486 + xy: 948, 74 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1222, 1510 + xy: 1406, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1120, 899 + xy: 1100, 1335 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1324, 898 + xy: 1814, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1406, 694 + xy: 1608, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1150, 490 + xy: 946, 364 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1150, 388 + xy: 1048, 1131 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1252, 184 + xy: 1048, 315 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1558, 388 + xy: 1354, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1732, 1538 + xy: 1456, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1834, 1538 + xy: 1150, 416 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Work Boats + rotate: false + xy: 1660, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1426, 1028 + xy: 1762, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 1426, 1640 + xy: 364, 1582 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 1448, 1640 + xy: 364, 1560 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 1470, 1640 + xy: 384, 1174 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 384, 562 + xy: 408, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2071,168 +2092,168 @@ UnitPromotionIcons/Barrage_II_(Civ5) index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 792, 1668 + xy: 1076, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 1076, 1718 + xy: 894, 1208 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 814, 902 + xy: 1048, 1260 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 866, 954 + xy: 386, 326 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 896, 698 + xy: 334, 274 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 948, 750 + xy: 1949, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 996, 596 + xy: 2001, 1822 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1048, 648 + xy: 794, 1310 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1426, 902 + xy: 846, 1362 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 262, 26 + xy: 946, 290 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1528, 1054 + xy: 998, 342 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1784, 1312 + xy: 1020, 342 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1936, 1462 + xy: 1558, 750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1732, 1260 + xy: 1660, 852 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1732, 1238 + xy: 1762, 954 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 204, 133 + xy: 1864, 1056 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1100, 61 + xy: 1966, 1158 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 572, 52 + xy: 1354, 442 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1478, 1692 + xy: 132, 8 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 406, 562 + xy: 1456, 635 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 770, 1646 + xy: 406, 1174 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 792, 1646 + xy: 770, 1646 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1098, 1718 + xy: 1076, 1748 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1076, 1696 + xy: 1098, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index fe7a4eda..2b9dc1b3 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json index 74abdba3..16cbf585 100644 --- a/android/assets/jsons/Techs.json +++ b/android/assets/jsons/Techs.json @@ -44,12 +44,12 @@ buildingCost:75, wonderCost:185, techs:[ - /*{ + { name:"Sailing", row:1, prerequisites:["Pottery"], baseDescription:"Does nothing since we have no sea tiles - In theory, Allows access to sea resources by building work boats" - },*/ + }, { name:"Calendar", row:2, diff --git a/android/assets/jsons/TileImprovements.json b/android/assets/jsons/TileImprovements.json index a71b4a31..94506837 100644 --- a/android/assets/jsons/TileImprovements.json +++ b/android/assets/jsons/TileImprovements.json @@ -71,6 +71,13 @@ improvingTech:"Chemistry", improvingTechStats:{production:1} }, + { + name:"Fishing Boats", + food:1, + techRequired:"Sailing", + improvingTech:"Compass", + improvingTechStats:{gold:1} + }, // Transportation { diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index cd588baf..2db6230f 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -63,6 +63,15 @@ uniqueTo:"Babylon", upgradesTo:"Crossbowman" }, + { + name:"Work Boats", + unitType:"WaterCivilian", + baseDescription: "May create improvements on water resources", + movement:4, + cost: 30, + requiredTech:"Sailing", + hurryCostModifier:20 + }, { name:"Chariot Archer", unitType:"Ranged", diff --git a/core/src/com/unciv/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt index b79f61ad..a5774c93 100644 --- a/core/src/com/unciv/UnCivGame.kt +++ b/core/src/com/unciv/UnCivGame.kt @@ -17,7 +17,7 @@ class UnCivGame : Game() { * This exists so that when debugging we can see the entire map. * Remember to turn this to false before commit and upload! */ - val viewEntireMapForDebug = false + val viewEntireMapForDebug = true lateinit var worldScreen: WorldScreen diff --git a/core/src/com/unciv/logic/HexMath.kt b/core/src/com/unciv/logic/HexMath.kt index 017e3e2c..4649ff3b 100644 --- a/core/src/com/unciv/logic/HexMath.kt +++ b/core/src/com/unciv/logic/HexMath.kt @@ -68,7 +68,7 @@ class HexMath { fun GetVectorsInDistance(origin: Vector2, distance: Int): List { val hexesToReturn = mutableListOf() - for (i in 0 until distance + 1) { + for (i in 0 .. distance) { hexesToReturn.addAll(GetVectorsAtDistance(origin, i)) } return hexesToReturn diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 8097386f..33ed06c5 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -307,7 +307,9 @@ class UnitAutomation{ val top5Tiles = tileInfo.neighbors.union(bestTilesFromOuterLayer) .sortedByDescending { nearbyTileRankings[it] } .take(5) - return top5Tiles.map { nearbyTileRankings[it]!! }.sum() + var rank = top5Tiles.map { nearbyTileRankings[it]!! }.sum() + if(tileInfo.neighbors.any{it.baseTerrain == "Coast"}) rank += 5 + return rank } private fun automateSettlerActions(unit: MapUnit) { diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 41047722..adf5d728 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -105,6 +105,8 @@ class MapUnit { val tileOwner = tile.getOwner() if(tile.getBaseTerrain().type==TerrainType.Water && baseUnit.unitType.isLandUnit()) return false + if(tile.getBaseTerrain().type==TerrainType.Land && baseUnit.unitType.isWaterUnit()) + return false if(tileOwner!=null && tileOwner.civName!=owner && (tile.isCityCenter() || !civInfo.canEnterTiles(tileOwner))) return false diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt index ca9e6cf1..81d4447d 100644 --- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt @@ -89,20 +89,18 @@ class BaseUnit : INamed, IConstruction, ICivilopedia { return (cost / 10).toInt() * 10 // rounded down o nearest ten } - fun isBuildable(civInfo:CivilizationInfo): Boolean { + override fun isBuildable(construction: CityConstructions): Boolean { + val civInfo = construction.cityInfo.civInfo if (unbuildable) return false if (requiredTech!=null && !civInfo.tech.isResearched(requiredTech!!)) return false if (obsoleteTech!=null && civInfo.tech.isResearched(obsoleteTech!!)) return false if (uniqueTo!=null && uniqueTo!=civInfo.civName) return false if (GameBasics.Units.values.any { it.uniqueTo==civInfo.civName && it.replaces==name }) return false if (requiredResource!=null && !civInfo.getCivResources().keys.any { it.name == requiredResource }) return false + if(unitType.isWaterUnit() && construction.cityInfo.getCenterTile().neighbors.none { it.baseTerrain=="Coast" }) return true } - override fun isBuildable(construction: CityConstructions): Boolean { - return isBuildable(construction.cityInfo.civInfo) - } - override fun postBuildEvent(construction: CityConstructions) { val unit = construction.cityInfo.civInfo.placeUnitNearTile(construction.cityInfo.location, name) unit.promotions.XP += construction.getBuiltBuildings().sumBy { it.xpForNewUnits } diff --git a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt index 9248e441..cd7130be 100644 --- a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt +++ b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt @@ -7,6 +7,7 @@ enum class UnitType{ Ranged, Scout, Mounted, + WaterCivilian, Siege; fun isMelee(): Boolean { @@ -27,4 +28,7 @@ enum class UnitType{ || this == Ranged || this == Siege } + fun isWaterUnit(): Boolean { + return this == WaterCivilian + } } \ No newline at end of file diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 59edd06f..14a8cec1 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -6,6 +6,7 @@ import com.unciv.logic.automation.WorkerAutomation import com.unciv.logic.map.MapUnit import com.unciv.models.gamebasics.Building import com.unciv.models.gamebasics.GameBasics +import com.unciv.models.gamebasics.tile.TerrainType import com.unciv.models.gamebasics.unit.UnitType import com.unciv.ui.pickerscreens.ImprovementPickerScreen import com.unciv.ui.pickerscreens.PromotionPickerScreen @@ -33,13 +34,6 @@ class UnitActions { val unitTable = worldScreen.bottomBar.unitTable val actionList = ArrayList() -// if (unitTable.currentlyExecutingAction != "moveTo" -// && (unit.action==null || !unit.action!!.startsWith("moveTo") )){ -// actionList += UnitAction("Move unit", { -// unitTable.currentlyExecutingAction = "moveTo" -// }, unit.currentMovement != 0f ) -// } -// if(unit.action!=null && unit.action!!.startsWith("moveTo")){ actionList += UnitAction("Stop movement", { @@ -136,13 +130,19 @@ class UnitActions { } } + if(unit.name == "Work Boats" && tile.improvement==null && tile.resource!=null + && tile.getBaseTerrain().type==TerrainType.Water) + actionList += UnitAction("Create Fishing Boats",{ + tile.improvement = "Fishing Boats" + unit.destroy() + }, unit.currentMovement != 0f) + if (unit.name == "Great Scientist") { actionList += UnitAction( "Discover Technology", { unit.civInfo.tech.freeTechs += 1 unit.destroy() worldScreen.game.screen = TechPickerScreen(true, unit.civInfo) - },unit.currentMovement != 0f) actionList += UnitAction("Construct Academy", constructImprovementAndDestroyUnit(unit, "Academy"), diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index 4ce789ca..7458d44f 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -39,6 +39,7 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ "Sleep" -> return ImageGetter.getImage("OtherIcons/Sleep.png") "Explore" -> return ImageGetter.getUnitIcon("Scout") "Stop exploration" -> return ImageGetter.getImage("OtherIcons/Stop.png") + "Create Fishing Boats" -> return ImageGetter.getImprovementIcon("Fishing Boats") else -> return ImageGetter.getImage("OtherIcons/Star.png") } }