diff --git a/Credits.md b/Credits.md index b52b355890..e38ad79191 100644 --- a/Credits.md +++ b/Credits.md @@ -334,6 +334,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Dynamite](https://thenounproject.com/term/dynamite/610652/) By Simon Martin ### Modern +* [Gears](https://thenounproject.com/term/gears/1484672/) By Aiden Icons for Replacable Parts * [Radio](https://thenounproject.com/term/radio/124575/) By Arthur Shlain * [Piston](https://thenounproject.com/term/piston/1224/) By Proletkult Graphik for Combustion * [Plastic](https://thenounproject.com/term/plastic/478826/) By Yu luck diff --git a/android/Images/UnitIcons/Gatling Gun.png b/android/Images/UnitIcons/Gatling Gun.png new file mode 100644 index 0000000000..c3746a28b2 Binary files /dev/null and b/android/Images/UnitIcons/Gatling Gun.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index ff879d9665..36555124b7 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -139,378 +139,378 @@ BuildingIcons/Forge index: -1 BuildingIcons/Granary rotate: false - xy: 510, 928 + xy: 612, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 714, 928 + xy: 816, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 816, 1030 + xy: 918, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 918, 1132 + xy: 714, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 714, 826 + xy: 816, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 918, 928 + xy: 1020, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 1020, 1030 + xy: 1122, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1122, 928 + xy: 1122, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 918, 724 + xy: 1020, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1020, 724 + xy: 1122, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 510, 622 + xy: 612, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 816, 622 + xy: 918, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 714, 520 + xy: 816, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1122, 520 + xy: 1252, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1252, 1540 + xy: 1252, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1252, 1438 + xy: 1252, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1224, 1132 + xy: 1224, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1224, 826 + xy: 1224, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1224, 622 + xy: 1224, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1297, 1642 + xy: 1399, 1662 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1603, 1640 + xy: 1705, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1909, 1640 + xy: 1354, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1354, 1438 + xy: 1354, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1354, 1336 + xy: 1354, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1354, 1234 + xy: 1326, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1456, 1335 + xy: 1456, 1233 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1428, 1029 + xy: 1428, 927 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1558, 1538 + xy: 1558, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1660, 1334 + xy: 1762, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1762, 1436 + xy: 1864, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1864, 1538 + xy: 1762, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1762, 1334 + xy: 1864, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1762, 1232 + xy: 1864, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1632, 1028 + xy: 1734, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1530, 824 + xy: 1632, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1632, 926 + xy: 1734, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1632, 824 + xy: 1734, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1734, 926 + xy: 1836, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1632, 722 + xy: 1734, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1836, 926 + xy: 1632, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1632, 620 + xy: 1734, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1836, 620 + xy: 1530, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1530, 518 + xy: 1632, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1632, 518 + xy: 1734, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1734, 518 + xy: 1836, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1836, 518 + xy: 1938, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1938, 1130 + xy: 1938, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1938, 1028 + xy: 1938, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1938, 926 + xy: 1938, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1938, 722 + xy: 1938, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 132, 274 + xy: 132, 172 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 132, 70 + xy: 234, 266 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 347, 418 + xy: 449, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 755, 418 + xy: 857, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -622,77 +622,77 @@ ImprovementIcons/Fishing Boats index: -1 ImprovementIcons/Landmark rotate: false - xy: 714, 724 + xy: 816, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 204, 667 + xy: 408, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 612, 622 + xy: 714, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 918, 520 + xy: 1020, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1807, 1640 + xy: 1909, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1456, 1539 + xy: 1456, 1437 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1428, 927 + xy: 1428, 825 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1428, 723 + xy: 1428, 621 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1428, 723 + xy: 1428, 621 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1558, 1334 + xy: 1660, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1938, 518 + xy: 143, 376 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -748,28 +748,28 @@ OtherIcons/Fire index: -1 OtherIcons/MenuIcon rotate: false - xy: 408, 520 + xy: 510, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1326, 928 + xy: 1326, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1530, 1028 + xy: 1632, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1734, 1130 + xy: 1530, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -783,7 +783,7 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 1734, 722 + xy: 1836, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -832,7 +832,7 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 959, 468 + xy: 1061, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -846,245 +846,245 @@ PolicyIcons/Constitution index: -1 PolicyIcons/Democracy rotate: false - xy: 1011, 468 + xy: 1113, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1063, 468 + xy: 1165, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1115, 468 + xy: 1217, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1167, 468 + xy: 1269, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1219, 468 + xy: 1321, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1271, 468 + xy: 1373, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1323, 468 + xy: 347, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1375, 468 + xy: 399, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 347, 366 + xy: 451, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 399, 366 + xy: 503, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 451, 366 + xy: 555, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 503, 366 + xy: 607, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 555, 366 + xy: 659, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 607, 366 + xy: 711, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 659, 366 + xy: 763, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 711, 366 + xy: 815, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 763, 366 + xy: 867, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 815, 366 + xy: 919, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 867, 366 + xy: 971, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 959, 416 + xy: 1061, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1011, 416 + xy: 1113, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1063, 416 + xy: 1165, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1115, 416 + xy: 1217, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1167, 416 + xy: 1269, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1219, 416 + xy: 1321, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1271, 416 + xy: 1373, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1323, 416 + xy: 1425, 467 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1375, 416 + xy: 1477, 467 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1427, 467 + xy: 1425, 415 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1427, 415 + xy: 1477, 415 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1966, 1588 + xy: 1529, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1966, 1536 + xy: 1581, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1966, 1484 + xy: 1633, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1966, 1432 + xy: 1685, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1966, 1380 + xy: 1737, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1154,133 +1154,133 @@ ResourceIcons/Furs index: -1 ResourceIcons/Gems rotate: false - xy: 612, 1132 + xy: 408, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 408, 826 + xy: 510, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 816, 826 + xy: 918, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1122, 1132 + xy: 918, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1020, 928 + xy: 1122, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1122, 826 + xy: 408, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 714, 622 + xy: 816, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1705, 1640 + xy: 1807, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1326, 1030 + xy: 1326, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1530, 1130 + xy: 1530, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1632, 1130 + xy: 1530, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1530, 926 + xy: 1632, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1530, 722 + xy: 1632, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1734, 824 + xy: 1836, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1734, 620 + xy: 1836, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 132, 172 + xy: 132, 70 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 234, 164 + xy: 234, 62 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 234, 62 + xy: 347, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 449, 418 + xy: 551, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1336,7 +1336,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1252, 1234 + xy: 1224, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1357,7 +1357,7 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1428, 621 + xy: 1428, 519 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1371,14 +1371,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1836, 1130 + xy: 1530, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1836, 824 + xy: 1734, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1595,266 +1595,266 @@ TechIcons/Future Tech index: -1 TechIcons/Guilds rotate: false - xy: 816, 1132 + xy: 612, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 612, 826 + xy: 714, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 918, 1030 + xy: 1020, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 918, 826 + xy: 1020, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1122, 1030 + xy: 1020, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 408, 622 + xy: 510, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1020, 622 + xy: 1122, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 1122, 622 + xy: 306, 566 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 306, 566 + xy: 408, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 510, 520 + xy: 612, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 612, 520 + xy: 714, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 816, 520 + xy: 918, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1020, 520 + xy: 1122, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1224, 928 + xy: 1224, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1224, 724 + xy: 1224, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1224, 520 + xy: 1297, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1354, 1540 + xy: 1354, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1326, 1132 + xy: 1326, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1326, 826 + xy: 1326, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1326, 724 + xy: 1326, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1326, 622 + xy: 1326, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1456, 1437 + xy: 1456, 1335 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1456, 1233 + xy: 1428, 1131 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1428, 1131 + xy: 1428, 1029 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1428, 825 + xy: 1428, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replacable Parts rotate: false - xy: 1428, 519 + xy: 1558, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1660, 1538 + xy: 1558, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1660, 1436 + xy: 1762, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1762, 1538 + xy: 1660, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1864, 1436 + xy: 1864, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1864, 1334 + xy: 1558, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1558, 1232 + xy: 1660, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1836, 1028 + xy: 1530, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1530, 620 + xy: 1632, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1938, 824 + xy: 1938, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1938, 620 + xy: 1938, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 143, 376 + xy: 245, 368 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 857, 418 + xy: 959, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1896,35 +1896,35 @@ TerrainIcons/HexagonBorder index: -1 TerrainIcons/Hill rotate: false - xy: 816, 928 + xy: 918, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 408, 724 + xy: 510, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 918, 622 + xy: 1020, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Mountain rotate: false - xy: 1252, 1336 + xy: 1252, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 1399, 1662 + xy: 1603, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2027,93 +2027,100 @@ UnitIcons/Galleass orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Great Artist +UnitIcons/Gatling Gun rotate: false - xy: 612, 1030 + xy: 612, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Great Engineer +UnitIcons/Great Artist rotate: false xy: 714, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Great Merchant +UnitIcons/Great Engineer rotate: false xy: 510, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Great Scientist +UnitIcons/Great Merchant rotate: false xy: 612, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Great War Infantry +UnitIcons/Great Scientist rotate: false xy: 714, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Great War Infantry + rotate: false + xy: 816, 1132 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Horseman rotate: false - xy: 1020, 1132 + xy: 816, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1020, 826 + xy: 1122, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 510, 724 + xy: 612, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 612, 724 + xy: 714, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 816, 724 + xy: 918, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1122, 724 + xy: 306, 668 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 306, 668 + xy: 204, 667 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1224, 1030 + xy: 1224, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2127,49 +2134,49 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 1326, 520 + xy: 1456, 1539 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1558, 1436 + xy: 1660, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1660, 1232 + xy: 1762, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1864, 1232 + xy: 1530, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1734, 1028 + xy: 1836, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1836, 722 + xy: 1836, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 245, 368 + xy: 132, 274 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2183,21 +2190,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 234, 266 + xy: 234, 164 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 551, 418 + xy: 653, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 653, 418 + xy: 755, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2281,210 +2288,210 @@ UnitPromotionIcons/Bombardment_III_(Civ5) index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 347, 544 + xy: 2015, 1822 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 1981, 1974 + xy: 1966, 1618 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 106, 46 + xy: 347, 544 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 919, 396 + xy: 1981, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 1479, 497 + xy: 106, 46 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 2015, 1822 + xy: 1023, 396 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1966, 1358 + xy: 1529, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 182, 628 + xy: 1789, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 204, 645 + xy: 182, 628 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 1531, 1952 + xy: 204, 645 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 347, 522 + xy: 1531, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 369, 544 + xy: 2015, 1800 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1981, 1952 + xy: 1966, 1596 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 2003, 1974 + xy: 1988, 1618 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 106, 24 + xy: 347, 522 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 106, 2 + xy: 369, 544 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 919, 374 + xy: 1981, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1479, 475 + xy: 2003, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1501, 497 + xy: 106, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 2015, 1800 + xy: 106, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1966, 1336 + xy: 1023, 374 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1988, 1358 + xy: 1529, 422 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 182, 606 + xy: 1551, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 204, 623 + xy: 1789, 474 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 226, 645 + xy: 1811, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 369, 522 + xy: 182, 606 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 2003, 1952 + xy: 204, 623 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1479, 453 + xy: 226, 645 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1501, 475 + xy: 2015, 1778 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 2015, 1778 + xy: 1966, 1574 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 56547b3afa..6a385e7b81 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 ad726a79b7..36aaaca03e 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -186,6 +186,8 @@ rangedStrength:18, cost: 120, requiredTech:"Machinery", + upgradesTo:"Gatling Gun", + obsoleteTech:"Industrialization", hurryCostModifier:20 }, { @@ -199,6 +201,8 @@ uniqueTo:"England", cost: 120, requiredTech:"Machinery", + upgradesTo:"Gatling Gun", + obsoleteTech:"Industrialization", hurryCostModifier:20 }, { @@ -282,6 +286,8 @@ rangedStrength:20, cost: 185, requiredTech:"Chemistry", + upgradesTo:"Artillery", + obsoleteTech:"Dynamite", uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility"], hurryCostModifier:20 }, @@ -334,6 +340,17 @@ // Industrial Era + { + name:"Gatling Gun", + unitType:"Ranged", + range:1, + movement:2, + strength:30, + rangedStrength:30, + cost: 225, + requiredTech:"Industrialization", + hurryCostModifier:20 + }, { name:"Rifleman", unitType:"Melee", diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt index 7117517251..887210c4b4 100644 --- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt @@ -10,6 +10,7 @@ import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.trade.Trade import com.unciv.logic.trade.TradeOffersList import com.unciv.ui.utils.* +import java.text.DecimalFormat import kotlin.math.roundToInt class EmpireOverviewScreen : CameraStageBaseScreen(){ @@ -249,7 +250,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ table.add(unit.name.tr()) if(baseUnit.strength>0) table.add(baseUnit.strength.toString()) else table.add() if(baseUnit.rangedStrength>0) table.add(baseUnit.rangedStrength.toString()) else table.add() - table.add(unit.currentMovement.toString()+"/"+unit.getMaxMovement()) + table.add(DecimalFormat("0.#").format(unit.currentMovement)+"/"+unit.getMaxMovement()) val closestCity = unit.getTile().getTilesInDistance(3).firstOrNull{it.isCityCenter()} if (closestCity!=null) table.add(closestCity.getCity()!!.name) else table.add() table.row() diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index 4e046496b5..380d94152f 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.InputEvent import com.badlogic.gdx.scenes.scene2d.ui.* import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener -import com.badlogic.gdx.utils.Align import com.unciv.UnCivGame import com.unciv.logic.HexMath import com.unciv.logic.city.CityInfo @@ -195,7 +194,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { val tileGroup = CityTileGroup(cityInfo, tileInfo) val tilesInRange = city.getTilesInRange() - // this needs to happen on pdate, because we can buy tiles, which changes the definition of the bought tiles... + // this needs to happen on update, because we can buy tiles, which changes the definition of the bought tiles... if (tileInfo.getCity()!=city) { // outside of city tileGroup.setColor(0f, 0f, 0f, 0.3f) tileGroup.yieldGroup.isVisible = false @@ -259,15 +258,15 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { val stats = tile.getTileStats(city, city.civInfo) tileTable.pad(20f) - tileTable.columnDefaults(0).padRight(10f) tileTable.add(Label(tile.toString(), CameraStageBaseScreen.skin)).colspan(2) tileTable.row() val statsTable = Table() + statsTable.defaults().pad(2f) for (entry in stats.toHashMap().filterNot { it.value==0f }) { - statsTable.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f).align(Align.right) - statsTable.add(Label(Math.round(entry.value).toString() + "", CameraStageBaseScreen.skin)).align(Align.left) + statsTable.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f) + statsTable.add(Label(Math.round(entry.value).toString() + "", CameraStageBaseScreen.skin)) statsTable.row() } tileTable.add(statsTable).row()