diff --git a/Credits.md b/Credits.md index fd6d7efd12..dba04deec5 100644 --- a/Credits.md +++ b/Credits.md @@ -17,6 +17,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Bow And Arrow](https://thenounproject.com/search/?q=Bow%20and%20Arrow&i=338261) By Viktor Ostrovsky for Archer * [Bow](https://thenounproject.com/search/?q=bow&i=101736) By Arthur Shlain for Bowman * [Fishing Vessel](https://thenounproject.com/term/fishing-vessel/23815/) By Luis Prado for Work Boats +* [Greek Trireme](https://thenounproject.com/search/?q=ancient%20boat&i=1626303) By Zachary McCune for Trireme * [Chariot](https://thenounproject.com/search/?q=Chariot&i=1189930) By Andrew Doane for Chariot Archer * [Spear](https://thenounproject.com/search/?q=Spear&i=11432) By Stephen Copinger for Spearman diff --git a/android/Images/BuildingIcons/SS Statis Chamber.png b/android/Images/BuildingIcons/SS Stasis Chamber.png similarity index 100% rename from android/Images/BuildingIcons/SS Statis Chamber.png rename to android/Images/BuildingIcons/SS Stasis Chamber.png diff --git a/android/Images/UnitIcons/Trireme.png b/android/Images/UnitIcons/Trireme.png new file mode 100644 index 0000000000..948191c6b1 Binary files /dev/null and b/android/Images/UnitIcons/Trireme.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 89f93aeaa7..6757b98776 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -27,77 +27,77 @@ BuildingIcons/Aqueduct index: -1 BuildingIcons/Armory rotate: false - xy: 334, 1062 + xy: 334, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 334, 552 + xy: 334, 246 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 334, 348 + xy: 260, 1600 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 260, 1702 + xy: 362, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 464, 1706 + xy: 566, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 566, 1706 + xy: 668, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 668, 1604 + xy: 386, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 590, 1400 + xy: 692, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 386, 1298 + xy: 590, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 488, 1298 + xy: 692, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 436, 1094 + xy: 538, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -125,350 +125,350 @@ BuildingIcons/Factory index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 742, 686 + xy: 742, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 742, 584 + xy: 742, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 844, 992 + xy: 792, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 770, 1690 + xy: 844, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 872, 1690 + xy: 844, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 974, 1690 + xy: 844, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 742, 278 + xy: 436, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 844, 278 + xy: 538, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 816, 176 + xy: 794, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 846, 74 + xy: 998, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 896, 1588 + xy: 1202, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 896, 1384 + xy: 1304, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1100, 1436 + xy: 1406, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1304, 1538 + xy: 1610, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastary rotate: false - xy: 1406, 1640 + xy: 1712, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1304, 1436 + xy: 1610, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1508, 1640 + xy: 1814, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1610, 1640 + xy: 1814, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1508, 1436 + xy: 1202, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1712, 1640 + xy: 1406, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1610, 1436 + xy: 1508, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1712, 1436 + xy: 1814, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1814, 1538 + xy: 1916, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1814, 1436 + xy: 1916, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper maker rotate: false - xy: 1202, 1334 + xy: 1916, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1916, 1436 + xy: 1608, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 996, 1282 + xy: 1914, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1506, 1232 + xy: 946, 772 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 946, 1078 + xy: 946, 160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 946, 976 + xy: 1048, 1131 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 946, 874 + xy: 1048, 1029 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/SS Statis Chamber +BuildingIcons/SS Stasis Chamber rotate: false - xy: 946, 772 + xy: 1048, 927 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1048, 621 + xy: 1150, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1048, 417 + xy: 1150, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1150, 1028 + xy: 1150, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1252, 1130 + xy: 1252, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1354, 1130 + xy: 1150, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1252, 926 + xy: 1354, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1354, 1028 + xy: 1456, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1456, 1028 + xy: 1456, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1558, 1130 + xy: 1558, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1150, 620 + xy: 1660, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1252, 722 + xy: 1150, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1354, 824 + xy: 1252, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1456, 926 + xy: 1354, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1660, 1130 + xy: 1558, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1558, 926 + xy: 1354, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1762, 1130 + xy: 1558, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1456, 722 + xy: 1150, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1864, 1130 + xy: 1558, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -531,7 +531,7 @@ FlagIcons/Spanish index: -1 ImprovementIcons/Academy rotate: false - xy: 204, 152 + xy: 132, 30 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -545,112 +545,112 @@ ImprovementIcons/Ancient ruins index: -1 ImprovementIcons/Camp rotate: false - xy: 668, 1706 + xy: 668, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 692, 1298 + xy: 486, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 538, 788 + xy: 436, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 538, 380 + xy: 538, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 742, 890 + xy: 742, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 744, 74 + xy: 896, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 794, 1588 + xy: 1100, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 794, 1384 + xy: 1100, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1304, 1640 + xy: 1610, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1814, 1640 + xy: 1712, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1916, 1640 + xy: 1404, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1098, 1233 + xy: 946, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1302, 1232 + xy: 946, 976 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1302, 1232 + xy: 946, 976 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1812, 1232 + xy: 946, 466 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1252, 620 + xy: 1762, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -664,21 +664,21 @@ OtherIcons/Circle index: -1 OtherIcons/CircleOld rotate: false - xy: 692, 1400 + xy: 488, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 590, 1298 + xy: 384, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 436, 788 + xy: 538, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -692,42 +692,42 @@ OtherIcons/DisbandUnit index: -1 OtherIcons/Fire rotate: false - xy: 742, 1094 + xy: 640, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1100, 1640 + xy: 1304, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1048, 927 + xy: 1048, 213 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1048, 519 + xy: 1252, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1150, 320 + xy: 1762, 932 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1456, 1130 + xy: 1558, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -769,161 +769,161 @@ PolicyIcons/Citizenship index: -1 PolicyIcons/Civil Society rotate: false - xy: 334, 296 + xy: 1949, 1792 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1949, 1792 + xy: 794, 1332 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 794, 1332 + xy: 1864, 1078 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 946, 312 + xy: 1150, 262 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Dicipline rotate: false - xy: 1354, 568 + xy: 1252, 364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1456, 670 + xy: 1354, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1558, 772 + xy: 1456, 568 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1660, 874 + xy: 1558, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1762, 976 + xy: 1660, 772 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1864, 1078 + xy: 1762, 880 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1252, 364 + xy: 1864, 1026 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1354, 516 + xy: 1150, 210 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1354, 464 + xy: 1762, 828 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1966, 1180 + xy: 1864, 974 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 312, 1548 + xy: 1150, 158 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1406, 568 + xy: 1966, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1406, 516 + xy: 312, 1548 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1406, 464 + xy: 1916, 1078 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1508, 670 + xy: 1916, 1026 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1610, 772 + xy: 1916, 974 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1712, 874 + xy: 1202, 262 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1814, 976 + xy: 1202, 210 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1916, 1078 + xy: 1202, 158 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -937,98 +937,98 @@ PolicyIcons/Police State index: -1 PolicyIcons/Populism rotate: false - xy: 1252, 312 + xy: 1406, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1304, 312 + xy: 1508, 568 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 438, 22 + xy: 1610, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 490, 22 + xy: 1712, 772 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 542, 22 + xy: 1814, 880 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 594, 22 + xy: 1814, 828 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 646, 22 + xy: 1764, 776 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 698, 22 + xy: 1816, 776 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 750, 22 + xy: 1150, 106 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 802, 22 + xy: 1202, 106 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 854, 22 + xy: 306, 194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 906, 22 + xy: 358, 194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 958, 22 + xy: 1866, 922 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1010, 22 + xy: 1866, 870 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1042,203 +1042,203 @@ ResourceIcons/Aluminum index: -1 ResourceIcons/Bananas rotate: false - xy: 334, 654 + xy: 334, 348 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 488, 1502 + xy: 488, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 690, 1196 + xy: 436, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 436, 890 + xy: 538, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 436, 686 + xy: 538, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 538, 686 + xy: 436, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 742, 992 + xy: 742, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 742, 482 + xy: 742, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 792, 1196 + xy: 742, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 844, 1094 + xy: 742, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 640, 278 + xy: 974, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 408, 176 + xy: 640, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 612, 176 + xy: 844, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 438, 74 + xy: 896, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 896, 1486 + xy: 1202, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1712, 1538 + xy: 1610, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1406, 1334 + xy: 894, 1282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1048, 1029 + xy: 1048, 315 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1048, 825 + xy: 1048, 111 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1048, 723 + xy: 1150, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1150, 1130 + xy: 1354, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1150, 824 + xy: 1252, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1252, 824 + xy: 1252, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1660, 1028 + xy: 1456, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1252, 518 + xy: 1762, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1354, 620 + xy: 1864, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1558, 824 + xy: 1252, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 384, 1196 + xy: 588, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 486, 1196 + xy: 690, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1280,7 +1280,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1406, 1538 + xy: 1712, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1301,7 +1301,7 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1404, 1232 + xy: 946, 874 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1315,14 +1315,14 @@ StatIcons/Science index: -1 StatIcons/Strength rotate: false - xy: 1150, 722 + xy: 1150, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Acoustics rotate: false - xy: 132, 30 + xy: 234, 49 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1357,84 +1357,84 @@ TechIcons/Archaeology index: -1 TechIcons/Archery rotate: false - xy: 306, 152 + xy: 334, 960 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Architecture rotate: false - xy: 336, 50 + xy: 334, 858 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Astronomy rotate: false - xy: 334, 858 + xy: 334, 552 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 334, 450 + xy: 260, 1702 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 260, 1600 + xy: 464, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 362, 1604 + xy: 464, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 464, 1604 + xy: 566, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 488, 1400 + xy: 692, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 488, 1400 + xy: 692, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 692, 1502 + xy: 386, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 588, 1196 + xy: 436, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 538, 1094 + xy: 436, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1448,7 +1448,7 @@ TechIcons/Computers index: -1 TechIcons/Construction rotate: false - xy: 538, 992 + xy: 436, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1462,7 +1462,7 @@ TechIcons/Currency index: -1 TechIcons/Dynamite rotate: false - xy: 436, 584 + xy: 538, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1476,28 +1476,28 @@ TechIcons/Eccology index: -1 TechIcons/Economics rotate: false - xy: 538, 584 + xy: 436, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 436, 482 + xy: 538, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 538, 482 + xy: 436, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 436, 380 + xy: 538, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1511,259 +1511,259 @@ TechIcons/Fertilizer index: -1 TechIcons/Flight rotate: false - xy: 742, 788 + xy: 742, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 742, 380 + xy: 742, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 844, 482 + xy: 844, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 844, 380 + xy: 844, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 436, 278 + xy: 770, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 510, 176 + xy: 742, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 714, 176 + xy: 794, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 794, 1486 + xy: 1100, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 998, 1588 + xy: 1202, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 998, 1486 + xy: 1304, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 998, 1384 + xy: 1406, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1100, 1538 + xy: 1406, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1202, 1640 + xy: 1508, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1202, 1538 + xy: 1508, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1202, 1436 + xy: 1508, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1508, 1538 + xy: 1814, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1610, 1538 + xy: 1304, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1304, 1334 + xy: 1916, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1508, 1334 + xy: 996, 1282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1610, 1334 + xy: 1098, 1233 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1712, 1334 + xy: 1200, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1916, 1538 + xy: 1506, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1916, 1334 + xy: 1710, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 894, 1282 + xy: 1812, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1200, 1232 + xy: 946, 1078 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1710, 1232 + xy: 946, 568 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1914, 1232 + xy: 946, 364 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 946, 1180 + xy: 946, 262 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 946, 670 + xy: 1048, 825 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 946, 568 + xy: 1048, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 946, 466 + xy: 1048, 621 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1150, 926 + xy: 1354, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1252, 1028 + xy: 1456, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1558, 1028 + xy: 1456, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1150, 518 + xy: 1660, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1354, 722 + xy: 1150, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1252, 416 + xy: 1660, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1833,147 +1833,147 @@ TerrainIcons/Oasis index: -1 TerrainIcons/road rotate: false - xy: 1456, 657 + xy: 132, 17 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 234, 50 + xy: 334, 1062 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 334, 960 + xy: 334, 654 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 334, 756 + xy: 334, 450 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 362, 1706 + xy: 362, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 566, 1604 + xy: 386, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 386, 1502 + xy: 488, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 386, 1400 + xy: 590, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 590, 1502 + xy: 590, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 436, 992 + xy: 538, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 538, 890 + xy: 436, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 844, 890 + xy: 844, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 844, 788 + xy: 844, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 844, 686 + xy: 844, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 844, 584 + xy: 844, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 538, 278 + xy: 872, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 540, 74 + xy: 794, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 642, 74 + xy: 896, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 918, 176 + xy: 998, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 948, 74 + xy: 998, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1406, 1436 + xy: 1712, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1987,70 +1987,77 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 1814, 1334 + xy: 1302, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1608, 1232 + xy: 946, 670 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 946, 364 + xy: 1048, 519 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1048, 1131 + xy: 1048, 417 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1048, 315 + xy: 1252, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1354, 926 + xy: 1354, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1456, 824 + xy: 1252, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Trireme + rotate: false + xy: 204, 151 + size: 100, 101 + orig: 100, 101 + offset: 0, 0 + index: -1 UnitIcons/Warrior - rotate: false - 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/Work Boats + rotate: false + xy: 1354, 518 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Worker rotate: false - xy: 1762, 1028 + xy: 1456, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2078,182 +2085,182 @@ UnitPromotionIcons/Accuracy_I_(Civ5) index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 408, 154 + xy: 770, 1668 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 770, 1668 + xy: 1076, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 1076, 1770 + xy: 894, 1208 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 894, 1208 + xy: 1048, 1260 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1048, 1260 + xy: 1949, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 386, 326 + xy: 2001, 1822 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 334, 274 + xy: 794, 1310 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 1949, 1770 + xy: 846, 1362 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 2001, 1822 + xy: 1966, 1158 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 794, 1310 + xy: 1252, 342 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 846, 1362 + xy: 1354, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 946, 290 + xy: 1456, 546 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 998, 342 + xy: 1558, 648 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1020, 342 + xy: 1660, 750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1558, 750 + xy: 306, 172 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1660, 852 + xy: 410, 224 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1762, 954 + xy: 1918, 952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1864, 1056 + xy: 1866, 848 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1966, 1158 + xy: 406, 1174 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1354, 442 + xy: 770, 1646 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 132, 8 + xy: 1076, 1748 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1456, 635 + xy: 1098, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 406, 1174 + xy: 916, 1208 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 770, 1646 + xy: 1048, 1238 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1076, 1748 + xy: 1070, 1260 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1098, 1770 + xy: 1949, 1748 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 2b9dc1b3cd..da0044f957 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 2db6230f09..941ad660d1 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -70,6 +70,17 @@ movement:4, cost: 30, requiredTech:"Sailing", + uniques:["Cannot enter ocean tiles until Astronomy"] + hurryCostModifier:20 + }, + { + name:"Trireme", + unitType:"WaterMelee", + movement:4, + strength:10, + cost: 45, + requiredTech:"Sailing", + uniques:["Cannot enter ocean tiles"] hurryCostModifier:20 }, { diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index c58f58dc5b..c41bebf665 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -8,7 +8,6 @@ import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.tile.TerrainType import com.unciv.models.gamebasics.unit.BaseUnit -import com.unciv.models.gamebasics.unit.UnitType import com.unciv.ui.utils.getRandom import java.text.DecimalFormat import java.util.* @@ -98,17 +97,26 @@ class MapUnit { return "$name - $owner" } - /** - * Designates whether we can walk to the tile - without attacking - */ - fun canMoveTo(tile: TileInfo): Boolean { + fun canPassThrough(tile: TileInfo):Boolean{ 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(tile.baseTerrain=="Ocean" && baseUnit.uniques.contains("Cannot enter ocean tiles until Astronomy") + && !civInfo.tech.isResearched("Astronomy")) + return false + if(tile.baseTerrain=="Ocean" && baseUnit.uniques.contains("Cannot enter ocean tiles")) return false if(tileOwner!=null && tileOwner.civName!=owner && (tile.isCityCenter() || !civInfo.canEnterTiles(tileOwner))) return false + return true + } + + /** + * Designates whether we can walk to the tile - without attacking + */ + fun canMoveTo(tile: TileInfo): Boolean { + if(!canPassThrough(tile)) return false if (baseUnit().unitType.isCivilian()) return tile.civilianUnit==null && (tile.militaryUnit==null || tile.militaryUnit!!.owner==owner) diff --git a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt index a268b0677b..75e9d5a089 100644 --- a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt +++ b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt @@ -1,7 +1,6 @@ package com.unciv.logic.map import com.badlogic.gdx.math.Vector2 -import com.unciv.models.gamebasics.tile.TerrainType class UnitMovementAlgorithms(val unit:MapUnit) { val tileMap = unit.getTile().tileMap @@ -24,6 +23,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) { return to.lastTerrain.movementCost.toFloat() // no road } + fun getDistanceToTilesWithinTurn(origin: Vector2, unitMovement: Float): HashMap { if(unitMovement==0f) return hashMapOf() val distanceToTiles = LinkedHashMap() @@ -36,13 +36,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) { for (tileToCheck in tilesToCheck) for (neighbor in tileToCheck.neighbors) { var totalDistanceToTile:Float - val neighborOwner = neighbor.getOwner() - val isOwnedByEnemy = neighborOwner!=null && neighborOwner!=unit.civInfo - if ( (unit.baseUnit.unitType.isLandUnit() && neighbor.getBaseTerrain().type== TerrainType.Water) - || (isOwnedByEnemy && neighbor.isCityCenter())// Enemy city, - || (neighbor.getUnits().isNotEmpty() && neighbor.getUnits().first().civInfo!=unit.civInfo) // Enemy unit - || (isOwnedByEnemy && !unit.civInfo.canEnterTiles(neighborOwner!!)) // enemyTile - ) + if (!unit.canPassThrough(neighbor)) totalDistanceToTile = unitMovement // Can't go here. // The reason that we don't just "return" is so that when calculating how to reach an enemy, // You need to assume his tile is reachable, otherwise all movement algs on reaching enemy diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt index 6153e532c5..76c8289bbd 100644 --- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt @@ -24,7 +24,7 @@ class BaseUnit : INamed, IConstruction, ICivilopedia { internal var unbuildable: Boolean = false // for special units like great people var requiredTech:String? = null var requiredResource:String? = null - var uniques:HashSet?=null + var uniques =HashSet() var obsoleteTech:String?=null var upgradesTo:String? = null var replaces:String?=null diff --git a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt index 09d9292ff5..2a925fd4e0 100644 --- a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt +++ b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt @@ -8,6 +8,7 @@ enum class UnitType{ Scout, Mounted, WaterCivilian, + WaterMelee, Siege; fun isMelee(): Boolean {