diff --git a/android/Images/NationIcons/Mongolia.png b/android/Images/NationIcons/Mongolia.png new file mode 100644 index 0000000000..d8c4660a2d Binary files /dev/null and b/android/Images/NationIcons/Mongolia.png differ diff --git a/android/Images/UnitIcons/Keshik.png b/android/Images/UnitIcons/Keshik.png new file mode 100644 index 0000000000..59aa8ade89 Binary files /dev/null and b/android/Images/UnitIcons/Keshik.png differ diff --git a/android/Images/UnitIcons/Khan.png b/android/Images/UnitIcons/Khan.png new file mode 100644 index 0000000000..94a61e6044 Binary files /dev/null and b/android/Images/UnitIcons/Khan.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index f631af971b..8dce8b84e0 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -265,266 +265,259 @@ BuildingIcons/Ironworks index: -1 BuildingIcons/Kremlin rotate: false - xy: 1430, 658 + xy: 206, 646 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1532, 658 + xy: 2, 634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 104, 618 + xy: 818, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 818, 614 + xy: 1022, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 920, 614 + xy: 1634, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Longhouse rotate: false - xy: 1634, 578 + xy: 1838, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Picchu rotate: false - xy: 1124, 556 + xy: 1430, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Manhattan Project rotate: false - xy: 1430, 556 + xy: 206, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 308, 520 + xy: 512, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 818, 512 + xy: 1022, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1736, 476 + xy: 1940, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1124, 454 + xy: 1430, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 308, 418 + xy: 512, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 410, 418 + xy: 104, 414 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mud Pyramid Mosque rotate: false - xy: 614, 418 + xy: 818, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mughal Fort rotate: false - xy: 104, 414 + xy: 920, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 716, 410 + xy: 1022, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1736, 374 + xy: 1328, 358 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 1328, 358 + xy: 1430, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1124, 352 + xy: 1532, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1532, 352 + xy: 308, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 2, 328 + xy: 512, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 512, 316 + xy: 716, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 104, 312 + xy: 920, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 920, 309 + xy: 1022, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 818, 308 + xy: 1634, 272 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1838, 272 + xy: 1124, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 614, 214 + xy: 818, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 716, 206 + xy: 1736, 171 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1430, 148 + xy: 2, 124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 716, 104 + xy: 1736, 69 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 818, 104 + xy: 1634, 68 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1022, 104 + xy: 1838, 68 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1634, 68 + xy: 1940, 68 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Satrap's Court rotate: false - xy: 1328, 52 + xy: 1430, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1430, 46 + xy: 2, 22 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 920, 3 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Solar Plant - rotate: false - xy: 818, 2 + xy: 1022, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -727,75 +720,61 @@ ImprovementIcons/Fishing Boats index: -1 ImprovementIcons/Landmark rotate: false - xy: 308, 622 + xy: 512, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1838, 578 + xy: 1328, 562 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1532, 556 + xy: 2, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1940, 476 + xy: 1124, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 1430, 454 + xy: 206, 442 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 410, 316 + xy: 104, 312 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 1634, 272 + xy: 1940, 272 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 308, 214 + xy: 614, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry - rotate: false - xy: 1022, 206 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 1838, 170 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/Railroad rotate: false xy: 1838, 170 size: 100, 100 @@ -804,7 +783,7 @@ TileSets/Default/Railroad index: -1 ImprovementIcons/Road rotate: false - xy: 308, 112 + xy: 614, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -902,49 +881,49 @@ NationIcons/Japan index: -1 NationIcons/Korea rotate: false - xy: 1226, 658 + xy: 1532, 658 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +NationIcons/Mongolia + rotate: false + xy: 614, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Persia rotate: false - xy: 1328, 256 + xy: 1430, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Polynesia rotate: false - xy: 512, 214 + xy: 716, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 104, 108 + xy: 920, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 920, 105 + xy: 1022, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Siam rotate: false - xy: 410, 10 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -NationIcons/Songhai - rotate: false - xy: 1022, 2 + xy: 104, 6 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1014,42 +993,35 @@ TileSets/FantasyHex/Hexagon index: -1 OtherIcons/MenuIcon rotate: false - xy: 920, 512 + xy: 1634, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1940, 272 + xy: 1226, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 2, 226 + xy: 512, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 818, 206 + xy: 1634, 170 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 2, 22 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Sleep - rotate: false - xy: 716, 2 + xy: 512, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1168,42 +1140,42 @@ ResourceIcons/Ivory index: -1 ResourceIcons/Marble rotate: false - xy: 2, 532 + xy: 410, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 308, 316 + xy: 614, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1736, 272 + xy: 1328, 256 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 206, 34 + xy: 410, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 512, 10 + xy: 716, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 614, 10 + xy: 818, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1280,7 +1252,7 @@ StatIcons/Production index: -1 StatIcons/Resistance rotate: false - xy: 1532, 148 + xy: 308, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1553,224 +1525,224 @@ TechIcons/Iron Working index: -1 TechIcons/Lasers rotate: false - xy: 614, 622 + xy: 716, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1328, 562 + xy: 1226, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 512, 520 + xy: 104, 516 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 614, 520 + xy: 716, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 104, 516 + xy: 818, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1022, 512 + xy: 1736, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1634, 476 + xy: 1838, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1838, 476 + xy: 1328, 460 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1328, 460 + xy: 1226, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 1532, 454 + xy: 2, 430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1022, 410 + xy: 1838, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1940, 374 + xy: 1226, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1226, 352 + xy: 206, 340 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 614, 316 + xy: 818, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1022, 308 + xy: 1838, 272 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1226, 250 + xy: 206, 238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1430, 250 + xy: 2, 226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1532, 250 + xy: 308, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 410, 214 + xy: 104, 210 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 104, 210 + xy: 920, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 920, 207 + xy: 1022, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 1634, 170 + xy: 1940, 170 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1736, 170 + xy: 1328, 154 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 1940, 170 + xy: 1124, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1124, 148 + xy: 1532, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 1226, 148 + xy: 206, 136 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 2, 124 + xy: 512, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 410, 112 + xy: 104, 108 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 614, 112 + xy: 818, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1736, 68 + xy: 1328, 52 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1940, 68 + xy: 1226, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1124, 46 + xy: 1532, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1782,20 +1754,6 @@ TileSets/Default/CityOverlay orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/CrosshatchHexagon - rotate: false - xy: 583, 1800 - size: 273, 236 - orig: 273, 236 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/CrosshatchHexagon - rotate: false - xy: 583, 1800 - size: 273, 236 - orig: 273, 236 - offset: 0, 0 - index: -1 TileSets/Default/FalloutOverlay rotate: false xy: 1736, 986 @@ -1833,42 +1791,70 @@ TileSets/Default/JungleOverlay index: -1 TileSets/Default/LakesOverlay rotate: false - xy: 206, 646 + xy: 308, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 410, 520 + xy: 614, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 512, 418 + xy: 716, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/NaturalWonderOverlay rotate: false - xy: 1838, 374 + xy: 1124, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 206, 340 + xy: 410, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +TileSets/Default/Railroad + rotate: false + xy: 1430, 148 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Railroad + rotate: false + xy: 1430, 148 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/CrosshatchHexagon + rotate: false + xy: 583, 1800 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 +TileSets/Default/CrosshatchHexagon + rotate: false + xy: 583, 1800 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 1328, 154 + xy: 1226, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2181,198 +2167,212 @@ UnitIcons/Jet Fighter orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Knight +UnitIcons/Keshik rotate: false xy: 1124, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Lancer +UnitIcons/Khan rotate: false - xy: 2, 634 + xy: 1226, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Landship +UnitIcons/Knight + rotate: false + xy: 1430, 658 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Lancer rotate: false xy: 410, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Landship + rotate: false + xy: 614, 622 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Landsknecht rotate: false - xy: 512, 622 + xy: 104, 618 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Legion rotate: false - xy: 716, 614 + xy: 920, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1022, 614 + xy: 1736, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 1736, 578 + xy: 1940, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 1940, 578 + xy: 1124, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mandekalu Cavalry rotate: false - xy: 1226, 556 + xy: 1532, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Maori Warrior rotate: false - xy: 206, 544 + xy: 308, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 716, 512 + xy: 920, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1226, 454 + xy: 1532, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 206, 442 + xy: 308, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mohawk Warrior rotate: false - xy: 2, 430 + xy: 410, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 818, 410 + xy: 1634, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 920, 411 + xy: 1736, 375 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Naresuan's Elephant rotate: false - xy: 1634, 374 + xy: 1940, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Nuclear Missile rotate: false - xy: 1430, 352 + xy: 2, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Panzer rotate: false - xy: 716, 308 + xy: 1736, 273 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Persian Immortal rotate: false - xy: 1124, 250 + xy: 1532, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 206, 238 + xy: 410, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 206, 136 + xy: 410, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 512, 112 + xy: 716, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1838, 68 + xy: 1124, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1226, 46 + xy: 206, 34 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1532, 46 + xy: 308, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ship of the Line rotate: false - xy: 308, 10 + xy: 614, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sipahi rotate: false - xy: 104, 6 + xy: 920, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2383,648 +2383,655 @@ size: 2048,1024 format: RGBA8888 filter: MipMapLinearLinear,MipMapLinearLinear repeat: none -BuildingIcons/Spaceship Factory - rotate: false - xy: 2, 922 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stable - rotate: false - xy: 206, 922 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stadium - rotate: false - xy: 2, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Statue of Liberty - rotate: false - xy: 104, 718 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stock Exchange - rotate: false - xy: 104, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stone Works - rotate: false - xy: 308, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stonehenge - rotate: false - xy: 410, 922 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Sydney Opera House - rotate: false - xy: 410, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Taj Mahal - rotate: false - xy: 512, 922 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Temple - rotate: false - xy: 104, 412 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Terracotta Army - rotate: false - xy: 308, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Great Library - rotate: false - xy: 410, 718 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Great Lighthouse - rotate: false - xy: 512, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Louvre - rotate: false - xy: 614, 922 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Oracle - rotate: false - xy: 2, 208 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Pyramids - rotate: false - xy: 206, 412 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Theatre - rotate: false - xy: 410, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/University - rotate: false - xy: 410, 514 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Walls - rotate: false - xy: 614, 718 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Walls of Babylon - rotate: false - xy: 716, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Wat - rotate: false - xy: 206, 207 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Windmill - rotate: false - xy: 512, 514 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Workshop - rotate: false - xy: 920, 922 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Trading post - rotate: false - xy: 614, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -NationIcons/Spain +BuildingIcons/Solar Plant rotate: false xy: 2, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -NationIcons/The Ottomans - rotate: false - xy: 104, 310 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Aircraft - rotate: false - xy: 614, 564 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -OtherIcons/BackArrow - rotate: false - xy: 1022, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -OtherIcons/Down - rotate: false - xy: 1490, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -OtherIcons/Stop - rotate: false - xy: 2, 412 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/TableBackground - rotate: false - xy: 1388, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -OtherIcons/Up - rotate: false - xy: 1700, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -OtherIcons/whiteDot - rotate: false - xy: 371, 307 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -PolicyIcons/Aristocracy - rotate: false - xy: 818, 768 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Citizenship - rotate: false - xy: 308, 141 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Civil Society - rotate: false - xy: 1178, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Collective Rule - rotate: false - xy: 1282, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Constitution - rotate: false - xy: 1334, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Democracy - rotate: false - xy: 1438, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Entrepreneurship - rotate: false - xy: 1594, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Fascism - rotate: false - xy: 1750, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Free Religion - rotate: false - xy: 1906, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Free Speech - rotate: false - xy: 1958, 972 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Free Thought - rotate: false - xy: 410, 308 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Humanism - rotate: false - xy: 564, 462 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Landed Elite - rotate: false - xy: 972, 870 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Legalism - rotate: false - xy: 258, 53 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Mandate Of Heaven - rotate: false - xy: 310, 37 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Mercantilism - rotate: false - xy: 360, 141 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Meritocracy - rotate: false - xy: 362, 89 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Militarism - rotate: false - xy: 362, 37 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Military Caste - rotate: false - xy: 412, 256 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Military Tradition - rotate: false - xy: 412, 204 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Monarchy - rotate: false - xy: 464, 256 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Oligarchy - rotate: false - xy: 464, 152 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Organized Religion - rotate: false - xy: 414, 100 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Patronage - rotate: false - xy: 414, 48 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Police State - rotate: false - xy: 466, 100 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Populism - rotate: false - xy: 466, 48 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Professional Army - rotate: false - xy: 616, 512 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Protectionism - rotate: false - xy: 616, 460 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Reformation - rotate: false - xy: 820, 716 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Representation - rotate: false - xy: 872, 716 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Republic - rotate: false - xy: 872, 664 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Scientific Revolution - rotate: false - xy: 1024, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Secularism - rotate: false - xy: 1128, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Sovereignty - rotate: false - xy: 1336, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Theocracy - rotate: false - xy: 1492, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Total War - rotate: false - xy: 1544, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Trade Unions - rotate: false - xy: 1596, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Universal Suffrage - rotate: false - xy: 1648, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Warrior Code - rotate: false - xy: 1804, 920 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -ResourceIcons/Spices - rotate: false - xy: 104, 820 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ResourceIcons/Stone - rotate: false - xy: 206, 718 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ResourceIcons/Sugar - rotate: false - xy: 206, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ResourceIcons/Uranium - rotate: false - xy: 512, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ResourceIcons/Whales - rotate: false - xy: 308, 310 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ResourceIcons/Wheat - rotate: false - xy: 410, 412 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ResourceIcons/Wine - rotate: false - xy: 614, 616 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -StatIcons/InterceptRange - rotate: false - xy: 768, 666 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -StatIcons/Movement - rotate: false - xy: 464, 204 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -StatIcons/Range - rotate: false - xy: 668, 512 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -StatIcons/RangedStrength - rotate: false - xy: 668, 460 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -StatIcons/Specialist +BuildingIcons/Spaceship Factory rotate: false xy: 2, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Steam Power +BuildingIcons/Stable + rotate: false + xy: 206, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Stadium rotate: false xy: 308, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Steel +BuildingIcons/Statue of Liberty rotate: false xy: 2, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/The Wheel +BuildingIcons/Stock Exchange + rotate: false + xy: 410, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Stone Works + rotate: false + xy: 104, 514 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Stonehenge + rotate: false + xy: 206, 616 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Sydney Opera House + rotate: false + xy: 104, 412 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Taj Mahal + rotate: false + xy: 206, 514 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Temple + rotate: false + xy: 410, 718 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Terracotta Army + rotate: false + xy: 614, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/The Great Library + rotate: false + xy: 2, 208 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/The Great Lighthouse + rotate: false + xy: 104, 310 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/The Louvre + rotate: false + xy: 206, 412 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/The Oracle rotate: false xy: 308, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Theology +BuildingIcons/The Pyramids rotate: false xy: 512, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Trapping +BuildingIcons/Theatre rotate: false xy: 716, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Writing +BuildingIcons/University rotate: false - xy: 104, 4 + xy: 716, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/road +BuildingIcons/Walls rotate: false - xy: 308, 297 - size: 61, 11 - orig: 61, 11 + xy: 2, 4 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 -TileSets/FantasyHex/road +BuildingIcons/Walls of Babylon rotate: false - xy: 308, 297 - size: 61, 11 - orig: 61, 11 + xy: 104, 106 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Wat + rotate: false + xy: 512, 513 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Windmill + rotate: false + xy: 818, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Workshop + rotate: false + xy: 308, 208 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Trading post + rotate: false + xy: 104, 208 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +NationIcons/Songhai + rotate: false + xy: 104, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +NationIcons/Spain + rotate: false + xy: 104, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +NationIcons/The Ottomans + rotate: false + xy: 410, 616 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Aircraft + rotate: false + xy: 920, 870 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +OtherIcons/BackArrow + rotate: false + xy: 308, 156 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +OtherIcons/Down + rotate: false + xy: 1438, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +OtherIcons/Sleep + rotate: false + xy: 2, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Stop + rotate: false + xy: 308, 718 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/TableBackground + rotate: false + xy: 618, 291 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +OtherIcons/Up + rotate: false + xy: 1076, 920 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +OtherIcons/whiteDot + rotate: false + xy: 1026, 583 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +PolicyIcons/Aristocracy + rotate: false + xy: 206, 54 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Citizenship + rotate: false + xy: 1126, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Civil Society + rotate: false + xy: 614, 447 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Collective Rule + rotate: false + xy: 1230, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Constitution + rotate: false + xy: 1282, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Democracy + rotate: false + xy: 1386, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Entrepreneurship + rotate: false + xy: 1542, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Fascism + rotate: false + xy: 1698, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Free Religion + rotate: false + xy: 1854, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Free Speech + rotate: false + xy: 1906, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Free Thought + rotate: false + xy: 1958, 972 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Humanism + rotate: false + xy: 768, 614 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Landed Elite + rotate: false + xy: 258, 2 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Legalism + rotate: false + xy: 360, 156 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Mandate Of Heaven + rotate: false + xy: 564, 359 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Mercantilism + rotate: false + xy: 666, 551 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Meritocracy + rotate: false + xy: 666, 499 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Militarism + rotate: false + xy: 666, 447 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Military Caste + rotate: false + xy: 668, 395 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Military Tradition + rotate: false + xy: 668, 343 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Monarchy + rotate: false + xy: 718, 510 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Oligarchy + rotate: false + xy: 770, 562 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Organized Religion + rotate: false + xy: 770, 510 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Patronage + rotate: false + xy: 770, 458 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Police State + rotate: false + xy: 720, 406 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Populism + rotate: false + xy: 720, 354 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Professional Army + rotate: false + xy: 772, 406 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Protectionism + rotate: false + xy: 772, 354 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Reformation + rotate: false + xy: 514, 307 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Representation + rotate: false + xy: 922, 818 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Republic + rotate: false + xy: 922, 766 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Scientific Revolution + rotate: false + xy: 974, 818 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Secularism + rotate: false + xy: 310, 104 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Sovereignty + rotate: false + xy: 566, 291 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Theocracy + rotate: false + xy: 618, 239 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Total War + rotate: false + xy: 820, 716 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Trade Unions + rotate: false + xy: 820, 664 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Universal Suffrage + rotate: false + xy: 1024, 920 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Warrior Code + rotate: false + xy: 1180, 920 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +ResourceIcons/Spices + rotate: false + xy: 104, 718 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Stone + rotate: false + xy: 2, 412 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Sugar + rotate: false + xy: 512, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Uranium + rotate: false + xy: 818, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Whales + rotate: false + xy: 614, 616 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Wheat + rotate: false + xy: 716, 718 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Wine + rotate: false + xy: 920, 922 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +StatIcons/InterceptRange + rotate: false + xy: 972, 870 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +StatIcons/Movement + rotate: false + xy: 718, 458 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +StatIcons/Range + rotate: false + xy: 720, 302 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +StatIcons/RangedStrength + rotate: false + xy: 772, 302 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +StatIcons/Specialist + rotate: false + xy: 2, 616 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Steam Power + rotate: false + xy: 206, 718 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Steel + rotate: false + xy: 308, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/The Wheel + rotate: false + xy: 614, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Theology + rotate: false + xy: 2, 106 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Trapping + rotate: false + xy: 206, 310 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Writing + rotate: false + xy: 410, 310 + size: 100, 100 + orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Academy @@ -3036,2016 +3043,2030 @@ TileSets/FantasyHex/Tiles/Academy index: -1 TileSets/FantasyHex/Tiles/Aluminum rotate: false - xy: 920, 840 + xy: 410, 228 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins rotate: false - xy: 206, 23 + xy: 310, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 954, 840 + xy: 1336, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bananas rotate: false - xy: 546, 432 + xy: 344, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment rotate: false - xy: 750, 636 + xy: 670, 283 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barringer Crater rotate: false - xy: 1058, 890 + xy: 872, 708 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Camp+Deer rotate: false - xy: 1126, 890 + xy: 872, 678 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Camp+Furs rotate: false - xy: 1160, 890 + xy: 1404, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Camp+Ivory rotate: false - xy: 1194, 890 + xy: 1438, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle rotate: false - xy: 1364, 890 + xy: 1160, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cerro de Potosi rotate: false - xy: 1432, 886 + xy: 1228, 886 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 1534, 883 + xy: 1540, 935 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City rotate: false - xy: 1568, 883 + xy: 1574, 935 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+City rotate: false - xy: 1568, 883 + xy: 1574, 935 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+City rotate: false - xy: 1568, 883 + xy: 1574, 935 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1602, 890 + xy: 1608, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coal rotate: false - xy: 1670, 890 + xy: 1676, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 1704, 890 + xy: 1710, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast+Oil well rotate: false - xy: 1738, 890 + xy: 1744, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cotton rotate: false - xy: 1874, 890 + xy: 1880, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 648, 423 + xy: 512, 218 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer rotate: false - xy: 682, 430 + xy: 1336, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 818, 634 + xy: 1370, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+City rotate: false - xy: 308, 2 + xy: 1404, 907 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Fallout rotate: false - xy: 852, 634 + xy: 1438, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 342, 7 + xy: 1472, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains rotate: false - xy: 886, 634 + xy: 1506, 914 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 376, 7 + xy: 1982, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Trading post rotate: false - xy: 1960, 912 + xy: 1540, 905 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Oasis rotate: false - xy: 1024, 860 + xy: 1574, 905 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Trading post rotate: false - xy: 1058, 860 + xy: 1608, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes rotate: false - xy: 1126, 860 + xy: 1676, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/El Dorado rotate: false - xy: 1160, 859 + xy: 1710, 911 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fish rotate: false - xy: 1194, 860 + xy: 1744, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 1228, 860 + xy: 1778, 914 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats+Whales rotate: false - xy: 1262, 862 + xy: 1812, 914 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 410, 2 + xy: 1880, 907 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fountain of Youth rotate: false - xy: 1330, 856 + xy: 1914, 908 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs rotate: false - xy: 1398, 860 + xy: 1982, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gems rotate: false - xy: 1534, 853 + xy: 906, 736 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gold rotate: false - xy: 1568, 853 + xy: 906, 706 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 1602, 856 + xy: 940, 732 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 1636, 860 + xy: 974, 736 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Fallout rotate: false - xy: 1670, 860 + xy: 906, 676 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 1704, 860 + xy: 940, 702 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false - xy: 1738, 857 + xy: 974, 703 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Aluminum rotate: false - xy: 1772, 859 + xy: 940, 669 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 1806, 859 + xy: 974, 670 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Deer rotate: false - xy: 1840, 857 + xy: 704, 269 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp+Furs rotate: false - xy: 1874, 857 + xy: 738, 269 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Coal rotate: false - xy: 1908, 857 + xy: 772, 269 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Gold rotate: false - xy: 444, 15 + xy: 1008, 733 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Iron rotate: false - xy: 478, 15 + xy: 1008, 700 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 1022, 827 + xy: 1008, 667 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Silver rotate: false - xy: 1056, 827 + xy: 806, 269 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false - xy: 1994, 936 + xy: 412, 192 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Camp rotate: false - xy: 1994, 900 + xy: 412, 156 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1942, 876 + xy: 446, 192 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1942, 845 + xy: 446, 161 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 988, 812 + xy: 414, 126 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1056, 797 + xy: 414, 66 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 514, 368 + xy: 940, 635 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Fallout rotate: false - xy: 548, 398 + xy: 974, 636 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest rotate: false - xy: 514, 321 + xy: 1008, 620 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp rotate: false - xy: 548, 351 + xy: 1026, 843 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Deer rotate: false - xy: 582, 385 + xy: 1026, 796 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp+Furs rotate: false - xy: 582, 338 + xy: 1060, 845 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill rotate: false - xy: 548, 304 + xy: 1060, 798 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 582, 304 + xy: 974, 602 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 718, 602 + xy: 1008, 586 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Terrace Farm rotate: false - xy: 718, 568 + xy: 704, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 720, 538 + xy: 1060, 768 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 720, 478 + xy: 772, 239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 754, 546 + xy: 806, 239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 754, 488 + xy: 448, 41 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 922, 803 + xy: 1042, 583 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 922, 773 + xy: 412, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 924, 675 + xy: 1914, 870 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1466, 821 + xy: 1076, 727 size: 32, 39 orig: 32, 39 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1534, 823 + xy: 1076, 667 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1636, 830 + xy: 1076, 579 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1704, 829 + xy: 1540, 874 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1772, 825 + xy: 1608, 878 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1806, 821 + xy: 1642, 876 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1976, 810 + xy: 1812, 884 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 2010, 810 + xy: 1846, 882 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1500, 800 + xy: 1880, 877 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1534, 789 + xy: 822, 600 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1636, 800 + xy: 822, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Cattle rotate: false - xy: 1704, 795 + xy: 824, 448 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Horses rotate: false - xy: 1738, 793 + xy: 824, 414 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture+Sheep rotate: false - xy: 1772, 791 + xy: 824, 380 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture2 rotate: false - xy: 1670, 800 + xy: 822, 482 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1806, 791 + xy: 824, 350 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1908, 799 + xy: 1710, 851 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 1942, 778 + xy: 1744, 847 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Fallout rotate: false - xy: 1976, 780 + xy: 1778, 854 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 2010, 780 + xy: 1812, 854 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 1908, 764 + xy: 1846, 847 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1942, 743 + xy: 1880, 842 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer rotate: false - xy: 1976, 745 + xy: 1914, 835 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs rotate: false - xy: 2010, 745 + xy: 1948, 821 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 750, 363 + xy: 1982, 817 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 920, 608 + xy: 856, 611 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 784, 391 + xy: 856, 574 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 784, 361 + xy: 856, 544 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1568, 765 + xy: 856, 514 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 1602, 768 + xy: 856, 484 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1636, 770 + xy: 858, 454 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Dyes rotate: false - xy: 1670, 770 + xy: 858, 424 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Incense rotate: false - xy: 1704, 765 + xy: 858, 394 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Silk rotate: false - xy: 1738, 763 + xy: 858, 364 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Spices rotate: false - xy: 1772, 761 + xy: 858, 334 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Sugar rotate: false - xy: 1806, 761 + xy: 890, 616 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Wine rotate: false - xy: 1840, 767 + xy: 890, 586 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 1874, 767 + xy: 890, 556 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1840, 737 + xy: 890, 526 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1874, 737 + xy: 890, 496 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1908, 734 + xy: 892, 466 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1976, 713 + xy: 892, 404 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 2010, 713 + xy: 892, 372 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 1092, 830 + xy: 892, 340 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 1126, 828 + xy: 924, 603 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 1160, 827 + xy: 924, 571 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 1194, 828 + xy: 924, 539 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1228, 826 + xy: 924, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1330, 826 + xy: 926, 415 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 1124, 798 + xy: 926, 357 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1158, 797 + xy: 926, 327 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 1364, 802 + xy: 892, 282 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1398, 800 + xy: 926, 267 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 1466, 791 + xy: 958, 544 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1568, 735 + xy: 960, 336 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 1602, 731 + xy: 960, 299 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Fallout rotate: false - xy: 1636, 740 + xy: 960, 269 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 1670, 736 + xy: 992, 552 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1704, 731 + xy: 992, 518 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer rotate: false - xy: 1738, 729 + xy: 994, 484 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs rotate: false - xy: 1772, 727 + xy: 994, 450 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1806, 727 + xy: 994, 416 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 1636, 710 + xy: 994, 386 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1704, 701 + xy: 994, 328 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 1840, 707 + xy: 1026, 525 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 1874, 707 + xy: 1028, 495 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1908, 704 + xy: 1028, 465 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1466, 761 + xy: 960, 424 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Aircraft Gun rotate: false - xy: 512, 432 + xy: 670, 313 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Tank Gun rotate: false - xy: 716, 636 + xy: 872, 738 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archer rotate: false - xy: 1024, 890 + xy: 820, 634 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Artillery rotate: false - xy: 1960, 942 + xy: 1024, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ballista rotate: false - xy: 240, 23 + xy: 444, 228 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battleship rotate: false - xy: 988, 842 + xy: 1058, 892 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berserker rotate: false - xy: 274, 23 + xy: 1370, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bowman rotate: false - xy: 580, 432 + xy: 478, 228 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Brute rotate: false - xy: 784, 636 + xy: 378, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Camel Archer rotate: false - xy: 1092, 890 + xy: 670, 253 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cannon rotate: false - xy: 1228, 890 + xy: 1472, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 1262, 892 + xy: 1092, 892 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Carrier rotate: false - xy: 1296, 892 + xy: 1506, 944 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Catapult rotate: false - xy: 1330, 890 + xy: 1126, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cavalry rotate: false - xy: 1398, 890 + xy: 1194, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chariot Archer rotate: false - xy: 1466, 890 + xy: 1262, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 1500, 890 + xy: 1296, 890 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 1636, 890 + xy: 1642, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 1772, 892 + xy: 1778, 944 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1806, 892 + xy: 1812, 944 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1840, 890 + xy: 1846, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1908, 890 + xy: 1914, 942 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 614, 432 + xy: 1948, 944 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 1092, 862 + xy: 1642, 914 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 1296, 862 + xy: 1846, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 1364, 862 + xy: 1948, 916 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 1432, 858 + xy: 1330, 884 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 1466, 862 + xy: 1364, 884 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 1500, 860 + xy: 1398, 877 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1500, 860 + xy: 1398, 877 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1022, 797 + xy: 414, 96 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1976, 870 + xy: 448, 131 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1976, 870 + xy: 448, 131 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1976, 840 + xy: 448, 101 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 2010, 870 + xy: 448, 71 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 2010, 870 + xy: 448, 71 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 2010, 840 + xy: 872, 648 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 514, 402 + xy: 906, 646 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 514, 402 + xy: 906, 646 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 752, 606 + xy: 1026, 766 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 752, 576 + xy: 670, 223 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 720, 508 + xy: 738, 239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 754, 518 + xy: 414, 38 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 720, 448 + xy: 1042, 736 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 754, 458 + xy: 1042, 706 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 716, 420 + xy: 1042, 678 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 682, 402 + xy: 1042, 650 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 716, 390 + xy: 1042, 620 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 924, 743 + xy: 1948, 886 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 924, 713 + xy: 1982, 882 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 924, 713 + xy: 1982, 882 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 924, 645 + xy: 1948, 856 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 754, 428 + xy: 1982, 852 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 750, 398 + xy: 704, 205 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1364, 832 + xy: 738, 209 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1398, 830 + xy: 772, 209 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1432, 830 + xy: 806, 211 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1500, 830 + xy: 1076, 697 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1568, 823 + xy: 1076, 637 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1602, 828 + xy: 1076, 609 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1670, 830 + xy: 1506, 884 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1738, 827 + xy: 1574, 875 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1840, 827 + xy: 1676, 882 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1874, 827 + xy: 1710, 881 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1908, 829 + xy: 1744, 884 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1942, 815 + xy: 1778, 884 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1568, 795 + xy: 822, 572 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1602, 798 + xy: 822, 542 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1840, 797 + xy: 824, 320 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1874, 797 + xy: 1676, 852 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1942, 713 + xy: 892, 436 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1262, 832 + xy: 926, 475 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1296, 832 + xy: 926, 445 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1090, 802 + xy: 926, 387 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1090, 774 + xy: 892, 312 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1124, 768 + xy: 858, 304 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1158, 767 + xy: 926, 297 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1432, 802 + xy: 958, 574 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1500, 770 + xy: 958, 514 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1534, 759 + xy: 960, 484 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1432, 772 + xy: 960, 454 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1500, 740 + xy: 960, 394 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1534, 731 + xy: 960, 366 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1670, 708 + xy: 994, 358 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1738, 699 + xy: 994, 298 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1772, 699 + xy: 994, 270 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1806, 699 + xy: 1026, 555 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1942, 685 + xy: 1028, 437 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 +TileSets/FantasyHex/road + rotate: false + xy: 614, 603 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +TileSets/Default/road + rotate: false + xy: 614, 603 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 UnitIcons/Spearman rotate: false - xy: 104, 922 + xy: 206, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Stealth Bomber rotate: false - xy: 206, 820 + xy: 104, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 104, 514 + xy: 410, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 308, 718 + xy: 2, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 2, 310 + xy: 308, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tercio rotate: false - xy: 206, 514 + xy: 512, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 2, 106 + xy: 308, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Triplane rotate: false - xy: 104, 208 + xy: 410, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 206, 309 + xy: 512, 615 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Turtle Ship rotate: false - xy: 308, 412 + xy: 614, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Chariot rotate: false - xy: 818, 922 + xy: 206, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Elephant rotate: false - xy: 2, 4 + xy: 308, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 104, 106 + xy: 410, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 716, 718 + xy: 104, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 818, 820 + xy: 206, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Zero rotate: false - xy: 206, 105 + xy: 512, 411 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy rotate: false - xy: 410, 360 + xy: 716, 666 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Air Repair rotate: false - xy: 512, 462 + xy: 818, 768 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush rotate: false - xy: 716, 666 + xy: 1022, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Armor Plating rotate: false - xy: 920, 870 + xy: 206, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 206, 53 + xy: 410, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz rotate: false - xy: 308, 245 + xy: 512, 359 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding Party rotate: false - xy: 1074, 972 + xy: 614, 551 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 308, 193 + xy: 1074, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge rotate: false - xy: 1126, 972 + xy: 614, 499 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal Raider rotate: false - xy: 1230, 972 + xy: 1178, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Cover rotate: false - xy: 1386, 972 + xy: 1334, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1386, 972 + xy: 1334, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1386, 972 + xy: 1334, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 1542, 972 + xy: 1490, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 1646, 972 + xy: 1594, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1698, 972 + xy: 1646, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1698, 972 + xy: 1646, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Flight Deck rotate: false - xy: 1802, 972 + xy: 1750, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Formation rotate: false - xy: 1854, 972 + xy: 1802, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Haka War Dance rotate: false - xy: 462, 360 + xy: 716, 614 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Heal Instantly rotate: false - xy: 462, 308 + xy: 768, 666 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect Fire rotate: false - xy: 666, 564 + xy: 870, 768 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Interception rotate: false - xy: 870, 768 + xy: 258, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics rotate: false - xy: 310, 89 + xy: 462, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/March rotate: false - xy: 360, 245 + xy: 616, 395 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 360, 193 + xy: 616, 343 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility rotate: false - xy: 412, 152 + xy: 718, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Rejuvenation rotate: false - xy: 820, 664 + xy: 514, 255 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting rotate: false - xy: 1076, 920 + xy: 974, 766 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry rotate: false - xy: 1076, 920 + xy: 974, 766 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 1180, 920 + xy: 310, 52 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 1232, 920 + xy: 362, 104 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sortie rotate: false - xy: 1284, 920 + xy: 362, 52 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting rotate: false - xy: 1440, 920 + xy: 566, 239 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting I (air) rotate: false - xy: 1440, 920 + xy: 566, 239 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Volley rotate: false - xy: 1752, 920 + xy: 1128, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack rotate: false - xy: 1856, 920 + xy: 1232, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman rotate: false - xy: 1908, 920 + xy: 1284, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 80e719ff8c..3891f44942 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 289da61f6c..5dbf5c23cc 100644 Binary files a/android/assets/game2.png and b/android/assets/game2.png differ diff --git a/android/assets/jsons/Nations/Nations.json b/android/assets/jsons/Nations/Nations.json index 2d071b376d..ec69a38839 100644 --- a/android/assets/jsons/Nations/Nations.json +++ b/android/assets/jsons/Nations/Nations.json @@ -675,6 +675,38 @@ "Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano", "Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"] }, + { + "name": "Mongolia", + "leaderName": "Genghis Khan", + "adjective": ["Mongolian"], + "startBias": ["Plains"], + "preferredVictoryType": "Domination", + + "startIntroPart1": "Greetings, o great Temujin, immortal emperor of the mighty Mongol Empire! Your fists shatter walls of cities and your voice brings despair to your enemies. O Khan! You united the warring tribes of Northern Asia into a mighty people, creating the greatest cavalry force the world has ever witnessed. Your people's cunning diplomacy divided their enemies, making them weak and helpless before Mongolia's conquering armies. In a few short years, your people soldiers conquered most of China and Eastern Asia, and the empire continued to grow until it reached west into Europe and south to Korea. Indeed, it was the greatest empire ever seen, dwarfing those pathetic conquests of the Romans of the Greeks.", + "startIntroPart2": "Temujin, your people cann upon you once more to lead them to battle and conquest. Will the world once again trembe at the thunderous sound of your cavalry, sweeping down from the steppes? Will you build a civilization that stands the test of time?", + "declaringWar": "You stand in the way of my armies. Let us solve this like warriors!", + "attacked": "No more words. Today, Mongolia charges toward your defeat.", + "defeated": "You have hobbled the Mongolian clans. My respect for you nearly matches the loathing. I am waiting for my execution.", + "introduction": "I am Temuujin, conqueror of cities and countries. Before me lie future Mongolian lands. Behind me is the only cavalry that matters.", + "neutralHello": "Hello.", + "neutralLetsHearIt": ["I'm listening.","What?"], + "neutralNo": ["No.","Of course not!"], + "neutralYes": ["Good.","That works.","Of course!"], + "hateHello": "So what now?", + "hateLetsHearIt": ["And then?","Continue..."], + "hateNo": ["Stop playing around.","This is not to be tolerated!"], + "hateYes": ["Very well...","Fine!"], + "afterPeace": "It seems I have underestimate you. Very well... I won't take you head for now.", + "tradeRequest": "I am not always this generous, but we hope you take this rare opportunity we give you.", + "outerColor": [81,0,9], + "innerColor": [255,120,0], + "uniqueName": "Mongol Terror", + "unique": "Combat Strength +30% when fighting City-State units or attacking a City-State itself. All mounted units have +1 Movement.", + "cities": ["Karakorum","Beshbalik","Turfan","Hsia","Old Sarai","New Sarai","Tabriz","Tiflis","Otrar","Sanchu","Kazan", + "Almarikh","Ulaanbaatar","Hovd","Darhan","Dalandzadgad","Mandalgovi","Choybalsan","Erdenet","Tsetserieg", + "Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Atlay","Uliastay","Bayanhongor", + "Har-Ayrag","Nalayh","Tes"] + }, /* { // REQUIRES RIVERS @@ -710,45 +742,13 @@ "Jilotzingo","Tlapanaloya","Tultitan","Ecatepec","Coatepec","Chalchiuites","Chiauhita","Chapultepec", "Itzapalapa","Ayotzinco","Iztapam"] }, - { - "name": "Mongolia", - "leaderName": "Genghis Khan", - "adjective": ["Mongolian"], - "startBias": ["Plains"], - "preferredVictoryType": "Domination", - - "startIntroPart1": "Greetings, o great Temujin, immortal emperor of the mighty Mongol Empire! Your fists shatter walls of cities and your voice brings despair to your enemies. O Khan! You united the warring tribes of Northern Asia into a mighty people, creating the greatest cavalry force the world has ever witnessed. Your people's cunning diplomacy divided their enemies, making them weak and helpless before Mongolia's conquering armies. In a few short years, your people soldiers conquered most of China and Eastern Asia, and the empire continued to grow until it reached west into Europe and south to Korea. Indeed, it was the greatest empire ever seen, dwarfing those pathetic conquests of the Romans of the Greeks.", - "startIntroPart2": "Temujin, your people cann upon you once more to lead them to battle and conquest. Will the world once again trembe at the thunderous sound of your cavalry, sweeping down from the steppes? Will you build a civilization that stands the test of time?", - "declaringWar": "You stand in the way of my armies. Let us solve this like warriors!", - "attacked": "No more words. Today, Mongolia charges toward your defeat.", - "defeated": "You have hobbled the Mongolian clans. My respect for you nearly matches the loathing. I am waiting for my execution.", - "introduction": "I am Temuujin, conqueror of cities and countries. Before me lie future Mongolian lands. Behind me is the only cavalry that matters.", - "neutralHello": "Hello.", - "neutralLetsHearIt": ["I'm listening.","What?"], - "neutralNo": ["No.","Of course not!"], - "neutralYes": ["Good.","That works.","Of course!"], - "hateHello": "So what now?", - "hateLetsHearIt": ["And then?","Continue..."], - "hateNo": ["Stop playing around.","This is not to be tolerated!"], - "hateYes": ["Very well...","Fine!"], - "afterPeace": "It seems I have underestimate you. Very well... I won't take you head for now.", - "tradeRequest": "I am not always this generous, but we hope you take this rare opportunity we give you.", - "outerColor": [51,0,0], - "innerColor": [0,204,102], - "uniqueName": "Mongol Terror", - "unique": "All mounted units have +1 Movement. +30% when assaulting cities,", - "cities": ["Karakorum","Beshbalik","Turfan","Hsia","Old Sarai","New Sarai","Tabriz","Tiflis","Otrar","Sanchu","Kazan", - "Almarikh","Ulaanbaatar","Hovd","Darhan","Dalandzadgad","Mandalgovi","Choybalsan","Erdenet","Tsetserieg", - "Baruun-Urt","Ereen","Batshireet","Choyr","Ulaangom","Tosontsengel","Atlay","Uliastay","Bayanhongor", - "Har-Ayrag","Nalayh","Tes"] - }, { "name": "Incan", "leaderName": "Pachacuti", "adjective": ["Incan"], "startBias": ["Hill"], "preferredVictoryType": "Cultural", - + "startIntroPart1": "Oh ye who remakes the world, your loyal subjects greet you, King Pachacuti Sapa Inca, ruler of the Inca people! From the beginnings in the small state of Cusco, the Incans displayed their potential for greatness, marching to war against their many enemies, crushing their armies into dust and carving for themselves a mighty empire stretching from Ecuador to Chile. Indeed, they build the greatest empire ever seen in all pre-Columbian Americas. More than mere soldiers, your people were great builders and artists as well, and the remnants of their works still awe and inspire the world today.", "startIntroPart2": "Oh King Pachacuti, truly are you called 'Earth Shaker'! Will you once again call upon the ground itself to a fight at your side? Your armies await your signal. Will you restore the glory of your empire? Can you build a civilization that will stand the test of time?", "declaringWar": "Resistance is futile! You cannot hope to stand against the mighty Incan empire. If you will not surrender immediately, then prepare for war!", diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 8148d6167d..3d5871380a 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -630,12 +630,12 @@ "hurryCostModifier": 20, "attackSound": "horse" }, - /* { "name": "Keshik", "replaces": "Knight", "uniqueTo": "Mongolia", "unitType": "Mounted", + "range": 2, "movement": 5, "strength": 15, "rangedStrength": 16, @@ -643,13 +643,11 @@ "requiredTech": "Chivalry", "requiredResource": "Horses", "upgradesTo": "Cavalry", - "obsoleteTech": "Military science", "uniques": ["Can move after attacking","No defensive terrain bonus","Combat very likely to create Great Generals","50% Bonus XP gain"], "hurryCostModifier": 20, "attackSound": "arrow" - //Mongolian unique unit. + // Keshik should have no penalty attacking cities }, - */ // Rennaisance Era @@ -1328,7 +1326,18 @@ "name": "Great General", "unbuildable": true, "unitType": "Civilian", - "uniques": ["Can start an 8-turn golden age","Bonus for units in 2 tile radius 15%"] //todo : should be able to build mega-fort + "uniques": ["Can start an 8-turn golden age","Bonus for units in 2 tile radius 15%"], + //todo : should be able to build mega-fort "movement": 2 + }, + { + "name": "Khan", + "unbuildable": true, + "unitType": "Civilian", + "uniqueTo": "Mongolia", + "replaces": "Great General", + "uniques": ["Can start an 8-turn golden age","Bonus for units in 2 tile radius 15%", "Heal adjacent units for an additional 15 HP per turn"], + //todo : should be able to build mega-fort + "movement": 5 } ] diff --git a/android/assets/jsons/translationsByLanguage/Italian.properties b/android/assets/jsons/translationsByLanguage/Italian.properties index 9b5b974ce4..b12bbc77a7 100644 --- a/android/assets/jsons/translationsByLanguage/Italian.properties +++ b/android/assets/jsons/translationsByLanguage/Italian.properties @@ -532,6 +532,10 @@ Spain = Spagna Isabella = Isabella 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it). Culture, Happiness and tile yields from Natural Wonders doubled. = Otteni Oro bonus (raddoppiato se la scopri per prima) quando scopri una Meraviglia Naturale, che donano il doppio di Cultura, Felicità e rese di casella. +Mongolia = Mongolia +Genghis Khan = Gengis Khan +Combat Strength +30% when fighting City-State units or attacking a City-State itself. All mounted units have +1 Movement. = +50% forza di combattimento contro unità di Città-Stato o attaccando la Città-Stato stessa. Tutte le unità a cavallo guadagnano +1 movimento. + # New game screen Uniques = Abilità unica @@ -1505,6 +1509,8 @@ Camel Archer = Arciere su cammello Conquistador = Conquistador Mandekalu Cavalry = Cavalleria Mandekalu Defense bonus when embarked = Difesa bonus quando imbarcato +Keshik = Keshik +50% Bonus XP gain = 50% bonus XP Naresuan's Elephant = Elefante di Naresuan Samurai = Samurai Combat very likely to create Great Generals = Può generare un Grande Generale combattendo @@ -1584,6 +1590,8 @@ Can speed up construction of a wonder = Può accelerare la costruzione di una Me Can build improvement: Manufactory = Può costruire il miglioramento: Manifattura Great General = Grande Generale Bonus for units in 2 tile radius 15% = 15% Bonus per le unità nel raggio di 2 caselle +Khan = Khan +Heal adjacent units for an additional 15 HP per turn = Cura le unità vicine di 15 HP aggiuntivi ogni turno # Promotions diff --git a/android/assets/jsons/translationsByLanguage/template.properties b/android/assets/jsons/translationsByLanguage/template.properties index 2184d2f6c9..bab19ea4b8 100644 --- a/android/assets/jsons/translationsByLanguage/template.properties +++ b/android/assets/jsons/translationsByLanguage/template.properties @@ -532,6 +532,11 @@ Spain = Isabella = 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it). Culture, Happiness and tile yields from Natural Wonders doubled. = +Mongolia = +Genghis Khan = +Combat Strength +30% when fighting City-State units or attacking a City-State itself. All mounted units have +1 Movement. = +Mongol Terror = + # New game screen Uniques = @@ -1505,6 +1510,8 @@ Camel Archer = Conquistador = Mandekalu Cavalry = Defense bonus when embarked = +Keshik = +50% Bonus XP gain = Naresuan's Elephant = Samurai = Combat very likely to create Great Generals = @@ -1584,6 +1591,8 @@ Can speed up construction of a wonder = Can build improvement: Manufactory = Great General = Bonus for units in 2 tile radius 15% = +Khan = +Heal adjacent units for an additional 15 HP per turn = # Promotions diff --git a/core/src/com/unciv/Constants.kt b/core/src/com/unciv/Constants.kt index 5081ec87c0..577f736f07 100644 --- a/core/src/com/unciv/Constants.kt +++ b/core/src/com/unciv/Constants.kt @@ -2,8 +2,9 @@ package com.unciv class Constants{ companion object { - const val worker="Worker" - const val settler="Settler" + const val worker = "Worker" + const val settler = "Settler" + const val greatGeneral = "Great General" const val ocean="Ocean" const val mountain="Mountain" diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt index dd0de44529..1b70816007 100644 --- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt @@ -447,7 +447,7 @@ class NextTurnAutomation{ when { unit.type.isRanged() -> rangedUnits.add(unit) unit.type.isMelee() -> meleeUnits.add(unit) - unit.name == "Great General" -> generals.add(unit) //generals move after military units + unit.name == civInfo.getEquivalentUnit(Constants.greatGeneral).name -> generals.add(unit) //generals move after military units else -> civilianUnits.add(unit) } } diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 2288025d82..ccd8bf2e4d 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -44,7 +44,7 @@ class UnitAutomation { return SpecificUnitAutomation().automateWorkBoats(unit) } - if (unit.name == "Great General") + if (unit.name == unit.civInfo.getEquivalentUnit(Constants.greatGeneral).name) return SpecificUnitAutomation().automateGreatGeneral(unit) if (unit.type == UnitType.Fighter) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index b5c839a60e..18714b00e8 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -223,17 +223,24 @@ object Battle { if(thisCombatant !is MapUnitCombatant) return if(thisCombatant.unit.promotions.totalXpProduced() >= 30 && otherCombatant.getCivInfo().isBarbarian()) return - var amountToAdd = amount - if(thisCombatant.getCivInfo().policies.isAdopted("Military Tradition")) amountToAdd = (amountToAdd * 1.5f).toInt() - thisCombatant.unit.promotions.XP += amountToAdd + var XPModifier = 1f + if (thisCombatant.getCivInfo().policies.isAdopted("Military Tradition")) XPModifier += 0.5f + if (thisCombatant.unit.hasUnique("50% Bonus XP gain")) XPModifier += 0.5f + + val XPGained = (amount * XPModifier).toInt() + thisCombatant.unit.promotions.XP += XPGained + + + var greatGeneralPointsModifier = 1f if(thisCombatant.getCivInfo().nation.unique == "Great general provides double combat bonus, and spawns 50% faster") - amountToAdd = (amountToAdd * 1.5f).toInt() + greatGeneralPointsModifier += 0.5f if(thisCombatant.unit.hasUnique("Combat very likely to create Great Generals")) - amountToAdd *= 2 + greatGeneralPointsModifier += 1f - thisCombatant.getCivInfo().greatPeople.greatGeneralPoints += amountToAdd + val greatGeneralPointsGained = (XPGained * greatGeneralPointsModifier).toInt() + thisCombatant.getCivInfo().greatPeople.greatGeneralPoints += greatGeneralPointsGained } private fun conquerCity(city: CityInfo, attacker: ICombatant) { diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 783541f092..ab1b7d3c72 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -90,6 +90,9 @@ class BattleDamage{ && combatant.getCivInfo().goldenAges.isGoldenAge()) modifiers["Golden Age"] = 0.1f + if (combatant.getCivInfo().nation.unique == "Combat Strength +30% when fighting City-State units or attacking a City-State itself. All mounted units have +1 Movement." + && enemy.getCivInfo().isCityState()) + modifiers["Mongol Terror"] = 0.3f } if (enemy.getCivInfo().isBarbarian()) { @@ -234,7 +237,7 @@ class BattleDamage{ /** * Includes attack modifiers */ - fun getAttackingStrength(attacker: ICombatant, defender: ICombatant): Float { + private fun getAttackingStrength(attacker: ICombatant, defender: ICombatant): Float { val attackModifier = modifiersToMultiplicationBonus(getAttackModifiers(attacker,defender)) return attacker.getAttackingStrength() * attackModifier } @@ -243,7 +246,7 @@ class BattleDamage{ /** * Includes defence modifiers */ - fun getDefendingStrength(attacker: ICombatant, defender: ICombatant): Float { + private fun getDefendingStrength(attacker: ICombatant, defender: ICombatant): Float { var defenceModifier = 1f if(defender is MapUnitCombatant) defenceModifier = modifiersToMultiplicationBonus(getDefenceModifiers(attacker,defender)) return defender.getDefendingStrength() * defenceModifier @@ -261,7 +264,7 @@ class BattleDamage{ return (damageModifier(ratio,false) * getHealthDependantDamageRatio(attacker)).roundToInt() } - fun damageModifier(attackerToDefenderRatio:Float, damageToAttacker:Boolean): Float { + private fun damageModifier(attackerToDefenderRatio: Float, damageToAttacker:Boolean): Float { // https://forums.civfanatics.com/threads/getting-the-combat-damage-math.646582/#post-15468029 val strongerToWeakerRatio = attackerToDefenderRatio.pow(if (attackerToDefenderRatio < 1) -1 else 1) var ratioModifier = ((((strongerToWeakerRatio + 3)/4).pow(4) +1)/2) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index a28a0ee71b..15912a088d 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -466,8 +466,9 @@ class CivilizationInfo { } fun addGreatPerson(greatPerson: String, city:CityInfo) { - placeUnitNearTile(city.location, greatPerson) - addNotification("A [$greatPerson] has been born in [${city.name}]!", city.location, Color.GOLD) + val greatPersonName = getEquivalentUnit(greatPerson).name + placeUnitNearTile(city.location, greatPersonName) + addNotification("A [$greatPersonName] has been born in [${city.name}]!", city.location, Color.GOLD) } fun placeUnitNearTile(location: Vector2, unitName: String, removeImprovement: Boolean = false): MapUnit? { diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 5e327362fb..56220833ab 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -104,9 +104,13 @@ class MapUnit { if (type.isWaterUnit() && civInfo.nation.unique == "+2 movement for all naval units") movement += 2 - if(civInfo.goldenAges.isGoldenAge() && + if (type == UnitType.Mounted && + civInfo.nation.unique == "Combat Strength +30% when fighting City-State units or attacking a City-State itself. All mounted units have +1 Movement.") + movement += 1 + + if (civInfo.goldenAges.isGoldenAge() && civInfo.nation.unique=="Golden Ages last 50% longer. During a Golden Age, units receive +1 Movement and +10% Strength") - movement+=1 + movement += 1 return movement } @@ -348,6 +352,8 @@ class MapUnit { if(currentTurnsFortified<2) action = action!!.replace(currentTurnsFortified.toString(),(currentTurnsFortified+1).toString(), true) } + if (hasUnique("Heal adjacent units for an additional 15 HP per turn")) + currentTile.neighbors.flatMap{ it.getUnits() }.forEach{ it.healBy(15) } } private fun workOnImprovement() { diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index c648242789..3ff76b9a71 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -151,9 +151,10 @@ class BaseUnit : INamed, IConstruction { override fun postBuildEvent(construction: CityConstructions) { val unit = construction.cityInfo.civInfo.placeUnitNearTile(construction.cityInfo.location, name) if(unit==null) return // couldn't place the unit, so there's actually no unit =( - unit.promotions.XP += construction.getBuiltBuildings().sumBy { it.xpForNewUnits } - if(construction.cityInfo.civInfo.policies.isAdopted("Total War")) - unit.promotions.XP += 15 + + var XP = construction.getBuiltBuildings().sumBy { it.xpForNewUnits } + if(construction.cityInfo.civInfo.policies.isAdopted("Total War")) XP += 15 + unit.promotions.XP = XP if(unit.type in listOf(UnitType.Melee,UnitType.Mounted,UnitType.Armor) && construction.cityInfo.containsBuildingUnique("All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion"))