diff --git a/Credits.md b/Credits.md index 227168ef..d875438a 100644 --- a/Credits.md +++ b/Credits.md @@ -3,6 +3,8 @@ Flag Icons made by [Freepik](https://www.flaticon.com/authors/freepik) from [www.flaticon.com](https://www.flaticon.com) and licensed by Creative Commons 3.0 +Tile icons for the "Fantasy Hex" tileset belong to CuddlyClover @ https://cuddlyclover.itch.io/fantasy-hex-tiles + All the following are from [the Noun Project](https://thenounproject.com) licenced under either Creative Commons or Public Domain diff --git a/android/Images/TerrainIcons/Hexagon.png b/android/Images/OtherIcons/Hexagon.png similarity index 100% rename from android/Images/TerrainIcons/Hexagon.png rename to android/Images/OtherIcons/Hexagon.png diff --git a/android/Images/TerrainIcons/HexagonBorder.png b/android/Images/TerrainIcons/HexagonBorder.png deleted file mode 100644 index 55c57ef4..00000000 Binary files a/android/Images/TerrainIcons/HexagonBorder.png and /dev/null differ diff --git a/android/Images/TerrainIcons/Test/HillOverlay.png b/android/Images/TerrainIcons/Test/HillOverlay.png deleted file mode 100644 index 0139f972..00000000 Binary files a/android/Images/TerrainIcons/Test/HillOverlay.png and /dev/null differ diff --git a/android/Images/TerrainIcons/CrosshatchHexagon.png b/android/Images/TileSets/Default/CrosshatchHexagon.png similarity index 100% rename from android/Images/TerrainIcons/CrosshatchHexagon.png rename to android/Images/TileSets/Default/CrosshatchHexagon.png diff --git a/android/Images/TerrainIcons/Default/Flood plainsOverlay.png b/android/Images/TileSets/Default/Flood plainsOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/Flood plainsOverlay.png rename to android/Images/TileSets/Default/Flood plainsOverlay.png diff --git a/android/Images/TerrainIcons/Default/ForestOverlay.png b/android/Images/TileSets/Default/ForestOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/ForestOverlay.png rename to android/Images/TileSets/Default/ForestOverlay.png diff --git a/android/Images/TileSets/Default/Hexagon.png b/android/Images/TileSets/Default/Hexagon.png new file mode 100644 index 00000000..092bb878 Binary files /dev/null and b/android/Images/TileSets/Default/Hexagon.png differ diff --git a/android/Images/TerrainIcons/Default/HillOverlay.png b/android/Images/TileSets/Default/HillOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/HillOverlay.png rename to android/Images/TileSets/Default/HillOverlay.png diff --git a/android/Images/TerrainIcons/Default/JungleOverlay.png b/android/Images/TileSets/Default/JungleOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/JungleOverlay.png rename to android/Images/TileSets/Default/JungleOverlay.png diff --git a/android/Images/TerrainIcons/Default/LakesOverlay.png b/android/Images/TileSets/Default/LakesOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/LakesOverlay.png rename to android/Images/TileSets/Default/LakesOverlay.png diff --git a/android/Images/TerrainIcons/Default/MarshOverlay.png b/android/Images/TileSets/Default/MarshOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/MarshOverlay.png rename to android/Images/TileSets/Default/MarshOverlay.png diff --git a/android/Images/TerrainIcons/Default/MountainOverlay.png b/android/Images/TileSets/Default/MountainOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/MountainOverlay.png rename to android/Images/TileSets/Default/MountainOverlay.png diff --git a/android/Images/TerrainIcons/Default/OasisOverlay.png b/android/Images/TileSets/Default/OasisOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Default/OasisOverlay.png rename to android/Images/TileSets/Default/OasisOverlay.png diff --git a/android/Images/TerrainIcons/road.png b/android/Images/TileSets/Default/road.png similarity index 100% rename from android/Images/TerrainIcons/road.png rename to android/Images/TileSets/Default/road.png diff --git a/android/Images/TileSets/FantasyHex/Coast.png b/android/Images/TileSets/FantasyHex/Coast.png new file mode 100644 index 00000000..77386936 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Coast.png differ diff --git a/android/Images/TileSets/FantasyHex/CrosshatchHexagon.png b/android/Images/TileSets/FantasyHex/CrosshatchHexagon.png new file mode 100644 index 00000000..65f5551c Binary files /dev/null and b/android/Images/TileSets/FantasyHex/CrosshatchHexagon.png differ diff --git a/android/Images/TileSets/FantasyHex/Desert.png b/android/Images/TileSets/FantasyHex/Desert.png new file mode 100644 index 00000000..3c11c600 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Desert.png differ diff --git a/android/Images/TerrainIcons/Test/Flood plainsOverlay.png b/android/Images/TileSets/FantasyHex/Flood plainsOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Test/Flood plainsOverlay.png rename to android/Images/TileSets/FantasyHex/Flood plainsOverlay.png diff --git a/android/Images/TerrainIcons/Test/ForestOverlay.png b/android/Images/TileSets/FantasyHex/ForestOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Test/ForestOverlay.png rename to android/Images/TileSets/FantasyHex/ForestOverlay.png diff --git a/android/Images/TerrainIcons/Test/Grasslands.png b/android/Images/TileSets/FantasyHex/Grassland.png similarity index 100% rename from android/Images/TerrainIcons/Test/Grasslands.png rename to android/Images/TileSets/FantasyHex/Grassland.png diff --git a/android/Images/TileSets/FantasyHex/Hexagon.png b/android/Images/TileSets/FantasyHex/Hexagon.png new file mode 100644 index 00000000..092bb878 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Hexagon.png differ diff --git a/android/Images/TileSets/FantasyHex/Hill.png b/android/Images/TileSets/FantasyHex/Hill.png new file mode 100644 index 00000000..31586706 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Hill.png differ diff --git a/android/Images/TerrainIcons/Test/JungleOverlay.png b/android/Images/TileSets/FantasyHex/JungleOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Test/JungleOverlay.png rename to android/Images/TileSets/FantasyHex/JungleOverlay.png diff --git a/android/Images/TerrainIcons/Test/LakesOverlay.png b/android/Images/TileSets/FantasyHex/LakesOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Test/LakesOverlay.png rename to android/Images/TileSets/FantasyHex/LakesOverlay.png diff --git a/android/Images/TerrainIcons/Test/MarshOverlay.png b/android/Images/TileSets/FantasyHex/MarshOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Test/MarshOverlay.png rename to android/Images/TileSets/FantasyHex/MarshOverlay.png diff --git a/android/Images/TileSets/FantasyHex/Mountain.png b/android/Images/TileSets/FantasyHex/Mountain.png new file mode 100644 index 00000000..047769b4 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Mountain.png differ diff --git a/android/Images/TerrainIcons/Test/MountainOverlay.png b/android/Images/TileSets/FantasyHex/MountainOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Test/MountainOverlay.png rename to android/Images/TileSets/FantasyHex/MountainOverlay.png diff --git a/android/Images/TerrainIcons/Test/OasisOverlay.png b/android/Images/TileSets/FantasyHex/OasisOverlay.png similarity index 100% rename from android/Images/TerrainIcons/Test/OasisOverlay.png rename to android/Images/TileSets/FantasyHex/OasisOverlay.png diff --git a/android/Images/TileSets/FantasyHex/Ocean.png b/android/Images/TileSets/FantasyHex/Ocean.png new file mode 100644 index 00000000..2f2a54c2 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Ocean.png differ diff --git a/android/Images/TileSets/FantasyHex/Plains.png b/android/Images/TileSets/FantasyHex/Plains.png new file mode 100644 index 00000000..d9116e36 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Plains.png differ diff --git a/android/Images/TileSets/FantasyHex/Tundra.png b/android/Images/TileSets/FantasyHex/Tundra.png new file mode 100644 index 00000000..5c3217d1 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tundra.png differ diff --git a/android/Images/TileSets/FantasyHex/road.png b/android/Images/TileSets/FantasyHex/road.png new file mode 100644 index 00000000..7c413bd8 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/road.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 6b1d8523..1c81950b 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,2821 +6,2884 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Alhambra rotate: false - xy: 1777, 1946 + xy: 1573, 1940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Angkor Wat rotate: false - xy: 383, 1744 + xy: 1879, 1940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 689, 1744 + xy: 132, 225 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 791, 1744 + xy: 132, 123 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 379, 1642 + xy: 234, 123 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 1093, 1642 + xy: 791, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 1301, 1764 + xy: 1097, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 143, 478 + xy: 379, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 1735, 1844 + xy: 685, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 1505, 1742 + xy: 889, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/CN Tower rotate: false - xy: 1607, 1742 + xy: 991, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 306, 714 + xy: 1531, 1838 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 538, 1540 + xy: 1709, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 436, 1336 + xy: 1939, 1838 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 538, 1438 + xy: 1913, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 334, 1030 + xy: 334, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 538, 1132 + xy: 436, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 640, 1030 + xy: 946, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 1048, 1438 + xy: 946, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 742, 928 + xy: 946, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 946, 1132 + xy: 1150, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 1048, 1030 + xy: 1252, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 510, 724 + xy: 1807, 1634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 612, 826 + xy: 1909, 1634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 612, 724 + xy: 1354, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 714, 826 + xy: 1354, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 1020, 826 + xy: 1456, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hubble Space Telescope rotate: false - xy: 1020, 724 + xy: 1456, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 1122, 826 + xy: 1456, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1252, 1030 + xy: 1558, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Kremlin rotate: false - xy: 1297, 1642 + xy: 1660, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1399, 1662 + xy: 1762, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 1354, 1540 + xy: 1558, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 1354, 1438 + xy: 1660, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1354, 1336 + xy: 1762, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 1326, 724 + xy: 336, 225 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1456, 1340 + xy: 386, 634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1660, 1436 + xy: 510, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1762, 1436 + xy: 714, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1660, 1232 + xy: 816, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1762, 1334 + xy: 714, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1558, 1028 + xy: 918, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1864, 1334 + xy: 1020, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1762, 1130 + xy: 816, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1762, 1028 + xy: 1020, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1864, 1028 + xy: 1224, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1864, 926 + xy: 1326, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1428, 724 + xy: 1122, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1530, 825 + xy: 1326, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1530, 723 + xy: 1224, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1836, 824 + xy: 1428, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 245, 407 + xy: 1836, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 132, 274 + xy: 1836, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 336, 203 + xy: 692, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 998, 622 + xy: 1100, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1100, 622 + xy: 998, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1202, 622 + xy: 1202, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1304, 622 + xy: 1100, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1916, 620 + xy: 1508, 717 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 551, 418 + xy: 1610, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 551, 316 + xy: 1814, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 653, 418 + xy: 1916, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 959, 520 + xy: 744, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 755, 316 + xy: 540, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 857, 418 + xy: 642, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 959, 418 + xy: 642, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 959, 316 + xy: 948, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1061, 418 + xy: 540, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1163, 316 + xy: 642, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1265, 418 + xy: 744, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1367, 418 + xy: 948, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1367, 316 + xy: 1152, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1469, 519 + xy: 744, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1469, 417 + xy: 846, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1469, 315 + xy: 948, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1571, 518 + xy: 1050, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1673, 518 + xy: 846, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1877, 416 + xy: 948, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1673, 314 + xy: 1152, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 438, 101 + xy: 1254, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 857, 214 + xy: 1356, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 FlagIcons/Dutch rotate: false - xy: 1271, 1866 + xy: 2, 444 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 2, 328 + xy: 1271, 1860 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 1401, 1866 + xy: 2, 314 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 2, 198 + xy: 1401, 1860 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 2, 68 + xy: 2, 184 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Portuguese rotate: false - xy: 204, 1438 + xy: 2, 54 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 204, 1308 + xy: 204, 1432 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 204, 1178 + xy: 204, 1302 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Simplified_Chinese rotate: false - xy: 204, 1048 + xy: 204, 1172 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 204, 918 + xy: 204, 1042 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 204, 713 + xy: 204, 837 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 281, 1744 + xy: 1777, 1940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 1939, 1844 + xy: 1195, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 334, 1132 + xy: 306, 838 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 946, 1540 + xy: 436, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 1150, 1540 + xy: 1048, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 946, 1234 + xy: 1048, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 1807, 1640 + xy: 1864, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1354, 1030 + xy: 284, 531 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1456, 1544 + xy: 336, 123 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1558, 1232 + xy: 612, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1762, 926 + xy: 1020, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 245, 509 + xy: 1734, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 132, 172 + xy: 1938, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 245, 305 + xy: 1938, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 245, 305 + xy: 1938, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 590, 622 + xy: 896, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1775, 518 + xy: 1050, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 1981, 1996 + xy: 2, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Banner rotate: false - xy: 1195, 1642 + xy: 995, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 2, 580 + xy: 2, 574 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 640, 1540 + xy: 306, 940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 742, 1336 + xy: 640, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 640, 1132 + xy: 742, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 742, 1030 + xy: 844, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +OtherIcons/Hexagon + rotate: false + xy: 2, 1800 + size: 277, 240 + orig: 277, 240 + offset: 0, 0 + index: -1 +TileSets/Default/Hexagon + rotate: false + xy: 2, 1800 + size: 277, 240 + orig: 277, 240 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Hexagon + rotate: false + xy: 2, 1800 + size: 277, 240 + orig: 277, 240 + offset: 0, 0 + index: -1 OtherIcons/MenuIcon rotate: false - xy: 1558, 1436 + xy: 438, 22 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1632, 722 + xy: 1428, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 284, 611 + xy: 1734, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 449, 306 + xy: 1712, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 755, 520 + xy: 1712, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1265, 520 + xy: 642, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 1271, 1996 + xy: 1271, 1990 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 1089, 1846 + xy: 1089, 1840 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 182, 713 + xy: 132, 531 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 2, 16 + xy: 488, 564 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 277, 1590 + xy: 1981, 1990 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 1061, 264 + xy: 277, 1584 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 54, 16 + xy: 334, 1074 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1113, 264 + xy: 408, 768 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1165, 264 + xy: 540, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1217, 264 + xy: 1356, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1217, 264 + xy: 1356, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1269, 264 + xy: 54, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1321, 264 + xy: 592, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1373, 264 + xy: 1356, 206 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1061, 212 + xy: 644, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1113, 212 + xy: 1356, 154 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1165, 212 + xy: 696, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1217, 212 + xy: 748, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1269, 212 + xy: 800, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1321, 212 + xy: 852, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1373, 212 + xy: 904, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1966, 1588 + xy: 956, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1966, 1536 + xy: 1008, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1966, 1484 + xy: 1060, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1966, 1432 + xy: 1112, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1966, 1380 + xy: 1164, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1966, 1276 + xy: 1268, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1966, 1224 + xy: 1408, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1966, 1172 + xy: 1408, 206 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1966, 1120 + xy: 1408, 154 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1966, 1068 + xy: 1356, 102 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1966, 1016 + xy: 1408, 102 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1966, 964 + xy: 1966, 1582 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 540, 110 + xy: 1966, 1478 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 592, 162 + xy: 1966, 1426 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 592, 110 + xy: 1966, 1374 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 644, 162 + xy: 1966, 1322 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 644, 110 + xy: 1966, 1270 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 696, 162 + xy: 1966, 1218 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 696, 110 + xy: 1966, 1166 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 748, 162 + xy: 540, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 748, 110 + xy: 592, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 800, 162 + xy: 644, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 800, 110 + xy: 696, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1879, 1946 + xy: 1675, 1940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 991, 1642 + xy: 689, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 334, 1438 + xy: 1735, 1838 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 742, 1540 + xy: 436, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 436, 1030 + xy: 334, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 436, 928 + xy: 538, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 742, 1234 + xy: 844, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 844, 1132 + xy: 946, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 1150, 1336 + xy: 1048, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 1150, 1234 + xy: 1150, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 946, 928 + xy: 1252, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 918, 724 + xy: 1456, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1122, 724 + xy: 1558, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1252, 1336 + xy: 1558, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1252, 928 + xy: 1660, 1328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1456, 1442 + xy: 336, 21 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1660, 926 + xy: 1122, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1734, 824 + xy: 1428, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 449, 408 + xy: 1610, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 551, 520 + xy: 1814, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 653, 520 + xy: 1916, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 755, 418 + xy: 540, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1163, 520 + xy: 744, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1163, 418 + xy: 846, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1571, 314 + xy: 1050, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1877, 314 + xy: 1050, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 438, 203 + xy: 1152, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 551, 214 + xy: 1356, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Acquire rotate: false - xy: 1573, 1946 + xy: 182, 633 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 436, 1234 + xy: 306, 736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 538, 1336 + xy: 334, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Culture rotate: false - xy: 281, 1846 + xy: 281, 1840 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Food rotate: false - xy: 2, 1366 + xy: 2, 1360 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Gold rotate: false - xy: 483, 1846 + xy: 483, 1840 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Happiness rotate: false - xy: 2, 1164 + xy: 2, 1158 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Malcontent rotate: false - xy: 685, 1846 + xy: 685, 1840 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 1966, 1328 + xy: 1216, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Population rotate: false - xy: 2, 962 + xy: 2, 956 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Production rotate: false - xy: 887, 1846 + xy: 887, 1840 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 540, 162 + xy: 1966, 1530 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 336, 101 + xy: 590, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Science rotate: false - xy: 2, 760 + xy: 2, 754 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 653, 316 + xy: 642, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Acoustics rotate: false - xy: 182, 611 + xy: 204, 735 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Agriculture rotate: false - xy: 1675, 1946 + xy: 182, 531 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Animal Husbandry rotate: false - xy: 485, 1744 + xy: 132, 429 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 485, 1744 + xy: 132, 429 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archaeology rotate: false - xy: 893, 1744 + xy: 132, 21 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archery rotate: false - xy: 1097, 1744 + xy: 234, 327 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Architecture rotate: false - xy: 277, 1642 + xy: 234, 225 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Astronomy rotate: false - xy: 583, 1642 + xy: 281, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Atomic Theory rotate: false - xy: 685, 1642 + xy: 383, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ballistics rotate: false - xy: 889, 1642 + xy: 587, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 1199, 1744 + xy: 893, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 1531, 1844 + xy: 481, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 1837, 1844 + xy: 787, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 1709, 1742 + xy: 1093, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 436, 1438 + xy: 1607, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 436, 1438 + xy: 1607, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 334, 1234 + xy: 1811, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 640, 1438 + xy: 334, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combined Arms rotate: false - xy: 436, 1132 + xy: 436, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 538, 1234 + xy: 538, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 742, 1438 + xy: 436, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 844, 1540 + xy: 538, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 334, 928 + xy: 640, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 844, 1438 + xy: 742, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 844, 1336 + xy: 538, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ecology rotate: false - xy: 946, 1438 + xy: 640, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 1048, 1540 + xy: 742, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 538, 928 + xy: 844, 1432 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 742, 1132 + xy: 640, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electronics rotate: false - xy: 844, 1234 + xy: 742, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 946, 1336 + xy: 844, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 640, 928 + xy: 742, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 1048, 1336 + xy: 1150, 1534 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 844, 928 + xy: 1150, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 408, 724 + xy: 1603, 1634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 510, 826 + xy: 1705, 1634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 816, 724 + xy: 1354, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 1252, 1540 + xy: 1558, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1252, 1234 + xy: 1660, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1326, 826 + xy: 336, 327 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1456, 1136 + xy: 438, 430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 1456, 1034 + xy: 438, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1456, 932 + xy: 438, 226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1660, 1538 + xy: 408, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1558, 1334 + xy: 408, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1762, 1538 + xy: 408, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1660, 1334 + xy: 510, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1762, 1232 + xy: 714, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1660, 1028 + xy: 918, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1864, 1232 + xy: 1122, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1428, 826 + xy: 1224, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1632, 824 + xy: 1326, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1734, 722 + xy: 1530, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1836, 722 + xy: 1530, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1938, 824 + xy: 1632, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 347, 509 + xy: 1836, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 347, 407 + xy: 1632, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 143, 376 + xy: 1734, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 132, 70 + xy: 1938, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 347, 305 + xy: 488, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 234, 203 + xy: 590, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 234, 101 + xy: 488, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 488, 622 + xy: 692, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 692, 622 + xy: 794, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 896, 622 + xy: 896, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1406, 622 + xy: 1304, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1610, 620 + xy: 1406, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1712, 620 + xy: 1304, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1061, 520 + xy: 846, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 857, 316 + xy: 540, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1571, 416 + xy: 1254, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1673, 416 + xy: 948, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1775, 416 + xy: 1152, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 959, 214 + xy: 1254, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/CrosshatchHexagon +TileSets/Default/CrosshatchHexagon rotate: false - xy: 2, 1568 + xy: 2, 1562 size: 273, 236 orig: 273, 236 offset: 0, 0 index: -1 -TerrainIcons/Default/Flood plainsOverlay +TileSets/FantasyHex/CrosshatchHexagon rotate: false - xy: 1150, 1438 + xy: 2, 1562 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 +TileSets/Default/Flood plainsOverlay + rotate: false + xy: 844, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/Flood plainsOverlay +TileSets/FantasyHex/Flood plainsOverlay rotate: false - xy: 1150, 1438 + xy: 844, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Default/ForestOverlay +TileSets/Default/ForestOverlay rotate: false - xy: 844, 1030 + xy: 1048, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/ForestOverlay +TileSets/FantasyHex/ForestOverlay rotate: false - xy: 844, 1030 + xy: 1048, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Default/HillOverlay +TileSets/Default/HillOverlay rotate: false - xy: 714, 724 + xy: 1354, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/HillOverlay +TileSets/Default/JungleOverlay rotate: false - xy: 714, 724 + xy: 1762, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Default/JungleOverlay +TileSets/FantasyHex/JungleOverlay rotate: false - xy: 1224, 826 + xy: 1762, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/JungleOverlay +TileSets/Default/LakesOverlay rotate: false - xy: 1224, 826 + xy: 1864, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Default/LakesOverlay +TileSets/FantasyHex/LakesOverlay rotate: false - xy: 1603, 1640 + xy: 1864, 1430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/LakesOverlay +TileSets/Default/MarshOverlay rotate: false - xy: 1603, 1640 + xy: 386, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Default/MarshOverlay +TileSets/FantasyHex/MarshOverlay rotate: false - xy: 1456, 1238 + xy: 386, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/MarshOverlay +TileSets/Default/MountainOverlay rotate: false - xy: 1456, 1238 + xy: 612, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Default/MountainOverlay +TileSets/FantasyHex/MountainOverlay rotate: false - xy: 1864, 1436 + xy: 612, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/MountainOverlay +TileSets/Default/OasisOverlay rotate: false - xy: 1864, 1436 + xy: 918, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Default/OasisOverlay +TileSets/FantasyHex/OasisOverlay rotate: false - xy: 1864, 1130 + xy: 918, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TerrainIcons/Test/OasisOverlay +TileSets/Default/road rotate: false - xy: 1864, 1130 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TerrainIcons/Hexagon - rotate: false - xy: 2, 1806 - size: 277, 240 - orig: 277, 240 - offset: 0, 0 - index: -1 -TerrainIcons/HexagonBorder - rotate: false - xy: 2, 458 - size: 139, 120 - orig: 139, 120 - offset: 0, 0 - index: -1 -TerrainIcons/Test/Grasslands - rotate: false - xy: 1531, 1964 - size: 32, 30 - orig: 32, 30 - offset: 0, 0 - index: -1 -TerrainIcons/road - rotate: false - xy: 182, 598 + xy: 1301, 1745 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 +TileSets/FantasyHex/road + rotate: false + xy: 1301, 1745 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Coast + rotate: false + xy: 1458, 585 + size: 32, 29 + orig: 32, 29 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Desert + rotate: false + xy: 488, 532 + size: 32, 30 + orig: 32, 30 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Grassland + rotate: false + xy: 334, 1042 + size: 32, 30 + orig: 32, 30 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Hill + rotate: false + xy: 1531, 1954 + size: 32, 34 + orig: 32, 34 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Mountain + rotate: false + xy: 132, 534 + size: 32, 38 + orig: 32, 38 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Ocean + rotate: false + xy: 1320, 75 + size: 32, 29 + orig: 32, 29 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Plains + rotate: false + xy: 408, 736 + size: 32, 30 + orig: 32, 30 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tundra + rotate: false + xy: 1981, 1954 + size: 32, 34 + orig: 32, 34 + offset: 0, 0 + index: -1 UnitIcons/Anti-Tank Gun rotate: false - xy: 587, 1744 + xy: 132, 327 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 995, 1744 + xy: 234, 429 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 481, 1642 + xy: 234, 21 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 787, 1642 + xy: 485, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Battleship rotate: false - xy: 1403, 1764 + xy: 277, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 1633, 1844 + xy: 583, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Camel Archer rotate: false - xy: 1811, 1742 + xy: 1199, 1738 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 1913, 1742 + xy: 1301, 1758 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 306, 816 + xy: 1403, 1758 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 334, 1540 + xy: 1633, 1838 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 436, 1540 + xy: 1837, 1838 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 334, 1336 + xy: 1505, 1736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 640, 1336 + xy: 334, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 640, 1234 + xy: 538, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Destroyer rotate: false - xy: 538, 1030 + xy: 640, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 1048, 1234 + xy: 946, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 946, 1030 + xy: 1048, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 1048, 1132 + xy: 1150, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 1150, 1132 + xy: 1252, 1330 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 1048, 928 + xy: 1252, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great General rotate: false - xy: 1501, 1646 + xy: 1501, 1640 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1501, 1646 + xy: 1501, 1640 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 1150, 1030 + xy: 1252, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 1150, 928 + xy: 1297, 1636 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Infantry rotate: false - xy: 408, 826 + xy: 1399, 1656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hoplite rotate: false - xy: 816, 826 + xy: 1354, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 918, 826 + xy: 1456, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Infantry rotate: false - xy: 1252, 1438 + xy: 1660, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1252, 1132 + xy: 1762, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1224, 724 + xy: 1864, 1532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1705, 1640 + xy: 1762, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 1909, 1640 + xy: 1864, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1354, 1234 + xy: 1864, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1354, 1132 + xy: 284, 633 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 1354, 928 + xy: 336, 429 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 1558, 1538 + xy: 438, 124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1864, 1538 + xy: 612, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 1558, 1130 + xy: 510, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1660, 1130 + xy: 816, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1558, 927 + xy: 1530, 819 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1938, 722 + xy: 1632, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 386, 612 + xy: 794, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 794, 622 + xy: 998, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1508, 621 + xy: 1202, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1814, 620 + xy: 1406, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 449, 510 + xy: 1508, 615 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 857, 520 + xy: 540, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 1061, 316 + xy: 744, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1367, 520 + xy: 1050, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 1265, 316 + xy: 846, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1877, 518 + xy: 1356, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 204, 815 + xy: 204, 939 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1775, 314 + xy: 1254, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 653, 214 + xy: 1152, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 755, 214 + xy: 1254, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 182, 738 + xy: 1505, 1838 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 1505, 1844 + xy: 277, 1562 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 277, 1568 + xy: 386, 1104 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 182, 716 + xy: 299, 1562 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 299, 1568 + xy: 386, 1082 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 234, 79 + xy: 386, 1060 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 2018, 700 + xy: 2018, 796 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 1979, 598 + xy: 460, 798 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 1981, 1974 + xy: 106, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 106, 46 + xy: 2015, 1816 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 1425, 294 + xy: 1966, 1144 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1447, 294 + xy: 748, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 2015, 1822 + xy: 1458, 563 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1966, 942 + xy: 2018, 774 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 852, 192 + xy: 460, 776 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 256, 79 + xy: 106, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 2018, 678 + xy: 2015, 1794 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1979, 576 + xy: 1988, 1144 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1981, 1952 + xy: 748, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 2003, 1974 + xy: 770, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 106, 24 + xy: 1458, 541 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 106, 2 + xy: 2018, 752 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1425, 272 + xy: 2015, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 2015, 1800 + xy: 770, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1988, 942 + xy: 792, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 852, 170 + xy: 1458, 519 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 874, 192 + xy: 2018, 730 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 278, 79 + xy: 2015, 1750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 2018, 656 + xy: 792, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1979, 554 + xy: 814, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 2003, 1952 + xy: 1458, 497 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1425, 250 + xy: 2018, 708 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1447, 272 + xy: 814, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1469, 293 + xy: 836, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 2015, 1778 + xy: 1458, 475 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 852, 148 + xy: 2018, 686 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 874, 170 + xy: 836, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 896, 192 + xy: 858, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 300, 79 + xy: 1458, 453 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 2018, 634 + xy: 2018, 664 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1979, 532 + xy: 858, 10 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 1425, 228 + xy: 880, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 1447, 250 + xy: 1458, 431 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 1469, 271 + xy: 2018, 642 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 415de8a0..1b202f11 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/build.gradle b/android/build.gradle index 7d2169dc..14b50aeb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 216 - versionName "2.13.14" + versionCode 217 + versionName "2.13.15" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/GameSaver.kt b/core/src/com/unciv/logic/GameSaver.kt index 01724679..f444c4f7 100644 --- a/core/src/com/unciv/logic/GameSaver.kt +++ b/core/src/com/unciv/logic/GameSaver.kt @@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.Json import com.unciv.GameSettings import com.unciv.logic.map.TileMap import com.unciv.ui.saves.Gzip +import com.unciv.ui.utils.ImageGetter class GameSaver { private val saveFilesFolder = "SaveFiles" @@ -54,7 +55,12 @@ class GameSaver { fun getGeneralSettings(): GameSettings { val settingsFile = getGeneralSettingsFile() if(!settingsFile.exists()) return GameSettings() - return json().fromJson(GameSettings::class.java, settingsFile) + val settings = json().fromJson(GameSettings::class.java, settingsFile) + + val currentTileSets = ImageGetter.atlas.regions.filter { it.name.startsWith("TileSets") } + .map { it.name.split("/")[1] }.distinct() + if(settings.tileSet !in currentTileSets) settings.tileSet = "Default" + return settings } fun setGeneralSettings(gameSettings: GameSettings){ diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt index bb71220b..6c1c5b28 100644 --- a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt +++ b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt @@ -7,6 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.unciv.GameParameters +import com.unciv.UnCivGame import com.unciv.logic.GameSaver import com.unciv.logic.map.TileMap import com.unciv.models.gamebasics.GameBasics @@ -23,6 +24,8 @@ import com.unciv.ui.utils.onClick import com.unciv.ui.worldscreen.TileGroupMap class MapEditorScreen(): CameraStageBaseScreen(){ + val tileSetLocation = "TileSets/"+UnCivGame.Current.settings.tileSet +"/" + var clearTerrainFeature=false var selectedTerrain : Terrain?=null var clearResource=false @@ -39,7 +42,7 @@ class MapEditorScreen(): CameraStageBaseScreen(){ } fun getHex(color: Color, image: Actor?=null): Group { - val hex = ImageGetter.getImage("TerrainIcons/Hexagon.png") + val hex = ImageGetter.getImage(tileSetLocation + "Hexagon") hex.color = color hex.width*=0.3f hex.height*=0.3f @@ -149,10 +152,10 @@ class MapEditorScreen(): CameraStageBaseScreen(){ var color = Color.WHITE if (terrain.type == TerrainType.TerrainFeature) - iconPath = "TerrainIcons/${terrain.name}.png" + iconPath = tileSetLocation + terrain.name+"Overlay" else { color = terrain.getColor() - val imagePath = "TerrainIcons/" + terrain.name + val imagePath = tileSetLocation + terrain.name+"Overlay" if (ImageGetter.imageExists(imagePath)) { iconPath = imagePath } diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 008ea1a7..4e4245a2 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -17,15 +17,16 @@ import com.unciv.ui.utils.UnitGroup import com.unciv.ui.utils.center open class TileGroup(var tileInfo: TileInfo) : Group() { - val tileSetLocation = "TerrainIcons/"+UnCivGame.Current.settings.tileSet +"/" + val tileSetLocation = "TileSets/"+UnCivGame.Current.settings.tileSet +"/" - protected var hexagon :Image= ImageGetter.getImage("TerrainIcons/Hexagon.png") + protected var hexagon :Image= ImageGetter.getImage(tileSetLocation+"Hexagon.png") protected var baseTerrainImage: Image? = null protected var baseTerrain:String="" protected var terrainFeatureImage: Image? = null protected var terrainFeature:String?=null protected var cityImage: Image? = null + var resourceImage: Actor? = null var resource:String?=null var improvementImage: Actor? = null @@ -36,8 +37,9 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { protected var militaryUnitImage: UnitGroup? = null private val circleImage = ImageGetter.getCircle() // for blue and red circles on the tile private val crosshairImage = ImageGetter.getImage("OtherIcons/Crosshair.png") // for when a unit is targeted - protected val fogImage = ImageGetter.getImage("TerrainIcons/CrosshatchHexagon") + protected val fogImage = ImageGetter.getImage(tileSetLocation+"CrosshatchHexagon") var yieldGroup = YieldGroup() + var lastIsRevealed = false var showEntireMap = UnCivGame.Current.viewEntireMapForDebug @@ -46,11 +48,11 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { var image: Image? = null } + val groupSize = 54f init { - val groupSize = 54f this.setSize(groupSize, groupSize) - addHexagon(groupSize) + updateTileImage(false) addCircleImage() addFogImage(groupSize) @@ -68,6 +70,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { } private fun addFogImage(groupSize: Float) { + print("Adding fog image") val imageScale = groupSize * 1.5f / fogImage.width fogImage.setScale(imageScale) fogImage.setOrigin(Align.center) @@ -89,9 +92,10 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { crosshairImage.isVisible = true } - private fun addHexagon(groupSize: Float) { + private fun updateTileImage(isRevealed: Boolean) { + hexagon.remove() val terrainTileLocation = tileSetLocation+tileInfo.baseTerrain - if(ImageGetter.imageExists(terrainTileLocation)) + if(!lastIsRevealed && isRevealed && ImageGetter.imageExists(terrainTileLocation)) hexagon = ImageGetter.getImage(terrainTileLocation) val imageScale = groupSize * 1.5f / hexagon.width @@ -142,6 +146,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { return } + updateTileImage(true) updateTerrainBaseImage() updateTerrainFeatureImage() updateCityImage() @@ -162,6 +167,11 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { fogImage.toFront() fogImage.isVisible = !(isViewable || showEntireMap) + circleImage.toFront() + for(borderImage in borderImages.flatMap { it.value }) + borderImage.toFront() + + lastIsRevealed = true } private fun updateTerrainBaseImage() { @@ -299,9 +309,11 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { } private fun updateTileColor(isViewable: Boolean) { + hexagon.color = + if (ImageGetter.imageExists(tileSetLocation + tileInfo.baseTerrain)) Color.WHITE // no need to color it, it's already colored + else tileInfo.getBaseTerrain().getColor() + if (!isViewable) hexagon.color = hexagon.color.lerp(Color.BLACK, 0.6f) - else if(ImageGetter.imageExists(tileSetLocation+tileInfo.baseTerrain)) return // no need to color it, it's already colored - else hexagon.color = tileInfo.getBaseTerrain().getColor() } private fun updateTerrainFeatureImage() { diff --git a/core/src/com/unciv/ui/worldscreen/Minimap.kt b/core/src/com/unciv/ui/worldscreen/Minimap.kt index 5dfedd66..e6d19d28 100644 --- a/core/src/com/unciv/ui/worldscreen/Minimap.kt +++ b/core/src/com/unciv/ui/worldscreen/Minimap.kt @@ -33,7 +33,7 @@ class Minimap(val tileMapHolder: TileMapHolder) : ScrollPane(null){ var bottomY = 0f for (tileInfo in tileMapHolder.tileMap.values) { - val hex = ImageGetter.getImage("TerrainIcons/Hexagon.png") + val hex = ImageGetter.getImage("OtherIcons/Hexagon") val positionalVector = HexMath().hex2WorldCoords(tileInfo.position) val groupSize = 10f diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt index 54c87b8d..00e5a8d9 100644 --- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt @@ -56,6 +56,8 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ addAutosaveTurnsSelectBox() + addTileSetSelectBox() + addSoundEffectsVolumeSlider() addButton("Close"){ remove() } @@ -101,6 +103,29 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){ }) } + private fun addTileSetSelectBox() { + add("Tileset".toLabel()) + + val tileSetSelectBox = SelectBox(skin) + val tileSetArray = Array() + val tileSets = ImageGetter.atlas.regions.filter { it.name.startsWith("TileSets") } + .map { it.name.split("/")[1] }.distinct() + for(tileset in tileSets) tileSetArray.add(tileset) + tileSetSelectBox.items = tileSetArray + tileSetSelectBox.selected = UnCivGame.Current.settings.tileSet + add(tileSetSelectBox).pad(10f).row() + + tileSetSelectBox.addListener(object : ChangeListener() { + override fun changed(event: ChangeEvent?, actor: Actor?) { + UnCivGame.Current.settings.tileSet = tileSetSelectBox.selected + UnCivGame.Current.settings.save() + UnCivGame.Current.worldScreen = WorldScreen() + UnCivGame.Current.setWorldScreen() + WorldScreenOptionsTable(UnCivGame.Current.worldScreen) + } + }) + } + private fun addAutosaveTurnsSelectBox() { add("Turns between autosaves".toLabel())