diff --git a/android/Images/BuildingIcons/Floating Gardens.png b/android/Images/BuildingIcons/Floating Gardens.png new file mode 100644 index 0000000000..00de6456ad Binary files /dev/null and b/android/Images/BuildingIcons/Floating Gardens.png differ diff --git a/android/Images/BuildingIcons/Garden.png b/android/Images/BuildingIcons/Garden.png new file mode 100644 index 0000000000..e3d654737a Binary files /dev/null and b/android/Images/BuildingIcons/Garden.png differ diff --git a/android/Images/BuildingIcons/Temple of Artemis.png b/android/Images/BuildingIcons/Temple of Artemis.png new file mode 100644 index 0000000000..4e44e2cbf4 Binary files /dev/null and b/android/Images/BuildingIcons/Temple of Artemis.png differ diff --git a/android/Images/NationIcons/Aztecs.png b/android/Images/NationIcons/Aztecs.png new file mode 100644 index 0000000000..20a0d94a33 Binary files /dev/null and b/android/Images/NationIcons/Aztecs.png differ diff --git a/android/Images/UnitIcons/Jaguar.png b/android/Images/UnitIcons/Jaguar.png new file mode 100644 index 0000000000..e0b2ff631c Binary files /dev/null and b/android/Images/UnitIcons/Jaguar.png differ diff --git a/android/Images/UnitPromotionIcons/Slinger Withdraw.png b/android/Images/UnitPromotionIcons/Slinger Withdraw.png new file mode 100644 index 0000000000..be6aed6462 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Slinger Withdraw.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 0a07f72b62..7afcc9aec5 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -41,434 +41,441 @@ BuildingIcons/Armory index: -1 BuildingIcons/Bank rotate: false - xy: 1264, 1308 + xy: 1366, 1308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 856, 1294 + xy: 614, 1238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 1570, 1228 + xy: 1672, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Big Ben rotate: false - xy: 1774, 1228 + xy: 1876, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Brandenburg Gate rotate: false - xy: 206, 1210 + xy: 308, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 308, 1210 + xy: 410, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 958, 1206 + xy: 1060, 1206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/CN Tower rotate: false - xy: 1060, 1206 + xy: 1162, 1206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 614, 1136 + xy: 1570, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 104, 1108 + xy: 206, 1108 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 512, 1108 + xy: 920, 1104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 920, 1104 + xy: 1022, 1104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colosseum rotate: false - xy: 1532, 1024 + xy: 1634, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colossus rotate: false - xy: 1634, 1024 + xy: 1736, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Courthouse rotate: false - xy: 920, 1002 + xy: 1022, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 1022, 1002 + xy: 1124, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 206, 904 + xy: 308, 904 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 1022, 900 + xy: 1124, 900 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Forbidden Palace +BuildingIcons/Floating Gardens rotate: false xy: 1736, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +BuildingIcons/Forbidden Palace + rotate: false + xy: 1940, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/Forge rotate: false - xy: 2, 818 + xy: 206, 802 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Garden + rotate: false + xy: 1226, 798 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 1430, 798 + xy: 614, 728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Great Wall rotate: false - xy: 1736, 718 + xy: 2, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 308, 700 + xy: 920, 696 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 410, 700 + xy: 1022, 696 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanse rotate: false - xy: 512, 700 + xy: 1124, 696 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 920, 696 + xy: 1226, 696 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 1124, 696 + xy: 1430, 696 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Himeji Castle rotate: false - xy: 1328, 696 + xy: 818, 682 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 1532, 616 + xy: 1838, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hubble Space Telescope rotate: false - xy: 1634, 616 + xy: 1940, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 1838, 616 + xy: 104, 598 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1124, 594 + xy: 1430, 594 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Kremlin rotate: false - xy: 1940, 514 + xy: 308, 496 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 2, 512 + xy: 410, 496 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 1022, 492 + xy: 1430, 492 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 1226, 492 + xy: 818, 478 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1328, 492 + xy: 614, 422 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Longhouse rotate: false - xy: 614, 428 + xy: 1838, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Picchu rotate: false - xy: 1940, 412 + xy: 308, 394 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Manhattan Project rotate: false - xy: 104, 394 + xy: 512, 394 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 920, 390 + xy: 1328, 390 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mausoleum of Halicarnassus rotate: false - xy: 1430, 390 + xy: 1736, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 818, 376 + xy: 1634, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1736, 310 + xy: 104, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 104, 292 + xy: 512, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1124, 288 + xy: 716, 274 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1328, 288 + xy: 614, 218 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mud Pyramid Mosque rotate: false - xy: 716, 274 + xy: 1532, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mughal Fort rotate: false - xy: 818, 274 + xy: 1634, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1532, 208 + xy: 1940, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 2, 206 + xy: 410, 190 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 308, 190 + xy: 1022, 186 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 920, 186 + xy: 1328, 186 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1226, 186 + xy: 818, 172 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1430, 186 + xy: 1736, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 614, 122 + xy: 1838, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1634, 106 + xy: 104, 89 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1838, 106 + xy: 206, 88 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 2, 104 + xy: 410, 88 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 410, 88 + xy: 1226, 84 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1532, 4 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Public School - rotate: false - xy: 1940, 4 + xy: 2, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -671,112 +678,112 @@ ImprovementIcons/Ancient ruins index: -1 ImprovementIcons/Barbarian encampment rotate: false - xy: 754, 1294 + xy: 856, 1294 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 1366, 1206 + xy: 1468, 1206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Citadel rotate: false - xy: 1022, 1104 + xy: 1124, 1104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 1124, 1104 + xy: 1226, 1104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 1430, 1002 + xy: 716, 988 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 1226, 900 + xy: 1328, 900 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 614, 830 + xy: 1532, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fort rotate: false - xy: 104, 802 + xy: 308, 802 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 308, 496 + xy: 1022, 492 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1634, 412 + xy: 2, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 206, 394 + xy: 920, 390 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1940, 310 + xy: 308, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 308, 292 + xy: 1022, 288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 818, 172 + xy: 1634, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 206, 88 + xy: 920, 84 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 818, 70 + xy: 1634, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -795,128 +802,135 @@ NationIcons/Arabia orig: 100, 100 offset: 0, 0 index: -1 +NationIcons/Aztecs + rotate: false + xy: 410, 1312 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 NationIcons/Babylon rotate: false - xy: 512, 1312 + xy: 958, 1308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/China rotate: false - xy: 206, 1108 + xy: 308, 1108 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/CityState rotate: false - xy: 1430, 1104 + xy: 716, 1090 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Denmark rotate: false - xy: 818, 988 + xy: 614, 932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Egypt rotate: false - xy: 104, 904 + xy: 206, 904 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/England rotate: false - xy: 920, 900 + xy: 1022, 900 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/France rotate: false - xy: 206, 802 + xy: 410, 802 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Germany rotate: false - xy: 1226, 798 + xy: 716, 784 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Greece rotate: false - xy: 2, 716 + xy: 308, 700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Inca rotate: false - xy: 2, 614 + xy: 308, 598 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/India rotate: false - xy: 206, 598 + xy: 512, 598 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Iroquois rotate: false - xy: 1226, 594 + xy: 716, 580 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Japan rotate: false - xy: 716, 580 + xy: 1532, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Korea rotate: false - xy: 1838, 514 + xy: 206, 496 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Mongolia rotate: false - xy: 1226, 288 + xy: 818, 274 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Persia rotate: false - xy: 920, 84 + xy: 1328, 84 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Polynesia rotate: false - xy: 1736, 5 + xy: 1940, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Banner rotate: false - xy: 1468, 1308 + xy: 754, 1294 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -930,112 +944,105 @@ OtherIcons/Circle index: -1 OtherIcons/Close rotate: false - xy: 818, 1090 + xy: 614, 1034 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 1226, 1002 + xy: 1328, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 1532, 922 + xy: 1634, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 716, 886 + xy: 818, 886 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Hexagon rotate: false - xy: 304, 1804 + xy: 583, 1804 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 1430, 492 + xy: 1736, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Lock rotate: false - xy: 716, 478 + xy: 1532, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 410, 394 + xy: 1124, 390 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 614, 326 + xy: 1838, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 920, 288 + xy: 1328, 288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 614, 224 + xy: 1838, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 410, 190 + xy: 1124, 186 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 1532, 106 + xy: 2, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 512, 88 + xy: 1124, 84 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 716, 70 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Puppet - rotate: false - xy: 2, 2 + xy: 1532, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1063,119 +1070,119 @@ ResourceIcons/Aluminum index: -1 ResourceIcons/Bananas rotate: false - xy: 1162, 1308 + xy: 1264, 1308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 1672, 1126 + xy: 1774, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 614, 1034 + xy: 1532, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 512, 1006 + xy: 920, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 716, 988 + xy: 818, 988 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 1634, 922 + xy: 1736, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 818, 886 + xy: 614, 830 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 410, 802 + xy: 920, 798 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 1124, 798 + xy: 1430, 798 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 1328, 798 + xy: 818, 784 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 614, 632 + xy: 1634, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 104, 598 + xy: 410, 598 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 512, 598 + xy: 1124, 594 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1328, 594 + xy: 818, 580 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 512, 394 + xy: 1226, 390 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 716, 172 + xy: 1532, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 308, 88 + xy: 1022, 84 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1189,7 +1196,7 @@ StatIcons/Acquire index: -1 StatIcons/CityConnection rotate: false - xy: 1226, 1104 + xy: 1328, 1104 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1308,348 +1315,334 @@ TechIcons/Atomic Theory index: -1 TechIcons/Ballistics rotate: false - xy: 1060, 1308 + xy: 1162, 1308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 1366, 1308 + xy: 1468, 1308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 1876, 1228 + xy: 2, 1226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 410, 1210 + xy: 512, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 1162, 1206 + xy: 1264, 1206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 2, 1124 + xy: 104, 1108 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 308, 1108 + xy: 410, 1108 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 716, 1090 + xy: 818, 1090 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combined Arms rotate: false - xy: 1736, 1024 + xy: 1838, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 1838, 1024 + xy: 1940, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 2, 1022 + xy: 104, 1006 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 104, 1006 + xy: 206, 1006 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 308, 1006 + xy: 410, 1006 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 1328, 1002 + xy: 1430, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 1736, 922 + xy: 1838, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ecology rotate: false - xy: 1838, 922 + xy: 1940, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 1940, 922 + xy: 2, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 2, 920 + xy: 104, 904 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 308, 904 + xy: 410, 904 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electronics rotate: false - xy: 410, 904 + xy: 512, 904 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 512, 904 + xy: 920, 900 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 1328, 900 + xy: 1430, 900 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 1532, 820 + xy: 1634, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 512, 802 + xy: 1022, 798 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 104, 700 + xy: 410, 700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 206, 700 + xy: 512, 700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 716, 682 + xy: 1736, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 308, 598 + xy: 920, 594 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 920, 594 + xy: 1226, 594 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Lasers rotate: false - xy: 920, 492 + xy: 1328, 492 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1838, 412 + xy: 206, 394 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1124, 390 + xy: 716, 376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 1226, 390 + xy: 818, 376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1328, 390 + xy: 614, 320 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1532, 310 + xy: 1940, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1634, 310 + xy: 2, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1838, 310 + xy: 206, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 2, 308 + xy: 410, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 410, 292 + xy: 1124, 288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1838, 208 + xy: 206, 190 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 206, 190 + xy: 920, 186 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1022, 186 + xy: 1430, 186 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1736, 107 + xy: 1940, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 104, 88 + xy: 512, 88 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1124, 84 + xy: 716, 70 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1226, 84 + xy: 818, 70 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1328, 84 + xy: 614, 14 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics - rotate: false - xy: 614, 20 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TechIcons/Pottery - rotate: false - xy: 1634, 4 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TechIcons/Printing Press rotate: false xy: 1838, 4 size: 100, 100 @@ -1665,16 +1658,86 @@ TileSets/Default/AtollOverlay index: -1 TileSets/Default/CityOverlay rotate: false - xy: 1328, 1104 + xy: 1430, 1104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/CrosshatchHexagon +TileSets/Default/FalloutOverlay rotate: false - xy: 862, 1808 - size: 273, 236 - orig: 273, 236 + xy: 1226, 900 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/Flood plainsOverlay + rotate: false + xy: 1838, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/ForestOverlay + rotate: false + xy: 104, 802 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/HillOverlay + rotate: false + xy: 716, 682 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/IceOverlay + rotate: false + xy: 206, 598 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/JungleOverlay + rotate: false + xy: 1838, 514 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/LakesOverlay + rotate: false + xy: 512, 496 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/MarshOverlay + rotate: false + xy: 1430, 390 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/MountainOverlay + rotate: false + xy: 1736, 214 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/NaturalWonderOverlay + rotate: false + xy: 512, 190 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/OasisOverlay + rotate: false + xy: 614, 116 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/CrosshatchHexagon @@ -1684,95 +1747,25 @@ TileSets/FantasyHex/CrosshatchHexagon orig: 273, 236 offset: 0, 0 index: -1 -TileSets/Default/FalloutOverlay +TileSets/Default/CrosshatchHexagon rotate: false - xy: 1124, 900 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/Flood plainsOverlay - rotate: false - xy: 1634, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/ForestOverlay - rotate: false - xy: 1940, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/Hexagon - rotate: false - xy: 583, 1804 - size: 277, 240 - orig: 277, 240 + xy: 862, 1808 + size: 273, 236 + orig: 273, 236 offset: 0, 0 index: -1 TileSets/FantasyHex/Hexagon rotate: false - xy: 583, 1804 + xy: 304, 1804 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 -TileSets/Default/HillOverlay +TileSets/Default/Hexagon rotate: false - xy: 1226, 696 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/IceOverlay - rotate: false - xy: 1940, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/JungleOverlay - rotate: false - xy: 614, 530 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/LakesOverlay - rotate: false - xy: 104, 496 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/MarshOverlay - rotate: false - xy: 1022, 390 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/MountainOverlay - rotate: false - xy: 1430, 288 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/NaturalWonderOverlay - rotate: false - xy: 104, 190 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/OasisOverlay - rotate: false - xy: 1328, 186 - size: 100, 100 - orig: 100, 100 + xy: 304, 1804 + size: 277, 240 + orig: 277, 240 offset: 0, 0 index: -1 UnitIcons/Anti-Aircraft Gun @@ -1805,455 +1798,462 @@ UnitIcons/Artillery index: -1 UnitIcons/B17 rotate: false - xy: 410, 1312 + xy: 512, 1312 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 958, 1308 + xy: 1060, 1308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Battleship rotate: false - xy: 614, 1238 + xy: 1570, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Berserker rotate: false - xy: 1672, 1228 + xy: 1774, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bomber rotate: false - xy: 2, 1226 + xy: 104, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 104, 1210 + xy: 206, 1210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Brute rotate: false - xy: 512, 1210 + xy: 958, 1206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Camel Archer rotate: false - xy: 1264, 1206 + xy: 1366, 1206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 1468, 1206 + xy: 716, 1192 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 716, 1192 + xy: 818, 1192 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Carrier rotate: false - xy: 818, 1192 + xy: 614, 1136 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 1570, 1126 + xy: 1672, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 1774, 1126 + xy: 1876, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 1876, 1126 + xy: 2, 1124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chu-Ko-Nu rotate: false - xy: 410, 1108 + xy: 512, 1108 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 1940, 1024 + xy: 2, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Conquistador rotate: false - xy: 206, 1006 + xy: 308, 1006 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cossack rotate: false - xy: 410, 1006 + xy: 512, 1006 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 1124, 1002 + xy: 1226, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Destroyer rotate: false - xy: 614, 932 + xy: 1532, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Fighter rotate: false - xy: 1430, 900 + xy: 716, 886 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Foreign Legion rotate: false - xy: 1838, 820 + xy: 2, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 308, 802 + xy: 512, 802 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 920, 798 + xy: 1124, 798 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 1022, 798 + xy: 1328, 798 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 716, 784 + xy: 1532, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 818, 784 + xy: 1634, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great General rotate: false - xy: 614, 734 + xy: 1736, 724 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 614, 734 + xy: 1736, 724 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 1532, 718 + xy: 1838, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 1634, 718 + xy: 1940, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Bomber rotate: false - xy: 1838, 718 + xy: 104, 700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Infantry rotate: false - xy: 1940, 718 + xy: 206, 700 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Helicopter rotate: false - xy: 1022, 696 + xy: 1328, 696 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hoplite rotate: false - xy: 1430, 696 + xy: 614, 626 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 818, 682 + xy: 1532, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hwach'a rotate: false - xy: 1736, 616 + xy: 2, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Infantry rotate: false - xy: 410, 598 + xy: 1022, 594 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1022, 594 + xy: 1328, 594 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Jaguar + rotate: false + xy: 614, 524 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Janissary rotate: false - xy: 1430, 594 + xy: 1736, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Jet Fighter rotate: false - xy: 818, 580 + xy: 1634, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Keshik rotate: false - xy: 1532, 514 + xy: 1940, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Khan rotate: false - xy: 1634, 514 + xy: 2, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1736, 514 + xy: 104, 496 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 206, 496 + xy: 920, 492 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 410, 496 + xy: 1124, 492 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landsknecht rotate: false - xy: 512, 496 + xy: 1226, 492 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Legion rotate: false - xy: 1124, 492 + xy: 716, 478 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 818, 478 + xy: 1634, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1532, 412 + xy: 1940, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 1736, 412 + xy: 104, 394 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mandekalu Cavalry rotate: false - xy: 2, 410 + xy: 410, 394 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Maori Warrior rotate: false - xy: 308, 394 + xy: 1022, 390 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 716, 376 + xy: 1532, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 206, 292 + xy: 920, 288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 512, 292 + xy: 1226, 288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mohawk Warrior rotate: false - xy: 1022, 288 + xy: 1430, 288 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1634, 208 + xy: 2, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1736, 209 + xy: 104, 191 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Naresuan's Elephant rotate: false - xy: 1940, 208 + xy: 308, 190 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Norwegian Ski Infantry rotate: false - xy: 512, 190 + xy: 1226, 186 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Nuclear Missile rotate: false - xy: 1124, 186 + xy: 716, 172 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Panzer rotate: false - xy: 1940, 106 + xy: 308, 88 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Persian Immortal rotate: false - xy: 1022, 84 + xy: 1430, 84 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1430, 84 + xy: 1736, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2264,3047 +2264,3089 @@ size: 2048,1024 format: RGBA8888 filter: MipMapLinearLinear,MipMapLinearLinear repeat: none +BuildingIcons/Public School + rotate: false + xy: 104, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/Research Lab rotate: false - xy: 206, 818 + xy: 206, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 410, 818 + xy: 206, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 512, 920 + xy: 308, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 2, 308 + xy: 410, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 104, 410 + xy: 512, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Satrap's Court rotate: false - xy: 512, 818 + xy: 206, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 206, 410 + xy: 614, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 308, 410 + xy: 716, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 614, 716 + xy: 104, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 818, 920 + xy: 308, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 410, 410 + xy: 818, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 512, 512 + xy: 920, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 614, 614 + xy: 104, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Zeus rotate: false - xy: 716, 716 + xy: 206, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 206, 104 + xy: 614, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 410, 308 + xy: 818, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 512, 410 + xy: 920, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1022, 920 + xy: 512, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 206, 2 + xy: 614, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 410, 206 + xy: 818, 616 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Temple of Artemis + rotate: false + xy: 920, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Terracotta Army rotate: false - xy: 716, 512 + xy: 308, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 818, 614 + xy: 410, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 920, 716 + xy: 512, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1022, 818 + xy: 614, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1124, 920 + xy: 716, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 410, 104 + xy: 920, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 614, 308 + xy: 1124, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 512, 104 + xy: 1022, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 716, 308 + xy: 1226, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls of Babylon rotate: false - xy: 818, 410 + xy: 1328, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Wat rotate: false - xy: 1226, 817 + xy: 818, 309 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Water Mill rotate: false - xy: 1328, 920 + xy: 920, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 716, 206 + xy: 1226, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1124, 614 + xy: 716, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 1848, 762 + xy: 1282, 406 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/TurnOld rotate: false - xy: 1900, 814 + xy: 1180, 354 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 2, 920 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 104, 818 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/Railroad - rotate: false - xy: 104, 818 + xy: 104, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 308, 818 + xy: 206, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 614, 410 + xy: 1124, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 818, 512 + xy: 410, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 206, 614 + xy: 2, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 308, 716 + xy: 104, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Siam rotate: false - xy: 716, 920 + xy: 308, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Songhai rotate: false - xy: 716, 818 + xy: 206, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Spain rotate: false - xy: 2, 2 + xy: 410, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 308, 2 + xy: 818, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 920, 358 + xy: 1430, 870 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 1328, 766 + xy: 818, 155 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Down rotate: false - xy: 1380, 766 + xy: 1948, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 +OtherIcons/Puppet + rotate: false + xy: 2, 718 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 OtherIcons/Quickstart rotate: false - xy: 2, 818 + xy: 206, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 2, 512 + xy: 410, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Scenario rotate: false - xy: 614, 920 + xy: 308, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 512, 716 + xy: 104, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 410, 512 + xy: 818, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 614, 512 + xy: 1022, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/TableBackground rotate: false - xy: 1796, 814 + xy: 1434, 662 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Up rotate: false - xy: 1900, 762 + xy: 1232, 354 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 813, 99 + xy: 1058, 93 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1124, 562 + xy: 716, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 716, 102 + xy: 1636, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 768, 154 + xy: 1022, 345 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 870, 256 + xy: 1740, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 972, 358 + xy: 1792, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1176, 562 + xy: 1896, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1432, 801 + xy: 1226, 614 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Fascism rotate: false - xy: 1493, 970 + xy: 1380, 768 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1649, 970 + xy: 768, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1701, 970 + xy: 972, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1753, 970 + xy: 972, 206 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1909, 970 + xy: 1024, 241 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1534, 918 + xy: 1228, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1534, 866 + xy: 1228, 510 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1586, 866 + xy: 1280, 510 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1690, 918 + xy: 1432, 818 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1690, 866 + xy: 1432, 766 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1742, 918 + xy: 1484, 818 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1742, 866 + xy: 1484, 766 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1794, 918 + xy: 1074, 447 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1846, 918 + xy: 1126, 447 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1898, 918 + xy: 1330, 716 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1898, 866 + xy: 1330, 664 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1950, 918 + xy: 1534, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1950, 866 + xy: 1586, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1484, 814 + xy: 1638, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1484, 762 + xy: 1690, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1536, 814 + xy: 1742, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1588, 814 + xy: 1898, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1588, 762 + xy: 1076, 343 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1640, 814 + xy: 1076, 291 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1588, 710 + xy: 1076, 239 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1692, 814 + xy: 1128, 291 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1692, 710 + xy: 1434, 714 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1796, 762 + xy: 1486, 662 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1848, 814 + xy: 1178, 406 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1796, 710 + xy: 1230, 406 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1848, 710 + xy: 1180, 302 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1952, 814 + xy: 1232, 302 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 410, 614 + xy: 2, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 2, 104 + xy: 410, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 104, 206 + xy: 512, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 308, 308 + xy: 716, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 308, 206 + xy: 716, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 818, 716 + xy: 308, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 614, 206 + xy: 1124, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 512, 2 + xy: 1022, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 614, 104 + xy: 1124, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 818, 308 + xy: 1328, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/InterceptRange rotate: false - xy: 1482, 918 + xy: 1176, 551 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 1846, 866 + xy: 1126, 395 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Range rotate: false - xy: 1484, 710 + xy: 1794, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1536, 762 + xy: 1846, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 308, 920 + xy: 308, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Specialist rotate: false - xy: 206, 206 + xy: 614, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1744, 762 + xy: 1382, 662 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 +TechIcons/Pottery + rotate: false + xy: 2, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Printing Press + rotate: false + xy: 2, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 TechIcons/Radar rotate: false - xy: 104, 920 + xy: 2, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 2, 716 + xy: 104, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 206, 920 + xy: 308, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 2, 614 + xy: 2, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 104, 716 + xy: 104, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 206, 716 + xy: 104, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 410, 920 + xy: 308, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 104, 512 + xy: 512, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 206, 512 + xy: 614, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 410, 716 + xy: 104, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 2, 206 + xy: 410, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 920, 920 + xy: 410, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 104, 2 + xy: 512, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 512, 206 + xy: 1022, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 716, 410 + xy: 1226, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 920, 614 + xy: 512, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1226, 715 + xy: 818, 207 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/Tiles/River-Bottom +TileSets/Default/Railroad rotate: false - xy: 1228, 133 - size: 32, 28 - orig: 32, 28 + xy: 206, 820 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -TileSets/FantasyHex/Tiles/River-Bottom +ImprovementIcons/Railroad rotate: false - xy: 1228, 133 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/Default/Tiles/River-BottomLeft - rotate: false - xy: 922, 232 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/River-BottomLeft - rotate: false - xy: 922, 232 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/Default/Tiles/River-BottomRight - rotate: false - xy: 956, 232 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/River-BottomRight - rotate: false - xy: 956, 232 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/Default/road - rotate: false - xy: 614, 91 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/road - rotate: false - xy: 614, 91 - size: 61, 11 - orig: 61, 11 + xy: 206, 820 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 1430, 1009 + xy: 1022, 501 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Academy rotate: false - xy: 1278, 677 + xy: 870, 169 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Aluminum rotate: false - xy: 614, 9 + xy: 818, 125 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins rotate: false - xy: 818, 226 + xy: 1534, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 2013, 992 + xy: 1232, 220 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bananas rotate: false - xy: 954, 328 + xy: 1284, 346 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment rotate: false - xy: 1056, 430 + xy: 1602, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barringer Crater rotate: false - xy: 1158, 532 + xy: 1284, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Camp+Deer rotate: false - xy: 2002, 932 + xy: 1738, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Camp+Furs rotate: false - xy: 2002, 902 + xy: 1772, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Camp+Ivory rotate: false - xy: 2002, 872 + xy: 1806, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle rotate: false - xy: 2004, 726 + xy: 1232, 190 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cerro de Potosi rotate: false - xy: 1278, 647 + xy: 904, 176 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 1312, 647 + xy: 1266, 213 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City rotate: false - xy: 1346, 647 + xy: 1266, 176 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+City rotate: false - xy: 1346, 647 + xy: 1266, 176 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+City rotate: false - xy: 1346, 647 + xy: 1266, 176 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1380, 684 + xy: 870, 139 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City-Ancient era rotate: false - xy: 1380, 642 + xy: 904, 134 size: 32, 40 orig: 32, 40 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City-Classical era rotate: false - xy: 1414, 655 + xy: 938, 134 size: 32, 40 orig: 32, 40 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City-Medieval era rotate: false - xy: 1448, 655 + xy: 972, 134 size: 32, 40 orig: 32, 40 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coal rotate: false - xy: 1484, 680 + xy: 1318, 346 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 1518, 680 + xy: 1318, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast+Atoll rotate: false - xy: 1552, 680 + xy: 1318, 286 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast+Ice rotate: false - xy: 1586, 680 + xy: 1318, 256 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast+Oil well rotate: false - xy: 1620, 680 + xy: 1300, 226 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cotton rotate: false - xy: 1756, 680 + xy: 1334, 196 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 1858, 673 + xy: 1006, 152 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer rotate: false - xy: 1892, 680 + xy: 1040, 159 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1926, 680 + xy: 1074, 157 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+City rotate: false - xy: 1960, 675 + xy: 1108, 152 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Fallout rotate: false - xy: 1482, 650 + xy: 1142, 157 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1516, 650 + xy: 1006, 122 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains rotate: false - xy: 1550, 650 + xy: 1040, 129 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1584, 650 + xy: 1074, 127 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Oasis rotate: false - xy: 1618, 650 + xy: 1108, 122 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes rotate: false - xy: 711, 72 + xy: 1176, 140 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/El Dorado rotate: false - xy: 745, 71 + xy: 1536, 859 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fish rotate: false - xy: 779, 72 + xy: 1536, 829 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 666, 46 + xy: 1570, 860 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats+Whales rotate: false - xy: 700, 42 + xy: 1536, 799 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 820, 191 + xy: 1604, 855 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fountain of Youth rotate: false - xy: 820, 157 + xy: 1570, 796 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs rotate: false - xy: 854, 196 + xy: 1604, 825 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gems rotate: false - xy: 854, 110 + xy: 1176, 110 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gold rotate: false - xy: 888, 198 + xy: 1142, 99 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 888, 164 + xy: 820, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 888, 134 + xy: 820, 61 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Fallout rotate: false - xy: 888, 104 + xy: 820, 31 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 813, 69 + xy: 1176, 80 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false - xy: 854, 77 + xy: 1332, 601 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Aluminum rotate: false - xy: 888, 71 + xy: 1332, 568 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 922, 295 + xy: 1332, 535 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Deer rotate: false - xy: 922, 262 + xy: 1332, 502 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Furs rotate: false - xy: 956, 295 + xy: 1332, 469 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Coal rotate: false - xy: 956, 262 + xy: 1334, 436 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Gold rotate: false - xy: 990, 295 + xy: 2002, 961 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Iron rotate: false - xy: 990, 262 + xy: 2002, 928 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 1024, 397 + xy: 2010, 895 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Silver rotate: false - xy: 1024, 364 + xy: 1040, 96 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false - xy: 1058, 396 + xy: 1074, 93 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1058, 362 + xy: 1108, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1092, 399 + xy: 1142, 68 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1414, 625 + xy: 1176, 50 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1618, 620 + xy: 1368, 226 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Fallout rotate: false - xy: 1126, 498 + xy: 1368, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest rotate: false - xy: 1126, 468 + xy: 1368, 162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp rotate: false - xy: 1160, 502 + xy: 2010, 865 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill rotate: false - xy: 1160, 472 + xy: 1874, 862 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Trading post rotate: false - xy: 1194, 502 + xy: 1908, 862 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Marble+Quarry rotate: false - xy: 1194, 472 + xy: 1942, 860 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 1824, 652 + xy: 1976, 860 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Stone+Quarry rotate: false - xy: 1858, 643 + xy: 2010, 835 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Terrace farm rotate: false - xy: 1892, 650 + xy: 1214, 160 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 1994, 666 + xy: 1210, 70 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 682, 12 + xy: 854, 109 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 716, 11 + xy: 854, 79 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 768, 41 + xy: 854, 49 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 1228, 485 + xy: 956, 102 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1228, 455 + xy: 888, 46 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1092, 331 + xy: 888, 8 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1024, 233 + xy: 1024, 55 size: 32, 39 orig: 32, 39 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1092, 243 + xy: 1024, 25 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 784, 9 + xy: 1092, 58 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1126, 437 + xy: 1058, 4 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1194, 440 + xy: 1126, 6 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1126, 399 + xy: 1160, 2 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1228, 425 + xy: 1366, 574 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean+Atoll rotate: false - xy: 1126, 339 + xy: 1366, 544 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean+Ice rotate: false - xy: 1160, 354 + xy: 1366, 514 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1194, 380 + xy: 1366, 484 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1228, 395 + xy: 1368, 454 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1126, 305 + xy: 1368, 420 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1228, 365 + xy: 1466, 632 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Cattle rotate: false - xy: 1160, 292 + xy: 1244, 126 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Horses rotate: false - xy: 1194, 316 + xy: 1244, 92 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Sheep rotate: false - xy: 1228, 331 + xy: 1244, 58 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture2 rotate: false - xy: 1126, 275 + xy: 1500, 632 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1126, 245 + xy: 1534, 632 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1228, 301 + xy: 1672, 860 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 1126, 208 + xy: 1638, 793 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Fallout rotate: false - xy: 1160, 232 + xy: 1672, 830 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1194, 256 + xy: 1706, 860 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 1228, 266 + xy: 1672, 795 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1160, 197 + xy: 1706, 825 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer rotate: false - xy: 1194, 221 + xy: 1740, 855 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs rotate: false - xy: 1228, 231 + xy: 1774, 855 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1194, 186 + xy: 1808, 855 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 1228, 197 + xy: 1706, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1228, 163 + xy: 1740, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 836, 39 + xy: 1740, 791 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 852, 9 + xy: 1774, 825 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1092, 185 + xy: 1774, 795 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Dyes rotate: false - xy: 1126, 178 + xy: 1808, 825 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Incense rotate: false - xy: 1160, 167 + xy: 1808, 795 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Silk rotate: false - xy: 1194, 156 + xy: 1638, 763 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Spices rotate: false - xy: 870, 41 + xy: 1672, 765 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Sugar rotate: false - xy: 904, 41 + xy: 1706, 761 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Wine rotate: false - xy: 886, 11 + xy: 1740, 761 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 920, 11 + xy: 1774, 765 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1892, 620 + xy: 1808, 765 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1926, 620 + xy: 1672, 735 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1960, 615 + xy: 1706, 731 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-Bottom + rotate: false + xy: 1774, 735 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-Bottom + rotate: false + xy: 1774, 735 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-BottomLeft + rotate: false + xy: 1808, 735 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-BottomLeft + rotate: false + xy: 1808, 735 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-BottomRight + rotate: false + xy: 1774, 705 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-BottomRight + rotate: false + xy: 1774, 705 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 990, 228 + xy: 1808, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 922, 172 + xy: 1386, 330 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 956, 172 + xy: 1386, 272 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 990, 198 + xy: 1400, 602 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow rotate: false - xy: 922, 114 + xy: 1400, 544 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 990, 168 + xy: 1468, 602 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1024, 175 + xy: 1400, 514 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 956, 112 + xy: 1400, 484 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Trading post rotate: false - xy: 1126, 148 + xy: 1502, 572 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 956, 82 + xy: 1468, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 990, 101 + xy: 1502, 535 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Fallout rotate: false - xy: 1024, 115 + xy: 1402, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 1058, 118 + xy: 1536, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1092, 121 + xy: 1536, 564 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer rotate: false - xy: 1126, 114 + xy: 1436, 450 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs rotate: false - xy: 1160, 103 + xy: 1536, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1194, 94 + xy: 1502, 501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 990, 71 + xy: 1536, 500 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 1126, 84 + xy: 1420, 392 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 1160, 73 + xy: 1420, 362 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1194, 64 + xy: 1420, 332 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1092, 155 + xy: 1468, 542 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Aircraft Gun rotate: false - xy: 920, 328 + xy: 2000, 994 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Tank Gun rotate: false - xy: 1022, 430 + xy: 1330, 634 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archer rotate: false - xy: 1124, 532 + xy: 1178, 469 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Artillery rotate: false - xy: 1226, 633 + xy: 1284, 376 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ballista rotate: false - xy: 852, 226 + xy: 1568, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battleship rotate: false - xy: 886, 228 + xy: 1636, 892 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berserker rotate: false - xy: 988, 328 + xy: 1284, 286 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bowman rotate: false - xy: 1090, 430 + xy: 1284, 256 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Brute rotate: false - xy: 1192, 532 + xy: 1670, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Camel Archer rotate: false - xy: 2013, 962 + xy: 1704, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cannon rotate: false - xy: 2004, 842 + xy: 1840, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 2004, 814 + xy: 1874, 892 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Carrier rotate: false - xy: 2004, 786 + xy: 1908, 892 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Catapult rotate: false - xy: 2004, 756 + xy: 1942, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cavalry rotate: false - xy: 2004, 696 + xy: 1976, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chariot Archer rotate: false - xy: 1312, 684 + xy: 938, 176 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 1346, 684 + xy: 972, 176 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 648, 9 + xy: 1318, 376 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 1654, 682 + xy: 1300, 198 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1688, 682 + xy: 1300, 170 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1722, 680 + xy: 1334, 226 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1790, 680 + xy: 1334, 166 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 1824, 682 + xy: 1180, 170 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 677, 76 + xy: 1142, 129 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 734, 41 + xy: 1570, 830 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 820, 129 + xy: 1536, 771 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 854, 168 + xy: 1604, 797 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 854, 140 + xy: 1570, 768 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 820, 99 + xy: 1604, 767 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 820, 99 + xy: 1604, 767 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1092, 369 + xy: 1334, 406 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1448, 625 + xy: 1352, 376 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1448, 625 + xy: 1352, 376 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1482, 620 + xy: 1352, 346 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1516, 620 + xy: 1352, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1516, 620 + xy: 1352, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1550, 620 + xy: 1352, 286 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1584, 620 + xy: 1352, 256 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1584, 620 + xy: 1352, 256 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1926, 650 + xy: 1210, 130 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1960, 645 + xy: 1210, 100 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1994, 636 + xy: 1210, 40 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 750, 13 + xy: 820, 3 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 802, 39 + xy: 854, 19 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1228, 603 + xy: 888, 104 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1228, 575 + xy: 922, 106 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1228, 547 + xy: 888, 76 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1228, 517 + xy: 922, 76 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1024, 334 + xy: 922, 46 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1058, 332 + xy: 956, 72 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1058, 332 + xy: 956, 72 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1024, 304 + xy: 922, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1024, 274 + xy: 956, 42 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1058, 302 + xy: 956, 12 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1092, 301 + xy: 990, 92 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1058, 272 + xy: 990, 62 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1092, 273 + xy: 990, 34 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1058, 242 + xy: 990, 4 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1058, 212 + xy: 1058, 63 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1092, 215 + xy: 1058, 35 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 818, 9 + xy: 1092, 28 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1160, 442 + xy: 1126, 38 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1160, 412 + xy: 1194, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1126, 369 + xy: 1228, 10 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1160, 384 + xy: 1364, 634 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1194, 410 + xy: 1366, 604 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1160, 326 + xy: 1398, 634 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1194, 350 + xy: 1432, 632 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1160, 262 + xy: 1638, 860 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1194, 286 + xy: 1638, 830 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1994, 606 + xy: 1740, 731 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 922, 202 + xy: 1386, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 956, 202 + xy: 1386, 360 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 922, 144 + xy: 1386, 302 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1024, 205 + xy: 1400, 574 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1058, 182 + xy: 1434, 602 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 956, 142 + xy: 1434, 572 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 922, 86 + xy: 1434, 544 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 990, 138 + xy: 1468, 572 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1024, 145 + xy: 1502, 602 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1058, 152 + xy: 1434, 514 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1160, 137 + xy: 1434, 484 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1194, 128 + xy: 1402, 456 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1228, 105 + xy: 1468, 484 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1024, 85 + xy: 1470, 454 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1058, 90 + xy: 1436, 422 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1092, 93 + xy: 1470, 426 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1228, 77 + xy: 1420, 304 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 +TileSets/FantasyHex/road + rotate: false + xy: 1124, 603 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +TileSets/Default/road + rotate: false + xy: 1124, 603 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 UnitIcons/Rifleman rotate: false - xy: 104, 614 + xy: 2, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 2, 410 + xy: 410, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 308, 614 + xy: 2, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 104, 308 + xy: 512, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 308, 512 + xy: 716, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ship of the Line rotate: false - xy: 614, 818 + xy: 206, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sipahi rotate: false - xy: 206, 308 + xy: 614, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Slinger rotate: false - xy: 512, 614 + xy: 2, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 104, 104 + xy: 512, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Stealth Bomber rotate: false - xy: 818, 818 + xy: 308, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 716, 614 + xy: 206, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 920, 818 + xy: 410, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 308, 104 + xy: 716, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tercio rotate: false - xy: 512, 308 + xy: 1022, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1022, 716 + xy: 614, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Triplane rotate: false - xy: 1124, 818 + xy: 716, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 1226, 919 + xy: 818, 411 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Turtle Ship rotate: false - xy: 410, 2 + xy: 920, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Chariot rotate: false - xy: 920, 512 + xy: 512, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Elephant rotate: false - xy: 1022, 614 + xy: 614, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1124, 716 + xy: 716, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 920, 410 + xy: 1430, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1022, 512 + xy: 614, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Zero rotate: false - xy: 1328, 818 + xy: 920, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy rotate: false - xy: 716, 154 + xy: 1226, 666 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Air Repair rotate: false - xy: 818, 256 + xy: 1328, 768 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush rotate: false - xy: 1022, 460 + xy: 1532, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Armor Plating rotate: false - xy: 1226, 663 + xy: 716, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 1430, 957 + xy: 920, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz rotate: false - xy: 614, 39 + xy: 1022, 449 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding Party rotate: false - xy: 1430, 905 + xy: 1124, 551 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 1430, 853 + xy: 1584, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge rotate: false - xy: 1328, 714 + xy: 1022, 397 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal Raider rotate: false - xy: 768, 102 + xy: 1688, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Cover rotate: false - xy: 1074, 460 + xy: 1844, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1074, 460 + xy: 1844, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 1380, 714 + xy: 920, 206 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 1432, 749 + xy: 1278, 666 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1432, 697 + xy: 1278, 614 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1432, 697 + xy: 1278, 614 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Flight Deck rotate: false - xy: 1545, 970 + xy: 1482, 870 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Formation rotate: false - xy: 1597, 970 + xy: 768, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Haka War Dance rotate: false - xy: 1805, 970 + xy: 1124, 499 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Heal Instantly rotate: false - xy: 1857, 970 + xy: 1024, 293 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect Fire rotate: false - xy: 1961, 970 + xy: 1024, 189 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Interception rotate: false - xy: 1482, 866 + xy: 1176, 499 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics rotate: false - xy: 1586, 918 + xy: 1280, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/March rotate: false - xy: 1638, 918 + xy: 1228, 458 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 1638, 866 + xy: 1280, 458 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility rotate: false - xy: 1794, 866 + xy: 1074, 395 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Rejuvenation rotate: false - xy: 1536, 710 + xy: 1950, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting rotate: false - xy: 1640, 762 + xy: 1128, 343 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry rotate: false - xy: 1640, 762 + xy: 1128, 343 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 1640, 710 + xy: 1128, 239 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 1692, 762 + xy: 1076, 187 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Slinger Withdraw + rotate: false + xy: 1128, 187 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sortie rotate: false - xy: 1744, 814 + xy: 1382, 714 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting rotate: false - xy: 1744, 710 + xy: 1486, 714 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting I (air) rotate: false - xy: 1744, 710 + xy: 1486, 714 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Volley rotate: false - xy: 1900, 710 + xy: 1180, 250 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack rotate: false - xy: 1952, 762 + xy: 1180, 198 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman rotate: false - xy: 1952, 710 + xy: 1232, 250 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index bb89ee1ae6..aabe0bf31a 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/game2.png b/android/assets/game2.png index 8ee5cb8659..995293cc53 100644 Binary files a/android/assets/game2.png and b/android/assets/game2.png differ diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index 4a2fb7e723..387e431cdb 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -48,7 +48,7 @@ "name": "Library", "hurryCostModifier": 25, "maintenance": 1, - "uniques": ["+1 Science Per 2 Population"], + "uniques": ["[+1 Science] Per [2] Population in this city"], "requiredTech": "Writing" }, { @@ -68,7 +68,7 @@ "uniqueTo": "China", "hurryCostModifier": 25, "gold": 2, - "uniques": ["+1 Science Per 2 Population"], + "uniques": ["[+1 Science] Per [2] Population in this city"], "requiredTech": "Writing" }, { @@ -87,19 +87,29 @@ "uniques": ["Must be next to river"], "requiredTech": "The Wheel" }, - - /* + { + "name": "Floating Gardens", + "replaces": "Water Mill", + "uniqueTo": "Aztecs", + "cost": 75, + "food": 2, + "production": 1, + "uniques": ["[+2 Food] from [Lakes] tiles in this city", "Must border a source of fresh water"], + "hurryCostModifier": 25, + "maintenance": 1, + "percentStatBonus": {"food": 15}, + "requiredTech": "The Wheel" + }, { "name": "Temple of Artemis", "culture": 1, "isWonder": true, + "cost": 185, "greatPersonPoints": {"production": 1}, - "uniques": ["+10% Growth in all Cities.","+15% Production towards Ranged Units."], - "requiredTech": "Archery" - "quote": "'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson" + "uniques": ["+[10]% growth in all cities", "+[15]% Production when constructing [ranged units]"], + "requiredTech": "Archery", + "quote": "'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson" }, - */ - { "name": "Walls", "cityStrength": 5, @@ -309,16 +319,15 @@ "hurryCostModifier": 25, "requiredTech": "Currency" }, - /* - { //Must be built in or near Desert + { // Will be Introduced in Gods & Kings. Flood plains are not supposed to be affected by this wonder. Add stats to all desert tiles and then add negative stats to flood plains to undo the effect on them for now "name": "Petra", "culture": 1, "isWonder": true, "greatPersonPoints": {"production": 1}, - "uniques": ["+1 Food and +1 Production from all worked Desert tiles in the City (except Flood plains).","+6 Culture when discovering Archeology."], - "requiredTech": "Currency" - "quote": "'...who drinks the water I shall give him, says the Lord, will have a spring inside him welling up for eternal life. Let them bring me to your holy mountain in the place where you dwell. Across the desert and through the mountain to the Canyon of the Crescent Moon...' - Indiana Jones" + "uniques": ["Must be next to [Desert]", "[+1 Food, +1 Production] from [Desert] tiles in this city", "[-1 Food, -1 Production] from [Flood plains] tiles in this city", "[+6 Culture] once [Archaeology] is discovered"], + "requiredTech": "Currency", + "quote": "'...who drinks the water I shall give him, says the Lord, will have a spring inside him welling up for eternal life. Let them bring me to your holy mountain in the place where you dwell. Across the desert and through the mountain to the Canyon of the Crescent Moon...' - Indiana Jones" }, */ { @@ -341,6 +350,14 @@ // Medieval Era + { + "name": "Garden", + "cost": 120, + "uniques": ["+[25]% great person generation in this city", "Must border a source of fresh water"], + "hurryCostModifier": 25, + "maintenance": 1, + "requiredTech": "Theology" + }, { "name": "Monastery", "maintenance": 0, @@ -481,6 +498,7 @@ "culture": 2, "hurryCostModifier": 25, "requiredBuilding": "Walls", + "uniques": ["[+1 Gold] once [Flight] is discovered"], "requiredTech": "Chivalry" }, { @@ -701,7 +719,7 @@ "requiredBuilding": "University", "maintenance": 3, "hurryCostModifier": 0, - "uniques": ["+1 Science Per 2 Population"], + "uniques": ["[+1 Science] Per [2] Population in this city"], "requiredTech": "Scientific Theory" }, { @@ -760,6 +778,17 @@ "requiredTech": "Industrialization", "quote": "'To achieve great things, two things are needed: a plan, and not quite enough time.' - Leonard Bernstein" }, + /* This works and even has icon but AI cannot manage its Aluminum at this moment + { + "name": "Hydro Plant", + "cost": 360, + "requiredResource": "Aluminum", + "hurryCostModifier": 25, + "maintenance": 3, + "uniques": ["Must be next to river","[+1 Production] from [River] tiles in this city"], + "requiredTech": "Electricity" + }, + */ // Modern Era diff --git a/android/assets/jsons/Civ V - Vanilla/Nations.json b/android/assets/jsons/Civ V - Vanilla/Nations.json index 5e6a20f1b6..21a328d616 100644 --- a/android/assets/jsons/Civ V - Vanilla/Nations.json +++ b/android/assets/jsons/Civ V - Vanilla/Nations.json @@ -575,9 +575,7 @@ "Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Altay","Uliastay","Bayanhongor", "Har-Ayrag","Nalayh","Tes"] }, - /* - - { // REQUIRES RIVERS + { "name": "Aztecs", "leaderName": "Montezuma I", "adjective": ["Aztec"], @@ -586,22 +584,26 @@ "startIntroPart1": "Welcome, O divine Montezuma! We grovel in awe at your magnificence! May the heaven shower all manner of good things upon you all the days of your life! Your are the leader of the mighty Aztec people, wandering nomads from a lost home in the north who in the 12th century came to live in the mesa central in the heart of what would come to be call Mexico. Surrounded by many tribes fighting to control the rich land surrounding the sacred lakes of Texoco, Xaltocan and Zampango. Through cunning alliances and martial prowess, within a mere two hundred years, the Aztecs came to dominate the Central American basin, ruling a mighty empire stretching from sea to sea. But the empire fell soon under the assault of the accursed Spaniards, wielding fiendish weapons the likes of which your faithful warriors had never seen.", "startIntroPart2": "O great king Montezuma, your people call upon you once more, to rise up and lead them to glory, bring them wealth and power, and give them dominion over their foes and rivals. Will you answer their call, glorious leader? Will you build a civilization that stands the test of time?", + "declaringWar": "Xi-miqa-can! Xi-miqa-can! Xi-miqa-can! (Die, die, die!)", "attacked": "Excellent! Let the blood flow in raging torrents!", - "defeated": " Monster! Who are you to destroy my greatness?", + "defeated": "Monster! Who are you to destroy my greatness?", "introduction": "What do I see before me? Another beating heart for my sacrificial fire.", + "neutralHello": "Welcome, friend.", "hateHello": "What do you want?", "tradeRequest": " Accept this agreement or suffer the consequences.", - "outerColor": [255,51,51], - "innerColor": [153,255,255], + + "outerColor": [139,32,23], + "innerColor": [134,238,214], + "uniqueName": "Sacrificial Captives", + "uniques": ["Gains culture from each enemy unit killed"], "cities": ["Tenochtitlan","Teotihuacan","Tlatelolco","Texcoco","Tlaxcala","Calixtlahuaca","Xochicalco","Tlacopan", "Atzcapotzalco","Tzintzuntzan","Malinalco","Tula","Tamuin","Teayo","Cempoala","Chalco","Tlalmanalco", "Ixtapaluca","Huexotla","Tepexpan","Tepetlaoxtoc","Chiconautla","Zitlaltepec","Coyotepec","Tequixquiac", "Jilotzingo","Tlapanaloya","Tultitan","Ecatepec","Coatepec","Chalchiuites","Chiauhita","Chapultepec", "Itzapalapa","Ayotzinco","Iztapam"] }, - */ { "name": "Inca", "leaderName": "Pachacuti", diff --git a/android/assets/jsons/Civ V - Vanilla/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json index f332c66e44..8b9ffba4a0 100644 --- a/android/assets/jsons/Civ V - Vanilla/Policies.json +++ b/android/assets/jsons/Civ V - Vanilla/Policies.json @@ -29,7 +29,7 @@ { "name": "Landed Elite", "effect": "+10% food growth and +2 food in capital", - "uniques": ["+10% food growth in capital", "[+2 Food] in capital"], + "uniques": ["+[10]% growth in capital", "[+2 Food] in capital"], "requires": ["Legalism"], "row": 2, "column": 2 @@ -45,7 +45,7 @@ { "name": "Tradition Complete", "effect": "+15% growth and +2 food in all cities", - "uniques": ["+15% growth in all cities","[+2 Food] in all cities"] + "uniques": ["+[15]% growth in all cities","[+2 Food] in all cities"] } ] }, diff --git a/android/assets/jsons/Civ V - Vanilla/Terrains.json b/android/assets/jsons/Civ V - Vanilla/Terrains.json index 6aeaf3e18f..53d0a049b5 100644 --- a/android/assets/jsons/Civ V - Vanilla/Terrains.json +++ b/android/assets/jsons/Civ V - Vanilla/Terrains.json @@ -50,7 +50,8 @@ "type": "Water", "food": 2, "gold": 1, - "RGB": [ 200, 200, 255] + "RGB": [ 200, 200, 255], + "uniques": ["Fresh water"] }, { "name": "Hill", @@ -126,7 +127,8 @@ "movementCost": 1, "unbuildable": true, "defenceBonus": -0.1, - "occursOn": ["Desert"] + "occursOn": ["Desert"], + "uniques": ["Fresh water"] }, { "name": "Flood plains", @@ -188,7 +190,7 @@ "uniques": ["Grants 500 Gold to the first civilization to discover it"], "weight": 2 }, - { + { // This will count as "Fresh water" in civ 6 "name": "Fountain of Youth", "type": "NaturalWonder", "happiness": 10, @@ -263,4 +265,17 @@ "unbuildable": true, "weight": 10 } + /* + {// Will be introduced in Brave New World. Despite being a lake, it cannot be sailed on and it blocks line of sight like a mountain. + "name": "Lake Victoria", + "type": "NaturalWonder", + "food": 6, + "occursOn": [Plains"], + "turnsInto": "Mountain", + "impassable": true, + "unbuildable": true, + "uniques": ["Fresh water"], + "weight": 5 + } + */ ] diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index 6648765b07..cbbd61042f 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -54,23 +54,21 @@ "upgradesTo": "Swordsman", "attackSound": "nonmetalhit" }, - /* { "name": "Jaguar", "unitType": "Melee", - "uniqueTo": "Aztec", + "uniqueTo": "Aztecs", "replaces": "Warrior", "movement": 2, "strength": 8, "cost": 40, "hurryCostModifier": 20, "obsoleteTech": "Metal Casting", - "uniques": ["+33% combat bonus in Forest/Jungle","Woodsmah","Heals 25 damage if it kills an Unit"], + "uniques": ["+[33]% combat bonus in [Forest]", "+[33]% combat bonus in [Jungle]", "Heals [25] damage if it kills a unit"], + "promotions": ["Woodsman"], "upgradesTo": "Swordsman", "attackSound": "nonmetalhit" - //Aztec unique unit, moves faster and fights better in Forest and Jungle. He also heals 25 if he kills an enemy. }, - */ { "name": "Brute", "unitType": "Melee", @@ -342,7 +340,7 @@ "upgradesTo": "Longswordsman", "obsoleteTech": "Gunpowder", "hurryCostModifier": 20, - "uniques": ["+33% combat bonus in Forest/Jungle"], + "uniques": ["+[33]% combat bonus in [Forest]", "+[33]% combat bonus in [Jungle]"], "attackSound": "metalhit" }, { @@ -904,7 +902,7 @@ "requiredTech": "Rifling", "obsoleteTech": "Replaceable Parts", "upgradesTo": "Great War Infantry", - "uniques": ["+25% bonus in Snow, Tundra and Hills", "Double movement in Snow, Tundra and Hills"], + "uniques": ["+[25]% combat bonus in [Snow]", "+[25]% combat bonus in [Tundra]", "+[25]% combat bonus in [Hill]", "Double movement in Snow, Tundra and Hills"], "hurryCostModifier": 20, "attackSound": "shot" }, diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 490adeb275..ae50b80abc 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -619,12 +619,14 @@ military units = melee units = mounted units = naval units = +ranged units = # For the All "newly-trained [relevant] units in this city receive the [] promotion" translation. Relevant as in 'units that can receive' relevant = # For '[stats] from [Water] tiles in this city' Water = # For [stats] from [Water resource] tiles in this city Water resource = +River = Wonders = Base values = @@ -809,6 +811,7 @@ Mass Media = # Terrains Impassable = +Fresh water = # Resources diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index a47256dec1..5c483546d6 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -60,8 +60,6 @@ object Battle { postBattleNotifications(attacker, defender, attackedTile) - tryHealAfterAttacking(attacker, defender) - postBattleNationUniques(defender, attackedTile, attacker) // This needs to come BEFORE the move-to-tile, because if we haven't conquered it we can't move there =) @@ -75,13 +73,17 @@ object Battle { if(!isAlreadyDefeatedCity) postBattleAddXp(attacker, defender) - // Add culture when defeating a barbarian when Honor policy is adopted (can be either attacker or defender!) - tryGetCultureFromHonor(attacker, defender) - tryGetCultureFromHonor(defender, attacker) - - if (defender.isDefeated() && defender is MapUnitCombatant && !defender.getUnitType().isCivilian() - && attacker.getCivInfo().hasUnique("Gain gold for each unit killed")) - attacker.getCivInfo().gold += defender.unit.baseUnit.getProductionCost(attacker.getCivInfo()) / 10 + // Add culture when defeating a barbarian when Honor policy is adopted, gold from enemy killed when honor is complete + // or any enemy military unit with Sacrificial captives unique (can be either attacker or defender!) + if (defender.isDefeated() && defender is MapUnitCombatant && !defender.getUnitType().isCivilian()) { + tryGetCultureFromKilling(attacker, defender) + tryGetGoldFromKilling(attacker, defender) + tryHealAfterKilling(attacker, defender) + } else if (attacker.isDefeated() && attacker is MapUnitCombatant && !attacker.getUnitType().isCivilian()) { + tryGetCultureFromKilling(defender, attacker) + tryGetGoldFromKilling(defender, attacker) + tryHealAfterKilling(defender, attacker) + } if (attacker is MapUnitCombatant) { if (attacker.getUnitType()==UnitType.Missile) { @@ -143,15 +145,12 @@ object Battle { } } - private fun tryHealAfterAttacking(attacker: ICombatant, defender: ICombatant) { - if (defender.isDefeated() - && defender is MapUnitCombatant - && attacker is MapUnitCombatant) { + private fun tryHealAfterKilling(attacker: ICombatant, defender: ICombatant) { + if (attacker is MapUnitCombatant) for (unique in attacker.unit.getMatchingUniques("Heals [] damage if it kills a unit")) { val amountToHeal = unique.params[0].toInt() attacker.unit.healBy(amountToHeal) } - } } private fun postBattleNationUniques(defender: ICombatant, attackedTile: TileInfo, attacker: ICombatant) { @@ -217,12 +216,19 @@ object Battle { } } - private fun tryGetCultureFromHonor(civUnit:ICombatant, barbarianUnit:ICombatant){ - if(barbarianUnit.isDefeated() && barbarianUnit is MapUnitCombatant - && barbarianUnit.getCivInfo().isBarbarian() - && civUnit.getCivInfo().hasUnique("Gain Culture when you kill a barbarian unit")) - civUnit.getCivInfo().policies.addCulture( - max(barbarianUnit.unit.baseUnit.strength, barbarianUnit.unit.baseUnit.rangedStrength)) + private fun tryGetCultureFromKilling(civUnit:ICombatant, defeatedUnit:MapUnitCombatant){ + //Aztecs get half the strength of the unit killed in culture and honor opener does the same thing. + //They stack. So you get culture equal to 100% of the dead unit's strength. + val civInfo = civUnit.getCivInfo() + if (defeatedUnit.getCivInfo().isBarbarian() && civInfo.hasUnique("Gain Culture when you kill a barbarian unit")) + civInfo.policies.addCulture(max(defeatedUnit.unit.baseUnit.strength, defeatedUnit.unit.baseUnit.rangedStrength) / 2) + if (civInfo.hasUnique("Gains culture from each enemy unit killed")) + civInfo.policies.addCulture(max(defeatedUnit.unit.baseUnit.strength, defeatedUnit.unit.baseUnit.rangedStrength) / 2) + } + + private fun tryGetGoldFromKilling(civUnit:ICombatant, defeatedUnit:MapUnitCombatant) { + if (civUnit.getCivInfo().hasUnique("Gain gold for each unit killed")) + civUnit.getCivInfo().gold += defeatedUnit.unit.baseUnit.getProductionCost(defeatedUnit.getCivInfo()) / 10 } // XP! diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 0f168c797c..ead849bc2f 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -179,11 +179,9 @@ object BattleDamage { modifiers.putAll(getTileSpecificModifiers(defender, tile)) - if (!defender.unit.hasUnique("No defensive terrain bonus")) { - val tileDefenceBonus = tile.getDefensiveBonus() - if (tileDefenceBonus > 0) - modifiers["Tile"] = tileDefenceBonus - } + val tileDefenceBonus = tile.getDefensiveBonus() + if (!defender.unit.hasUnique("No defensive terrain bonus") || tileDefenceBonus < 0) + modifiers["Tile"] = tileDefenceBonus if (attacker.isRanged()) { val defenceVsRanged = 0.25f * defender.unit.getUniques().count { it.text == "+25% Defence against ranged attacks" } @@ -212,6 +210,7 @@ object BattleDamage { if(!tile.isFriendlyTerritory(unit.getCivInfo()) && unit.unit.hasUnique("+20% bonus outside friendly territory")) modifiers["Foreign Land"] = 0.2f + // This is to be deprecated and converted to "+[]% combat bonus in []" - keeping it here to that mods with this can still work for now if (unit.unit.hasUnique("+25% bonus in Snow, Tundra and Hills") && (tile.baseTerrain == Constants.snow || tile.baseTerrain == Constants.tundra @@ -230,11 +229,18 @@ object BattleDamage { .any { it.hasUnique("-10% combat strength for adjacent enemy units") && it.civInfo.isAtWarWith(unit.getCivInfo()) }) modifiers["Haka War Dance"] = -0.1f - + // This is to be deprecated and converted to "+[]% combat bonus in []" - keeping it here to that mods with this can still work for now if(unit.unit.hasUnique("+33% combat bonus in Forest/Jungle") && (tile.terrainFeature== Constants.forest || tile.terrainFeature==Constants.jungle)) modifiers[tile.terrainFeature!!]=0.33f + for (unique in unit.unit.getUniques().filter { it.placeholderText == "+[]% combat bonus in []" }) + if (tile.terrainFeature == unique.params[1]) + modifiers[tile.terrainFeature!!] = unique.params[0].toFloat() / 100 + else if (tile.baseTerrain == unique.params[1] + && tile.terrainFeature == null) + modifiers[tile.baseTerrain] = unique.params[0].toFloat() / 100 + val isRoughTerrain = tile.isRoughTerrain() for (BDM in getBattleDamageModifiersOfUnit(unit.unit)) { val text = BDM.getText() diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index 88d6b243f4..3a1347f199 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -71,6 +71,13 @@ class CityConstructions { val stats = Stats() for (building in getBuiltBuildings()) stats.add(building.getStats(cityInfo.civInfo)) + + for (unique in builtBuildingUniqueMap.getAllUniques()) when (unique.placeholderText) { + "[] Per [] Population in this city" -> stats.add(Stats.parse(unique.params[0]).times(cityInfo.population.population / unique.params[1].toFloat())) + "[] once [] is discovered" -> if (cityInfo.civInfo.tech.isResearched(unique.params[1])) stats.add(Stats.parse(unique.params[0])) + } + + // This is to be deprecated and converted to "[stats] Per [N] Population in this city" - keeping it here to that mods with this can still work for now stats.science += (builtBuildingUniqueMap.getAllUniques().count { it.text == "+1 Science Per 2 Population" } * cityInfo.population.population / 2).toFloat() return stats } diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 77df60bf68..5e7e8e36e8 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -267,7 +267,8 @@ class CityInfo { if (stat != null) entry.value.add(stat, entry.value.get(stat) * unique.params[1].toFloat()/100) } - for (unique in civInfo.getMatchingUniques("+[]% great person generation in all cities")) + for (unique in civInfo.getMatchingUniques("+[]% great person generation in all cities") + + cityConstructions.builtBuildingUniqueMap.getUniques("+[]% great person generation in this city")) stats[entry.key] = stats[entry.key]!!.times(1 + (unique.params[0].toFloat() / 100)) } diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 72254280ed..859aed98d2 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -161,13 +161,20 @@ class CityStats { return stats } - fun getGrowthBonusFromPolicies(): Float { + fun getGrowthBonusFromPoliciesAndWonders(): Float { var bonus = 0f + + // This is to be deprecated and converted to "+[]% growth in all cities" and "+[]% growth in capital" - keeping it here to that mods with this can still work for now if (cityInfo.civInfo.hasUnique("+10% food growth in capital") && cityInfo.isCapital()) - bonus += 0.1f + bonus += 10f if (cityInfo.civInfo.hasUnique("+15% growth in all cities")) - bonus += 0.15f - return bonus + bonus += 15f + + for(unique in cityInfo.civInfo.getMatchingUniques("+[]% growth in all cities")) + bonus += unique.params[0].toFloat() + if (cityInfo.isCapital()) for(unique in cityInfo.civInfo.getMatchingUniques("+[]% growth in capital")) + bonus += unique.params[0].toFloat() + return bonus/100 } // needs to be a separate function because we need to know the global happiness state @@ -357,6 +364,7 @@ class CityStats { return construction.name == filter || (filter == "land units" && construction is BaseUnit && construction.unitType.isLandUnit()) || (filter == "naval units" && construction is BaseUnit && construction.unitType.isWaterUnit()) + || (filter == "ranged units" && construction is BaseUnit && construction.unitType == UnitType.Ranged) || (filter == "mounted units" && construction is BaseUnit && construction.unitType == UnitType.Mounted) || (filter == "military units" && construction is BaseUnit && !construction.unitType.isCivilian()) || (filter == "melee units" && construction is BaseUnit && construction.unitType.isMelee()) @@ -490,7 +498,7 @@ class CityStats { // Since growth bonuses are special, (applied afterwards) they will be displayed separately in the user interface as well. if(totalFood>0) { - val foodFromGrowthBonuses = getGrowthBonusFromPolicies() * totalFood + val foodFromGrowthBonuses = getGrowthBonusFromPoliciesAndWonders() * totalFood newFinalStatList["Policies"]!!.food += foodFromGrowthBonuses totalFood = newFinalStatList.values.map { it.food }.sum() // recalculate again } diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index c8169ec307..13b3f7ad3c 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -24,6 +24,12 @@ open class TileInfo { @Transient var isWater = false @Transient var isOcean = false + // This will be called often - farm can be built on Hill and tundra if adjacent to fresh water + // and farms on adjacent to fresh water tiles will have +1 additional Food after researching Civil Service + @delegate:Transient + val isAdjacentToFreshwater: Boolean by lazy { isAdjacentToRiver() || neighbors.any { it.getBaseTerrain().uniques.contains("Fresh water") + || it.terrainFeature != null && it.getTerrainFeature()!!.uniques.contains("Fresh water") }} + var militaryUnit: MapUnit? = null var civilianUnit: MapUnit? = null var airUnits = ArrayList() @@ -188,6 +194,7 @@ open class TileInfo { || (tileType == "Water" && isWater) || (tileType == "Strategic resource" && hasViewableResource(observingCiv) && getTileResource().resourceType == ResourceType.Strategic) || (tileType == "Water resource" && isWater && hasViewableResource(observingCiv)) + || (tileType == "River" && isAdjacentToRiver()) ) stats.add(Stats.parse(unique.params[0])) } diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index 72bae24afd..8f91b7be17 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -257,6 +257,10 @@ class Building : NamedStats(), IConstruction { && !cityCenter.isCoastalTile()) return "Can only be built in coastal cities" + if ("Must border a source of fresh water" in uniques + && !cityCenter.isAdjacentToFreshwater) + return "Must border a source of fresh water" + if ("Can only be built in annexed cities" in uniques && (construction.cityInfo.isPuppet || construction.cityInfo.foundingCiv == "" || construction.cityInfo.civInfo.civName == construction.cityInfo.foundingCiv)) diff --git a/docs/Credits.md b/docs/Credits.md index 75c4e14bd3..24b4c4adbe 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -175,6 +175,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Stonehenge](https://thenounproject.com/term/stonehenge/543289/) By icon 54 * [Ho Chi Minh mausoleum](https://thenounproject.com/thanhloc1009/collection/asia-landmark/?i=2412921) By Phạm Thanh Lộc for Mausoleum of Halicarnassus * Icon for Statue of Zeus made by [JackRainy](https://github.com/JackRainy), based on [King](https://thenounproject.com/eucalyp/collection/game-elements-glyph1/?i=3155251) By Eucalyp +* [temple](https://thenounproject.com/search/?q=temple&i=28256) By Fabio Meroni for Temple of Artemis ### Classical Era @@ -192,6 +193,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Aqueduct](https://thenounproject.com/term/aqueduct/24639/) By Arthur Shlain * [Great Wall](https://thenounproject.com/search/?q=great%20wall&i=545909) By icon 54 * [Rice Field](https://thenounproject.com/term/rice-field/2511648/) by Graphic Engineer for Terrace farm +* [Canoe](https://thenounproject.com/term/canoe/402285/) By Viktor Fedyuk (Tim P) for Floating Gardens ### Medieval Era @@ -214,6 +216,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Notre Dame](https://thenounproject.com/term/notre-dame/1361725/) By Marco Livolsi * [Bullets](https://thenounproject.com/term/bullets/810156/) By Aldric Rodriguez for Armory * [Machu Picchu](https://thenounproject.com/browse/?i=1678226/) By [Chanut is Industries](https://thenounproject.com/chanut-is) +* [Garden](https://thenounproject.com/search/?q=garden&i=1478380) By Bharat ### Renaissance Era @@ -494,6 +497,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Competition](https://thenounproject.com/search/?q=move%20fast&i=1743826) by luca fruzza * Icon for Flight Deck is made by [JackRainy](https://github.com/JackRainy) * Icon for Armor Plating is made by [JackRainy](https://github.com/JackRainy) +* [Slingshot](https://thenounproject.com/term/slingshot/9106/) by James Keuning for Slinger Withdraw ## Others