diff --git a/android/Images/NationIcons/Iroquois.png b/android/Images/NationIcons/Iroquois.png new file mode 100644 index 0000000000..c8cb2e4992 Binary files /dev/null and b/android/Images/NationIcons/Iroquois.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index b790fe4406..354363e269 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -251,385 +251,385 @@ BuildingIcons/Ironworks index: -1 BuildingIcons/Kremlin rotate: false - xy: 1528, 781 + xy: 1630, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1630, 883 + xy: 1732, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 1834, 985 + xy: 1936, 1087 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 2038, 1189 + xy: 1732, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1732, 781 + xy: 1834, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Picchu rotate: false - xy: 1936, 883 + xy: 2038, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 2242, 1189 + xy: 1936, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 2242, 883 + xy: 2242, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 2344, 985 + xy: 2344, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1528, 679 + xy: 1630, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1630, 679 + xy: 1732, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mughal Fort rotate: false - xy: 1834, 679 + xy: 1936, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1936, 679 + xy: 2038, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 2344, 679 + xy: 488, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 488, 549 + xy: 590, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 590, 651 + xy: 590, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 692, 651 + xy: 692, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 794, 651 + xy: 794, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 896, 549 + xy: 998, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 998, 549 + xy: 1100, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1100, 651 + xy: 1100, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1202, 651 + xy: 1202, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1304, 549 + xy: 488, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1304, 447 + xy: 486, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 690, 345 + xy: 792, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1406, 475 + xy: 1508, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1916, 475 + xy: 2018, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 2018, 577 + xy: 2018, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 2018, 475 + xy: 2120, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1406, 373 + xy: 2120, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 2018, 373 + xy: 1916, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 2120, 577 + xy: 1914, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 2120, 373 + xy: 2118, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 2118, 271 + xy: 2222, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 2222, 373 + xy: 2324, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 2220, 271 + xy: 2324, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 2324, 475 + xy: 2324, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 436, 67 + xy: 538, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 538, 141 + xy: 640, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 640, 243 + xy: 640, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 844, 141 + xy: 946, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 946, 243 + xy: 946, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1048, 243 + xy: 1048, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Terracotta Army rotate: false - xy: 1048, 141 + xy: 1150, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1150, 243 + xy: 1150, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1150, 141 + xy: 1252, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1252, 243 + xy: 1252, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1252, 141 + xy: 538, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 640, 39 + xy: 742, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 844, 39 + xy: 946, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1456, 67 + xy: 1660, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1558, 67 + xy: 1864, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls of Babylon rotate: false - xy: 1660, 169 + xy: 1966, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1966, 169 + xy: 1660, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 2170, 169 + xy: 2068, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -769,84 +769,84 @@ ImprovementIcons/Fishing Boats index: -1 ImprovementIcons/Landmark rotate: false - xy: 1936, 1189 + xy: 1630, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 2038, 1087 + xy: 2140, 1189 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 2038, 985 + xy: 2140, 1087 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 2344, 1189 + xy: 2344, 1087 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 896, 651 + xy: 896, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1100, 447 + xy: 1202, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 792, 345 + xy: 894, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1098, 345 + xy: 1200, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 1098, 345 + xy: 1200, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 1098, 345 + xy: 1200, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1610, 475 + xy: 1712, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1048, 39 + xy: 1150, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -928,37 +928,44 @@ NationIcons/India orig: 100, 100 offset: 0, 0 index: -1 +NationIcons/Iroquois + rotate: false + xy: 1630, 1087 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 NationIcons/Japan rotate: false - xy: 1426, 781 + xy: 1528, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Korea rotate: false - xy: 1834, 1189 + xy: 1528, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 1814, 475 + xy: 1916, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 1916, 577 + xy: 1916, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 538, 39 + xy: 640, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1035,42 +1042,42 @@ TileSets/FantasyHex/Hexagon index: -1 OtherIcons/MenuIcon rotate: false - xy: 2140, 883 + xy: 2242, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 488, 447 + xy: 590, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 998, 447 + xy: 1100, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1608, 271 + xy: 1404, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 2120, 475 + xy: 2016, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 640, 141 + xy: 742, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1119,266 +1126,266 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 2272, 117 + xy: 2374, 219 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 2374, 219 + xy: 2374, 167 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 2272, 65 + xy: 2374, 115 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 2324, 117 + xy: 2374, 63 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 2324, 117 + xy: 2374, 63 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 2324, 65 + xy: 1354, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1354, 14 + xy: 2426, 627 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1406, 14 + xy: 2426, 575 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1458, 15 + xy: 2426, 523 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1510, 15 + xy: 2426, 471 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1562, 15 + xy: 2426, 419 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1666, 15 + xy: 2424, 315 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1718, 15 + xy: 65, 5 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1770, 15 + xy: 117, 5 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1822, 15 + xy: 2426, 263 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1874, 15 + xy: 2426, 211 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1926, 15 + xy: 2426, 159 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1978, 15 + xy: 2426, 107 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 2030, 15 + xy: 2426, 55 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 2082, 15 + xy: 2419, 1341 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 2186, 15 + xy: 1610, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 2426, 627 + xy: 1662, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 2426, 575 + xy: 1714, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 2426, 523 + xy: 1766, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 2426, 471 + xy: 1818, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 2426, 419 + xy: 1870, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 2426, 367 + xy: 1922, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 2290, 13 + xy: 2078, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 2342, 13 + xy: 2130, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 65, 5 + xy: 2182, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 117, 5 + xy: 2234, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 2426, 263 + xy: 2286, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 2426, 211 + xy: 2338, 11 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 2419, 1341 + xy: 2390, 3 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 386, 15 + xy: 1406, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 438, 15 + xy: 1458, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 436, 293 + xy: 386, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 2423, 1697 + xy: 438, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1483,98 +1490,98 @@ ResourceIcons/Iron index: -1 ResourceIcons/Ivory rotate: false - xy: 1630, 1087 + xy: 1732, 1189 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 2140, 1087 + xy: 2242, 1189 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 794, 549 + xy: 896, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1304, 651 + xy: 1304, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1506, 271 + xy: 2120, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1812, 271 + xy: 1608, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1914, 271 + xy: 1710, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 2324, 577 + xy: 2220, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 538, 243 + xy: 538, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 742, 141 + xy: 844, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1558, 169 + xy: 1762, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1864, 169 + xy: 1456, 66 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1864, 67 + xy: 1558, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1966, 67 + xy: 1762, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1630,7 +1637,7 @@ StatIcons/Happiness index: -1 StatIcons/InterceptRange rotate: false - xy: 1614, 15 + xy: 2426, 367 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1644,7 +1651,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 2134, 15 + xy: 1558, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1665,21 +1672,21 @@ StatIcons/Production index: -1 StatIcons/Range rotate: false - xy: 2424, 315 + xy: 1974, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 2238, 13 + xy: 2026, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 1508, 577 + xy: 1508, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1693,7 +1700,7 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 2222, 475 + xy: 2222, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1980,252 +1987,252 @@ TechIcons/Lasers index: -1 TechIcons/Machinery rotate: false - xy: 1834, 781 + xy: 1936, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 2038, 883 + xy: 2140, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 2140, 985 + xy: 2242, 1087 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 2242, 1087 + xy: 2038, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 2242, 985 + xy: 2140, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 2140, 781 + xy: 2242, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 2242, 781 + xy: 2344, 1189 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 2344, 1087 + xy: 2344, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 2344, 781 + xy: 1426, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 2242, 679 + xy: 2344, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 488, 651 + xy: 488, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 590, 549 + xy: 692, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 998, 651 + xy: 998, 549 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1202, 549 + xy: 1304, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 590, 447 + xy: 692, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 692, 447 + xy: 794, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 794, 447 + xy: 896, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1202, 447 + xy: 1304, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 486, 345 + xy: 588, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 588, 345 + xy: 690, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 894, 345 + xy: 996, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 996, 345 + xy: 1098, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 1200, 345 + xy: 1302, 345 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1302, 345 + xy: 1406, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 1406, 577 + xy: 1406, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1610, 577 + xy: 1610, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1712, 577 + xy: 1712, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1814, 577 + xy: 1814, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1508, 373 + xy: 1406, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1712, 373 + xy: 1610, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1814, 373 + xy: 1712, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 2322, 271 + xy: 436, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 436, 169 + xy: 436, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 742, 39 + xy: 844, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 946, 39 + xy: 1048, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1150, 39 + xy: 1252, 39 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2281,35 +2288,35 @@ TileSets/Default/HillOverlay index: -1 TileSets/Default/JungleOverlay rotate: false - xy: 1630, 985 + xy: 1732, 1087 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/LakesOverlay rotate: false - xy: 1732, 985 + xy: 1834, 1087 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 1936, 781 + xy: 2038, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 1732, 679 + xy: 1834, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 692, 549 + xy: 794, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2330,182 +2337,182 @@ TileSets/FantasyHex/road index: -1 TileSets/FantasyHex/City rotate: false - xy: 1354, 308 + xy: 436, 320 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+City rotate: false - xy: 1354, 308 + xy: 436, 320 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill+City rotate: false - xy: 1354, 308 + xy: 436, 320 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Coast rotate: false - xy: 406, 671 + xy: 1354, 315 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert rotate: false - xy: 2, 14 + xy: 2392, 1719 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+City rotate: false - xy: 169, 22 + xy: 406, 666 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Flood plains rotate: false - xy: 2374, 189 + xy: 2, 14 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Oasis rotate: false - xy: 2419, 1311 + xy: 169, 27 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland rotate: false - xy: 490, 37 + xy: 2419, 1311 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopRightBorder rotate: false - xy: 490, 37 + xy: 2419, 1311 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Forest rotate: false - xy: 626, 8 + xy: 762, 8 size: 31, 29 orig: 31, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Jungle rotate: false - xy: 488, 309 + xy: 2444, 1765 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Marsh rotate: false - xy: 2423, 1666 + xy: 2442, 24 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill rotate: false - xy: 2444, 1767 + xy: 1510, 32 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill+Forest rotate: false - xy: 2423, 1619 + xy: 490, 20 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Lakes rotate: false - xy: 1354, 278 + xy: 1510, 2 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Mountain rotate: false - xy: 488, 271 + xy: 440, 663 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Ocean rotate: false - xy: 2423, 1589 + xy: 1354, 285 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains rotate: false - xy: 2423, 1559 + xy: 2444, 1735 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+City rotate: false - xy: 2423, 1522 + xy: 524, 2 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Forest rotate: false - xy: 490, 2 + xy: 558, 4 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Jungle rotate: false - xy: 524, 2 + xy: 592, 2 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 2423, 1492 + xy: 626, 9 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra rotate: false - xy: 558, 5 + xy: 660, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+City rotate: false - xy: 592, 2 + xy: 694, 2 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+Forest rotate: false - xy: 2423, 1458 + xy: 728, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2792,273 +2799,273 @@ UnitIcons/Ironclad index: -1 UnitIcons/Janissary rotate: false - xy: 1732, 1189 + xy: 1426, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Jet Fighter rotate: false - xy: 1528, 883 + xy: 1630, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1732, 1087 + xy: 1834, 1189 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1834, 1087 + xy: 1936, 1189 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 1630, 781 + xy: 1732, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landsknecht rotate: false - xy: 1732, 883 + xy: 1834, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Legion rotate: false - xy: 1936, 1087 + xy: 2038, 1189 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1834, 883 + xy: 1936, 985 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1936, 985 + xy: 2038, 1087 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 2140, 1189 + xy: 1834, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 2038, 781 + xy: 2140, 883 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 2344, 883 + xy: 2344, 781 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 1426, 679 + xy: 1528, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 2038, 679 + xy: 2140, 679 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 2140, 680 + xy: 2242, 680 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Panzer rotate: false - xy: 1100, 549 + xy: 1202, 651 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 896, 447 + xy: 998, 447 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1508, 475 + xy: 1610, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 1712, 475 + xy: 1814, 577 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1610, 373 + xy: 1508, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1916, 373 + xy: 1814, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1404, 271 + xy: 2018, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ship of the Line rotate: false - xy: 1710, 271 + xy: 1506, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sipahi rotate: false - xy: 2016, 271 + xy: 1812, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 2222, 577 + xy: 2222, 475 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Stealth Bomber rotate: false - xy: 2324, 373 + xy: 2322, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 742, 243 + xy: 742, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 844, 243 + xy: 844, 141 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 946, 141 + xy: 1048, 243 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1252, 39 + xy: 1354, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Triplane rotate: false - xy: 1354, 169 + xy: 1354, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 1354, 66 + xy: 1456, 168 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Turtle Ship rotate: false - xy: 1456, 169 + xy: 1558, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Chariot rotate: false - xy: 1660, 67 + xy: 2068, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Elephant rotate: false - xy: 1762, 169 + xy: 2170, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1762, 67 + xy: 2272, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 2068, 169 + xy: 1864, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 2068, 67 + xy: 1966, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Zero rotate: false - xy: 2272, 169 + xy: 2272, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -3079,413 +3086,413 @@ UnitPromotionIcons/Accuracy_II_(Civ5) index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 436, 271 + xy: 2442, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Air_Repair_(Civ5) rotate: false - xy: 458, 271 + xy: 1470, 1291 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush_II_(Civ5) rotate: false - xy: 1470, 1291 + xy: 281, 1727 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush_I_(Civ5) rotate: false - xy: 281, 1727 + xy: 1474, 1677 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 1474, 1677 + xy: 379, 1343 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 379, 1343 + xy: 384, 283 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 458, 731 + xy: 36, 22 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 384, 283 + xy: 169, 5 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 2392, 1727 + xy: 458, 731 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 36, 22 + xy: 795, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 2423, 1436 + xy: 1478, 1343 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 659, 17 + xy: 281, 1705 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1478, 1343 + xy: 379, 1321 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 281, 1705 + xy: 406, 283 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 379, 1321 + xy: 458, 709 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 458, 709 + xy: 817, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 406, 283 + xy: 1478, 1321 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 2392, 1705 + xy: 281, 1683 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 2423, 1414 + xy: 379, 1299 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 681, 17 + xy: 839, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 1478, 1321 + xy: 379, 1277 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 281, 1683 + xy: 861, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 379, 1299 + xy: 883, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion_(Civ5) rotate: false - xy: 703, 17 + xy: 905, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 379, 1277 + xy: 927, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 725, 17 + xy: 949, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Heal_Instantly_(Civ5) rotate: false - xy: 747, 17 + xy: 971, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 769, 17 + xy: 993, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_III_(Civ5) rotate: false - xy: 791, 17 + xy: 1015, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_II_(Civ5) rotate: false - xy: 813, 17 + xy: 1037, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_I_(Civ5) rotate: false - xy: 835, 17 + xy: 1059, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 857, 17 + xy: 1081, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 879, 17 + xy: 1103, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Medic_(Civ5) rotate: false - xy: 901, 17 + xy: 1125, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Medic_II_(Civ5) rotate: false - xy: 901, 17 + xy: 1125, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 923, 17 + xy: 1147, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Operational_Range_(Civ5) rotate: false - xy: 945, 17 + xy: 1169, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 945, 17 + xy: 1169, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 967, 17 + xy: 1191, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 989, 17 + xy: 1213, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1011, 17 + xy: 1235, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1033, 17 + xy: 1257, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1055, 17 + xy: 1279, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1077, 17 + xy: 1301, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1099, 17 + xy: 1323, 17 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1121, 17 + xy: 2453, 1319 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_I_(Civ5) rotate: false - xy: 1121, 17 + xy: 2453, 1319 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_III_(Civ5) rotate: false - xy: 1143, 17 + xy: 436, 298 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_II_(Civ5) rotate: false - xy: 1165, 17 + xy: 458, 298 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sortie_(Civ5) rotate: false - xy: 1187, 17 + xy: 2453, 1297 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 1209, 17 + xy: 2446, 1275 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1231, 17 + xy: 2446, 1253 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1253, 17 + xy: 2446, 1231 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(air)_(Civ5) rotate: false - xy: 1253, 17 + xy: 2446, 1231 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1275, 17 + xy: 2446, 1209 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 1297, 17 + xy: 2446, 1187 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 1319, 17 + xy: 2446, 1165 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 440, 679 + xy: 2446, 1143 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman_(Civ5) rotate: false - xy: 2453, 1319 + xy: 2446, 1121 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index fe3335b1e2..9e0d3904b3 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations/Nations.json similarity index 99% rename from android/assets/jsons/Nations.json rename to android/assets/jsons/Nations/Nations.json index 05763358ed..e10a8c2e8f 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations/Nations.json @@ -541,7 +541,45 @@ "Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju", "Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"] }, + /* + { + name:"Iroquois", + leaderName:"Hiawatha", + adjective:["Irochese"], + startBias:["Forest"], + preferredVictoryType:"Scientific", + + startIntroPart1: "Greetings, noble Hiawatha, leader of the mighty Iroquois nations! Long have your people lived near the great and holy lake Ontario in the land that has come to be known as the New York state in North America. In the mists of antiquity, the five peoples of Seneca, Onondaga, Mohawks, Cayugas and Oneida united into one nation, the Haudenosaunee, the Iroquois. With no written language, the wise men of your nation created the great law of peace, the model for many contitutions including that of the United States. For many years, your people battled great enemies, such as the Huron, and the French and English invaders. Tought outnumbered and facing weapons far more advanced than the ones your warriors wielded, the Iroquois survived and prospered, until they were finally overwhelmed by the mighty armies of the new United States." + startIntroPart2: "Oh noble Hiawatha, listen to the cries of your people! They call out to you to lead them in peace and war, to rebuild the great longhouse and unite the tribes once again. Will you accept this challenge, great leader? Will you build a civilization that will stand the test of time?" + + declaringWar:"You are a plague upon Mother Earth! Prepare for battle!" + attacked:"You evil creature! My braves will slaughter you!" + defeated:"You have defeated us... but our spirits will never be vanquished! We shall return!" + introduction:"Greetings, stranger. I am Hiawatha, speaker for the Iroquois. We seek peace with all, but we do not shrink from war." + + neutralHello:"Good day." + neutralLetsHearIt:["Yes?","I'm listening"] + neutralNo:["No.","Certainly not."] + neutralYes:["Very well.","Alright."] + + hateHello:"Oh, it's you." + hateLetsHearIt:["I'm listening.","Speak."] + hateNo:["That's unacceptable","You cannot be serious!"] + hateYes:["I suppose I must.","Very well."] + + afterPeace:"I thank you for your mercy. I pray that we can now be friends." + tradeRequest:"Does this trade work for you, my friend?" + + outerColor:[88,109,109], + innerColor:[246,205,137], + uniqueName:"The Great Warpath" + unique:"All units move through Forest and Jungle tiles in friendly territory as if it is Road. These tiles can be used to establish City Connections upon researching the Wheel.", + cities:["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River", + "Canandaigua Lake","Lake Simcoe","Salamanca","Gowanda","Cuba","Akron","Kanesatake","Ganienkeh","Cayuga Castle", + "Chondote","Canajoharie","Nedrow","Oneida Lake","Kanonwalohale","Green Bay","Southwold","Mohawk Valley", + "Schoharie","Bay of Quinte","Kanawale","Kanatsiokareke","Tyendinaga","Hahta"] + }, { name:"Australia", leaderName:"John Curtin", @@ -920,43 +958,6 @@ "Nan","Tak","Suphanburi","Hongsawadee","Thawaii","Ayutthuya","Taphan Hin","Uthai Thani","Lap Buri","Ratchasima", "Ban Phai","Loci","Khan Kaen","Surin"] }, - { - name:"Iroquois", - leaderName:"Hiawatha", - adjective:["Irochese"], - startBias:["Forest"], - preferredVictoryType:"Scientific", - - startIntroPart1: "Greetings, noble Hiawatha, leader of the mighty Iroquois nations! Long have your people lived near the great and holy lake Ontario in the land that has come to be known as the New York state in North America. In the mists of antiquity, the five peoples of Seneca, Onondaga, Mohawks, Cayugas and Oneida united into one nation, the Haudenosaunee, the Iroquois. With no written language, the wise men of your nation created the great law of peace, the model for many contitutions including that of the United States. For many years, your people battled great enemies, such as the Huron, and the French and English invaders. Tought outnumbered and facing weapons far more advanced than the ones your warriors wielded, the Iroquois survived and prospered, until they were finally overwhelmed by the mighty armies of the new United States." - startIntroPart2: "Oh noble Hiawatha, listen to the cries of your people! They call out to you to lead them in peace and war, to rebuild the great longhouse and unite the tribes once again. Will you accept this challenge, great leader? Will you build a civilization that will stand the test of time?" - - declaringWar:"You are a plague upon Mother Earth! Prepare for battle!" - attacked:"You evil creature! My braves will slaughter you!" - defeated:"You have defeated us... but our spirits will never be vanquished! We shall return!" - introduction:"Greetings, stranger. I am Hiawatha, speaker for the Iroquois. We seek peace with all, but we do not shrink from war." - - neutralHello:"Good day." - neutralLetsHearIt:["Yes?","I'm listening"] - neutralNo:["No.","Certainly not."] - neutralYes:["Very well.","Alright."] - - hateHello:"Oh, it's you." - hateLetsHearIt:["I'm listening.","Speak."] - hateNo:["That's unacceptable","You cannot be serious!"] - hateYes:["I suppose I must.","Very well."] - - afterPeace:"I thank you for your mercy. I pray that we can now be friends." - tradeRequest:"Does this trade work for you, my friend?" - - outerColor:[0,25,51], - innerColor:[255,255,102], - uniqueName:"The Great Warpath" - unique:"All units move through Forest and Jungle tiles in friendly territory as if it is Road. These tiles can be used to establish City Connections upon researching the Wheel.", - cities:["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River", - "Canandaigua Lake","Lake Simcoe","Salamanca","Gowanda","Cuba","Akron","Kanesatake","Ganienkeh","Cayuga Castle", - "Chondote","Canajoharie","Nedrow","Oneida Lake","Kanonwalohale","Green Bay","Southwold","Mohawk Valley", - "Schoharie","Bay of Quinte","Kanawale","Kanatsiokareke","Tyendinaga","Hahta"] - }, { //NEEDS SNOW AND ICE name:"Denmark", diff --git a/android/assets/jsons/Nations_Italian.json b/android/assets/jsons/Nations/Nations_Italian.json similarity index 100% rename from android/assets/jsons/Nations_Italian.json rename to android/assets/jsons/Nations/Nations_Italian.json diff --git a/android/assets/jsons/Nations_Simplified_Chinese.json b/android/assets/jsons/Nations/Nations_Simplified_Chinese.json similarity index 100% rename from android/assets/jsons/Nations_Simplified_Chinese.json rename to android/assets/jsons/Nations/Nations_Simplified_Chinese.json diff --git a/android/build.gradle b/android/build.gradle index 737d66056a..53a364e108 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 29 - versionCode 297 - versionName "3.0.4" + versionCode 298 + versionName "3.0.5" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 9c4231717f..45584dacbc 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -41,6 +41,7 @@ class GameInfo { toReturn.difficulty=difficulty toReturn.gameParameters = gameParameters toReturn.gameId = gameId + toReturn.oneMoreTurnMode = oneMoreTurnMode return toReturn } diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index b02eb5c2a3..8e3e842204 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -109,8 +109,8 @@ class CivilizationInfo { fun getTranslatedNation(): Nation { val language = UnCivGame.Current.settings.language.replace(" ","_") - if(!Gdx.files.internal("jsons/Nations_$language.json").exists()) return nation - val translatedNation = GameBasics.getFromJson(Array::class.java, "Nations_$language") + if(!Gdx.files.internal("jsons/Nations/Nations_$language.json").exists()) return nation + val translatedNation = GameBasics.getFromJson(Array::class.java, "Nations/Nations_$language") .firstOrNull { it.name==civName} if(translatedNation==null) // this language's trnslation doesn't contain this nation yet, return nation // default to english diff --git a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt index c650781f55..1f08c37237 100644 --- a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt +++ b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt @@ -5,40 +5,39 @@ import com.unciv.Constants import com.unciv.logic.civilization.CivilizationInfo class UnitMovementAlgorithms(val unit:MapUnit) { + + // This function is called ALL THE TIME and should be as time-optimal as possible! private fun getMovementCostBetweenAdjacentTiles(from: TileInfo, to: TileInfo, civInfo: CivilizationInfo): Float { - var cost = getMovementCostBetweenAdjacentTiles(from,to) - val toOwner = to.getOwner() - if(toOwner!=null && to.isLand && civInfo.isAtWarWith(toOwner) && toOwner.hasActiveGreatWall) - cost += 1 - return cost - } - - private fun getMovementCostBetweenAdjacentTiles(from: TileInfo, to: TileInfo): Float { - - if(unit.type.isLandUnit() && (from.isLand != to.isLand)) + if ((from.isLand != to.isLand) && unit.type.isLandUnit()) return 100f // this is embarkment or disembarkment, and will take the entire turn + var extraCost = 0f + + val toOwner = to.getOwner() + if (toOwner != null && to.isLand && toOwner.hasActiveGreatWall && civInfo.isAtWarWith(toOwner)) + extraCost += 1 + if (from.roadStatus === RoadStatus.Railroad && to.roadStatus === RoadStatus.Railroad) - return 1 / 10f + return 1 / 10f + extraCost if (from.roadStatus !== RoadStatus.None && to.roadStatus !== RoadStatus.None) //Road { - if (unit.civInfo.tech.movementSpeedOnRoadsImproved) return 1 / 3f - else return 1 / 2f + if (unit.civInfo.tech.movementSpeedOnRoadsImproved) return 1 / 3f + extraCost + else return 1 / 2f + extraCost } - if (unit.ignoresTerrainCost) return 1f - if(unit.doubleMovementInForestAndJungle && (to.baseTerrain==Constants.forest || to.baseTerrain==Constants.jungle)) - return 1f + if (unit.ignoresTerrainCost) return 1f + extraCost + if (unit.doubleMovementInForestAndJungle && (to.baseTerrain == Constants.forest || to.baseTerrain == Constants.jungle)) + return 1f + extraCost if (unit.roughTerrainPenalty && (to.baseTerrain == Constants.hill || to.terrainFeature == Constants.forest || to.terrainFeature == Constants.jungle)) - return 4f + return 4f + extraCost - if(unit.doubleMovementInCoast && to.baseTerrain==Constants.coast) - return 1/2f + if (unit.doubleMovementInCoast && to.baseTerrain == Constants.coast) + return 1 / 2f + extraCost - return to.getLastTerrain().movementCost.toFloat() // no road + return to.getLastTerrain().movementCost.toFloat() + extraCost // no road } class ParentTileAndTotalDistance(val parentTile:TileInfo, val totalDistance: Float) diff --git a/core/src/com/unciv/models/gamebasics/GameBasics.kt b/core/src/com/unciv/models/gamebasics/GameBasics.kt index bf65702249..709405d5ca 100644 --- a/core/src/com/unciv/models/gamebasics/GameBasics.kt +++ b/core/src/com/unciv/models/gamebasics/GameBasics.kt @@ -45,7 +45,7 @@ object GameBasics { Units += createHashmap(getFromJson(Array::class.java, "Units")) UnitPromotions += createHashmap(getFromJson(Array::class.java, "UnitPromotions")) PolicyBranches += createHashmap(getFromJson(Array::class.java, "Policies")) - Nations += createHashmap(getFromJson(Array::class.java, "Nations")) + Nations += createHashmap(getFromJson(Array::class.java, "Nations/Nations")) Difficulties += createHashmap(getFromJson(Array::class.java, "Difficulties")) val techColumns = getFromJson(Array::class.java, "Techs")