diff --git a/android/Images/OtherIcons/ExclamationMark.png b/android/Images/OtherIcons/ExclamationMark.png new file mode 100644 index 0000000000..1ffbc0feb7 Binary files /dev/null and b/android/Images/OtherIcons/ExclamationMark.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index c56735c1d6..1084e341bc 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,21 +6,21 @@ filter: MipMapLinearLinear, MipMapLinearLinear repeat: none EmojiIcons/Culture rotate: false - xy: 1498, 1346 + xy: 760, 558 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Faith rotate: false - xy: 760, 376 + xy: 1672, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Food rotate: false - xy: 1788, 1346 + xy: 760, 268 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -34,7 +34,7 @@ EmojiIcons/Gold index: -1 EmojiIcons/Happiness rotate: false - xy: 818, 1130 + xy: 926, 1238 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -48,14 +48,14 @@ EmojiIcons/Production index: -1 EmojiIcons/Science rotate: false - xy: 1100, 1288 + xy: 876, 832 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 1100, 1230 + xy: 934, 948 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -118,119 +118,119 @@ ImprovementIcons/Customs house index: -1 ImprovementIcons/Farm rotate: false - xy: 112, 110 + xy: 220, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 220, 980 + xy: 220, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fort rotate: false - xy: 220, 440 + xy: 220, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Holy site rotate: false - xy: 1434, 1728 + xy: 1542, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 289, 1700 + xy: 397, 1700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 396, 1592 + xy: 298, 1484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 298, 1376 + xy: 406, 1484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 328, 728 + xy: 328, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 328, 620 + xy: 328, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 436, 944 + xy: 436, 836 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 436, 620 + xy: 436, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 504, 1592 + xy: 514, 1484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Polder rotate: false - xy: 514, 1484 + xy: 514, 1376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 544, 836 + xy: 544, 728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 622, 1398 + xy: 652, 1290 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 1486, 1512 + xy: 1486, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1702, 1512 + xy: 1702, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -307,175 +307,175 @@ NationIcons/England index: -1 NationIcons/France rotate: false - xy: 220, 224 + xy: 220, 116 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Germany rotate: false - xy: 678, 1722 + xy: 786, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Greece rotate: false - xy: 1002, 1728 + xy: 1110, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Inca rotate: false - xy: 1866, 1728 + xy: 220, 8 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/India rotate: false - xy: 786, 1620 + xy: 894, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Iroquois rotate: false - xy: 1002, 1620 + xy: 1110, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Japan rotate: false - xy: 1326, 1620 + xy: 1434, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Korea rotate: false - xy: 1758, 1620 + xy: 1866, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Mongolia rotate: false - xy: 328, 404 + xy: 328, 296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Persia rotate: false - xy: 436, 188 + xy: 436, 80 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Polynesia rotate: false - xy: 514, 1376 + xy: 612, 1614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 652, 1290 + xy: 652, 1182 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 652, 1182 + xy: 652, 1074 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Siam rotate: false - xy: 652, 210 + xy: 652, 102 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Songhai rotate: false - xy: 838, 1404 + xy: 946, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Spain rotate: false - xy: 946, 1512 + xy: 946, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Sweden rotate: false - xy: 1270, 1404 + xy: 1378, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Huns rotate: false - xy: 1486, 1404 + xy: 1594, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Netherlands rotate: false - xy: 1594, 1512 + xy: 1594, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 1594, 1404 + xy: 1702, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 976, 1346 + xy: 760, 1022 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/ArrowLeft rotate: false - xy: 1974, 1701 + xy: 760, 964 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/ArrowRight rotate: false - xy: 760, 1014 + xy: 1974, 1701 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 760, 1014 + xy: 1974, 1701 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 1092, 1346 + xy: 868, 1122 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -489,14 +489,14 @@ OtherIcons/Banner index: -1 OtherIcons/Border-inner rotate: false - xy: 1436, 951 + xy: 984, 1125 size: 31, 15 orig: 31, 15 offset: 0, 0 index: -1 OtherIcons/Border-outer rotate: false - xy: 1036, 587 + xy: 1134, 332 size: 31, 15 orig: 31, 15 offset: 0, 0 @@ -566,14 +566,21 @@ OtherIcons/DisbandUnit index: -1 OtherIcons/Down rotate: false - xy: 1556, 1346 + xy: 760, 500 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 +OtherIcons/ExclamationMark + rotate: false + xy: 112, 326 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 OtherIcons/Fire rotate: false - xy: 220, 1196 + xy: 220, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -601,182 +608,182 @@ TileSets/FantasyHex/Hexagon index: -1 OtherIcons/Link rotate: false - xy: 818, 666 + xy: 818, 732 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 397, 1700 + xy: 288, 1592 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Lock rotate: false - xy: 288, 1592 + xy: 396, 1592 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 406, 1484 + xy: 406, 1376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Maritime rotate: false - xy: 328, 1268 + xy: 328, 1160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 328, 1052 + xy: 328, 944 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mercantile rotate: false - xy: 328, 944 + xy: 328, 836 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Militaristic rotate: false - xy: 328, 836 + xy: 328, 728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 328, 512 + xy: 328, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 328, 188 + xy: 328, 80 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 436, 1268 + xy: 436, 1160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 436, 836 + xy: 436, 728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pencil rotate: false - xy: 436, 404 + xy: 436, 296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 436, 296 + xy: 436, 188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 436, 80 + xy: 504, 1592 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Present rotate: false - xy: 544, 1160 + xy: 544, 1052 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 544, 944 + xy: 544, 836 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quest rotate: false - xy: 544, 728 + xy: 544, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 544, 620 + xy: 544, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Remove Heresy rotate: false - xy: 544, 188 + xy: 544, 80 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 622, 1506 + xy: 622, 1398 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Search rotate: false - xy: 652, 858 + xy: 652, 750 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/SecretOptions rotate: false - xy: 652, 750 + xy: 652, 642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Settings rotate: false - xy: 652, 642 + xy: 652, 534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 652, 426 + xy: 652, 318 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 838, 1512 + xy: 838, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -797,14 +804,14 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 1162, 1512 + xy: 1162, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 1270, 1512 + xy: 1270, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -818,7 +825,7 @@ OtherIcons/Triangle index: -1 OtherIcons/Up rotate: false - xy: 1274, 1230 + xy: 934, 774 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -839,168 +846,168 @@ PolicyIcons/Aesthetics index: -1 PolicyIcons/Aristocracy rotate: false - xy: 760, 1072 + xy: 868, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 1266, 1346 + xy: 760, 790 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 760, 782 + xy: 1266, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 760, 724 + xy: 1324, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Communism rotate: false - xy: 1382, 1346 + xy: 760, 674 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 760, 666 + xy: 1382, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Cultural Diplomacy rotate: false - xy: 760, 608 + xy: 1440, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 760, 550 + xy: 1498, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Educated Elite rotate: false - xy: 1614, 1346 + xy: 760, 442 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Fascism rotate: false - xy: 1730, 1346 + xy: 760, 326 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1846, 1346 + xy: 760, 210 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 760, 202 + xy: 1846, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 760, 144 + xy: 760, 152 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 818, 1014 + xy: 926, 1122 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 818, 782 + xy: 818, 848 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 818, 724 + xy: 818, 790 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 818, 550 + xy: 818, 616 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 818, 376 + xy: 818, 442 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Merchant Navy rotate: false - xy: 818, 318 + xy: 818, 384 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 818, 260 + xy: 818, 326 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 818, 202 + xy: 818, 268 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 818, 144 + xy: 818, 210 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 926, 1238 + xy: 818, 152 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 818, 86 + xy: 818, 94 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1084,91 +1091,91 @@ PolicyIcons/Reformation index: -1 PolicyIcons/Representation rotate: false - xy: 1962, 1295 + xy: 876, 1006 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 984, 1288 + xy: 876, 948 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scholasticism rotate: false - xy: 1042, 1288 + xy: 876, 890 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1158, 1288 + xy: 876, 774 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1274, 1288 + xy: 876, 658 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Socialism rotate: false - xy: 1448, 1288 + xy: 876, 484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1564, 1288 + xy: 876, 368 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1796, 1288 + xy: 876, 136 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 984, 1230 + xy: 934, 1064 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1042, 1230 + xy: 934, 1006 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/United Front rotate: false - xy: 1158, 1230 + xy: 934, 890 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1216, 1230 + xy: 934, 832 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1390, 1230 + xy: 934, 658 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1203,91 +1210,91 @@ ReligionIcons/Enhancer index: -1 ReligionIcons/Follower rotate: false - xy: 220, 764 + xy: 220, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Founder rotate: false - xy: 220, 332 + xy: 220, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Hinduism rotate: false - xy: 1326, 1728 + xy: 1434, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Islam rotate: false - xy: 1110, 1620 + xy: 1218, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Judaism rotate: false - xy: 1542, 1620 + xy: 1650, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Pantheon rotate: false - xy: 436, 728 + xy: 436, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Religion rotate: false - xy: 544, 404 + xy: 544, 296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Religious rotate: false - xy: 544, 404 + xy: 544, 296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Shinto rotate: false - xy: 652, 318 + xy: 652, 210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Sikhism rotate: false - xy: 652, 102 + xy: 730, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Taoism rotate: false - xy: 1378, 1512 + xy: 1378, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Tengriism rotate: false - xy: 1378, 1404 + xy: 1486, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ReligionIcons/Zoroastrianism rotate: false - xy: 868, 1296 + xy: 760, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1364,175 +1371,175 @@ ResourceIcons/Dyes index: -1 ResourceIcons/Fish rotate: false - xy: 220, 1088 + xy: 220, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 220, 116 + xy: 570, 1722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 570, 1722 + xy: 678, 1722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold Ore rotate: false - xy: 894, 1728 + xy: 1002, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 1542, 1728 + xy: 1650, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 220, 8 + xy: 786, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 894, 1620 + xy: 1002, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1218, 1620 + xy: 1326, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Jewelry rotate: false - xy: 1434, 1620 + xy: 1542, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 406, 1376 + xy: 328, 1268 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 436, 1052 + xy: 436, 944 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 436, 512 + xy: 436, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Porcelain rotate: false - xy: 544, 1268 + xy: 544, 1160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Salt rotate: false - xy: 652, 1074 + xy: 652, 966 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 652, 534 + xy: 652, 426 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 730, 1512 + xy: 730, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 730, 1404 + xy: 838, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1054, 1512 + xy: 1054, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1054, 1404 + xy: 1162, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1162, 1404 + xy: 1270, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Truffles rotate: false - xy: 1702, 1404 + xy: 1810, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1810, 1512 + xy: 1810, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1810, 1404 + xy: 760, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 760, 1296 + xy: 760, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 760, 1188 + xy: 868, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1560,105 +1567,105 @@ StatIcons/Culture index: -1 StatIcons/Faith rotate: false - xy: 112, 326 + xy: 112, 218 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 220, 656 + xy: 220, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 786, 1728 + xy: 894, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 1110, 1728 + xy: 1218, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/InterceptRange rotate: false - xy: 818, 898 + xy: 818, 964 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 298, 1484 + xy: 298, 1376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 612, 1614 + xy: 544, 1268 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 544, 1052 + xy: 544, 944 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Range rotate: false - xy: 744, 28 + xy: 744, 36 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 802, 28 + xy: 802, 36 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/ReligiousStrength rotate: false - xy: 544, 296 + xy: 544, 188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 544, 80 + xy: 622, 1506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 652, 966 + xy: 652, 858 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 946, 1404 + xy: 1054, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1622, 1288 + xy: 876, 310 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1679,91 +1686,91 @@ TileSets/Default/CityOverlay index: -1 TileSets/Default/FalloutOverlay rotate: false - xy: 112, 218 + xy: 112, 110 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Flood plainsOverlay rotate: false - xy: 220, 872 + xy: 220, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/ForestOverlay rotate: false - xy: 220, 548 + xy: 220, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/HillOverlay rotate: false - xy: 1218, 1728 + xy: 1326, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/IceOverlay rotate: false - xy: 1650, 1728 + xy: 1758, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/JungleOverlay rotate: false - xy: 1650, 1620 + xy: 1758, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/LakesOverlay rotate: false - xy: 1866, 1620 + xy: 289, 1700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 328, 1160 + xy: 328, 1052 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 328, 296 + xy: 328, 188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/NaturalWonderOverlay rotate: false - xy: 328, 80 + xy: 436, 1268 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 436, 1160 + xy: 436, 1052 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 544, 512 + xy: 544, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 544, 512 + xy: 544, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1777,21 +1784,21 @@ TileSets/Default/Road index: -1 TileSets/Default/Tiles/River-Bottom rotate: false - xy: 1476, 1154 + xy: 1054, 165 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/Default/Tiles/River-BottomLeft rotate: false - xy: 1236, 923 + xy: 1054, 93 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/Default/Tiles/River-BottomRight rotate: false - xy: 1276, 941 + xy: 1054, 57 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -1847,7 +1854,7 @@ TileSets/FantasyHex/Tiles/Aluminum index: -1 TileSets/FantasyHex/Tiles/Ancient ruins rotate: false - xy: 1854, 1310 + xy: 976, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -1861,1099 +1868,1099 @@ TileSets/FantasyHex/Tiles/Ancient ruins-Jungle index: -1 TileSets/FantasyHex/Tiles/Ancient ruins-Sand rotate: false - xy: 1564, 1252 + xy: 934, 506 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins-Snow rotate: false - xy: 908, 1202 + xy: 1016, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins2 rotate: false - xy: 868, 1202 + xy: 876, 100 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 170, 30 + xy: 934, 362 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bananas rotate: false - xy: 876, 1166 + xy: 1216, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment rotate: false - xy: 876, 1130 + xy: 934, 290 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment-Snow rotate: false - xy: 876, 1093 + xy: 934, 253 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barringer Crater rotate: false - xy: 876, 1057 + xy: 1256, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bison rotate: false - xy: 876, 841 + xy: 1376, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bison+Camp rotate: false - xy: 876, 805 + xy: 1416, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle rotate: false - xy: 876, 366 + xy: 170, 30 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle+Pasture rotate: false - xy: 876, 326 + xy: 984, 1270 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cerro de Potosi rotate: false - xy: 876, 254 + xy: 984, 1234 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 876, 139 + xy: 984, 1191 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel-Snow rotate: false - xy: 876, 101 + xy: 1024, 1200 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citrus rotate: false - xy: 916, 1166 + xy: 1104, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citrus+Plantation rotate: false - xy: 916, 1130 + xy: 1064, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center rotate: false - xy: 916, 1087 + xy: 984, 1148 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Ancient era rotate: false - xy: 916, 1047 + xy: 1024, 1160 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Atomic era rotate: false - xy: 916, 1005 + xy: 1064, 1196 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Classical era rotate: false - xy: 916, 965 + xy: 1104, 1234 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Future era rotate: false - xy: 916, 923 + xy: 1144, 1268 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Industrial era rotate: false - xy: 916, 882 + xy: 1184, 1269 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Information era rotate: false - xy: 916, 838 + xy: 1224, 1266 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Medieval era rotate: false - xy: 916, 798 + xy: 1264, 1270 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Modern era rotate: false - xy: 916, 756 + xy: 1304, 1268 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Renaissance era rotate: false - xy: 916, 716 + xy: 1344, 1270 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 916, 680 + xy: 1064, 1160 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coal rotate: false - xy: 916, 608 + xy: 1144, 1232 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 916, 572 + xy: 1184, 1233 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cocoa rotate: false - xy: 916, 536 + xy: 1384, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cocoa+Plantation rotate: false - xy: 916, 500 + xy: 1104, 1162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Copper rotate: false - xy: 916, 318 + xy: 1424, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cotton rotate: false - xy: 916, 246 + xy: 1224, 1194 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Crab rotate: false - xy: 916, 210 + xy: 1264, 1198 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 916, 97 + xy: 1384, 1231 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer rotate: false - xy: 918, 61 + xy: 1424, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer+Camp rotate: false - xy: 918, 25 + xy: 1464, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1564, 1216 + xy: 1304, 1196 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1604, 1216 + xy: 1344, 1200 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1644, 1216 + xy: 1144, 1159 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes rotate: false - xy: 1764, 1216 + xy: 1264, 1162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes+Plantation rotate: false - xy: 1804, 1216 + xy: 1304, 1160 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/El Dorado rotate: false - xy: 1844, 1237 + xy: 1344, 1163 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fallout rotate: false - xy: 1844, 1194 + xy: 1384, 1188 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fish rotate: false - xy: 1894, 1258 + xy: 1424, 1202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 1884, 1222 + xy: 1464, 1202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Flood plains rotate: false - xy: 1884, 1186 + xy: 1384, 1152 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Forest rotate: false - xy: 1974, 1255 + xy: 1464, 1162 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 1924, 1217 + xy: 974, 501 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fountain of Youth rotate: false - xy: 1924, 1177 + xy: 974, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs rotate: false - xy: 1964, 1183 + xy: 974, 389 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs+Camp rotate: false - xy: 2004, 1219 + xy: 974, 353 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gems rotate: false - xy: 956, 1158 + xy: 974, 209 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gold Ore rotate: false - xy: 956, 1083 + xy: 974, 134 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 956, 1043 + xy: 934, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 956, 1007 + xy: 974, 98 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 956, 971 + xy: 1424, 1130 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 956, 932 + xy: 1464, 1123 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Deer+Camp rotate: false - xy: 956, 893 + xy: 860, 55 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Furs+Camp rotate: false - xy: 956, 854 + xy: 860, 16 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 956, 815 + xy: 1344, 1124 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Truffles+Camp rotate: false - xy: 956, 776 + xy: 1384, 1113 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Farm rotate: false - xy: 956, 740 + xy: 1424, 1094 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Camp rotate: false - xy: 956, 704 + xy: 1464, 1087 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Lumber mill rotate: false - xy: 956, 668 + xy: 1896, 1294 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Trading post rotate: false - xy: 956, 632 + xy: 1936, 1294 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 956, 592 + xy: 1976, 1313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/GrasslandForest rotate: false - xy: 956, 553 + xy: 1976, 1274 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 956, 442 + xy: 1104, 1126 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 996, 1154 + xy: 900, 60 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillForest+Lumber mill rotate: false - xy: 1036, 1194 + xy: 900, 24 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMarbleQuarry rotate: false - xy: 1036, 1158 + xy: 1576, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMine rotate: false - xy: 996, 1118 + xy: 1616, 1268 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillStoneQuarry rotate: false - xy: 1076, 1194 + xy: 1656, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Holy site rotate: false - xy: 996, 1074 + xy: 1696, 1266 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 996, 1038 + xy: 1856, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses+Pasture rotate: false - xy: 1036, 1082 + xy: 1896, 1254 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ice rotate: false - xy: 1156, 1194 + xy: 1936, 1221 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 1076, 1085 + xy: 1696, 1230 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense+Plantation rotate: false - xy: 1156, 1158 + xy: 1736, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 996, 966 + xy: 1856, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 1076, 1049 + xy: 1936, 1185 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory+Camp rotate: false - xy: 1196, 1158 + xy: 1976, 1166 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Jungle rotate: false - xy: 1236, 1190 + xy: 1816, 1198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 1116, 1048 + xy: 1936, 1147 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1196, 1122 + xy: 1976, 1130 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 996, 886 + xy: 992, 1077 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1236, 1107 + xy: 992, 778 size: 32, 39 orig: 32, 39 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1316, 1158 + xy: 992, 706 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marsh rotate: false - xy: 1036, 898 + xy: 992, 633 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1196, 1050 + xy: 1032, 1049 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1276, 1085 + xy: 1032, 904 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1076, 903 + xy: 1032, 758 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Kailash rotate: false - xy: 1116, 936 + xy: 1032, 718 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Sinai rotate: false - xy: 1156, 974 + xy: 1032, 678 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1196, 1006 + xy: 1032, 634 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oasis rotate: false - xy: 1316, 1086 + xy: 1072, 944 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1036, 826 + xy: 1072, 908 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Offshore Platform rotate: false - xy: 1076, 867 + xy: 1072, 872 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1116, 900 + xy: 1072, 836 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1156, 938 + xy: 1072, 800 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1196, 966 + xy: 1072, 760 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 996, 738 + xy: 1072, 648 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1436, 1158 + xy: 1072, 576 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1036, 790 + xy: 1014, 454 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1076, 831 + xy: 1014, 418 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1116, 860 + xy: 1014, 378 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1156, 898 + xy: 1014, 338 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1196, 926 + xy: 1014, 298 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsForest rotate: false - xy: 1476, 1190 + xy: 1014, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsJungle rotate: false - xy: 1236, 959 + xy: 1014, 218 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 996, 702 + xy: 1014, 182 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 1276, 977 + xy: 1014, 146 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1436, 1122 + xy: 1014, 110 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 1316, 1013 + xy: 1054, 489 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1036, 754 + xy: 1054, 381 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1076, 795 + xy: 1054, 345 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1116, 824 + xy: 1054, 309 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1516, 1194 + xy: 1054, 201 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 1516, 1158 + xy: 1054, 129 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 996, 666 + xy: 1014, 74 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1316, 973 + xy: 1504, 1269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Salt rotate: false - xy: 1396, 1050 + xy: 1504, 1197 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1156, 826 + xy: 1184, 1088 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep+Pasture rotate: false - xy: 1196, 850 + xy: 1224, 1079 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 1236, 887 + xy: 1344, 1052 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk+Plantation rotate: false - xy: 996, 630 + xy: 1384, 1041 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1276, 905 + xy: 1424, 1022 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow rotate: false - xy: 1396, 1014 + xy: 1544, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow+Farm rotate: false - xy: 1436, 1050 + xy: 1544, 1202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 1076, 723 + xy: 1544, 1130 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices+Plantation rotate: false - xy: 1116, 751 + xy: 1544, 1094 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sri Pada rotate: false - xy: 1156, 786 + xy: 1544, 1054 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1196, 814 + xy: 1544, 1018 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 1516, 1086 + xy: 1544, 982 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar+Plantation rotate: false - xy: 1236, 851 + xy: 1112, 1087 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Terrace farm rotate: false - xy: 1356, 942 + xy: 1112, 943 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Trading post rotate: false - xy: 1436, 1014 + xy: 1112, 871 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Truffles rotate: false - xy: 1116, 715 + xy: 1112, 763 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Truffles+Camp rotate: false - xy: 1156, 750 + xy: 1112, 727 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1196, 778 + xy: 1112, 691 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Farm rotate: false - xy: 1476, 1047 + xy: 1112, 655 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1236, 811 + xy: 1112, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs rotate: false - xy: 996, 554 + xy: 1112, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Deer+Camp rotate: false - xy: 1276, 829 + xy: 1112, 535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1316, 859 + xy: 1094, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Truffles+Camp rotate: false - xy: 1356, 902 + xy: 1094, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/TundraForest rotate: false - xy: 1396, 938 + xy: 1094, 415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uluru rotate: false - xy: 1436, 974 + xy: 1094, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1036, 610 + xy: 1094, 303 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 1476, 1011 + xy: 1094, 125 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales+Fishing Boats rotate: false - xy: 1236, 775 + xy: 1094, 89 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 996, 518 + xy: 1094, 53 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1276, 793 + xy: 1134, 499 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine+Plantation rotate: false - xy: 1316, 823 + xy: 1134, 463 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1396, 978 + xy: 1112, 907 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2967,931 +2974,931 @@ TileSets/FantasyHex/Units/African Forest Elephant index: -1 TileSets/FantasyHex/Units/Anti-Aircraft Gun rotate: false - xy: 1604, 1252 + xy: 934, 470 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Tank Gun rotate: false - xy: 1644, 1252 + xy: 1056, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archaeologist rotate: false - xy: 1684, 1252 + xy: 934, 434 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archer rotate: false - xy: 1724, 1252 + xy: 1096, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Artillery rotate: false - xy: 1764, 1252 + xy: 934, 398 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Atlatlist rotate: false - xy: 1804, 1252 + xy: 1136, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Axe Thrower rotate: false - xy: 1854, 1274 + xy: 1176, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ballista rotate: false - xy: 1894, 1294 + xy: 934, 326 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battering Ram rotate: false - xy: 876, 1021 + xy: 934, 217 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battleship rotate: false - xy: 876, 985 + xy: 1296, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bazooka rotate: false - xy: 876, 949 + xy: 934, 181 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berber Cavalry rotate: false - xy: 876, 913 + xy: 1336, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berserker rotate: false - xy: 876, 877 + xy: 934, 145 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bowman rotate: false - xy: 876, 769 + xy: 1456, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Brute rotate: false - xy: 876, 733 + xy: 1496, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Camel Archer rotate: false - xy: 876, 696 + xy: 1536, 1309 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cannon rotate: false - xy: 876, 660 + xy: 1576, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Caravan rotate: false - xy: 876, 618 + xy: 1616, 1304 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 876, 582 + xy: 1656, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cargo Ship rotate: false - xy: 876, 546 + xy: 1696, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Carolean rotate: false - xy: 876, 510 + xy: 1736, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Carrier rotate: false - xy: 876, 474 + xy: 1776, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cataphract rotate: false - xy: 876, 438 + xy: 1816, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Catapult rotate: false - xy: 876, 402 + xy: 1856, 1310 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cavalry rotate: false - xy: 876, 290 + xy: 1024, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chariot Archer rotate: false - xy: 876, 218 + xy: 1064, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 876, 182 + xy: 1024, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 916, 644 + xy: 1104, 1198 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Comanche Rider rotate: false - xy: 916, 463 + xy: 1144, 1195 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 916, 426 + xy: 1184, 1196 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Composite Bowman rotate: false - xy: 916, 390 + xy: 1224, 1230 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 916, 354 + xy: 1264, 1234 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 916, 282 + xy: 1464, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 916, 174 + xy: 1304, 1232 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 916, 140 + xy: 1344, 1236 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 1684, 1216 + xy: 1184, 1160 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Dromon rotate: false - xy: 1724, 1216 + xy: 1224, 1158 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 1934, 1259 + xy: 1424, 1166 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 1964, 1219 + xy: 974, 425 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 2004, 1183 + xy: 974, 317 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 1964, 1147 + xy: 974, 281 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 2004, 1147 + xy: 974, 245 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Giant Death Robot rotate: false - xy: 956, 1119 + xy: 974, 170 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Admiral rotate: false - xy: 956, 514 + xy: 1024, 1121 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 956, 478 + xy: 1064, 1124 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 956, 406 + xy: 1144, 1123 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Galleass rotate: false - xy: 956, 370 + xy: 1184, 1124 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 956, 331 + xy: 1224, 1119 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 956, 295 + xy: 1264, 1126 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Musician rotate: false - xy: 956, 259 + xy: 1304, 1124 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Prophet rotate: false - xy: 956, 223 + xy: 1264, 1090 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 956, 187 + xy: 1304, 1088 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 956, 151 + xy: 1344, 1088 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Writer rotate: false - xy: 956, 115 + xy: 1384, 1077 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hakkapeliitta rotate: false - xy: 956, 1194 + xy: 1424, 1058 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Helicopter Gunship rotate: false - xy: 996, 1194 + xy: 1464, 1051 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1076, 1158 + xy: 1736, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horse Archer rotate: false - xy: 1036, 1122 + xy: 1776, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1116, 1194 + xy: 1816, 1274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hussar rotate: false - xy: 1076, 1121 + xy: 1936, 1257 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1116, 1158 + xy: 1976, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Immortal rotate: false - xy: 996, 1002 + xy: 1976, 1202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Impi rotate: false - xy: 1036, 1046 + xy: 1656, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1116, 1122 + xy: 1776, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Inquisitor rotate: false - xy: 1196, 1194 + xy: 1816, 1238 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1036, 1010 + xy: 1896, 1218 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1116, 1086 + xy: 1736, 1202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1156, 1122 + xy: 1776, 1202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 996, 930 + xy: 1856, 1202 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1036, 971 + xy: 1896, 1179 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1076, 1013 + xy: 1856, 1166 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Kris Swordsman rotate: false - xy: 1156, 1086 + xy: 1896, 1143 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1276, 1194 + xy: 1936, 1111 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1236, 1154 + xy: 1976, 1094 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1276, 1158 + xy: 992, 1041 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1036, 935 + xy: 992, 1005 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1076, 977 + xy: 992, 969 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1116, 1012 + xy: 992, 933 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1156, 1050 + xy: 992, 897 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1196, 1086 + xy: 992, 861 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1316, 1194 + xy: 992, 825 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 996, 850 + xy: 992, 742 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1276, 1122 + xy: 992, 670 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1076, 941 + xy: 992, 597 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mehal Sefari rotate: false - xy: 1116, 976 + xy: 992, 561 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Merchant Of Venice rotate: false - xy: 1156, 1014 + xy: 1032, 1085 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1356, 1194 + xy: 1032, 1013 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Missile Cruiser rotate: false - xy: 1236, 1071 + xy: 1032, 977 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Missionary rotate: false - xy: 996, 814 + xy: 1032, 941 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mobile SAM rotate: false - xy: 1356, 1158 + xy: 1032, 868 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Modern Armor rotate: false - xy: 1316, 1122 + xy: 1032, 832 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1036, 862 + xy: 1032, 796 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1396, 1194 + xy: 1032, 598 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1236, 1035 + xy: 1032, 562 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 996, 778 + xy: 1072, 1088 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Nau rotate: false - xy: 1276, 1049 + xy: 1072, 1052 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1396, 1158 + xy: 1072, 1016 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Nuclear Submarine rotate: false - xy: 1356, 1122 + xy: 1072, 980 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1436, 1194 + xy: 1072, 724 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1236, 999 + xy: 1072, 688 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pathfinder rotate: false - xy: 1276, 1013 + xy: 1072, 612 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1396, 1122 + xy: 1072, 540 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pictish Warrior rotate: false - xy: 1316, 1050 + xy: 1032, 526 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1356, 1086 + xy: 1014, 490 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pracinha rotate: false - xy: 1356, 1050 + xy: 1054, 453 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Privateer rotate: false - xy: 1396, 1086 + xy: 1054, 417 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Quinquereme rotate: false - xy: 1156, 862 + xy: 1054, 273 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1196, 890 + xy: 1054, 237 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1356, 1014 + xy: 1504, 1233 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Samurai rotate: false - xy: 1436, 1086 + xy: 1504, 1161 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1036, 718 + xy: 1504, 1125 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sea Beggar rotate: false - xy: 1076, 759 + xy: 1504, 1089 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1116, 787 + xy: 1504, 1052 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship Of The Line rotate: false - xy: 1476, 1117 + xy: 1264, 1053 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1476, 1117 + xy: 1264, 1053 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Siege Tower rotate: false - xy: 1516, 1122 + xy: 1304, 1052 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1316, 935 + xy: 1464, 1013 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1356, 978 + xy: 1504, 1016 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1036, 682 + xy: 1544, 1166 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1476, 1083 + xy: 1504, 982 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 996, 594 + xy: 1112, 1051 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1276, 869 + xy: 1112, 1015 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1316, 899 + xy: 1112, 979 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1036, 646 + xy: 1112, 835 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1076, 687 + xy: 1112, 799 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1516, 1050 + xy: 1094, 379 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1076, 651 + xy: 1094, 267 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1116, 679 + xy: 1094, 231 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1156, 714 + xy: 1094, 195 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1196, 744 + xy: 1094, 161 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Winged Hussar rotate: false - xy: 1356, 866 + xy: 1134, 427 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1396, 902 + xy: 1134, 391 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1516, 1014 + xy: 1134, 355 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3919,21 +3926,21 @@ UnitPromotionIcons/Accuracy index: -1 UnitPromotionIcons/Air Repair rotate: false - xy: 760, 1130 + xy: 868, 1238 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Air Targeting rotate: false - xy: 868, 1238 + xy: 976, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting rotate: false - xy: 868, 1238 + xy: 976, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -3968,112 +3975,112 @@ UnitPromotionIcons/Armor Plating index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 1974, 1643 + xy: 1092, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Besiege rotate: false - xy: 760, 956 + xy: 760, 906 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 760, 956 + xy: 760, 906 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz rotate: false - xy: 1150, 1346 + xy: 1974, 1643 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding Party rotate: false - xy: 760, 898 + xy: 1150, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 1208, 1346 + xy: 760, 848 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge rotate: false - xy: 760, 840 + xy: 1208, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal Raider rotate: false - xy: 1324, 1346 + xy: 760, 732 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Cover rotate: false - xy: 1440, 1346 + xy: 760, 616 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1440, 1346 + xy: 760, 616 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 760, 492 + xy: 1556, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 760, 434 + xy: 1614, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1672, 1346 + xy: 760, 384 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1672, 1346 + xy: 760, 384 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Flight Deck rotate: false - xy: 760, 318 + xy: 1730, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Formation rotate: false - xy: 760, 260 + xy: 1788, 1346 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4101,56 +4108,56 @@ UnitPromotionIcons/Haka War Dance index: -1 UnitPromotionIcons/Heal Instantly rotate: false - xy: 818, 1072 + xy: 926, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ignore terrain cost rotate: false - xy: 1758, 1728 + xy: 1866, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect Fire rotate: false - xy: 818, 956 + xy: 818, 1022 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Interception rotate: false - xy: 818, 840 + xy: 818, 906 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics rotate: false - xy: 818, 608 + xy: 818, 674 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/March rotate: false - xy: 818, 492 + xy: 818, 558 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 818, 434 + xy: 818, 500 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility rotate: false - xy: 760, 86 + xy: 760, 94 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4164,77 +4171,77 @@ UnitPromotionIcons/Morale index: -1 UnitPromotionIcons/Rejuvenation rotate: false - xy: 860, 28 + xy: 876, 1064 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting rotate: false - xy: 1216, 1288 + xy: 876, 716 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry rotate: false - xy: 1216, 1288 + xy: 876, 716 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 1332, 1288 + xy: 876, 600 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Slinger Withdraw rotate: false - xy: 1390, 1288 + xy: 876, 542 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sortie rotate: false - xy: 1506, 1288 + xy: 876, 426 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Supply rotate: false - xy: 1680, 1288 + xy: 876, 252 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Survivalism rotate: false - xy: 1738, 1288 + xy: 876, 194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Volley rotate: false - xy: 1332, 1230 + xy: 934, 716 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack rotate: false - xy: 1448, 1230 + xy: 934, 600 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman rotate: false - xy: 1506, 1230 + xy: 934, 542 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 6f0446f337..f329362827 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Civ V - Vanilla/Difficulties.json b/android/assets/jsons/Civ V - Vanilla/Difficulties.json index 6a0593a6f0..1537097f34 100644 --- a/android/assets/jsons/Civ V - Vanilla/Difficulties.json +++ b/android/assets/jsons/Civ V - Vanilla/Difficulties.json @@ -5,6 +5,8 @@ "extraHappinessPerLuxury": 1, "researchCostModifier": 0.9, "unitCostModifier": 0.5, + "unitSupplyBase": 10, + "unitSupplyPerCity": 3, "buildingCostModifier": 0.5, "policyCostModifier": 0.5, "unhappinessModifier": 0.4, @@ -16,6 +18,7 @@ "aiWonderCostModifier": 1.6, "aiBuildingMaintenanceModifier": 1, "aiUnitMaintenanceModifier": 1, + "aiUnitSupplyModifier": 0, "aiFreeTechs": [], "aiMajorCivBonusStartingUnits": [], "aiCityStateBonusStartingUnits": [], @@ -30,6 +33,8 @@ "extraHappinessPerLuxury": 1, "researchCostModifier": 0.95, "unitCostModifier": 0.67, + "unitSupplyBase": 7, + "unitSupplyPerCity": 3, "buildingCostModifier": 0.67, "policyCostModifier": 0.67, "unhappinessModifier": 0.6, @@ -41,6 +46,7 @@ "aiWonderCostModifier": 1.3, "aiBuildingMaintenanceModifier": 1, "aiUnitMaintenanceModifier": 1, + "aiUnitSupplyModifier": 0, "aiFreeTechs": [], "aiMajorCivBonusStartingUnits": [], "aiCityStateBonusStartingUnits": [], @@ -55,6 +61,8 @@ "extraHappinessPerLuxury": 0, "researchCostModifier": 1, "unitCostModifier": 0.85, + "unitSupplyBase": 7, + "unitSupplyPerCity": 2, "buildingCostModifier": 0.85, "policyCostModifier": 0.85, "unhappinessModifier": 0.75, @@ -66,6 +74,7 @@ "aiWonderCostModifier": 1.1, "aiBuildingMaintenanceModifier": 1, "aiUnitMaintenanceModifier": 1, + "aiUnitSupplyModifier": 0.1, "aiFreeTechs": [], "aiMajorCivBonusStartingUnits": [], "aiCityStateBonusStartingUnits": [], @@ -80,6 +89,8 @@ "extraHappinessPerLuxury": 0, "researchCostModifier": 1, "unitCostModifier": 1, + "unitSupplyBase": 5, + "unitSupplyPerCity": 2, "buildingCostModifier": 1, "policyCostModifier": 1, "unhappinessModifier": 1, @@ -91,6 +102,7 @@ "aiWonderCostModifier": 1, "aiBuildingMaintenanceModifier": 1, "aiUnitMaintenanceModifier": 0.85, + "aiUnitSupplyModifier": 0.2, "aiFreeTechs": [], "aiMajorCivBonusStartingUnits": [], "aiCityStateBonusStartingUnits": [], @@ -105,6 +117,8 @@ "extraHappinessPerLuxury": 0, "researchCostModifier": 1, "unitCostModifier": 1, + "unitSupplyBase": 5, + "unitSupplyPerCity": 2, "buildingCostModifier": 1, "policyCostModifier": 1, "unhappinessModifier": 1, @@ -116,6 +130,7 @@ "aiWonderCostModifier": 1, "aiBuildingMaintenanceModifier": 0.85, "aiUnitMaintenanceModifier": 0.8, + "aiUnitSupplyModifier": 0.3, "aiFreeTechs": ["Pottery"], "aiMajorCivBonusStartingUnits": ["Era Starting Unit"], "aiCityStateBonusStartingUnits": [], @@ -130,6 +145,8 @@ "extraHappinessPerLuxury": 0, "researchCostModifier": 1, "unitCostModifier": 1, + "unitSupplyBase": 5, + "unitSupplyPerCity": 2, "buildingCostModifier": 1, "policyCostModifier": 1, "unhappinessModifier": 1, @@ -141,6 +158,7 @@ "aiWonderCostModifier": 1, "aiBuildingMaintenanceModifier": 0.8, "aiUnitMaintenanceModifier": 0.75, + "aiUnitSupplyModifier": 0.3, "aiFreeTechs": ["Pottery","Animal Husbandry"], "aiMajorCivBonusStartingUnits": ["Era Starting Unit", "Scout"], "aiCityStateBonusStartingUnits": [], @@ -155,6 +173,8 @@ "extraHappinessPerLuxury": 0, "researchCostModifier": 1, "unitCostModifier": 1, + "unitSupplyBase": 5, + "unitSupplyPerCity": 2, "buildingCostModifier": 1, "policyCostModifier": 1, "unhappinessModifier": 1, @@ -166,6 +186,7 @@ "aiWonderCostModifier": 1, "aiBuildingMaintenanceModifier": 0.65, "aiUnitMaintenanceModifier": 0.65, + "aiUnitSupplyModifier": 0.4, "aiFreeTechs": ["Pottery","Animal Husbandry","Mining"], "aiMajorCivBonusStartingUnits": ["Worker", "Scout", "Era Starting Unit", "Era Starting Unit"], "aiCityStateBonusStartingUnits": [], @@ -180,6 +201,8 @@ "extraHappinessPerLuxury": 0, "researchCostModifier": 1, "unitCostModifier": 1, + "unitSupplyBase": 5, + "unitSupplyPerCity": 2, "buildingCostModifier": 1, "policyCostModifier": 1, "unhappinessModifier": 1, @@ -191,6 +214,7 @@ "aiWonderCostModifier": 1, "aiBuildingMaintenanceModifier": 0.5, "aiUnitMaintenanceModifier": 0.5, + "aiUnitSupplyModifier": 0.5, "aiFreeTechs": ["Pottery","Animal Husbandry","Mining","The Wheel"], "aiMajorCivBonusStartingUnits": ["Settler", "Worker", "Scout", "Era Starting Unit", "Era Starting Unit", "Era Starting Unit"], "aiCityStateBonusStartingUnits": [], diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index e10dea6e82..4b7b2e6ed1 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -862,6 +862,13 @@ Transportation upkeep = Unit upkeep = Trades = Units = +Unit Supply = +Base Supply = +Total Supply = +In Use = +Supply Deficit = +Production Penalty = +Increase your supply or reduce the amount of units to remove the production penalty = Name = Closest city = Action = diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 37d4418592..903135d025 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -320,6 +320,14 @@ class CityStats(val cityInfo: CityInfo) { return stats } + private fun getStatPercentBonusesFromUnitSupply(): Stats { + val stats = Stats() + val supplyDeficit = cityInfo.civInfo.stats().getUnitSupplyDeficit() + if (supplyDeficit > 0) + stats.production = cityInfo.civInfo.stats().getUnitSupplyProductionPenalty() + return stats + } + private fun constructionMatchesFilter(construction: IConstruction, filter: String): Boolean { if (construction is Building) return construction.matchesFilter(filter) if (construction is BaseUnit) return construction.matchesFilter(filter) @@ -465,6 +473,7 @@ class CityStats(val cityInfo: CityInfo) { newStatPercentBonusList["National ability"] = getStatPercentBonusesFromNationUnique(currentConstruction) newStatPercentBonusList["Puppet City"] = getStatPercentBonusesFromPuppetCity() newStatPercentBonusList["Religion"] = getStatPercentBonusesFromUniques(currentConstruction, cityInfo.religion.getUniques()) + newStatPercentBonusList["Unit Supply"] = getStatPercentBonusesFromUnitSupply() if (UncivGame.Current.superchargedForDebug) { val stats = Stats() diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt index 5a7a02ecaa..384ebcdfa1 100644 --- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt +++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt @@ -87,6 +87,24 @@ class CivInfoStats(val civInfo: CivilizationInfo) { return transportationUpkeep } + fun getUnitSupply(): Int { + /* TotalSupply = BaseSupply + NumCities*modifier + Population*modifier + * In civ5, it seems population modifier is always 0.5, so i hardcoded it down below */ + var supply = getBaseUnitSupply() + getUnitSupplyFromCities() + getUnitSupplyFromPop() + + if (civInfo.isMajorCiv() && civInfo.playerType == PlayerType.AI) + supply = (supply*(1f + civInfo.getDifficulty().aiUnitSupplyModifier)).toInt() + return supply + } + + fun getBaseUnitSupply(): Int = civInfo.getDifficulty().unitSupplyBase + fun getUnitSupplyFromCities(): Int = civInfo.cities.size * civInfo.getDifficulty().unitSupplyPerCity + fun getUnitSupplyFromPop(): Int = civInfo.cities.sumOf { it.population.population } / 2 + fun getUnitSupplyDeficit(): Int = max(0,civInfo.getCivUnitsSize() - getUnitSupply()) + + /** Per each supply missing, a player gets -10% production. Capped at -70%. */ + fun getUnitSupplyProductionPenalty(): Float = -min(getUnitSupplyDeficit() * 10f, 70f) + fun getStatMapForNextTurn(): StatMap { val statMap = StatMap() for (city in civInfo.cities) { diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index e856c354ab..6b16728f8e 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -329,6 +329,7 @@ class CivilizationInfo { } //region Units + fun getCivUnitsSize(): Int = units.size fun getCivUnits(): Sequence = units.asSequence() fun getCivGreatPeople(): Sequence = getCivUnits().filter { mapUnit -> mapUnit.isGreatPerson() } diff --git a/core/src/com/unciv/models/ruleset/Difficulty.kt b/core/src/com/unciv/models/ruleset/Difficulty.kt index 0c806bb6e2..4f24d477c4 100644 --- a/core/src/com/unciv/models/ruleset/Difficulty.kt +++ b/core/src/com/unciv/models/ruleset/Difficulty.kt @@ -11,6 +11,8 @@ class Difficulty: INamed, ICivilopediaText { var extraHappinessPerLuxury: Float = 0f var researchCostModifier:Float = 1f var unitCostModifier:Float = 1f + var unitSupplyBase: Int = 0 + var unitSupplyPerCity: Int = 0 var buildingCostModifier:Float = 1f var policyCostModifier:Float = 1f var unhappinessModifier:Float = 1f @@ -23,6 +25,7 @@ class Difficulty: INamed, ICivilopediaText { var aiWonderCostModifier:Float = 1f var aiBuildingMaintenanceModifier:Float = 1f var aiUnitMaintenanceModifier = 1f + var aiUnitSupplyModifier: Float = 0f var aiFreeTechs = ArrayList() var aiMajorCivBonusStartingUnits = ArrayList() var aiCityStateBonusStartingUnits = ArrayList() diff --git a/core/src/com/unciv/ui/overviewscreen/UnitOverviewTable.kt b/core/src/com/unciv/ui/overviewscreen/UnitOverviewTable.kt index 49d279dd07..e4a9e9c57d 100644 --- a/core/src/com/unciv/ui/overviewscreen/UnitOverviewTable.kt +++ b/core/src/com/unciv/ui/overviewscreen/UnitOverviewTable.kt @@ -2,6 +2,7 @@ package com.unciv.ui.overviewscreen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button +import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.translations.tr @@ -14,59 +15,116 @@ import kotlin.math.abs * Supplies the Unit sub-table for the Empire Overview */ class UnitOverviewTable( - viewingPlayer: CivilizationInfo, - overviewScreen: EmpireOverviewScreen + private val viewingPlayer: CivilizationInfo, + private val overviewScreen: EmpireOverviewScreen ) : Table(CameraStageBaseScreen.skin) { init { - val game = overviewScreen.game - - defaults().pad(5f) - add("Name".tr()) - add("Action".tr()) - add(Fonts.strength.toString()) - add(Fonts.rangedStrength.toString()) - add(Fonts.movement.toString()) - add("Closest city".tr()) - add("Promotions".tr()) - add("Health".tr()) - row() - addSeparator() - - for (unit in viewingPlayer.getCivUnits().sortedWith(compareBy({ it.displayName() }, { !it.due }, - { it.currentMovement < 0.1f }, { abs(it.currentTile.position.x) + abs(it.currentTile.position.y) }))) { - val baseUnit = unit.baseUnit() - - val button = Button(skin) - button.add(UnitGroup(unit,20f)).padRight(5f) - button.add(unit.displayName().toLabel()) - button.onClick { - game.setWorldScreen() - game.worldScreen.mapHolder.setCenterPosition(unit.currentTile.position) - } - add(button).left() - if (unit.action == null) add() - else add(unit.getActionLabel().tr()) - if (baseUnit.strength > 0) add(baseUnit.strength.toString()) else add() - if (baseUnit.rangedStrength > 0) add(baseUnit.rangedStrength.toString()) else add() - add(DecimalFormat("0.#").format(unit.currentMovement) + "/" + unit.getMaxMovement()) - val closestCity = unit.getTile().getTilesInDistance(3).firstOrNull { it.isCityCenter() } - if (closestCity != null) add(closestCity.getCity()!!.name.tr()) else add() - val promotionsTable = Table() - val promotionsForUnit = unit.civInfo.gameInfo.ruleSet.unitPromotions.values.filter { unit.promotions.promotions.contains(it.name) } // force same sorting as on picker (.sorted() would be simpler code, but...) - for (promotion in promotionsForUnit) - promotionsTable.add(ImageGetter.getPromotionIcon(promotion.name)) - if (unit.promotions.canBePromoted()) promotionsTable.add(ImageGetter.getImage("OtherIcons/Star").apply { color = Color.GOLDENROD }).size(24f).padLeft(8f) - if (unit.canUpgrade()) promotionsTable.add(ImageGetter.getUnitIcon(unit.getUnitToUpgradeTo().name, Color.GREEN)).size(28f).padLeft(8f) - promotionsTable.onClick { - if (unit.promotions.canBePromoted() || unit.promotions.promotions.isNotEmpty()) { - game.setScreen(PromotionPickerScreen(unit)) - } - } - add(promotionsTable) - if (unit.health < 100) add(unit.health.toString()) else add() - row() - } + add(getUnitSupplyTable()).top().padRight(25f) + add(getUnitListTable()) pack() } + + private fun getUnitSupplyTable(): Table { + val unitSupplyTable = Table(CameraStageBaseScreen.skin) + unitSupplyTable.defaults().pad(5f) + unitSupplyTable.apply { + add("Unit Supply".tr()).colspan(2).center().row() + addSeparator() + add("Base Supply".tr()).left() + add(viewingPlayer.stats().getBaseUnitSupply().toLabel()).right().row() + add("Cities".tr()).left() + add(viewingPlayer.stats().getUnitSupplyFromCities().toLabel()).right().row() + add("Population".tr()).left() + add(viewingPlayer.stats().getUnitSupplyFromPop().toLabel()).right().row() + addSeparator() + add("Total Supply".tr()).left() + add(viewingPlayer.stats().getUnitSupply().toLabel()).right().row() + add("In Use".tr()).left() + add(viewingPlayer.getCivUnitsSize().toLabel()).right().row() + addSeparator() + val deficit = viewingPlayer.stats().getUnitSupplyDeficit() + add("Supply Deficit".tr()).left() + add(deficit.toLabel()).right().row() + add("Production Penalty".tr()).left() + add((viewingPlayer.stats().getUnitSupplyProductionPenalty()).toInt().toString()+"%").right().row() + if (deficit > 0) { + val penaltyLabel = "Increase your supply or reduce the amount of units to remove the production penalty" + .toLabel(Color.FIREBRICK) + penaltyLabel.wrap = true + add(penaltyLabel).colspan(2).left() + .width(overviewScreen.stage.width * 0.2f).row() + } + pack() + } + return unitSupplyTable + } + + private fun getUnitListTable(): Table { + val game = overviewScreen.game + val unitListTable = Table(CameraStageBaseScreen.skin) + unitListTable.defaults().pad(5f) + unitListTable.apply { + add("Name".tr()) + add("Action".tr()) + add(Fonts.strength.toString()) + add(Fonts.rangedStrength.toString()) + add(Fonts.movement.toString()) + add("Closest city".tr()) + add("Promotions".tr()) + add("Health".tr()) + row() + addSeparator() + + for (unit in viewingPlayer.getCivUnits().sortedWith( + compareBy({ it.displayName() }, + { !it.due }, + { it.currentMovement < 0.1f }, + { abs(it.currentTile.position.x) + abs(it.currentTile.position.y) }) + )) { + val baseUnit = unit.baseUnit() + + val button = Button(skin) + button.add(UnitGroup(unit, 20f)).padRight(5f) + button.add(unit.displayName().toLabel()) + button.onClick { + game.setWorldScreen() + game.worldScreen.mapHolder.setCenterPosition(unit.currentTile.position) + } + add(button).left() + if (unit.action == null) add() + else add(unit.getActionLabel().tr()) + if (baseUnit.strength > 0) add(baseUnit.strength.toString()) else add() + if (baseUnit.rangedStrength > 0) add(baseUnit.rangedStrength.toString()) else add() + add(DecimalFormat("0.#").format(unit.currentMovement) + "/" + unit.getMaxMovement()) + val closestCity = + unit.getTile().getTilesInDistance(3).firstOrNull { it.isCityCenter() } + if (closestCity != null) add(closestCity.getCity()!!.name.tr()) else add() + val promotionsTable = Table() + val promotionsForUnit = unit.civInfo.gameInfo.ruleSet.unitPromotions.values.filter { + unit.promotions.promotions.contains(it.name) + } // force same sorting as on picker (.sorted() would be simpler code, but...) + for (promotion in promotionsForUnit) + promotionsTable.add(ImageGetter.getPromotionIcon(promotion.name)) + if (unit.promotions.canBePromoted()) promotionsTable.add( + ImageGetter.getImage("OtherIcons/Star").apply { color = Color.GOLDENROD }) + .size(24f).padLeft(8f) + if (unit.canUpgrade()) promotionsTable.add( + ImageGetter.getUnitIcon( + unit.getUnitToUpgradeTo().name, + Color.GREEN + ) + ).size(28f).padLeft(8f) + promotionsTable.onClick { + if (unit.promotions.canBePromoted() || unit.promotions.promotions.isNotEmpty()) { + game.setScreen(PromotionPickerScreen(unit)) + } + } + add(promotionsTable) + if (unit.health < 100) add(unit.health.toString()) else add() + row() + } + } + return unitListTable + } } diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt index b7fcbdfb3c..38825dff51 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt @@ -158,15 +158,27 @@ class WorldScreenTopBar(val worldScreen: WorldScreen) : Table() { return menuButton } - private fun getOverviewButton(): Button { + private fun getOverviewButton(): Table { + val rightTable = Table(CameraStageBaseScreen.skin).apply{ defaults().pad(10f) } + + val unitSupplyImage = ImageGetter.getImage("OtherIcons/ExclamationMark") + .apply { color = Color.FIREBRICK } + .onClick { worldScreen.game.setScreen(EmpireOverviewScreen(worldScreen.selectedCiv, "Units")) } + val overviewButton = Button(CameraStageBaseScreen.skin) overviewButton.add("Overview".toLabel()).pad(10f) overviewButton.addTooltip('e') - overviewButton.pack() overviewButton.onClick { worldScreen.game.setScreen(EmpireOverviewScreen(worldScreen.selectedCiv)) } - overviewButton.centerY(this) - overviewButton.x = worldScreen.stage.width - overviewButton.width - 10 - return overviewButton + + if (worldScreen.selectedCiv.stats().getUnitSupplyDeficit() > 0) + rightTable.add(unitSupplyImage).size(50f) + rightTable.add(overviewButton) + + rightTable.pack() + rightTable.centerY(this) + rightTable.x = worldScreen.stage.width - rightTable.width - 10 + + return rightTable } private fun getSelectedCivilizationTable(): Table {