diff --git a/Credits.md b/Credits.md index 9082404c78..9826225f97 100644 --- a/Credits.md +++ b/Credits.md @@ -68,6 +68,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [machine-gun](https://thenounproject.com/search/?q=machine%20gun&i=591058) By Joana Pereira * [Anti-Tank Gun](https://thenounproject.com/term/anti-tank-gun/1802450/) By Tom Fricker * [Tank](https://thenounproject.com/search/?q=tank&i=981914) By jeff +* [Modern Armor](https://thenounproject.com/search/?q=tank&i=218) By Public Domain Nouns for Modern Armor ### Great People diff --git a/android/Images/UnitIcons/Modern Armor.png b/android/Images/UnitIcons/Modern Armor.png new file mode 100644 index 0000000000..358b46d621 Binary files /dev/null and b/android/Images/UnitIcons/Modern Armor.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 92e2e26437..9b8bb07733 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -279,294 +279,294 @@ BuildingIcons/Mint index: -1 BuildingIcons/Monastery rotate: false - xy: 1558, 1130 + xy: 1660, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1660, 1232 + xy: 1762, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1864, 1436 + xy: 1558, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1762, 1232 + xy: 1864, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1660, 1028 + xy: 1762, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1864, 1232 + xy: 1762, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1864, 1130 + xy: 1864, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1660, 926 + xy: 1762, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1864, 926 + xy: 1428, 825 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1428, 825 + xy: 1428, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1428, 723 + xy: 1530, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1734, 824 + xy: 1836, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 245, 509 + xy: 347, 509 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 347, 407 + xy: 143, 376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 234, 203 + xy: 234, 101 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 692, 622 + xy: 794, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 794, 622 + xy: 896, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 896, 622 + xy: 998, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 998, 622 + xy: 1100, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1508, 620 + xy: 1610, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 449, 408 + xy: 449, 306 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 551, 520 + xy: 653, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 653, 520 + xy: 551, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 653, 418 + xy: 857, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 857, 520 + xy: 653, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 653, 316 + xy: 755, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 755, 316 + xy: 857, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1061, 520 + xy: 857, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 857, 316 + xy: 959, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1265, 520 + xy: 1061, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1061, 316 + xy: 1163, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1163, 316 + xy: 1265, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1265, 418 + xy: 1265, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1265, 316 + xy: 1367, 519 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1367, 519 + xy: 1367, 417 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1367, 417 + xy: 1367, 315 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1367, 315 + xy: 1469, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1469, 416 + xy: 1571, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1775, 518 + xy: 1775, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1877, 518 + xy: 1877, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1673, 314 + xy: 1775, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 438, 101 + xy: 551, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -720,49 +720,49 @@ ImprovementIcons/Mine index: -1 ImprovementIcons/Oil well rotate: false - xy: 1558, 926 + xy: 1660, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1938, 722 + xy: 284, 611 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 143, 376 + xy: 132, 274 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 132, 172 + xy: 132, 70 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 132, 172 + xy: 132, 70 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 386, 612 + xy: 488, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1571, 416 + xy: 1673, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -825,28 +825,28 @@ OtherIcons/MenuIcon index: -1 OtherIcons/Pentagon rotate: false - xy: 1836, 824 + xy: 1530, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 1938, 824 + xy: 1938, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1814, 620 + xy: 1916, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 449, 306 + xy: 551, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -860,7 +860,7 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 959, 418 + xy: 1163, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -909,7 +909,7 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 653, 264 + xy: 755, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -930,14 +930,14 @@ PolicyIcons/Democracy index: -1 PolicyIcons/Discipline rotate: false - xy: 705, 264 + xy: 807, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 705, 264 + xy: 807, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -951,224 +951,224 @@ PolicyIcons/Entrepreneurship index: -1 PolicyIcons/Facism rotate: false - xy: 757, 264 + xy: 859, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 809, 264 + xy: 911, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 861, 264 + xy: 963, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 913, 264 + xy: 1015, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 965, 264 + xy: 1067, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1017, 264 + xy: 1119, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1069, 264 + xy: 1171, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1121, 264 + xy: 1223, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1173, 264 + xy: 1275, 264 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1225, 264 + xy: 755, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1277, 264 + xy: 807, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 653, 212 + xy: 859, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 705, 212 + xy: 911, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 757, 212 + xy: 963, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 861, 212 + xy: 1067, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 913, 212 + xy: 1119, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 965, 212 + xy: 1171, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1017, 212 + xy: 1223, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1069, 212 + xy: 1275, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1121, 212 + xy: 492, 49 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1173, 212 + xy: 1966, 1588 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1277, 212 + xy: 1966, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 492, 49 + xy: 1966, 1432 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1966, 1588 + xy: 1966, 1380 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1966, 1536 + xy: 1966, 1328 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1966, 1484 + xy: 1966, 1276 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1966, 1432 + xy: 1966, 1224 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1966, 1380 + xy: 1966, 1172 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1966, 1328 + xy: 1966, 1120 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1966, 1276 + xy: 1966, 1068 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1966, 1224 + xy: 1966, 1016 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1966, 1172 + xy: 1966, 964 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1287,84 +1287,84 @@ ResourceIcons/Marble index: -1 ResourceIcons/Oil rotate: false - xy: 1864, 1028 + xy: 1558, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1632, 824 + xy: 1734, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1712, 620 + xy: 1814, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1916, 620 + xy: 449, 510 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 449, 510 + xy: 449, 408 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 551, 316 + xy: 653, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 857, 418 + xy: 1061, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 959, 316 + xy: 1061, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1775, 416 + xy: 1877, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1469, 314 + xy: 1571, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1571, 314 + xy: 1673, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1775, 314 + xy: 1877, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1427,7 +1427,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 809, 212 + xy: 1015, 212 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1448,14 +1448,14 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1225, 212 + xy: 1966, 1536 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 234, 101 + xy: 336, 203 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1469,7 +1469,7 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 755, 520 + xy: 551, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1805,189 +1805,189 @@ TechIcons/Mining index: -1 TechIcons/Nanotechnology rotate: false - xy: 1660, 1130 + xy: 1762, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1864, 1334 + xy: 1660, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1762, 1130 + xy: 1864, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1762, 926 + xy: 1864, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1530, 824 + xy: 1632, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1530, 722 + xy: 1632, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1632, 722 + xy: 1734, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1734, 722 + xy: 1836, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 284, 611 + xy: 245, 509 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 347, 509 + xy: 245, 407 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 245, 407 + xy: 347, 407 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 132, 274 + xy: 132, 172 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 132, 70 + xy: 245, 305 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 245, 305 + xy: 347, 305 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replacable Parts rotate: false - xy: 347, 305 + xy: 234, 203 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 336, 101 + xy: 386, 612 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 488, 622 + xy: 590, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 590, 622 + xy: 692, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1100, 622 + xy: 1202, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1202, 622 + xy: 1304, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1304, 622 + xy: 1406, 621 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 755, 418 + xy: 959, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 959, 520 + xy: 755, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1469, 518 + xy: 1469, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1571, 518 + xy: 1571, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1673, 518 + xy: 1673, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 551, 214 + xy: 653, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2057,14 +2057,14 @@ TerrainIcons/Marsh index: -1 TerrainIcons/Mountain rotate: false - xy: 1762, 1334 + xy: 1864, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 1762, 1028 + xy: 1864, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2321,9 +2321,16 @@ UnitIcons/Minuteman orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Modern Armor + rotate: false + xy: 1558, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Musketeer rotate: false - xy: 1558, 1028 + xy: 1660, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2337,63 +2344,63 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 1836, 722 + xy: 1938, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 336, 203 + xy: 336, 101 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1406, 621 + xy: 1508, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1610, 620 + xy: 1712, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 551, 418 + xy: 755, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 1163, 520 + xy: 959, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1061, 418 + xy: 1265, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 1163, 418 + xy: 1163, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1673, 416 + xy: 1775, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2407,21 +2414,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 1877, 416 + xy: 1469, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1877, 314 + xy: 438, 203 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 438, 203 + xy: 438, 101 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2519,7 +2526,7 @@ UnitPromotionIcons/Bombardment_I_(Civ5) index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1329, 294 + xy: 1327, 294 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2533,7 +2540,7 @@ UnitPromotionIcons/Coastal_Raider_III_(Civ5) index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 1966, 1150 + xy: 1966, 942 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2603,7 +2610,7 @@ UnitPromotionIcons/Indirect_Fire_(Civ5) index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1329, 272 + xy: 1327, 272 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2617,119 +2624,119 @@ UnitPromotionIcons/March_(Civ5) index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1966, 1128 + xy: 1988, 942 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1988, 1150 + xy: 2018, 656 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 2018, 656 + xy: 1979, 554 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1979, 554 + xy: 2003, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 2003, 1952 + xy: 358, 5 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 358, 5 + xy: 380, 27 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 380, 27 + xy: 1327, 250 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1329, 250 + xy: 2015, 1778 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 2015, 1778 + xy: 2018, 634 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1966, 1106 + xy: 1979, 532 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 1988, 1128 + xy: 380, 5 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 2018, 634 + xy: 402, 27 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1979, 532 + xy: 1327, 228 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 380, 5 + xy: 2015, 1756 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 402, 27 + xy: 1979, 510 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 1329, 228 + xy: 402, 5 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 2015, 1756 + xy: 424, 27 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 32f01de038..b9ae34c473 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 9928bc590b..93b880c7ec 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -591,6 +591,19 @@ uniques:["Bonus vs Armor 100%"] hurryCostModifier:20, }, + /* + { + name:"Modern Armor", + unitType:"Armor", + movement:5, + strength:100, + cost: 425, + requiredTech:"Robotics", + requiredResource:"Aluminum", + uniques:["Can move after attacking","No defensive terrain bonus"] + hurryCostModifier:20, + }, + */ /* Great people */