diff --git a/Credits.md b/Credits.md index 966cbc7bc3..66c44a2f4c 100644 --- a/Credits.md +++ b/Credits.md @@ -191,6 +191,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Stadium](https://thenounproject.com/term/stadium/13872/) By Karuna Lalvani * [Signal Tower](https://thenounproject.com/term/signal-tower/1547758/) By Nociconist for Broadcast Tower * [Eiffel Tower](https://thenounproject.com/term/eiffel-tower/1907757/) By Felipe Alvarado +* [Statue of Liberty](https://thenounproject.com/search/?q=statue%20of%20liberty&i=1801199) By 1516 * [Christ the redeemer](https://thenounproject.com/term/christ-the-redeemer/56112/) By Stefan Spieler for Cristo Redentor ### Information Era @@ -348,6 +349,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Plastic](https://thenounproject.com/term/plastic/478826/) By Yu luck * [Microphone](https://thenounproject.com/term/microphone/470266/) By Viktor Vorobyev for Mass Media * [Flight](https://thenounproject.com/term/flight/1014306/) By Genius Icons +* [Train](https://thenounproject.com/term/train/651644/) By Federico Panzano for Railroad * [Refridgerator](https://thenounproject.com/search/?q=refridgerator&i=1188873) By b farias, CL ### Information diff --git a/android/Images/BuildingIcons/Statue of Liberty.png b/android/Images/BuildingIcons/Statue of Liberty.png new file mode 100644 index 0000000000..b4ccfabb19 Binary files /dev/null and b/android/Images/BuildingIcons/Statue of Liberty.png differ diff --git a/android/Images/TechIcons/Ballistics.png b/android/Images/TechIcons/Ballistics.png new file mode 100644 index 0000000000..47622a1701 Binary files /dev/null and b/android/Images/TechIcons/Ballistics.png differ diff --git a/android/Images/TechIcons/Railroad.png b/android/Images/TechIcons/Railroad.png new file mode 100644 index 0000000000..409b71234e Binary files /dev/null and b/android/Images/TechIcons/Railroad.png differ diff --git a/android/Images/UnitIcons/Infantry.png b/android/Images/UnitIcons/Infantry.png new file mode 100644 index 0000000000..ad86b32464 Binary files /dev/null and b/android/Images/UnitIcons/Infantry.png differ diff --git a/android/Images/UnitIcons/Machine Gun.png b/android/Images/UnitIcons/Machine Gun.png new file mode 100644 index 0000000000..2941ca7e6c Binary files /dev/null and b/android/Images/UnitIcons/Machine Gun.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 49772994e0..630c068e88 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -34,497 +34,504 @@ BuildingIcons/Armory index: -1 BuildingIcons/Bank rotate: false - xy: 685, 1639 + xy: 787, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 991, 1639 + xy: 1093, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 1199, 1741 + xy: 1195, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 1403, 1761 + xy: 143, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 1531, 1841 + xy: 1633, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 1709, 1739 + xy: 1811, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 334, 1537 + xy: 334, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 436, 1537 + xy: 334, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 334, 1333 + xy: 436, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 334, 1129 + xy: 436, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 538, 1231 + xy: 640, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 640, 1129 + xy: 742, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 1048, 1537 + xy: 538, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 640, 925 + xy: 742, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 844, 1129 + xy: 946, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 1150, 1333 + xy: 844, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 1150, 1027 + xy: 1150, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 1150, 925 + xy: 408, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 408, 823 + xy: 408, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 408, 721 + xy: 510, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 714, 721 + xy: 816, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 816, 823 + xy: 816, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1122, 823 + xy: 1252, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1252, 1333 + xy: 1252, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 1224, 823 + xy: 1297, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 1224, 721 + xy: 1399, 1659 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1297, 1639 + xy: 1501, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 1807, 1637 + xy: 1354, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1354, 1435 + xy: 1354, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1456, 1535 + xy: 1456, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1558, 1433 + xy: 1558, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1456, 1229 + xy: 1762, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1558, 1331 + xy: 1456, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1456, 1127 + xy: 1762, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1762, 1433 + xy: 1558, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1456, 1025 + xy: 1762, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1660, 1229 + xy: 1558, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1864, 1433 + xy: 1762, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1762, 1229 + xy: 1762, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1660, 1025 + xy: 1762, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1762, 1127 + xy: 1864, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1864, 1229 + xy: 1864, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1632, 821 + xy: 1530, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1530, 719 + xy: 1836, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 245, 506 + xy: 143, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 132, 67 + xy: 234, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 245, 302 + xy: 336, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 347, 302 + xy: 336, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 234, 200 + xy: 386, 609 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 488, 619 + xy: 896, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1100, 619 + xy: 1508, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1304, 619 + xy: 1712, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1406, 618 + xy: 1814, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1814, 617 + xy: 449, 303 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1916, 617 + xy: 551, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Stock Exchange - rotate: false - xy: 449, 303 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stone Works +BuildingIcons/Statue of Liberty rotate: false xy: 653, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +BuildingIcons/Stock Exchange + rotate: false + xy: 551, 313 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Stone Works + rotate: false + xy: 857, 517 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/Stonehenge rotate: false - xy: 551, 415 + xy: 653, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 755, 415 + xy: 857, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 959, 517 + xy: 959, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 755, 313 + xy: 1163, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 857, 415 + xy: 959, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1061, 517 + xy: 1061, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 857, 313 + xy: 1265, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 959, 415 + xy: 1061, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1163, 517 + xy: 1163, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1061, 415 + xy: 1265, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1265, 415 + xy: 1469, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1367, 516 + xy: 1571, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1469, 413 + xy: 1775, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1673, 413 + xy: 1469, 311 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -615,112 +622,112 @@ ImprovementIcons/Ancient ruins index: -1 ImprovementIcons/Camp rotate: false - xy: 1837, 1841 + xy: 1505, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 538, 1537 + xy: 334, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 334, 925 + xy: 436, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 538, 925 + xy: 640, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 946, 1333 + xy: 1048, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 1252, 1027 + xy: 1224, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1603, 1637 + xy: 1807, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1909, 1637 + xy: 1354, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1558, 1535 + xy: 1660, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1660, 1127 + xy: 1660, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1428, 720 + xy: 1734, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1632, 719 + xy: 1938, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1836, 719 + xy: 284, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1836, 719 + xy: 284, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 143, 373 + xy: 245, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1061, 313 + xy: 1367, 516 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -734,7 +741,7 @@ OtherIcons/BackArrow index: -1 OtherIcons/Banner rotate: false - xy: 889, 1639 + xy: 991, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -748,63 +755,63 @@ OtherIcons/Circle index: -1 OtherIcons/City rotate: false - xy: 436, 1435 + xy: 538, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 742, 1435 + xy: 844, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 640, 1231 + xy: 742, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 742, 1129 + xy: 844, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1354, 925 + xy: 1456, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1864, 1025 + xy: 1762, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 1428, 822 + xy: 1632, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 794, 619 + xy: 1202, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1202, 619 + xy: 1610, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -818,7 +825,7 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 755, 517 + xy: 755, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -867,259 +874,259 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1469, 361 + xy: 1673, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1775, 463 + xy: 54, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1877, 565 + xy: 1725, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 54, 13 + xy: 1777, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1521, 361 + xy: 1829, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1929, 565 + xy: 1881, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1573, 361 + xy: 388, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1625, 361 + xy: 1673, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1677, 361 + xy: 1725, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 388, 46 + xy: 1777, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1775, 411 + xy: 1829, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1827, 463 + xy: 1881, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1827, 411 + xy: 1933, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1469, 309 + xy: 1933, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1521, 309 + xy: 1966, 1585 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1573, 309 + xy: 1966, 1533 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1625, 309 + xy: 1966, 1481 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1677, 309 + xy: 1966, 1429 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1966, 1585 + xy: 1966, 1377 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1966, 1533 + xy: 1966, 1325 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1966, 1481 + xy: 1966, 1273 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1966, 1429 + xy: 1966, 1221 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1966, 1377 + xy: 1966, 1169 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1966, 1325 + xy: 1966, 1117 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1966, 1273 + xy: 1966, 1065 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1966, 1221 + xy: 1966, 1013 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1966, 1169 + xy: 1966, 961 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1966, 1117 + xy: 1979, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1966, 1065 + xy: 1979, 513 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1966, 1013 + xy: 1979, 461 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1966, 961 + xy: 106, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1981, 565 + xy: 158, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 106, 13 + xy: 438, 250 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 158, 15 + xy: 438, 198 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 438, 250 + xy: 438, 146 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 438, 198 + xy: 490, 251 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 438, 146 + xy: 490, 199 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1133,189 +1140,189 @@ ResourceIcons/Aluminum index: -1 ResourceIcons/Bananas rotate: false - xy: 583, 1639 + xy: 685, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 1939, 1841 + xy: 1913, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 640, 1537 + xy: 334, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 436, 1129 + xy: 538, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 436, 1027 + xy: 538, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 742, 1333 + xy: 844, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 844, 1231 + xy: 946, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 1048, 1333 + xy: 1150, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 946, 1129 + xy: 1048, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 1048, 1231 + xy: 1150, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 714, 823 + xy: 714, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 816, 721 + xy: 918, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 918, 721 + xy: 1020, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1122, 721 + xy: 1252, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1354, 1537 + xy: 1354, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1558, 1025 + xy: 1864, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1864, 1127 + xy: 1660, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 692, 619 + xy: 1100, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 896, 619 + xy: 1304, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 998, 619 + xy: 1406, 618 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1712, 617 + xy: 449, 405 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 551, 517 + xy: 653, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 857, 517 + xy: 857, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1265, 313 + xy: 1469, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1367, 312 + xy: 1673, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1469, 515 + xy: 1673, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1571, 515 + xy: 1775, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1329,14 +1336,14 @@ StatIcons/Acquire index: -1 StatIcons/CityConnection rotate: false - xy: 334, 1231 + xy: 436, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 436, 1333 + xy: 538, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1378,7 +1385,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1762, 1535 + xy: 1660, 1331 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1399,14 +1406,14 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1938, 821 + xy: 347, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 347, 506 + xy: 132, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1420,14 +1427,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1610, 617 + xy: 449, 507 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 551, 313 + xy: 959, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1488,436 +1495,450 @@ TechIcons/Astronomy orig: 100, 100 offset: 0, 0 index: -1 +TechIcons/Ballistics + rotate: false + xy: 583, 1639 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 TechIcons/Banking rotate: false - xy: 787, 1639 + xy: 889, 1639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 1195, 1639 + xy: 1301, 1761 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 143, 475 + xy: 1531, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 1633, 1841 + xy: 1735, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 306, 711 + xy: 334, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 306, 711 + xy: 334, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 334, 1435 + xy: 436, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 538, 1435 + xy: 640, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 436, 1231 + xy: 538, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 640, 1435 + xy: 742, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 742, 1537 + xy: 334, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 334, 1027 + xy: 436, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 844, 1537 + xy: 334, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 844, 1435 + xy: 946, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ecology rotate: false - xy: 946, 1537 + xy: 436, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 436, 925 + xy: 538, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 538, 1027 + xy: 640, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 742, 1231 + xy: 844, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electronics rotate: false - xy: 844, 1333 + xy: 946, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 946, 1435 + xy: 1048, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 640, 1027 + xy: 742, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 1048, 1435 + xy: 1150, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 1150, 1435 + xy: 742, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 1150, 1129 + xy: 1048, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 1048, 925 + xy: 1150, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 612, 823 + xy: 612, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 918, 823 + xy: 918, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1020, 823 + xy: 1122, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1705, 1637 + xy: 1354, 1537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1354, 1231 + xy: 1354, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 1354, 1129 + xy: 1326, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1354, 1027 + xy: 1326, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1326, 823 + xy: 1456, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1326, 721 + xy: 1558, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1456, 1433 + xy: 1558, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1456, 1331 + xy: 1456, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1660, 1331 + xy: 1456, 1025 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1864, 1535 + xy: 1660, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1558, 1127 + xy: 1864, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1864, 1331 + xy: 1864, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1762, 1025 + xy: 1558, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1558, 923 + xy: 1864, 923 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1660, 923 + xy: 1428, 822 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1762, 923 + xy: 1428, 720 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1530, 821 + xy: 1836, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1734, 821 + xy: 1632, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1836, 821 + xy: 1734, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1734, 719 + xy: 1938, 719 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Railroad + rotate: false + xy: 245, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1938, 719 + xy: 245, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replacable Parts rotate: false - xy: 284, 608 + xy: 347, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 347, 404 + xy: 132, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 132, 271 + xy: 347, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 132, 169 + xy: 234, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 234, 98 + xy: 488, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 336, 200 + xy: 590, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 336, 98 + xy: 692, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 449, 507 + xy: 551, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 449, 405 + xy: 755, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 959, 313 + xy: 1163, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1265, 517 + xy: 1265, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1163, 415 + xy: 1367, 414 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1775, 515 + xy: 1571, 311 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1931,14 +1952,14 @@ TerrainIcons/CrosshatchHexagon index: -1 TerrainIcons/Flood plains rotate: false - xy: 1150, 1537 + xy: 640, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 742, 1027 + xy: 844, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1959,42 +1980,42 @@ TerrainIcons/HexagonBorder index: -1 TerrainIcons/Hill rotate: false - xy: 510, 823 + xy: 510, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 1252, 1537 + xy: 1252, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Lakes rotate: false - xy: 1252, 1231 + xy: 1252, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 1354, 1333 + xy: 1354, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Mountain rotate: false - xy: 1660, 1433 + xy: 1558, 1229 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 1762, 1331 + xy: 1660, 1127 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2029,210 +2050,224 @@ UnitIcons/Ballista index: -1 UnitIcons/Battleship rotate: false - xy: 1093, 1639 + xy: 1199, 1741 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 1301, 1761 + xy: 1403, 1761 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Camel Archer rotate: false - xy: 1735, 1841 + xy: 1837, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 1505, 1739 + xy: 1607, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 1607, 1739 + xy: 1709, 1739 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 1811, 1739 + xy: 1939, 1841 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 1913, 1739 + xy: 306, 813 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 306, 813 + xy: 306, 711 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 538, 1333 + xy: 640, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 640, 1333 + xy: 742, 1435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Destroyer rotate: false - xy: 538, 1129 + xy: 640, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 946, 1231 + xy: 1048, 1333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 742, 925 + xy: 844, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 844, 1027 + xy: 946, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 844, 925 + xy: 946, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 946, 1027 + xy: 1048, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great General rotate: false - xy: 1048, 1129 + xy: 1150, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 1150, 1231 + xy: 946, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 946, 925 + xy: 1048, 1027 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Infantry rotate: false - xy: 1048, 1027 + xy: 1150, 1129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hoplite rotate: false - xy: 510, 721 + xy: 612, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 612, 721 + xy: 714, 823 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Infantry + rotate: false + xy: 1020, 823 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1020, 721 + xy: 1122, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1252, 1435 + xy: 1252, 1231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1252, 1129 + xy: 1252, 925 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 1252, 925 + xy: 1224, 721 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1399, 1659 + xy: 1603, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1501, 1637 + xy: 1705, 1637 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Machine Gun + rotate: false + xy: 1909, 1637 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1660, 1535 + xy: 1660, 1433 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1558, 1229 + xy: 1864, 1535 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2246,56 +2281,56 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 1864, 923 + xy: 1530, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 245, 404 + xy: 132, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 386, 609 + xy: 794, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 590, 619 + xy: 998, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1508, 617 + xy: 1916, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 653, 415 + xy: 755, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 653, 313 + xy: 1061, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1163, 313 + xy: 1367, 312 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2309,21 +2344,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 1367, 414 + xy: 1571, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1571, 413 + xy: 1877, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1673, 515 + xy: 1877, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2400,49 +2435,49 @@ UnitPromotionIcons/Boarding_Party_I_(Civ5) index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 1729, 391 + xy: 2015, 1819 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1877, 543 + xy: 1966, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 2015, 1819 + xy: 2018, 697 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1966, 939 + xy: 1979, 439 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 2018, 697 + xy: 210, 45 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 210, 45 + xy: 438, 124 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 438, 124 + xy: 490, 177 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2484,70 +2519,70 @@ UnitPromotionIcons/Drill_I_(Civ5) index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1729, 369 + xy: 2015, 1797 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1751, 391 + xy: 1988, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1877, 521 + xy: 2018, 675 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1899, 543 + xy: 1979, 417 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 2015, 1797 + xy: 2001, 439 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1988, 939 + xy: 210, 23 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 2018, 675 + xy: 438, 102 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 210, 23 + xy: 460, 124 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 438, 102 + xy: 490, 155 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 460, 124 + xy: 512, 177 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2575,63 +2610,63 @@ UnitPromotionIcons/Shock_II_(Civ5) index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1729, 347 + xy: 2015, 1775 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1751, 369 + xy: 2018, 653 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 1899, 521 + xy: 2001, 417 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1921, 543 + xy: 460, 102 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 2015, 1775 + xy: 512, 155 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 2018, 653 + xy: 380, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 460, 102 + xy: 402, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 380, 2 + xy: 2015, 1753 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 402, 24 + xy: 2018, 631 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index f7e76661de..c0a858e8b2 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 50948bac28..6b107d7a28 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -536,6 +536,13 @@ uniques:["Provides 1 happiness per social policy"], requiredTech:"Radio" }, + { + name:"Statue of Liberty", + culture:1, + isWonder:true, + uniques:["+1 Production from specialists"], + requiredTech:"Replacable Parts" + }, { name:"Research Lab", science:4, diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json index 2e6773ccce..82ca796c23 100644 --- a/android/assets/jsons/Techs.json +++ b/android/assets/jsons/Techs.json @@ -377,6 +377,11 @@ row:6, prerequisites:["Steam Power"] } + { + name:"Railroad", + row:8, + prerequisites:["Steam Power","Dynamite"] + } ] }, { @@ -396,10 +401,15 @@ row:5, prerequisites:["Replacable Parts", "Flight"], }, + { + name:"Ballistics", + row:6, + prerequisites:["Flight"], + }, { name:"Combustion", row:8, - prerequisites:["Steam Power","Dynamite"] + prerequisites:["Railroad"] } ] }, @@ -420,11 +430,6 @@ prerequisites:["Electronics"], uniques:["+10% science and production in all cities"] }, - { - name:"Nuclear Fission", - row:7, - prerequisites:["Combustion"] - } ] }, { @@ -447,7 +452,12 @@ { name:"Rocketry", row:6, - prerequisites:["Flight","Computers"] + prerequisites:["Ballistics","Computers"] + }, + { + name:"Nuclear Fission", + row:7, + prerequisites:["Combustion"] } ] }, diff --git a/android/assets/jsons/TileImprovements.json b/android/assets/jsons/TileImprovements.json index 9450683735..ad630c6ba0 100644 --- a/android/assets/jsons/TileImprovements.json +++ b/android/assets/jsons/TileImprovements.json @@ -88,7 +88,7 @@ { name:"Railroad", turnsToBuild:4, - techRequired:"Combustion" + techRequired:"Railroad" }, // Removals diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 3411ffde06..23f19418e1 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -542,8 +542,33 @@ cost: 320, requiredTech:"Replacable Parts", hurryCostModifier:20, + upgradesTo:"Infantry", + obsoleteTech:"Plastics" attackSound:"shot" }, + { + name:"Infantry", + unitType:"Melee", + movement:2, + strength:70, + cost: 375, + requiredTech:"Plastics", + hurryCostModifier:20, + attackSound:"shot" + }, + { + name:"Machine Gun", + unitType:"Ranged", + range:1, + movement:2, + strength:60, + rangedStrength:60, + cost: 350, + requiredTech:"Ballistics", + hurryCostModifier:20, + attackSound:"machinegun" + }, + /* Great people */ diff --git a/android/build.gradle b/android/build.gradle index c94c8dac84..1f53f6c9c0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,7 +21,7 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 190 + versionCode 191 versionName "2.12.0" } diff --git a/core/src/com/unciv/GameStarter.kt b/core/src/com/unciv/GameStarter.kt index 826e34002a..898b98e7fe 100644 --- a/core/src/com/unciv/GameStarter.kt +++ b/core/src/com/unciv/GameStarter.kt @@ -35,6 +35,7 @@ class GameStarter{ val availableCivNames = Stack() availableCivNames.addAll(GameBasics.Nations.keys.shuffled()) availableCivNames.removeAll(newGameParameters.humanNations) + availableCivNames.remove("Barbarians") for(nation in newGameParameters.humanNations) { val playerCiv = CivilizationInfo(nation) diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index f69f3bd1ed..f8f6ddbdda 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -185,6 +185,8 @@ class CityStats { if (policies.contains("Commerce Complete")) stats.gold += 1 if (policies.contains("Secularism")) stats.science += 2 + if(cityInfo.getBuildingUniques().contains("+1 Production from specialists")) + stats.production += 1 return stats } diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 72b79e576c..7bd7f109b2 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -109,7 +109,7 @@ class MapUnit { && civInfo.getBuildingUniques().contains("All military naval units receive +1 movement and +1 sight")) visibilityRange += 1 val tile = getTile() - if (tile.baseTerrain == "Hill") visibilityRange += 1 + if (tile.baseTerrain == "Hill" && type.isLandUnit()) visibilityRange += 1 return tile.getViewableTiles(visibilityRange) }