diff --git a/Credits.md b/Credits.md index 0c2ab1d6ba..fd8d6c5b27 100644 --- a/Credits.md +++ b/Credits.md @@ -20,6 +20,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [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 +* [Greek shield](https://thenounproject.com/search/?q=hoplite&i=440135) for Hoplite ### Classical Era diff --git a/android/Images/UnitIcons/Hoplite.png b/android/Images/UnitIcons/Hoplite.png new file mode 100644 index 0000000000..48e338a8c1 Binary files /dev/null and b/android/Images/UnitIcons/Hoplite.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 61af1766a9..becc1970bf 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -174,350 +174,350 @@ BuildingIcons/Hermitage index: -1 BuildingIcons/Hospital rotate: false - xy: 510, 721 + xy: 612, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 612, 823 + xy: 612, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 918, 823 + xy: 918, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1122, 823 + xy: 1122, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 1252, 1333 + xy: 1252, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1252, 1231 + xy: 1252, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 1224, 721 + xy: 1297, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1501, 1637 + xy: 1603, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1354, 1231 + xy: 1354, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1326, 823 + xy: 1326, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1456, 1535 + xy: 1456, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1456, 1433 + xy: 1558, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1558, 1433 + xy: 1660, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1558, 1331 + xy: 1660, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1762, 1535 + xy: 1456, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1558, 1229 + xy: 1660, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1762, 1433 + xy: 1864, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1558, 1127 + xy: 1660, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1762, 1331 + xy: 1864, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1864, 1433 + xy: 1558, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper maker rotate: false - xy: 1558, 1025 + xy: 1660, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1558, 923 + xy: 1660, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1864, 923 + xy: 1428, 822 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1836, 821 + xy: 1530, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 284, 608 + xy: 245, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 245, 506 + xy: 347, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 347, 506 + xy: 245, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 245, 404 + xy: 347, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 132, 67 + xy: 245, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 336, 98 + xy: 386, 609 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 488, 619 + xy: 590, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 590, 619 + xy: 692, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 998, 619 + xy: 1100, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1100, 619 + xy: 1202, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1406, 618 + xy: 1508, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1610, 617 + xy: 1712, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1712, 617 + xy: 1814, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 449, 303 + xy: 551, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 551, 517 + xy: 653, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 653, 517 + xy: 551, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 551, 415 + xy: 755, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 755, 517 + xy: 551, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 551, 313 + xy: 653, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 653, 415 + xy: 857, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 857, 517 + xy: 653, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 755, 415 + xy: 959, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 857, 313 + xy: 959, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1163, 517 + xy: 959, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1061, 313 + xy: 1163, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1265, 313 + xy: 1367, 516 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -643,77 +643,77 @@ ImprovementIcons/Fishing Boats index: -1 ImprovementIcons/Landmark rotate: false - xy: 1252, 1537 + xy: 1252, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1252, 925 + xy: 1224, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1297, 1639 + xy: 1399, 1659 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1354, 1027 + xy: 1354, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1456, 1025 + xy: 1558, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1864, 1127 + xy: 1864, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1428, 822 + xy: 1428, 720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1530, 821 + xy: 1632, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1530, 821 + xy: 1632, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1836, 719 + xy: 1938, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 755, 313 + xy: 857, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -769,28 +769,28 @@ OtherIcons/Fire index: -1 OtherIcons/MenuIcon rotate: false - xy: 1354, 1537 + xy: 1354, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1864, 1331 + xy: 1660, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 234, 200 + xy: 234, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 386, 609 + xy: 488, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -804,7 +804,7 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 1814, 617 + xy: 1916, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -853,7 +853,7 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1367, 464 + xy: 1367, 362 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -867,245 +867,245 @@ PolicyIcons/Constitution index: -1 PolicyIcons/Democracy rotate: false - xy: 1367, 412 + xy: 388, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1367, 360 + xy: 1419, 362 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 388, 46 + xy: 1367, 310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1419, 464 + xy: 1419, 310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1419, 412 + xy: 1966, 1585 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1419, 360 + xy: 1966, 1533 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1367, 308 + xy: 1966, 1481 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1419, 308 + xy: 1966, 1429 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1966, 1585 + xy: 1966, 1377 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1966, 1533 + xy: 1966, 1325 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1966, 1481 + xy: 1966, 1273 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1966, 1429 + xy: 1966, 1221 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1966, 1377 + xy: 1966, 1169 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1966, 1325 + xy: 1966, 1117 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1966, 1273 + xy: 1966, 1065 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1966, 1221 + xy: 1966, 1013 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1966, 1169 + xy: 1966, 961 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1966, 1117 + xy: 106, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1966, 1065 + xy: 158, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1966, 1013 + xy: 1469, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1966, 961 + xy: 1469, 513 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 106, 13 + xy: 1521, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 158, 15 + xy: 1469, 461 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1469, 565 + xy: 1521, 513 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1521, 565 + xy: 1573, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1573, 565 + xy: 1521, 461 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1625, 565 + xy: 1573, 513 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1677, 565 + xy: 1625, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1729, 565 + xy: 1573, 461 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1781, 565 + xy: 1625, 513 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1833, 565 + xy: 1677, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1885, 565 + xy: 1625, 461 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1937, 565 + xy: 1677, 513 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1989, 565 + xy: 1729, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 438, 250 + xy: 1677, 461 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1189,119 +1189,119 @@ ResourceIcons/Gold index: -1 ResourceIcons/Horses rotate: false - xy: 510, 823 + xy: 510, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 612, 721 + xy: 714, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 714, 721 + xy: 816, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 918, 721 + xy: 1020, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1399, 1659 + xy: 1501, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1864, 1535 + xy: 1456, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1762, 1229 + xy: 1864, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 347, 302 + xy: 234, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 234, 98 + xy: 336, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 336, 200 + xy: 336, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 896, 619 + xy: 998, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1508, 617 + xy: 1610, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 449, 507 + xy: 449, 405 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 959, 415 + xy: 1163, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1061, 415 + xy: 1265, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1265, 517 + xy: 1061, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1163, 415 + xy: 1163, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1364,7 +1364,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1456, 1331 + xy: 1558, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1385,14 +1385,14 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1632, 821 + xy: 1734, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 1530, 719 + xy: 1632, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1406,14 +1406,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 794, 619 + xy: 896, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1916, 617 + xy: 449, 507 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1644,252 +1644,252 @@ TechIcons/Gunpowder index: -1 TechIcons/Horseback Riding rotate: false - xy: 408, 823 + xy: 408, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 714, 823 + xy: 714, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 816, 823 + xy: 816, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1224, 823 + xy: 1224, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1705, 1637 + xy: 1807, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 1807, 1637 + xy: 1909, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1909, 1637 + xy: 1354, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1354, 1435 + xy: 1354, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1354, 1333 + xy: 1354, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1354, 1129 + xy: 1354, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1354, 925 + xy: 1326, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1456, 1229 + xy: 1558, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1660, 1433 + xy: 1762, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1456, 1127 + xy: 1558, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1660, 1229 + xy: 1762, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1660, 1127 + xy: 1762, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1660, 1025 + xy: 1762, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1762, 1127 + xy: 1864, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1864, 1229 + xy: 1762, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1864, 1025 + xy: 1558, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1660, 923 + xy: 1762, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1762, 923 + xy: 1864, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1428, 720 + xy: 1530, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replacable Parts rotate: false - xy: 1734, 821 + xy: 1836, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1734, 719 + xy: 1836, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1938, 821 + xy: 1938, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1938, 719 + xy: 284, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 347, 404 + xy: 143, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 143, 373 + xy: 132, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 132, 271 + xy: 132, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1202, 619 + xy: 1304, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1304, 619 + xy: 1406, 618 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 653, 313 + xy: 755, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 959, 517 + xy: 755, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 857, 415 + xy: 1061, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1367, 516 + xy: 1367, 414 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1938,28 +1938,28 @@ TerrainIcons/Hill index: -1 TerrainIcons/Jungle rotate: false - xy: 1020, 823 + xy: 1020, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1603, 1637 + xy: 1705, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Mountain rotate: false - xy: 1558, 1535 + xy: 1456, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 1660, 1331 + xy: 1762, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2118,65 +2118,72 @@ UnitIcons/Great War Infantry orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Hoplite + rotate: false + xy: 408, 823 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Horseman rotate: false - xy: 408, 721 + xy: 510, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 816, 721 + xy: 918, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1020, 721 + xy: 1122, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1122, 721 + xy: 1252, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 1252, 1435 + xy: 1252, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1252, 1129 + xy: 1252, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1252, 1027 + xy: 1252, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1326, 721 + xy: 1456, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1660, 1535 + xy: 1456, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2190,49 +2197,49 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 1762, 1025 + xy: 1864, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1632, 719 + xy: 1734, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 132, 169 + xy: 132, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 245, 302 + xy: 347, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 692, 619 + xy: 794, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 449, 405 + xy: 449, 303 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1061, 517 + xy: 857, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2246,21 +2253,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 959, 313 + xy: 1061, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1163, 313 + xy: 1265, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1265, 415 + xy: 1265, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2323,231 +2330,231 @@ UnitPromotionIcons/Boarding_Party_III_(Civ5) index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 1981, 1971 + xy: 2018, 697 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 336, 24 + xy: 1981, 1971 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 2015, 1819 + xy: 336, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1966, 939 + xy: 2015, 1819 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 210, 45 + xy: 1966, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1469, 543 + xy: 210, 45 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 2018, 697 + xy: 1469, 439 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 438, 228 + xy: 1729, 543 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1531, 1949 + xy: 1781, 595 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1981, 1949 + xy: 1531, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 2003, 1971 + xy: 2018, 675 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 336, 2 + xy: 1981, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 358, 24 + xy: 2003, 1971 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 2015, 1797 + xy: 336, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1988, 939 + xy: 358, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 210, 23 + xy: 2015, 1797 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1469, 521 + xy: 1988, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1491, 543 + xy: 210, 23 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 2018, 675 + xy: 1469, 417 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 438, 206 + xy: 1491, 439 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 460, 228 + xy: 1729, 521 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 2003, 1949 + xy: 1751, 543 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 358, 2 + xy: 1781, 573 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 380, 24 + xy: 1803, 595 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 2015, 1775 + xy: 2018, 653 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1491, 521 + xy: 2003, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1513, 543 + xy: 358, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 2018, 653 + xy: 380, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 438, 184 + xy: 2015, 1775 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 460, 206 + xy: 1491, 417 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 380, 2 + xy: 1513, 439 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 402, 24 + xy: 1729, 499 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 2015, 1753 + xy: 1751, 521 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index f5e03cb94f..0a33ac33eb 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index f3a7614ab9..3783ff502d 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -61,6 +61,7 @@ name:"Rome", mainColor:[ 53,0,87], secondaryColor:[238,201,9], + unique:"+25% Production towards any buildings that already exist in the Capital", cities:["Rome","Antium","Cumae","Neapolis","Ravenna","Arretium","Mediolanum","Arpinum","Circei","Setia", "Satricum","Ardea","Ostia","Velitrae","Viroconium","Tarentum","Brundisium","Caesaraugusta","Caesarea","Palmyra", "Signia","Aquileia","Clusium","Sutrium","Cremona","Placentia","Hispalis","Artaxata","Aurelianorum","Nicopolis"] diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 7bcef6d037..6d587eba87 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -3354,6 +3354,9 @@ Simplified_Chinese:"替代" } + "National ability":{ // the unique ability that each nation has + } + "Babylon":{ Italian:"Babilonia" Russian:"Вавилон" @@ -3412,24 +3415,30 @@ Simplified_Chinese:"法兰西" Portuguese:"França" } + "Russia":{ Simplified_Chinese:"俄罗斯" } "Strategic Resources provide +1 Production, and Horses, Iron and Uranium Resources provide double quantity":{ Simplified_Chinese:"所有战略资源+1生产力, 并且马 铁和铀 提供双份" } + "Rome":{ Simplified_Chinese:"罗马" } + "+25% Production towards any buildings that already exist in the Capital":{} + "Arabia":{ Simplified_Chinese:"阿拉伯" } + "America":{ Simplified_Chinese:"美国" } "All land military units have +1 sight, 50% discount when purchasing tiles":{ Simplified_Chinese:"所有陆军 +1 视野, 购买地块打五折" } + "Barbarians":{ Simplified_Chinese:"蛮族" } @@ -4827,9 +4836,11 @@ Simplified_Chinese:"战车射手" Portuguese:"Arqueiro de Biga" } - "War Chariot":{ + "War Chariot":{ // Egypt unique Simplified_Chinese:"埃及战车" - } // Egypt unique + } + + "Spearman":{ Italian:"Lanciere" Russian:"Копейщик" @@ -5044,7 +5055,9 @@ } "Cossack":{ Simplified_Chinese:"哥萨克骑兵" - Russian:"Казаки:} // Russia unique + Russian:"Казаки" + } // Russia unique + "Artillery":{ Italian:"Artiglieria" Russian:"Артиллерия" diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 11c47be892..97a73eed65 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -109,6 +109,20 @@ uniques:["Bonus vs Mounted 50%"], hurryCostModifier:20 }, + { + name:"Hoplite", + replaces:"Spearman", + uniqueTo:"Greece", + unitType:"Melee", + movement:2, + strength:13, + cost: 56, + requiredTech:"Bronze Working", + obsoleteTech:"Civil Service", + upgradesTo: "Pikeman", + uniques:["Bonus vs Mounted 50%"], + hurryCostModifier:20 + }, /* Classical Era */ diff --git a/core/src/com/unciv/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt index 5835061029..d42f058e89 100644 --- a/core/src/com/unciv/UnCivGame.kt +++ b/core/src/com/unciv/UnCivGame.kt @@ -21,7 +21,7 @@ class UnCivGame : Game() { val viewEntireMapForDebug = false // For when you need to test something in an advanced game and don't have time to faff around - val superchagedForDebug = false + val superchargedForDebug = true lateinit var worldScreen: WorldScreen diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 748a5f5d5f..6c4b752478 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -104,6 +104,19 @@ class CityStats { return stats } + private fun getStatPercentBonusesFromNationUnique(): Stats { + val stats = Stats() + + val civUnique = cityInfo.civInfo.getNation().unique + if(civUnique=="+25% Production towards any buildings that already exist in the Capital" + && cityInfo.cityConstructions.getCurrentConstruction() is Building + && cityInfo.civInfo.getCapital().cityConstructions.builtBuildings + .contains(cityInfo.cityConstructions.currentConstruction)) + stats.production+=25f + + return stats + } + private fun getGrowthBonusFromPolicies(): Float { var bonus = 0f @@ -277,8 +290,9 @@ class CityStats { newStatPercentBonusList["Marble"]=getStatPercentBonusesFromMarble() newStatPercentBonusList["Computers"]=getStatPercentBonusesFromComputers() newStatPercentBonusList["Difficulty"]=getStatPercentBonusesFromDifficulty() + newStatPercentBonusList["National ability"]=getStatPercentBonusesFromNationUnique() - if(UnCivGame.Current.superchagedForDebug) { + if(UnCivGame.Current.superchargedForDebug) { val stats = Stats() for(stat in Stat.values()) stats.add(stat,10000f) newStatPercentBonusList["Supercharged"] = stats diff --git a/core/src/com/unciv/ui/pickerscreens/TechButton.kt b/core/src/com/unciv/ui/pickerscreens/TechButton.kt index 0c7c459158..e01fa14bfb 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechButton.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechButton.kt @@ -34,6 +34,10 @@ class TechButton(techName:String, val techManager: TechManager) : Table(CameraSt val techEnabledIcons = Table() techEnabledIcons.defaults().pad(5f) + val units = GameBasics.Units.values.filter { it.requiredTech==techName } + .filter { it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName } + + for(unit in GameBasics.Units.values.filter { it.requiredTech==techName && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) }) techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(30f))