diff --git a/android/Images/OtherIcons/Present.png b/android/Images/OtherIcons/Present.png new file mode 100644 index 0000000000..2a121d8b13 Binary files /dev/null and b/android/Images/OtherIcons/Present.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 490924b83c..4ad749be3e 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,21 +6,21 @@ filter: MipMapLinearLinear, MipMapLinearLinear repeat: none EmojiIcons/Gold rotate: false - xy: 1816, 1495 + xy: 1932, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Production rotate: false - xy: 1759, 1306 + xy: 1759, 1248 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 1674, 726 + xy: 1732, 726 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -174,42 +174,28 @@ ImprovementIcons/Polder index: -1 ImprovementIcons/Quarry rotate: false - xy: 1292, 868 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 752, 328 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/Railroad - rotate: false - xy: 752, 328 + xy: 1184, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1400, 760 + xy: 1292, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 1378, 220 + xy: 760, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1192, 112 + xy: 1300, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -356,35 +342,35 @@ NationIcons/Polynesia index: -1 NationIcons/Rome rotate: false - xy: 1076, 436 + xy: 968, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 968, 328 + xy: 1400, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Siam rotate: false - xy: 1292, 436 + xy: 1184, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Songhai rotate: false - xy: 1400, 328 + xy: 1508, 976 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Spain rotate: false - xy: 1508, 976 + xy: 1508, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -398,14 +384,14 @@ NationIcons/The Huns index: -1 NationIcons/The Netherlands rotate: false - xy: 760, 112 + xy: 868, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 868, 112 + xy: 976, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -419,7 +405,7 @@ OtherIcons/Aircraft index: -1 OtherIcons/BackArrow rotate: false - xy: 1208, 54 + xy: 1316, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -440,7 +426,7 @@ OtherIcons/Border-inner index: -1 OtherIcons/Border-outer rotate: false - xy: 1870, 681 + xy: 1870, 601 size: 31, 15 orig: 31, 15 offset: 0, 0 @@ -503,7 +489,7 @@ OtherIcons/DisbandUnit index: -1 OtherIcons/Down rotate: false - xy: 684, 14 + xy: 1874, 1716 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -524,7 +510,7 @@ OtherIcons/Hexagon index: -1 OtherIcons/Link rotate: false - xy: 1643, 1364 + xy: 1585, 1248 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -599,65 +585,72 @@ OtherIcons/Pillage orig: 100, 100 offset: 0, 0 index: -1 +OtherIcons/Present + rotate: false + xy: 752, 436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 OtherIcons/Puppet rotate: false - xy: 1400, 976 + xy: 1292, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quest rotate: false - xy: 1184, 760 + xy: 1076, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 1076, 652 + xy: 968, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 968, 436 + xy: 860, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1400, 544 + xy: 1292, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1292, 328 + xy: 1400, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1508, 658 + xy: 1508, 550 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 838, 220 + xy: 946, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 1054, 220 + xy: 1162, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -671,273 +664,273 @@ OtherIcons/Triangle index: -1 OtherIcons/Up rotate: false - xy: 1674, 668 + xy: 1732, 668 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 1870, 672 + xy: 1790, 610 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aesthetics rotate: false - xy: 976, 54 + xy: 1084, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1150, 54 + xy: 1258, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 1556, 54 + xy: 278, 9 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 220, 9 + xy: 336, 9 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 336, 9 + xy: 452, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Communism rotate: false - xy: 394, 9 + xy: 510, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 452, 14 + xy: 568, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Cultural Diplomacy rotate: false - xy: 568, 14 + xy: 684, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 626, 14 + xy: 1874, 1774 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Educated Elite rotate: false - xy: 1874, 1716 + xy: 1874, 1658 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Fascism rotate: false - xy: 1932, 1716 + xy: 1932, 1658 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1932, 1600 + xy: 1932, 1542 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1874, 1542 + xy: 1816, 1495 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1932, 1542 + xy: 1874, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1658, 1480 + xy: 1585, 1422 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1643, 1422 + xy: 1643, 1364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1585, 1306 + xy: 1701, 1422 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1585, 1248 + xy: 1701, 1364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1643, 1248 + xy: 1701, 1248 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Merchant Navy rotate: false - xy: 1701, 1306 + xy: 1585, 1190 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1701, 1248 + xy: 1643, 1190 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1585, 1190 + xy: 1701, 1190 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1643, 1190 + xy: 1581, 1132 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1701, 1190 + xy: 1639, 1132 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1639, 1132 + xy: 1990, 1774 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Nationalism rotate: false - xy: 1990, 1716 + xy: 1990, 1600 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Naval Tradition rotate: false - xy: 1990, 1658 + xy: 1990, 1542 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1990, 1600 + xy: 1990, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1990, 1542 + xy: 1606, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Philantropy rotate: false - xy: 1990, 1484 + xy: 1594, 276 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Planned Economy rotate: false - xy: 1594, 276 + xy: 1759, 1422 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1759, 1422 + xy: 1759, 1364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1759, 1364 + xy: 1759, 1306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1759, 1248 + xy: 1759, 1190 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1759, 1190 + xy: 1755, 1132 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1616, 1074 + xy: 1616, 1016 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1674, 1074 + xy: 1674, 1016 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -951,28 +944,28 @@ PolicyIcons/Republic index: -1 PolicyIcons/Scholasticism rotate: false - xy: 1674, 1016 + xy: 1732, 1016 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1732, 1074 + xy: 1674, 958 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1674, 958 + xy: 1732, 958 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Socialism rotate: false - xy: 1674, 900 + xy: 1732, 900 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -986,14 +979,14 @@ PolicyIcons/Sovereignty index: -1 PolicyIcons/Theocracy rotate: false - xy: 1674, 784 + xy: 1732, 784 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1732, 842 + xy: 1674, 726 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1007,7 +1000,7 @@ PolicyIcons/Trade Unions index: -1 PolicyIcons/United Front rotate: false - xy: 1732, 784 + xy: 1674, 668 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1063,7 +1056,7 @@ ReligionIcons/Pantheon index: -1 ReligionIcons/Taoism rotate: false - xy: 1162, 220 + xy: 1270, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1196,70 +1189,70 @@ ResourceIcons/Pearls index: -1 ResourceIcons/Sheep rotate: false - xy: 1076, 328 + xy: 1400, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1184, 328 + xy: 1400, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1400, 436 + xy: 1292, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1508, 760 + xy: 1508, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 730, 220 + xy: 838, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 946, 220 + xy: 1054, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1408, 112 + xy: 1486, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1486, 220 + xy: 1516, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1516, 112 + xy: 760, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 760, 4 + xy: 868, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1315,7 +1308,7 @@ StatIcons/Happiness index: -1 StatIcons/InterceptRange rotate: false - xy: 1585, 1422 + xy: 1643, 1422 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1329,7 +1322,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1990, 1774 + xy: 1990, 1658 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1350,21 +1343,21 @@ StatIcons/Production index: -1 StatIcons/Range rotate: false - xy: 1755, 1132 + xy: 1616, 1074 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1614, 54 + xy: 1674, 1074 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 1076, 544 + xy: 968, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1378,14 +1371,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1508, 868 + xy: 1508, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1674, 842 + xy: 1732, 842 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1812,21 +1805,21 @@ TechIcons/Pottery index: -1 TechIcons/Printing Press rotate: false - xy: 752, 436 + xy: 1400, 976 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 968, 544 + xy: 860, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 860, 436 + xy: 752, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1840,112 +1833,112 @@ TechIcons/Railroad index: -1 TechIcons/Refrigeration rotate: false - xy: 1292, 760 + xy: 1184, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 1184, 652 + xy: 1076, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 860, 328 + xy: 1400, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1292, 652 + xy: 1184, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1184, 544 + xy: 1076, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1400, 652 + xy: 1292, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1292, 544 + xy: 1184, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1184, 436 + xy: 1076, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Stealth rotate: false - xy: 1508, 550 + xy: 1508, 442 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1508, 442 + xy: 1508, 334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1508, 334 + xy: 730, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Telecommunications rotate: false - xy: 1270, 220 + xy: 1378, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 976, 112 + xy: 1084, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1084, 112 + xy: 1192, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1300, 112 + xy: 1408, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 868, 4 + xy: 976, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1964,20 +1957,6 @@ TileSets/Default/CityOverlay orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/CrosshatchHexagon - rotate: false - xy: 4, 1147 - size: 273, 236 - orig: 273, 236 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/CrosshatchHexagon - rotate: false - xy: 4, 1147 - size: 273, 236 - orig: 273, 236 - offset: 0, 0 - index: -1 TileSets/Default/FalloutOverlay rotate: false xy: 1369, 1408 @@ -1999,20 +1978,6 @@ TileSets/Default/ForestOverlay orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/Hexagon - rotate: false - xy: 412, 1800 - size: 277, 240 - orig: 277, 240 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Hexagon - rotate: false - xy: 412, 1800 - size: 277, 240 - orig: 277, 240 - offset: 0, 0 - index: -1 TileSets/Default/HillOverlay rotate: false xy: 1708, 1646 @@ -2069,60 +2034,46 @@ TileSets/Default/OasisOverlay orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/Tiles/River-Bottom +TileSets/Default/Railroad rotate: false - xy: 1990, 860 - size: 32, 28 - orig: 32, 28 + xy: 1292, 760 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/River-Bottom +ImprovementIcons/Railroad rotate: false - xy: 1990, 860 - size: 32, 28 - orig: 32, 28 + xy: 1292, 760 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/Tiles/River-BottomLeft +TileSets/FantasyHex/CrosshatchHexagon rotate: false - xy: 1990, 824 - size: 32, 28 - orig: 32, 28 + xy: 4, 1147 + size: 273, 236 + orig: 273, 236 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/River-BottomLeft +TileSets/Default/CrosshatchHexagon rotate: false - xy: 1990, 824 - size: 32, 28 - orig: 32, 28 + xy: 4, 1147 + size: 273, 236 + orig: 273, 236 offset: 0, 0 index: -1 -TileSets/Default/Tiles/River-BottomRight +TileSets/FantasyHex/Hexagon rotate: false - xy: 1990, 788 - size: 32, 28 - orig: 32, 28 + xy: 412, 1800 + size: 277, 240 + orig: 277, 240 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/River-BottomRight +TileSets/Default/Hexagon rotate: false - xy: 1990, 788 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/Default/road - rotate: false - xy: 1816, 1843 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/road - rotate: false - xy: 1816, 1843 - size: 61, 11 - orig: 61, 11 + xy: 412, 1800 + size: 277, 240 + orig: 277, 240 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad @@ -2141,7 +2092,7 @@ TileSets/FantasyHex/Tiles/Academy index: -1 TileSets/FantasyHex/Tiles/Academy-Snow rotate: false - xy: 976, 11 + xy: 1084, 11 size: 32, 35 orig: 32, 35 offset: 0, 0 @@ -2176,7 +2127,7 @@ TileSets/FantasyHex/Tiles/Ancient ruins-Sand index: -1 TileSets/FantasyHex/Tiles/Ancient ruins-Snow rotate: false - xy: 1674, 574 + xy: 1732, 574 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2190,924 +2141,966 @@ TileSets/FantasyHex/Tiles/Ancient ruins2 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 1056, 18 + xy: 1164, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bananas rotate: false - xy: 1096, 18 + xy: 1656, 480 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment rotate: false - xy: 2009, 1904 + xy: 1204, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment-Snow rotate: false - xy: 1616, 407 + xy: 2009, 1903 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barringer Crater rotate: false - xy: 1136, 18 + xy: 1616, 408 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle rotate: false - xy: 1576, 18 + xy: 1564, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle+Pasture rotate: false - xy: 1616, 14 + xy: 1696, 512 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cerro de Potosi rotate: false - xy: 1732, 596 + xy: 1696, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 1817, 1380 + xy: 1656, 328 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel-Snow rotate: false - xy: 1817, 1342 + xy: 1696, 366 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center rotate: false - xy: 1817, 1299 + xy: 1652, 285 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Ancient era rotate: false - xy: 1817, 1259 + xy: 1696, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Classical era rotate: false - xy: 1817, 1219 + xy: 1692, 286 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Future era rotate: false - xy: 1817, 1177 + xy: 1817, 1453 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Industrial era rotate: false - xy: 1813, 1136 + xy: 1817, 1412 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Information era rotate: false - xy: 1790, 1088 + xy: 1817, 1368 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Medieval era rotate: false - xy: 1790, 1048 + xy: 1817, 1328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Modern era rotate: false - xy: 1790, 1006 + xy: 1817, 1286 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Renaissance era rotate: false - xy: 1790, 966 + xy: 1817, 1246 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1790, 930 + xy: 1817, 1210 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coal rotate: false - xy: 1790, 858 + xy: 1813, 1138 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 1790, 822 + xy: 1790, 1096 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cotton rotate: false - xy: 1857, 1412 + xy: 1790, 878 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 1897, 1405 + xy: 1790, 799 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer rotate: false - xy: 1937, 1448 + xy: 1790, 763 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer+Camp rotate: false - xy: 1857, 1342 + xy: 1790, 727 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1897, 1369 + xy: 1790, 691 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1937, 1412 + xy: 1790, 655 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1977, 1448 + xy: 1790, 619 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes rotate: false - xy: 1937, 1376 + xy: 1897, 1448 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes+Plantation rotate: false - xy: 1977, 1412 + xy: 1857, 1376 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/El Dorado rotate: false - xy: 1857, 1269 + xy: 1897, 1411 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fallout rotate: false - xy: 1897, 1290 + xy: 1937, 1441 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fish rotate: false - xy: 1937, 1340 + xy: 1857, 1340 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 1977, 1376 + xy: 1897, 1375 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Flood plains rotate: false - xy: 1857, 1233 + xy: 1937, 1405 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Forest rotate: false - xy: 1937, 1300 + xy: 1857, 1300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 1977, 1335 + xy: 1897, 1334 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fountain of Youth rotate: false - xy: 1857, 1193 + xy: 1937, 1365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs rotate: false - xy: 1937, 1264 + xy: 1857, 1264 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs+Camp rotate: false - xy: 1977, 1299 + xy: 1897, 1298 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gems rotate: false - xy: 1897, 1182 + xy: 1897, 1262 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gold Ore rotate: false - xy: 1937, 1192 + xy: 1937, 1293 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 1977, 1187 + xy: 1977, 1336 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 1857, 1157 + xy: 1857, 1192 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 1897, 1146 + xy: 1897, 1226 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 1937, 1153 + xy: 1937, 1254 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Deer+Camp rotate: false - xy: 1977, 1148 + xy: 1977, 1297 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Furs+Camp rotate: false - xy: 1656, 499 + xy: 1977, 1258 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 1656, 460 + xy: 1897, 1187 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Farm rotate: false - xy: 1656, 424 + xy: 1937, 1218 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Camp rotate: false - xy: 1656, 388 + xy: 1977, 1222 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Lumber mill rotate: false - xy: 1656, 352 + xy: 1937, 1182 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Trading post rotate: false - xy: 1714, 560 + xy: 1977, 1186 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1714, 520 + xy: 1857, 1152 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/GrasslandForest rotate: false - xy: 1696, 481 + xy: 1897, 1148 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1696, 370 + xy: 1644, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1754, 556 + xy: 1776, 534 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillForest+Lumber mill rotate: false - xy: 1754, 520 + xy: 1776, 498 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMarbleQuarry rotate: false - xy: 1736, 484 + xy: 1776, 462 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMine rotate: false - xy: 1736, 448 + xy: 1776, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillStoneQuarry rotate: false - xy: 1736, 412 + xy: 1776, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 1794, 560 + xy: 1776, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses+Pasture rotate: false - xy: 1794, 520 + xy: 1772, 278 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ice rotate: false - xy: 1776, 411 + xy: 1830, 1029 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 1776, 303 + xy: 1830, 921 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense+Plantation rotate: false - xy: 1816, 484 + xy: 1830, 885 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 1816, 412 + xy: 1830, 813 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 1816, 340 + xy: 1830, 741 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory+Camp rotate: false - xy: 1816, 304 + xy: 1830, 705 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Jungle rotate: false - xy: 1830, 1009 + xy: 1830, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 1830, 860 + xy: 1664, 127 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1830, 788 + xy: 1664, 55 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1830, 672 + xy: 1714, 242 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1874, 517 + xy: 1744, 159 size: 32, 39 orig: 32, 39 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1856, 445 + xy: 1744, 87 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marsh rotate: false - xy: 1856, 372 + xy: 1794, 241 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1896, 445 + xy: 1784, 97 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1896, 336 + xy: 1764, 14 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1870, 1000 + xy: 1824, 95 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1870, 956 + xy: 1824, 51 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oasis rotate: false - xy: 1870, 740 + xy: 1816, 449 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1870, 704 + xy: 1816, 413 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Offshore Platform rotate: false - xy: 1910, 1074 + xy: 1816, 377 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1910, 1038 + xy: 1816, 341 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1910, 1002 + xy: 1816, 305 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1910, 962 + xy: 1856, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1910, 850 + xy: 1856, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1910, 778 + xy: 1856, 369 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1973, 1112 + xy: 1870, 1076 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1950, 1074 + xy: 1870, 1040 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1950, 1034 + xy: 1870, 1000 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1950, 994 + xy: 1870, 960 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1950, 954 + xy: 1870, 920 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsForest rotate: false - xy: 1950, 914 + xy: 1870, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsJungle rotate: false - xy: 1950, 874 + xy: 1870, 840 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1950, 838 + xy: 1870, 804 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 1950, 802 + xy: 1870, 768 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1950, 766 + xy: 1870, 732 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 1950, 730 + xy: 1870, 696 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1990, 1040 + xy: 1910, 1107 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1990, 1004 + xy: 1910, 1071 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1990, 968 + xy: 1910, 1035 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-Bottom + rotate: false + xy: 1910, 927 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-Bottom + rotate: false + xy: 1910, 927 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-BottomLeft + rotate: false + xy: 1910, 891 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-BottomLeft + rotate: false + xy: 1910, 891 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-BottomRight + rotate: false + xy: 1910, 855 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-BottomRight + rotate: false + xy: 1910, 855 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1990, 748 + xy: 1910, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1990, 640 + xy: 1910, 598 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep+Pasture rotate: false - xy: 1656, 14 + xy: 1896, 558 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 1816, 268 + xy: 1896, 449 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk+Plantation rotate: false - xy: 1732, 231 + xy: 1896, 413 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1772, 231 + xy: 1896, 377 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow rotate: false - xy: 1932, 622 + xy: 1936, 562 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow+Farm rotate: false - xy: 1816, 232 + xy: 1936, 526 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 1896, 228 + xy: 1936, 454 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices+Plantation rotate: false - xy: 1732, 195 + xy: 1936, 418 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1772, 195 + xy: 1936, 382 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 1852, 190 + xy: 1936, 312 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar+Plantation rotate: false - xy: 1812, 162 + xy: 1950, 1078 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Terrace farm rotate: false - xy: 1892, 120 + xy: 1950, 934 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Trading post rotate: false - xy: 2012, 604 + xy: 1950, 862 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1972, 568 + xy: 1950, 754 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Farm rotate: false - xy: 2012, 568 + xy: 1950, 718 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1624, 155 + xy: 1950, 678 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs rotate: false - xy: 1624, 115 + xy: 1950, 638 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Deer+Camp rotate: false - xy: 1914, 582 + xy: 1950, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1914, 542 + xy: 1990, 1074 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/TundraForest rotate: false - xy: 1954, 528 + xy: 1990, 1034 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1936, 492 + xy: 1990, 962 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 1936, 314 + xy: 1990, 784 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales+Fishing Boats rotate: false - xy: 1936, 278 + xy: 1990, 748 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 1936, 242 + xy: 1990, 712 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1936, 206 + xy: 1990, 676 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine+Plantation rotate: false - xy: 1976, 492 + xy: 1990, 640 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1972, 604 + xy: 1950, 898 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3121,35 +3114,35 @@ TileSets/FantasyHex/Units/African Forest Elephant index: -1 TileSets/FantasyHex/Units/Anti-Aircraft Gun rotate: false - xy: 1732, 632 + xy: 325, 1171 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Tank Gun rotate: false - xy: 325, 1171 + xy: 1124, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archer rotate: false - xy: 1016, 18 + xy: 2009, 1976 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Artillery rotate: false - xy: 2009, 1976 + xy: 1616, 480 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Atlatlist rotate: false - xy: 1616, 480 + xy: 1656, 516 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3170,830 +3163,844 @@ TileSets/FantasyHex/Units/Ballista index: -1 TileSets/FantasyHex/Units/Battering Ram rotate: false - xy: 2009, 1868 + xy: 1656, 444 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battleship rotate: false - xy: 2009, 1832 + xy: 1244, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bazooka rotate: false - xy: 1616, 371 + xy: 2009, 1867 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berber Cavalry rotate: false - xy: 1176, 18 + xy: 1616, 372 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berserker rotate: false - xy: 1616, 335 + xy: 1656, 408 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bowman rotate: false - xy: 1216, 18 + xy: 1284, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Brute rotate: false - xy: 1256, 18 + xy: 1616, 336 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Camel Archer rotate: false - xy: 1296, 17 + xy: 1656, 371 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cannon rotate: false - xy: 1336, 18 + xy: 1324, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 1376, 18 + xy: 1364, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Carolean rotate: false - xy: 1416, 18 + xy: 1404, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Carrier rotate: false - xy: 1456, 18 + xy: 1444, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cataphract rotate: false - xy: 1496, 18 + xy: 1484, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Catapult rotate: false - xy: 1536, 18 + xy: 1524, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cavalry rotate: false - xy: 1674, 538 + xy: 1604, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chariot Archer rotate: false - xy: 1817, 1459 + xy: 1696, 440 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 1817, 1423 + xy: 1696, 404 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 1790, 894 + xy: 1817, 1174 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Comanche Rider rotate: false - xy: 1790, 785 + xy: 1790, 1059 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 1790, 748 + xy: 1790, 1022 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Composite Bowman rotate: false - xy: 1790, 712 + xy: 1790, 986 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1790, 676 + xy: 1790, 950 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1857, 1448 + xy: 1790, 914 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1897, 1448 + xy: 1790, 842 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 1857, 1378 + xy: 2009, 1833 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 1857, 1306 + xy: 1857, 1448 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Dromon rotate: false - xy: 1897, 1333 + xy: 1857, 1412 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 1897, 1254 + xy: 1977, 1448 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 1897, 1218 + xy: 1977, 1412 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 1937, 1228 + xy: 1937, 1329 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 1977, 1263 + xy: 1977, 1376 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 1977, 1227 + xy: 1857, 1228 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Admiral rotate: false - xy: 1696, 442 + xy: 1937, 1143 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1696, 406 + xy: 1977, 1150 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1696, 334 + xy: 1634, 240 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Galleass rotate: false - xy: 1656, 316 + xy: 1624, 204 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1652, 277 + xy: 1624, 165 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1696, 298 + xy: 1624, 129 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Musician rotate: false - xy: 1853, 1121 + xy: 1772, 574 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Prophet rotate: false - xy: 1893, 1110 + xy: 1736, 538 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1692, 262 + xy: 1736, 502 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1652, 241 + xy: 1736, 466 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Writer rotate: false - xy: 1692, 226 + xy: 1736, 430 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hakkapeliitta rotate: false - xy: 1772, 632 + xy: 1736, 394 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Helicopter Gunship rotate: false - xy: 1772, 596 + xy: 1736, 358 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1736, 376 + xy: 1736, 322 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horse Archer rotate: false - xy: 1736, 340 + xy: 1776, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1736, 304 + xy: 1732, 286 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hussar rotate: false - xy: 1776, 483 + xy: 1830, 1101 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1776, 447 + xy: 1830, 1065 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Immortal rotate: false - xy: 1776, 375 + xy: 1830, 993 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Impi rotate: false - xy: 1776, 339 + xy: 1830, 957 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1816, 448 + xy: 1830, 849 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1816, 376 + xy: 1830, 777 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1830, 1085 + xy: 1830, 669 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1830, 1049 + xy: 1830, 633 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1830, 973 + xy: 1977, 1114 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1830, 934 + xy: 1664, 201 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1830, 898 + xy: 1664, 165 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Kris Swordsman rotate: false - xy: 1830, 824 + xy: 1664, 91 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1830, 752 + xy: 1684, 19 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1830, 716 + xy: 1674, 249 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1812, 636 + xy: 1704, 206 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1812, 600 + xy: 1704, 170 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1852, 636 + xy: 1704, 134 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1852, 600 + xy: 1704, 98 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1834, 564 + xy: 1704, 62 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1834, 528 + xy: 1754, 242 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1874, 564 + xy: 1744, 206 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1856, 481 + xy: 1744, 123 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1856, 409 + xy: 1744, 51 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1856, 336 + xy: 1784, 205 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mehal Sefari rotate: false - xy: 1856, 300 + xy: 1784, 169 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Merchant Of Venice rotate: false - xy: 1896, 481 + xy: 1784, 133 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1896, 409 + xy: 1784, 61 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Missile Cruiser rotate: false - xy: 1896, 373 + xy: 1724, 15 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mobile SAM rotate: false - xy: 1896, 300 + xy: 1824, 205 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Modern Armor rotate: false - xy: 1870, 1074 + xy: 1824, 169 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1870, 1038 + xy: 1824, 133 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1870, 920 + xy: 1804, 15 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1870, 884 + xy: 1844, 15 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1870, 848 + xy: 1816, 557 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Nau rotate: false - xy: 1870, 812 + xy: 1816, 521 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1870, 776 + xy: 1816, 485 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1910, 926 + xy: 1856, 517 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1910, 890 + xy: 1856, 481 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pathfinder rotate: false - xy: 1910, 814 + xy: 1856, 405 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1910, 742 + xy: 1856, 333 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pictish Warrior rotate: false - xy: 1910, 706 + xy: 1856, 297 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1933, 1110 + xy: 1870, 1112 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pracinha rotate: false - xy: 1950, 694 + xy: 1870, 660 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Privateer rotate: false - xy: 1990, 1076 + xy: 1870, 624 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Quinquereme rotate: false - xy: 1990, 932 + xy: 1910, 999 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1990, 896 + xy: 1910, 963 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1990, 712 + xy: 1910, 779 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Samurai rotate: false - xy: 1990, 676 + xy: 1910, 743 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1910, 670 + xy: 1910, 707 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sea Beggar rotate: false - xy: 1950, 658 + xy: 1910, 671 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1892, 633 + xy: 1910, 634 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1736, 267 + xy: 1896, 521 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Siege Tower rotate: false - xy: 1776, 267 + xy: 1896, 485 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1856, 262 + xy: 1896, 339 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1896, 264 + xy: 1896, 303 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1856, 226 + xy: 1936, 490 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1812, 198 + xy: 1936, 348 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1852, 154 + xy: 1950, 1042 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1896, 192 + xy: 1950, 1006 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1892, 156 + xy: 1950, 970 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1932, 156 + xy: 1950, 826 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1932, 120 + xy: 1950, 790 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1994, 532 + xy: 1990, 998 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1936, 456 + xy: 1990, 926 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1936, 420 + xy: 1990, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1936, 384 + xy: 1990, 854 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1936, 350 + xy: 1990, 820 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Winged Hussar rotate: false - xy: 1976, 456 + xy: 1990, 604 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1976, 420 + xy: 1976, 562 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1976, 384 + xy: 1976, 526 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 +TileSets/FantasyHex/road + rotate: false + xy: 1816, 1843 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +TileSets/Default/road + rotate: false + xy: 1816, 1843 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 UnitPromotionIcons/Accuracy rotate: false xy: 644, 1094 @@ -4010,21 +4017,21 @@ UnitPromotionIcons/Air Repair index: -1 UnitPromotionIcons/Air Targeting rotate: false - xy: 1034, 54 + xy: 1142, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting rotate: false - xy: 1034, 54 + xy: 1142, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush rotate: false - xy: 1092, 54 + xy: 1200, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4052,189 +4059,189 @@ UnitPromotionIcons/Barrage index: -1 UnitPromotionIcons/Besiege rotate: false - xy: 1266, 54 + xy: 1374, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 1266, 54 + xy: 1374, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz rotate: false - xy: 1324, 54 + xy: 1432, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding Party rotate: false - xy: 1382, 54 + xy: 1490, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 1440, 54 + xy: 1548, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge rotate: false - xy: 1498, 54 + xy: 220, 9 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal Raider rotate: false - xy: 278, 9 + xy: 394, 9 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Cover rotate: false - xy: 510, 14 + xy: 626, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 510, 14 + xy: 626, 14 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 1874, 1774 + xy: 1932, 1774 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 1932, 1774 + xy: 1932, 1716 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1874, 1658 + xy: 1874, 1600 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1874, 1658 + xy: 1874, 1600 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Flight Deck rotate: false - xy: 1874, 1600 + xy: 1932, 1600 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Formation rotate: false - xy: 1932, 1658 + xy: 1874, 1542 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Great Generals rotate: false - xy: 1874, 1484 + xy: 1600, 1480 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Quick Study rotate: false - xy: 1874, 1484 + xy: 1600, 1480 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Haka War Dance rotate: false - xy: 1932, 1484 + xy: 1658, 1480 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Heal Instantly rotate: false - xy: 1600, 1480 + xy: 1716, 1480 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect Fire rotate: false - xy: 1716, 1480 + xy: 1585, 1364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Interception rotate: false - xy: 1585, 1364 + xy: 1585, 1306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics rotate: false - xy: 1701, 1422 + xy: 1643, 1306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/March rotate: false - xy: 1643, 1306 + xy: 1643, 1248 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 1701, 1364 + xy: 1701, 1306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility rotate: false - xy: 1581, 1132 + xy: 1697, 1132 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Morale rotate: false - xy: 1697, 1132 + xy: 1990, 1716 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Rejuvenation rotate: false - xy: 1616, 1016 + xy: 1732, 1074 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4255,7 +4262,7 @@ UnitPromotionIcons/Sentry index: -1 UnitPromotionIcons/Shock rotate: false - xy: 1732, 1016 + xy: 1674, 900 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4269,14 +4276,14 @@ UnitPromotionIcons/Slinger Withdraw index: -1 UnitPromotionIcons/Sortie rotate: false - xy: 1732, 958 + xy: 1674, 842 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Supply rotate: false - xy: 1732, 900 + xy: 1674, 784 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4290,21 +4297,21 @@ UnitPromotionIcons/Survivalism index: -1 UnitPromotionIcons/Volley rotate: false - xy: 1732, 726 + xy: 1674, 610 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack rotate: false - xy: 1674, 610 + xy: 1732, 610 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman rotate: false - xy: 1732, 668 + xy: 1674, 552 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 70e24a0437..8432809070 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index b25acbcc7f..e0b5da68e0 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -231,6 +231,8 @@ Your arrogant demands are in bad taste = Your use of nuclear weapons is disgusting! = # Requires translation! You have stolen our lands! = +# Requires translation! +You gave us units! = # Requires translation! Demands = @@ -1022,6 +1024,8 @@ Health = # Requires translation! Disband unit = # Requires translation! +Gift unit = +# Requires translation! Explore = # Requires translation! Stop exploration = diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 864abf34df..248249958d 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -124,6 +124,7 @@ You refused to stop settling cities near us = Ni vägrade sluta bygga städer n Your arrogant demands are in bad taste = Era arroganta krav är smaklösa Your use of nuclear weapons is disgusting! = Ert kärnvapensbruk är vidrigt! You have stolen our lands! = Ni har stulit vårt land! +You gave us units! = Ni har gett oss enheter! Demands = Krav Please don't settle new cities near us. = Var god och bygg inte nya städer nära oss. @@ -540,6 +541,7 @@ Found city = Grunda stad Promote = Befordra Health = Hälsa Disband unit = Hemförlova enhet +Gift unit = Skänk enhet Explore = Utforska Stop exploration = Avsluta utforskning Pillage = Plundra diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 157eee334f..9b53cc9521 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -124,6 +124,7 @@ You refused to stop settling cities near us = Your arrogant demands are in bad taste = Your use of nuclear weapons is disgusting! = You have stolen our lands! = +You gave us units! = Demands = Please don't settle new cities near us. = @@ -541,6 +542,7 @@ Found city = Promote = Health = Disband unit = +Gift unit = Explore = Stop exploration = Pillage = diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 2d41d7c498..469f36f722 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -57,7 +57,8 @@ enum class DiplomaticModifiers{ DeclaredFriendshipWithOurAllies, DenouncedOurEnemies, OpenBorders, - FulfilledPromiseToNotSettleCitiesNearUs + FulfilledPromiseToNotSettleCitiesNearUs, + GaveUsUnits } class DiplomacyManager() { @@ -486,6 +487,7 @@ class DiplomacyManager() { revertToZero(DiplomaticModifiers.DenouncedOurAllies, 1 / 4f) revertToZero(DiplomaticModifiers.DenouncedOurEnemies, 1 / 4f) revertToZero(DiplomaticModifiers.Denunciation, 1 / 8f) // That's personal, it'll take a long time to fade + revertToZero(DiplomaticModifiers.GaveUsUnits, 1 / 4f) setFriendshipBasedModifier() diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 206ac1d83b..c1d398c3ff 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -658,6 +658,17 @@ class MapUnit { .forEach { unit -> unit.destroy() } } + fun gift(recipient: CivilizationInfo) { + civInfo.removeUnit(this) + civInfo.updateViewableTiles() + // all transported units should be destroyed as well + currentTile.getUnits().filter { it.isTransported && isTransportTypeOf(it) } + .toList() // because we're changing the list + .forEach { unit -> unit.destroy() } + assignOwner(recipient) + recipient.updateViewableTiles() + } + fun removeFromTile() = currentTile.removeUnit(this) fun moveThroughTile(tile: TileInfo) { diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt index 821006c021..94d09b91c9 100644 --- a/core/src/com/unciv/models/UnitAction.kt +++ b/core/src/com/unciv/models/UnitAction.kt @@ -36,5 +36,6 @@ enum class UnitActionType(val value: String) { HurryWonder("Hurry Wonder"), ConductTradeMission("Conduct Trade Mission"), FoundReligion("Found a Religion"), - DisbandUnit("Disband unit") + DisbandUnit("Disband unit"), + GiftUnit("Gift unit") } \ No newline at end of file diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index c964394037..7642888773 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -430,6 +430,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { UnacceptableDemands -> "Your arrogant demands are in bad taste" UsedNuclearWeapons -> "Your use of nuclear weapons is disgusting!" StealingTerritory -> "You have stolen our lands!" + GaveUsUnits -> "You gave us units!" } text = text.tr() + " " if (modifier.value > 0) text += "+" diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 626188ff46..8cf16bf368 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -67,6 +67,7 @@ object UnitActions { addSpreadReligionActions(unit, actionList, tile) actionList += getImprovementConstructionActions(unit, tile) addDisbandAction(actionList, unit, worldScreen) + addGiftAction(unit, actionList, tile) return actionList } @@ -611,4 +612,42 @@ object UnitActions { // Can't pillage friendly tiles, just like you can't attack them - it's an 'act of war' thing return tileOwner == null || tileOwner == unit.civInfo || unit.civInfo.isAtWarWith(tileOwner) } + + private fun addGiftAction(unit: MapUnit, actionList: ArrayList, tile: TileInfo) { + val getGiftAction = getGiftAction(unit, tile) + if (getGiftAction != null) actionList += getGiftAction + } + + fun getGiftAction(unit: MapUnit, tile: TileInfo): UnitAction? { + val recipient = tile.getOwner() + // We need to be in another civs territory. + if (recipient == null || recipient.isCurrentPlayer()) return null + + // City States only take miliary units (and GPs for certain civs) + if (recipient.isCityState()) { + if (unit.isGreatPerson()) return null // Unless Sweden + else if (!unit.baseUnit().matchesFilter("Military")) return null + } + // If gifting to major civ they need to be friendly + else if (!tile.isFriendlyTerritory(unit.civInfo)) return null + + if (unit.currentMovement <= 0) + return UnitAction(UnitActionType.GiftUnit, uncivSound = UncivSound.Silent, action = null) + + val giftAction = { + if (recipient.isCityState()) { + if (unit.isGreatPerson()) + recipient.getDiplomacyManager(unit.civInfo).influence += 90 + else + recipient.getDiplomacyManager(unit.civInfo).influence += 5 + recipient.updateAllyCivForCityState() + } + else recipient.getDiplomacyManager(unit.civInfo).addModifier(DiplomaticModifiers.GaveUsUnits, 5f) + + unit.gift(recipient) + // UncivGame.Current.worldScreen.shouldUpdate = true + } + + return UnitAction(UnitActionType.GiftUnit, uncivSound = UncivSound.Silent, action = giftAction) + } } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index 0497d80385..c53c50464e 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -61,6 +61,7 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table() { "Stop exploration" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Stop"), 'x') "Pillage" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Pillage"), 'p') "Disband unit" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/DisbandUnit")) + "Gift unit" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Present")) else -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Star")) } }