diff --git a/android/Images/UnitPromotionIcons/Blitz.png b/android/Images/UnitPromotionIcons/Blitz.png new file mode 100644 index 0000000000..daf08b990f Binary files /dev/null and b/android/Images/UnitPromotionIcons/Blitz.png differ diff --git a/android/Images/UnitPromotionIcons/March.png b/android/Images/UnitPromotionIcons/March.png new file mode 100644 index 0000000000..c21df70bb5 Binary files /dev/null and b/android/Images/UnitPromotionIcons/March.png differ diff --git a/android/Images/UnitPromotionIcons/March_(Civ5).png b/android/Images/UnitPromotionIcons/March_(Civ5).png deleted file mode 100644 index 0fa2d22276..0000000000 Binary files a/android/Images/UnitPromotionIcons/March_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Mobility.png b/android/Images/UnitPromotionIcons/Mobility.png new file mode 100644 index 0000000000..9c364a9c99 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Mobility.png differ diff --git a/android/Images/UnitPromotionIcons/Mobility_(Civ5).png b/android/Images/UnitPromotionIcons/Mobility_(Civ5).png deleted file mode 100644 index fefaeeec3c..0000000000 Binary files a/android/Images/UnitPromotionIcons/Mobility_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Volley.png b/android/Images/UnitPromotionIcons/Volley.png new file mode 100644 index 0000000000..3261ad24a5 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Volley.png differ diff --git a/android/Images/UnitPromotionIcons/Volley_(Civ5).png b/android/Images/UnitPromotionIcons/Volley_(Civ5).png deleted file mode 100644 index 2b1f1bd83a..0000000000 Binary files a/android/Images/UnitPromotionIcons/Volley_(Civ5).png and /dev/null differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 7a53ee53f8..0e9422a13a 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -1,6 +1,6 @@ game.png -size: 2462,1840 +size: 2460,1840 format: RGBA8888 filter: MipMapLinearLinear,MipMapLinearLinear repeat: none @@ -300,350 +300,350 @@ BuildingIcons/Machu Picchu index: -1 BuildingIcons/Market rotate: false - xy: 2140, 1024 + xy: 2038, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 2344, 1126 + xy: 2344, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1426, 718 + xy: 2344, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1936, 718 + xy: 1834, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 2038, 718 + xy: 1936, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mughal Fort rotate: false - xy: 2242, 718 + xy: 2140, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 2344, 718 + xy: 2242, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 692, 690 + xy: 590, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 896, 690 + xy: 794, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 998, 690 + xy: 896, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1202, 690 + xy: 1100, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 590, 588 + xy: 1304, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 896, 588 + xy: 794, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1100, 588 + xy: 998, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1202, 588 + xy: 1100, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 488, 487 + xy: 1304, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 794, 486 + xy: 692, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 894, 384 + xy: 792, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1200, 384 + xy: 1098, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1712, 616 + xy: 1610, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 2222, 616 + xy: 2120, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 2222, 514 + xy: 2222, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 2324, 616 + xy: 2222, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 2324, 514 + xy: 2324, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Satrap's Court rotate: false - xy: 1712, 412 + xy: 1610, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 2018, 412 + xy: 1916, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1812, 310 + xy: 1710, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 2016, 310 + xy: 1914, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 2118, 310 + xy: 2016, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 436, 106 + xy: 436, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 436, 4 + xy: 436, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 538, 208 + xy: 436, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 640, 180 + xy: 640, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 640, 78 + xy: 742, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 742, 180 + xy: 640, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 844, 78 + xy: 946, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 946, 180 + xy: 844, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 946, 78 + xy: 1048, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Terracotta Army rotate: false - xy: 1048, 180 + xy: 946, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1150, 282 + xy: 1048, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1048, 78 + xy: 1150, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1150, 180 + xy: 1048, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1252, 282 + xy: 1150, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1252, 180 + xy: 1150, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1354, 208 + xy: 1252, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1864, 208 + xy: 1660, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 2068, 208 + xy: 1762, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls of Babylon rotate: false - xy: 2170, 208 + xy: 1864, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 2068, 106 + xy: 2170, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1456, 4 + xy: 1354, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -804,63 +804,63 @@ ImprovementIcons/Manufactory index: -1 ImprovementIcons/Mine rotate: false - xy: 2344, 922 + xy: 2344, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 794, 588 + xy: 692, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 690, 384 + xy: 588, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1302, 384 + xy: 1200, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1508, 616 + xy: 1406, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 1508, 616 + xy: 1406, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 1508, 616 + xy: 1406, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1916, 616 + xy: 1814, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1456, 208 + xy: 1354, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -965,28 +965,28 @@ NationIcons/Korea index: -1 NationIcons/Persia rotate: false - xy: 998, 486 + xy: 896, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 2120, 616 + xy: 2018, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 2120, 514 + xy: 2120, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 1150, 78 + xy: 1252, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1063,42 +1063,42 @@ TileSets/FantasyHex/Hexagon index: -1 OtherIcons/MenuIcon rotate: false - xy: 2242, 922 + xy: 2140, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 896, 486 + xy: 794, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 588, 384 + xy: 486, 385 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 2324, 412 + xy: 2222, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1914, 310 + xy: 1812, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 844, 282 + xy: 742, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1119,7 +1119,7 @@ OtherIcons/tileTableBackground index: -1 OtherIcons/whiteDot rotate: false - xy: 2459, 441 + xy: 277, 1543 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -1147,266 +1147,252 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1814, 54 + xy: 1712, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1814, 2 + xy: 692, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 692, 26 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Discipline - rotate: false - xy: 1866, 54 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -StatIcons/Strength - rotate: false - xy: 1866, 54 + xy: 1764, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 744, 26 + xy: 1816, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1918, 54 + xy: 1816, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1918, 2 + xy: 1868, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 796, 26 + xy: 1868, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1970, 54 + xy: 848, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1970, 2 + xy: 1920, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 2022, 54 + xy: 900, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 2022, 2 + xy: 1972, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 900, 26 + xy: 1972, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 2074, 2 + xy: 2024, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 952, 26 + xy: 2024, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 2126, 54 + xy: 1004, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 2126, 2 + xy: 2076, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1004, 26 + xy: 2076, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 2178, 54 + xy: 1056, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1056, 26 + xy: 2128, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 2230, 54 + xy: 1108, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 2230, 2 + xy: 2180, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1108, 26 + xy: 2180, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 2282, 54 + xy: 1160, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 2282, 2 + xy: 2232, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1160, 26 + xy: 2232, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 2374, 258 + xy: 2284, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 2374, 206 + xy: 1264, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 2374, 154 + xy: 2374, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 2374, 102 + xy: 2374, 206 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 65, 44 + xy: 2374, 154 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 2386, 50 + xy: 2388, 50 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 436, 333 + xy: 65, 44 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 488, 333 + xy: 117, 44 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 540, 332 + xy: 436, 333 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 169, 8 + xy: 488, 333 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 221, 8 + xy: 540, 332 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1518,84 +1504,84 @@ ResourceIcons/Ivory index: -1 ResourceIcons/Marble rotate: false - xy: 2038, 922 + xy: 1936, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 692, 588 + xy: 590, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 692, 486 + xy: 590, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 2222, 412 + xy: 2120, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1506, 310 + xy: 1404, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1608, 310 + xy: 1506, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 436, 208 + xy: 2322, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 742, 282 + xy: 640, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 844, 180 + xy: 742, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1966, 208 + xy: 1762, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1864, 106 + xy: 2068, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1966, 106 + xy: 2068, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1658,7 +1644,7 @@ StatIcons/Happiness index: -1 StatIcons/InterceptRange rotate: false - xy: 848, 26 + xy: 1920, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1672,7 +1658,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 2178, 2 + xy: 2128, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1700,14 +1686,14 @@ StatIcons/Range index: -1 StatIcons/RangedStrength rotate: false - xy: 1264, 26 + xy: 2284, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 1712, 514 + xy: 1712, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1721,7 +1707,7 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 2322, 310 + xy: 2220, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2015,252 +2001,252 @@ TechIcons/Machinery index: -1 TechIcons/Masonry rotate: false - xy: 2038, 820 + xy: 2242, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 2140, 922 + xy: 2038, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 2242, 1024 + xy: 2140, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 2242, 820 + xy: 2242, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 2344, 1228 + xy: 2242, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 2344, 1024 + xy: 2344, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 2344, 820 + xy: 2344, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 1630, 718 + xy: 1528, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 590, 690 + xy: 488, 589 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 794, 690 + xy: 692, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1100, 690 + xy: 998, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 998, 588 + xy: 896, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 590, 486 + xy: 488, 487 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1100, 486 + xy: 998, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1202, 486 + xy: 1100, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1304, 486 + xy: 1202, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 792, 384 + xy: 690, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 996, 384 + xy: 894, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1098, 384 + xy: 996, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 1406, 616 + xy: 1302, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1406, 514 + xy: 1406, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 1508, 514 + xy: 1508, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1610, 616 + xy: 1508, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 1610, 514 + xy: 1610, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1814, 514 + xy: 1814, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1916, 514 + xy: 1916, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 2018, 514 + xy: 2018, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1406, 412 + xy: 2324, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1610, 412 + xy: 1508, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1814, 412 + xy: 1712, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 538, 4 + xy: 538, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 640, 282 + xy: 538, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1252, 78 + xy: 1252, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1354, 106 + xy: 1354, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1456, 106 + xy: 1456, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1558, 4 + xy: 1456, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2323,21 +2309,21 @@ TileSets/Default/LakesOverlay index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 2242, 1126 + xy: 2140, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 2140, 718 + xy: 2038, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 1304, 690 + xy: 1202, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2400,70 +2386,70 @@ TileSets/FantasyHex/Desert+City index: -1 TileSets/FantasyHex/Desert+Flood plains rotate: false - xy: 2334, 20 + xy: 2336, 20 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Oasis rotate: false - xy: 592, 354 + xy: 169, 66 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland rotate: false - xy: 169, 66 + xy: 592, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopRightBorder rotate: false - xy: 169, 66 + xy: 592, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Forest rotate: false - xy: 2426, 413 + xy: 169, 35 size: 31, 29 orig: 31, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Jungle rotate: false - xy: 273, 24 + xy: 1354, 311 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Marsh rotate: false - xy: 1354, 316 + xy: 2370, 19 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill rotate: false - xy: 2368, 16 + xy: 2404, 16 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill+Forest rotate: false - xy: 2402, 3 + xy: 2426, 671 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Lakes rotate: false - xy: 592, 324 + xy: 2426, 641 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2477,63 +2463,63 @@ TileSets/FantasyHex/Mountain index: -1 TileSets/FantasyHex/Ocean rotate: false - xy: 1316, 13 + xy: 2426, 611 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains rotate: false - xy: 2426, 688 + xy: 2426, 581 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+City rotate: false - xy: 2426, 651 + xy: 2426, 544 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Forest rotate: false - xy: 2426, 616 + xy: 2426, 509 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Jungle rotate: false - xy: 2426, 579 + xy: 2426, 472 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 2426, 549 + xy: 2426, 442 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra rotate: false - xy: 2426, 515 + xy: 2426, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+City rotate: false - xy: 2426, 478 + xy: 2424, 371 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+Forest rotate: false - xy: 2426, 444 + xy: 2424, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2895,219 +2881,212 @@ UnitIcons/Machine Gun orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Maori Warrior - rotate: false - xy: 1936, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 2140, 820 + xy: 2242, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1528, 718 + xy: 1426, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 1732, 718 + xy: 1630, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mohawk Warrior rotate: false - xy: 1834, 718 + xy: 1732, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 488, 690 + xy: 2344, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 488, 589 + xy: 488, 691 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Panzer rotate: false - xy: 1304, 588 + xy: 1202, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 486, 385 + xy: 1304, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1814, 616 + xy: 1712, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 2018, 616 + xy: 1916, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1508, 412 + xy: 1406, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1916, 412 + xy: 1814, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 2120, 412 + xy: 2018, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ship of the Line rotate: false - xy: 1404, 310 + xy: 2324, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sipahi rotate: false - xy: 1710, 310 + xy: 1608, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 2220, 310 + xy: 2118, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Stealth Bomber rotate: false - xy: 538, 106 + xy: 538, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 742, 78 + xy: 844, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 946, 282 + xy: 844, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 1048, 282 + xy: 946, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1558, 208 + xy: 1456, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Triplane rotate: false - xy: 1558, 106 + xy: 1558, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 1660, 207 + xy: 1558, 105 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Turtle Ship rotate: false - xy: 1762, 208 + xy: 1660, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Chariot rotate: false - xy: 2272, 208 + xy: 1864, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Elephant rotate: false - xy: 1660, 105 + xy: 1966, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1762, 106 + xy: 1966, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 2272, 106 + xy: 2272, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1354, 4 + xy: 2272, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Zero rotate: false - xy: 1660, 3 + xy: 1558, 3 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -3135,336 +3114,294 @@ UnitPromotionIcons/Ambush_II_(Civ5) index: -1 UnitPromotionIcons/Ambush_I_(Civ5) rotate: false - xy: 273, 2 + xy: 1470, 1330 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 1762, 54 + xy: 1660, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 295, 2 + xy: 281, 1766 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 1470, 1330 + xy: 1474, 1716 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 281, 1766 + xy: 379, 1382 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 1474, 1716 + xy: 640, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 1762, 2 + xy: 1660, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) - rotate: false - xy: 379, 1382 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Coastal_Raider_III_(Civ5) - rotate: false - xy: 384, 322 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false xy: 2, 9 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Coastal_Raider_I_(Civ5) +UnitPromotionIcons/Coastal_Raider rotate: false - xy: 458, 770 - size: 20, 20 - orig: 20, 20 + xy: 1712, 54 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Cover_II_(Civ5) +UnitPromotionIcons/Cover rotate: false - xy: 640, 4 - size: 20, 20 - orig: 20, 20 + xy: 1764, 54 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Cover_I_(Civ5) +PolicyIcons/Discipline rotate: false - xy: 307, 38 - size: 20, 20 - orig: 20, 20 + xy: 1764, 54 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +StatIcons/Strength + rotate: false + xy: 1764, 54 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 1866, 2 + xy: 744, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion_(Civ5) rotate: false - xy: 1478, 1382 + xy: 384, 322 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Formation_II_(Civ5) +UnitPromotionIcons/Formation rotate: false - xy: 281, 1744 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Formation_I_(Civ5) - rotate: false - xy: 379, 1360 - size: 20, 20 - orig: 20, 20 + xy: 796, 26 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Heal_Instantly_(Civ5) rotate: false - xy: 406, 322 + xy: 592, 332 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 24, 9 + xy: 458, 770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_III_(Civ5) rotate: false - xy: 458, 748 + xy: 2424, 315 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_II_(Civ5) rotate: false - xy: 662, 4 + xy: 1478, 1382 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_I_(Civ5) rotate: false - xy: 1478, 1360 + xy: 281, 1744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 281, 1722 + xy: 379, 1360 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 379, 1338 + xy: 662, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 2074, 54 + xy: 952, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 684, 4 + xy: 24, 9 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Operational_Range_(Civ5) rotate: false - xy: 379, 1316 + xy: 406, 322 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 379, 1316 + xy: 406, 322 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 706, 4 + xy: 458, 748 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 728, 4 + xy: 1478, 1360 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 750, 4 + xy: 281, 1722 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 772, 4 + xy: 379, 1338 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 117, 44 + xy: 2374, 102 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 2334, 50 + xy: 2336, 50 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Siege_(Civ5) - rotate: false - xy: 794, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Siege_I_(Civ5) - rotate: false - xy: 794, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Siege_III_(Civ5) - rotate: false - xy: 816, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Siege_II_(Civ5) - rotate: false - xy: 838, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 UnitPromotionIcons/Sortie_(Civ5) rotate: false - xy: 860, 4 + xy: 684, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 882, 4 + xy: 379, 1316 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 904, 4 + xy: 706, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 926, 4 + xy: 728, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(air)_(Civ5) rotate: false - xy: 926, 4 + xy: 728, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 948, 4 + xy: 750, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 970, 4 + xy: 772, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 992, 4 + xy: 794, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 1014, 4 + xy: 816, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman_(Civ5) rotate: false - xy: 1036, 4 + xy: 838, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 323a24fede..725302ce97 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 1a601f6963..9ab69f2e0d 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -489,7 +489,8 @@ culture:1, isWonder:true, uniques:["Culture in all cities increased by 25%"], - requiredTech:"Acoustics" + requiredTech:"Acoustics", + quote:"'I live and love in God's peculiar light.' - Michelangelo Buonarroti" }, { name:"Bank", @@ -529,7 +530,8 @@ culture:1, isWonder:true, uniques:["Unhappiness from population decreased by 10%"], - requiredTech:"Banking" + requiredTech:"Banking", + quote:"'Most of us can, as we choose, make of this world either a palace or a prison' - John Lubbock" }, { name:"Theatre", @@ -545,6 +547,7 @@ isWonder:true, uniques:["Free Great Person"] requiredTech:"Printing Press" + quote:"'Don't clap too hard - it's a very old building.' - John Osbourne" }, { name:"Himeji Castle", @@ -552,8 +555,9 @@ isWonder:true, greatPersonPoints:{production:2} providesFreeBuilding:"Castle", - uniques:["+15% combat strength for units fighting in friendly territory"] // todo - requiredTech:"Gunpowder" + uniques:["+15% combat strength for units fighting in friendly territory"] + requiredTech:"Gunpowder", + quote:"'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.' - Yamamoto Tsunetomo" }, { name:"Museum", @@ -578,7 +582,8 @@ happiness:4, isWonder:true, uniques:["Free Great Artist Appears"], - requiredTech:"Archaeology" + requiredTech:"Archaeology", + quote:"'Every genuine work of art has as much reason for being as the earth and the sun' - Ralph Waldo Emerson" }, { name:"Seaport", @@ -595,7 +600,8 @@ happiness:4, isWonder:true, uniques:["Empire enters golden age"], - requiredTech:"Architecture" + requiredTech:"Architecture", + quote:"'The Taj Mahal rises above the banks of the river like a solitary tear suspended on the cheek of time.' - Rabindranath Tagore" }, { name:"Porcelain Tower", @@ -603,7 +609,8 @@ greatPersonPoints:{science:2}, isWonder:true, uniques:["Free great scientist appears","Production to science conversion in cities increased by 33%"], - requiredTech:"Architecture" + requiredTech:"Architecture", + quote:"'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.' - James Russell Lowell" }, { name:"Windmill", @@ -670,7 +677,8 @@ gold:4, isWonder:true, uniques:["-15% to purchasing items in cities"], - requiredTech:"Industrialization" + requiredTech:"Industrialization", + quote:"'To achieve great things, two things are needed: a plan, and not quite enough time.' - Leonard Bernstein" }, // Modern Era @@ -689,14 +697,16 @@ happiness:5 isWonder:true, uniques:["Provides 1 happiness per social policy"], - requiredTech:"Radio" + requiredTech:"Radio", + quote:"'We live only to discover beauty, all else is a form of waiting' - Kahlil Gibran" }, { name:"Statue of Liberty", culture:1, isWonder:true, uniques:["+1 Production from specialists"], - requiredTech:"Replaceable Parts" + requiredTech:"Replaceable Parts", + quote:"'Give me your tired, your poor, your huddled masses yearning to breathe free, the wretched refuse of your teeming shore. Send these, the homeless, tempest-tossed to me, I lift my lamp beside the golden door!' - Emma Lazarus" }, { name:"Research Lab", @@ -719,7 +729,8 @@ culture:5, isWonder:true, uniques:["Culture cost of adopting new Policies reduced by 10%"], - requiredTech:"Flight" + requiredTech:"Flight", + quote:"'Come to me, all who labor and are heavy burdened, and I will give you rest.' - New Testament, Matthew 11:28" }, { name:"Kremlin", @@ -737,7 +748,9 @@ isWonder:true, uniques:["+1 happiness, +2 culture and +3 gold from every Castle", "Must be next to mountain"], - requiredTech:"Railroad" + requiredTech:"Railroad", + quote:"'...the location is one of the most beautiful to be found, holy and unapproachable, a worthy temple for the divine friend who has brought salvation and true blessing to the world.' - King Ludwig II of Bavaria" + }, // Information Era @@ -774,7 +787,8 @@ isWonder:true, percentStatBonus:{culture:50}, uniques:["Free Social Policy","Can only be built in coastal cities"], - requiredTech:"Ecology" + requiredTech:"Ecology", + quote:"'Those who lose dreaming are lost.' - Australian Aboriginal saying" }, /* { @@ -792,7 +806,8 @@ culture:1, greatPersonPoints:{production:2} uniques:["Gold cost of upgrading military units reduced by 33%"] - requiredTech:"Combined Arms" + requiredTech:"Combined Arms", + quote:"'In preparing for battle I have always found that plans are useless, but planning is indispensable.' - Dwight D. Eisenhower" }, { name:"Spaceship Factory", @@ -826,7 +841,8 @@ providesFreeBuilding: "Spaceship Factory", uniques:["2 free great scientists appear", "Increases production of spaceship parts by 25%"], - requiredTech:"Satellites" + requiredTech:"Satellites", + quote:"'The wonder is, not that the field of stars is so vast, but that man has measured it.' - Anatole France" }, { name:"SS Cockpit", diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json index 7f1e4e76a7..a20974c1e7 100644 --- a/android/assets/jsons/Techs.json +++ b/android/assets/jsons/Techs.json @@ -8,6 +8,7 @@ { name:"Agriculture", row:5, + quote:"'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster" } ] @@ -21,18 +22,22 @@ { name:"Pottery", row:2, + quote:"'Shall the clay say to him that fashioneth it, what makest thou?' - Bible Isaiah 45:9" }, { name:"Animal Husbandry", - row:5 + row:5, + quote:"'Thou shalt not muzzle the ox when he treadeth out the corn.' - Bible Deuteronomy 25:4" }, { name:"Archery", - row:7 + row:7, + quote:"'The haft of the arrow has been feathered with one of the eagle's own plumes, we often give our enemies the means of our own destruction' - Aesop" }, { name:"Mining", - row:9 + row:9, + quote:"'The meek shall inherit the Earth, but not its mineral rights.' - J. Paul Getty" } ] @@ -48,36 +53,43 @@ name:"Sailing", row:1, prerequisites:["Pottery"], + quote:"'He who commands the sea has command of everything.' - Themistocles" }, { name:"Calendar", row:2, - prerequisites:["Pottery"] + prerequisites:["Pottery"], + quote:"'So teach us to number our days, so that we may apply our hearts unto wisdom.' - Bible Psalms 90:12" }, { name:"Writing", row:3, - prerequisites:["Pottery"] + prerequisites:["Pottery"], + quote:"'He who destroys a good book kills reason itself.' - John Milton" }, { name:"Trapping", row:5, - prerequisites:["Animal Husbandry"] + prerequisites:["Animal Husbandry"], + quote:"'Even brute beasts and wandering birds do not fall into the same traps or nets twice.' - Saint Jerome" }, { name:"The Wheel", row:7, - prerequisites:["Animal Husbandry", "Archery"] + prerequisites:["Animal Husbandry", "Archery"], + quote:"'Wisdom and virtue are like the two wheels of a cart.' - Japanese proverb" }, { name:"Masonry", row:9, - prerequisites:["Mining"] + prerequisites:["Mining"], + quote:"'How happy are those whose walls already rise!' - Virgil" }, { name:"Bronze Working", row:10, - prerequisites:["Mining"] + prerequisites:["Mining"], + quote:"'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer" } ] }, @@ -93,22 +105,26 @@ cost:85, row:1, prerequisites:["Sailing"], - uniques:["Enables embarkation for land units"] + uniques:["Enables embarkation for land units"], + quote:"'He made an instrument to know if the moon shine at full or no.' - Samuel Butler" }, { name:"Horseback Riding", row:5, - prerequisites:["Trapping","The Wheel"] + prerequisites:["Trapping","The Wheel"], + quote:"'A Horse! A Horse! My kingdom for a horse!' - Shakespeare (Richard III)" }, { name:"Mathematics", row:7, - prerequisites:["The Wheel"] + prerequisites:["The Wheel"], + quote:"'Mathematics is the gate and key to the sciences.' - Roger Bacon" }, { name:"Construction", row:9, - prerequisites:["Masonry","The Wheel"] + prerequisites:["Masonry","The Wheel"], + quote:"'Three things are to be looked to in a building: that it stands on the right spot; that it be securely founded; that it be successfulyl executed.' - Johann Wolfgang von Goethe" } ] }, @@ -122,22 +138,26 @@ { name:"Philosophy", row:3, - prerequisites:["Writing","Calendar"] + prerequisites:["Writing","Calendar"], + quote:"'There is only one good, knowledge, and one evil, ignorance.' - Socrates" }, { name:"Currency", row:7, - prerequisites:["Mathematics"] + prerequisites:["Mathematics"], + quote:"'Better is bread with a happy heart than wealth with vexation.' - Amenemope" }, { name:"Engineering", row:8, - prerequisites:["Mathematics","Construction"] + prerequisites:["Mathematics","Construction"], + quote:"'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci" }, { name:"Iron Working", row:10, - prerequisites:["Bronze Working"] + prerequisites:["Bronze Working"], + quote:"'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats" } ] }, @@ -539,4 +559,4 @@ } ] } -] \ No newline at end of file +] diff --git a/android/build.gradle b/android/build.gradle index 53a364e108..83946f5cd0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 29 - versionCode 298 - versionName "3.0.5" + versionCode 299 + versionName "3.0.6" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt b/core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt index 7b9b27ae48..b736be3548 100644 --- a/core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt @@ -112,9 +112,9 @@ class SpecificUnitAutomation{ val possibleCityLocations = unit.getTile().getTilesInDistance(5) .filter { val tileOwner=it.getOwner() - (tileOwner==null || tileOwner==unit.civInfo) && // don't allow settler to settle inside other civ's territory + it.isLand && (tileOwner==null || tileOwner==unit.civInfo) && // don't allow settler to settle inside other civ's territory (unit.movement.canMoveTo(it) || unit.currentTile==it) - && it !in tilesNearCities && it.isLand } + && it !in tilesNearCities } val luxuryResourcesInCivArea = unit.civInfo.cities.asSequence() .flatMap { it.getTiles().asSequence() }.filter { it.resource!=null } @@ -126,7 +126,7 @@ class SpecificUnitAutomation{ .firstOrNull { unit.movement.canReach(it) } if(bestCityLocation==null) { // We got a badass over here, all tiles within 5 are taken? Screw it, random walk. - if(UnitAutomation().tryExplore(unit, unit.movement.getDistanceToTiles())) return // try to find new areas + if (UnitAutomation().tryExplore(unit, unit.movement.getDistanceToTiles())) return // try to find new areas UnitAutomation().wander(unit, unit.movement.getDistanceToTiles()) // go around aimlessly return } diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt index 10a60bbf2c..3c5b156628 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt @@ -81,7 +81,7 @@ class WorldScreenMenuTable(val worldScreen: WorldScreen) : PopupTable(worldScree multiplayerPopup.addGoodSizedLabel("HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!").row() multiplayerPopup.addGoodSizedLabel("To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID.").row() - multiplayerPopup.addGoodSizedLabel("You can assign your own user ID there easily, and othr players can copy their user IDs here and send them to you for you to include them in the game.").row() + multiplayerPopup.addGoodSizedLabel("You can assign your own user ID there easily, and other players can copy their user IDs here and send them to you for you to include them in the game.").row() multiplayerPopup.addButton("Copy User Id"){ Gdx.app.clipboard.contents = UnCivGame.Current.settings.userId }.row() @@ -92,7 +92,7 @@ class WorldScreenMenuTable(val worldScreen: WorldScreen) : PopupTable(worldScree if(!worldScreen.gameInfo.gameParameters.isOnlineMultiplayer) copyGameIdButton.actor.disable() - multiplayerPopup.addGoodSizedLabel("Players can enter you game by copying the game ID to the clipboard, and clicking on the Join Game button").row() + multiplayerPopup.addGoodSizedLabel("Players can enter your game by copying the game ID to the clipboard, and clicking on the Join Game button").row() val badGameIdLabel = "".toLabel().setFontColor(Color.RED) badGameIdLabel.isVisible = false multiplayerPopup.addButton("Join Game") { diff --git a/docs/Credits.md b/docs/Credits.md index 3032297576..d2120c991b 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -454,6 +454,9 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [City](https://thenounproject.com/search/?q=city&i=2402817) By iconcheese for Siege * [Skull and Crossbones](https://thenounproject.com/search/?q=skull%20and%20cross%20bones&i=15526) By Anton Outkine for Coastal Raider * [Spear](https://thenounproject.com/search/?q=spear&i=1754184) By Deemak Daksina for Formation +* [Wall](https://thenounproject.com/search/?q=wall&i=1305174) By Graphic Tigers for Volley +* [Lightning](https://thenounproject.com/search/?q=lightning&i=1187991) By Mooms for Blitz +* [Move](https://thenounproject.com/search/?q=move&i=790952) By Sandra for Mobility ## Others