diff --git a/android/Images/BuildingIcons/Manhattan Project.png b/android/Images/BuildingIcons/Manhattan Project.png new file mode 100644 index 0000000000..ff700a5b0a Binary files /dev/null and b/android/Images/BuildingIcons/Manhattan Project.png differ diff --git a/android/Images/TileSets/Default/FalloutOverlay.png b/android/Images/TileSets/Default/FalloutOverlay.png new file mode 100644 index 0000000000..91a19fa54b Binary files /dev/null and b/android/Images/TileSets/Default/FalloutOverlay.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Desert+Fallout.png b/android/Images/TileSets/FantasyHex/Tiles/Desert+Fallout.png new file mode 100644 index 0000000000..771f3b39d7 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Desert+Fallout.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Grassland+Fallout.png b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Fallout.png new file mode 100644 index 0000000000..4689f58a8f Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Grassland+Fallout.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Hill+Fallout.png b/android/Images/TileSets/FantasyHex/Tiles/Hill+Fallout.png new file mode 100644 index 0000000000..914baa4ac3 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Hill+Fallout.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Plains+Fallout.png b/android/Images/TileSets/FantasyHex/Tiles/Plains+Fallout.png new file mode 100644 index 0000000000..59d1a7be18 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Plains+Fallout.png differ diff --git a/android/Images/TileSets/FantasyHex/Tiles/Tundra+Fallout.png b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Fallout.png new file mode 100644 index 0000000000..6fbb8a0247 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Tiles/Tundra+Fallout.png differ diff --git a/android/Images/UnitIcons/Nuclear Missile.png b/android/Images/UnitIcons/Nuclear Missile.png new file mode 100644 index 0000000000..e90ecad6d3 Binary files /dev/null and b/android/Images/UnitIcons/Nuclear Missile.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 60ebfbe366..1e36ed44ae 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -167,399 +167,399 @@ BuildingIcons/Factory index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 1634, 986 + xy: 1736, 986 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 1940, 986 + xy: 410, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 206, 952 + xy: 308, 952 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Great Wall rotate: false - xy: 1022, 920 + xy: 1634, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 1124, 862 + xy: 1226, 862 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 1226, 862 + xy: 1328, 862 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanse rotate: false - xy: 1328, 862 + xy: 1430, 862 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 1430, 862 + xy: 1532, 862 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 512, 854 + xy: 614, 854 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Himeji Castle rotate: false - xy: 104, 850 + xy: 206, 850 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 818, 818 + xy: 920, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hubble Space Telescope rotate: false - xy: 920, 818 + xy: 1022, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 1634, 782 + xy: 1736, 782 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1430, 760 + xy: 1532, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Kremlin rotate: false - xy: 818, 716 + xy: 920, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 920, 716 + xy: 1022, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 1124, 658 + xy: 1226, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 1328, 658 + xy: 1430, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 1430, 658 + xy: 1532, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Longhouse rotate: false - xy: 512, 650 + xy: 614, 650 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Picchu rotate: false - xy: 2, 634 + xy: 818, 620 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Manhattan Project + rotate: false + xy: 716, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1022, 614 + xy: 1736, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 1124, 556 + xy: 1328, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1532, 556 + xy: 614, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 206, 544 + xy: 2, 532 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1022, 512 + xy: 1736, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1634, 476 + xy: 1838, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mughal Fort rotate: false - xy: 1838, 476 + xy: 410, 470 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1940, 476 + xy: 1124, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1430, 454 + xy: 512, 446 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 512, 446 + xy: 104, 442 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 614, 446 + xy: 206, 442 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 206, 442 + xy: 818, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 2, 430 + xy: 920, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 920, 410 + xy: 1736, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1634, 374 + xy: 1940, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1736, 374 + xy: 410, 368 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1940, 374 + xy: 1124, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1328, 352 + xy: 614, 344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1022, 308 + xy: 1838, 272 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1838, 272 + xy: 1328, 251 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 614, 242 + xy: 308, 238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1736, 170 + xy: 410, 164 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1838, 170 + xy: 1328, 149 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1940, 170 + xy: 1124, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 410, 164 + xy: 1226, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Satrap's Court rotate: false - xy: 1430, 148 + xy: 614, 140 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 614, 140 + xy: 308, 136 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1634, 68 + xy: 1940, 68 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1838, 68 + xy: 1328, 47 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 410, 62 + xy: 1226, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1430, 46 + xy: 614, 38 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1532, 46 + xy: 104, 34 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 512, 38 + xy: 206, 34 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 308, 34 + xy: 716, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 716, 8 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stonehenge - rotate: false - xy: 818, 2 + xy: 1022, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -720,105 +720,105 @@ ImprovementIcons/Customs house index: -1 ImprovementIcons/Farm rotate: false - xy: 104, 1054 + xy: 206, 1054 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 818, 1022 + xy: 920, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 1736, 680 + xy: 1838, 680 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 104, 646 + xy: 206, 646 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 716, 620 + xy: 920, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 614, 548 + xy: 206, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 2, 532 + xy: 716, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 818, 410 + xy: 1634, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 1124, 353 + xy: 1430, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 716, 314 + xy: 1022, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 410, 266 + xy: 1226, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1328, 250 + xy: 614, 242 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 1328, 250 + xy: 614, 242 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 1328, 250 + xy: 614, 242 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 2, 226 + xy: 920, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -874,91 +874,91 @@ NationIcons/England index: -1 NationIcons/France rotate: false - xy: 410, 980 + xy: 1124, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Germany rotate: false - xy: 614, 956 + xy: 104, 952 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Greece rotate: false - xy: 1838, 884 + xy: 1940, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/India rotate: false - xy: 1838, 782 + xy: 1940, 782 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Iroquois rotate: false - xy: 1532, 760 + xy: 512, 752 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Japan rotate: false - xy: 104, 748 + xy: 206, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Korea rotate: false - xy: 716, 722 + xy: 716, 716 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Persia rotate: false - xy: 1532, 352 + xy: 104, 340 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Polynesia rotate: false - xy: 920, 308 + xy: 1736, 272 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 1022, 206 + xy: 1838, 170 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 1634, 170 + xy: 1940, 170 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Siam rotate: false - xy: 716, 110 + xy: 1022, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Songhai rotate: false - xy: 1940, 68 + xy: 1124, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -993,7 +993,7 @@ OtherIcons/DisbandUnit index: -1 OtherIcons/Fire rotate: false - xy: 2, 1042 + xy: 716, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1021,49 +1021,42 @@ TileSets/FantasyHex/Hexagon index: -1 OtherIcons/MenuIcon rotate: false - xy: 1226, 556 + xy: 1430, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1430, 352 + xy: 512, 344 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 2, 328 + xy: 920, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 1940, 272 + xy: 1124, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 308, 136 + xy: 716, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1736, 68 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -OtherIcons/Stop - rotate: false - xy: 920, 2 + xy: 410, 62 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1126,112 +1119,112 @@ ResourceIcons/Dyes index: -1 ResourceIcons/Fish rotate: false - xy: 716, 1022 + xy: 818, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 1226, 964 + xy: 1328, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 512, 956 + xy: 614, 956 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 104, 952 + xy: 206, 952 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 716, 824 + xy: 716, 818 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1736, 782 + xy: 1838, 782 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1124, 760 + xy: 1226, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 512, 752 + xy: 614, 752 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 920, 614 + xy: 1634, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 716, 416 + xy: 1022, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1226, 352 + xy: 1532, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 206, 136 + xy: 818, 110 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 818, 104 + xy: 1634, 68 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 920, 104 + xy: 1736, 68 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1328, 46 + xy: 512, 38 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 2, 22 + xy: 920, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1308,7 +1301,7 @@ StatIcons/Production index: -1 StatIcons/Resistance rotate: false - xy: 104, 238 + xy: 2, 226 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1322,7 +1315,7 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1226, 46 + xy: 1532, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1532,294 +1525,294 @@ TechIcons/Engineering index: -1 TechIcons/Fertilizer rotate: false - xy: 206, 1054 + xy: 308, 1054 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 920, 1022 + xy: 1022, 1022 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 1328, 964 + xy: 1430, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 1940, 884 + xy: 410, 878 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 410, 878 + xy: 1124, 862 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 308, 850 + xy: 2, 838 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 1940, 782 + xy: 410, 776 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1226, 760 + xy: 1328, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Lasers rotate: false - xy: 410, 674 + xy: 1124, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 308, 646 + xy: 2, 634 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1736, 578 + xy: 1940, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 1838, 578 + xy: 410, 572 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1940, 578 + xy: 1124, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1328, 556 + xy: 1532, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1430, 556 + xy: 512, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 512, 548 + xy: 104, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 104, 544 + xy: 308, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 716, 518 + xy: 920, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1226, 454 + xy: 1430, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1532, 454 + xy: 614, 446 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 104, 442 + xy: 308, 442 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1022, 410 + xy: 1838, 374 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 410, 368 + xy: 1226, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 614, 344 + xy: 308, 340 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 104, 340 + xy: 2, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 206, 340 + xy: 818, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 818, 308 + xy: 1634, 272 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1634, 272 + xy: 1940, 272 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1736, 272 + xy: 410, 266 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 1124, 251 + xy: 1430, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1226, 250 + xy: 1532, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 1430, 250 + xy: 512, 242 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1532, 250 + xy: 104, 238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 512, 242 + xy: 206, 238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 308, 238 + xy: 716, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 716, 212 + xy: 1022, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 920, 206 + xy: 1736, 170 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1124, 149 + xy: 1430, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1328, 148 + xy: 512, 140 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1532, 148 + xy: 104, 136 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 104, 34 + xy: 2, 22 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 206, 34 + xy: 818, 8 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1845,58 +1838,65 @@ TileSets/FantasyHex/CrosshatchHexagon orig: 273, 236 offset: 0, 0 index: -1 +TileSets/Default/FalloutOverlay + rotate: false + xy: 104, 1054 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 TileSets/Default/Flood plainsOverlay rotate: false - xy: 1022, 1022 + xy: 1634, 986 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/ForestOverlay rotate: false - xy: 1838, 986 + xy: 1940, 986 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/HillOverlay rotate: false - xy: 614, 854 + xy: 104, 850 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/JungleOverlay rotate: false - xy: 308, 748 + xy: 2, 736 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/LakesOverlay rotate: false - xy: 1022, 716 + xy: 1634, 680 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 1634, 578 + xy: 1838, 578 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 1736, 476 + xy: 1940, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 308, 442 + xy: 716, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2050,350 +2050,350 @@ UnitIcons/Destroyer index: -1 UnitIcons/Fighter rotate: false - xy: 308, 1054 + xy: 2, 1042 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Foreign Legion rotate: false - xy: 1736, 986 + xy: 1838, 986 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 1124, 964 + xy: 1226, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 1430, 964 + xy: 1532, 964 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 1532, 964 + xy: 512, 956 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 308, 952 + xy: 2, 940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 2, 940 + xy: 716, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great General rotate: false - xy: 716, 926 + xy: 818, 926 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 716, 926 + xy: 818, 926 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 818, 920 + xy: 920, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 920, 920 + xy: 1022, 920 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Bomber rotate: false - xy: 1634, 884 + xy: 1736, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great War Infantry rotate: false - xy: 1736, 884 + xy: 1838, 884 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Helicopter rotate: false - xy: 1532, 862 + xy: 512, 854 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hoplite rotate: false - xy: 206, 850 + xy: 308, 850 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 2, 838 + xy: 818, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Hwach'a rotate: false - xy: 1022, 818 + xy: 1634, 782 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Infantry rotate: false - xy: 410, 776 + xy: 1124, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1328, 760 + xy: 1430, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Janissary rotate: false - xy: 614, 752 + xy: 104, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Jet Fighter rotate: false - xy: 206, 748 + xy: 308, 748 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 2, 736 + xy: 818, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1634, 680 + xy: 1736, 680 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 1838, 680 + xy: 1940, 680 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landsknecht rotate: false - xy: 1940, 680 + xy: 410, 674 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Legion rotate: false - xy: 1226, 658 + xy: 1328, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 1532, 658 + xy: 512, 650 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 614, 650 + xy: 104, 646 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 206, 646 + xy: 308, 646 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Maori Warrior rotate: false - xy: 818, 614 + xy: 1022, 614 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 410, 572 + xy: 1226, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 308, 544 + xy: 818, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 818, 512 + xy: 1022, 512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mohawk Warrior rotate: false - xy: 920, 512 + xy: 1634, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 410, 470 + xy: 1226, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1124, 455 + xy: 1328, 455 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Naresuan's Elephant rotate: false - xy: 1328, 454 + xy: 1532, 454 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Nuclear Missile + rotate: false + xy: 2, 430 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Panzer rotate: false - xy: 1838, 374 + xy: 1328, 353 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Persian Immortal rotate: false - xy: 512, 344 + xy: 206, 340 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 308, 340 + xy: 716, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 206, 238 + xy: 818, 212 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 818, 206 + xy: 1634, 170 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1226, 148 + xy: 1532, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 512, 140 + xy: 206, 136 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 104, 136 + xy: 2, 124 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ship of the Line rotate: false - xy: 2, 124 + xy: 920, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sipahi rotate: false - xy: 1022, 104 + xy: 1838, 68 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1124, 47 + xy: 1430, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Stealth Bomber rotate: false - xy: 614, 38 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -UnitIcons/Submarine - rotate: false - xy: 1022, 2 + xy: 308, 34 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2404,338 +2404,352 @@ size: 2048,512 format: RGBA8888 filter: MipMapLinearLinear,MipMapLinearLinear repeat: none +BuildingIcons/Stonehenge + rotate: false + xy: 2, 410 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/Sydney Opera House - rotate: false - xy: 104, 410 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Taj Mahal - rotate: false - xy: 2, 206 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Temple rotate: false xy: 206, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Terracotta Army +BuildingIcons/Taj Mahal rotate: false xy: 2, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Great Library - rotate: false - xy: 2, 2 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Great Lighthouse +BuildingIcons/Temple rotate: false xy: 104, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Louvre +BuildingIcons/Terracotta Army rotate: false xy: 206, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Oracle +BuildingIcons/The Great Library rotate: false xy: 308, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Pyramids - rotate: false - xy: 104, 2 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Theatre - rotate: false - xy: 308, 308 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/University - rotate: false - xy: 308, 2 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Walls - rotate: false - xy: 512, 307 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Walls of Babylon - rotate: false - xy: 614, 410 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Wat - rotate: false - xy: 614, 308 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Windmill - rotate: false - xy: 614, 206 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Workshop - rotate: false - xy: 614, 2 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Trading post - rotate: false - xy: 206, 104 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -NationIcons/The Ottomans +BuildingIcons/The Great Lighthouse rotate: false xy: 104, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +BuildingIcons/The Louvre + rotate: false + xy: 104, 2 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/The Oracle + rotate: false + xy: 206, 206 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/The Pyramids + rotate: false + xy: 410, 410 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Theatre + rotate: false + xy: 206, 2 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/University + rotate: false + xy: 614, 410 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Walls + rotate: false + xy: 512, 206 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Walls of Babylon + rotate: false + xy: 614, 308 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Wat + rotate: false + xy: 614, 206 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Windmill + rotate: false + xy: 614, 104 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Workshop + rotate: false + xy: 920, 410 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Trading post + rotate: false + xy: 410, 308 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +NationIcons/The Ottomans + rotate: false + xy: 308, 308 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 OtherIcons/Aircraft rotate: false - xy: 818, 256 + xy: 1022, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 920, 395 + xy: 1074, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 +OtherIcons/Stop + rotate: false + xy: 2, 308 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 OtherIcons/TableBackground rotate: false - xy: 1804, 408 + xy: 1026, 252 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 2023, 509 + xy: 1642, 347 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 716, 102 + xy: 818, 204 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 870, 256 + xy: 1230, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 922, 291 + xy: 1282, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 983, 460 + xy: 1386, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1035, 460 + xy: 1438, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1139, 460 + xy: 1542, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1243, 460 + xy: 1646, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1399, 460 + xy: 1802, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1503, 460 + xy: 1906, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1555, 460 + xy: 1958, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1607, 460 + xy: 870, 256 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1763, 460 + xy: 870, 100 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1971, 460 + xy: 922, 254 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 972, 408 + xy: 922, 202 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1024, 408 + xy: 922, 98 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1076, 356 + xy: 974, 202 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1128, 408 + xy: 974, 150 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1128, 356 + xy: 974, 98 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1180, 408 + xy: 922, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1180, 356 + xy: 974, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1232, 356 + xy: 1076, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1284, 356 + xy: 1180, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1336, 408 + xy: 1232, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1336, 356 + xy: 1284, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1388, 408 + xy: 1336, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1388, 356 + xy: 1388, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -2749,1645 +2763,1687 @@ PolicyIcons/Professional Army index: -1 PolicyIcons/Protectionism rotate: false - xy: 1440, 356 + xy: 1492, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1544, 408 + xy: 1648, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1544, 356 + xy: 1700, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1596, 408 + xy: 1752, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1596, 356 + xy: 1804, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1648, 356 + xy: 1908, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1752, 356 + xy: 1078, 356 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1856, 408 + xy: 1130, 356 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1856, 356 + xy: 1026, 200 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1908, 408 + xy: 1078, 252 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1908, 356 + xy: 1130, 304 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1960, 356 + xy: 1026, 148 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 2, 410 + xy: 2, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 410, 206 + xy: 410, 103 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 716, 410 + xy: 716, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 512, 103 + xy: 818, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 716, 308 + xy: 614, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/InterceptRange rotate: false - xy: 1867, 460 + xy: 972, 358 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Movement rotate: false - xy: 1284, 408 + xy: 1128, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Range rotate: false - xy: 1492, 408 + xy: 1544, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1492, 356 + xy: 1596, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 206, 206 + xy: 206, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 410, 410 + xy: 308, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 206, 2 + xy: 512, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 716, 206 + xy: 716, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/road rotate: false - xy: 920, 499 + xy: 410, 90 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 TileSets/FantasyHex/road rotate: false - xy: 920, 499 + xy: 410, 90 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Academy rotate: false - xy: 512, 12 + xy: 818, 9 size: 32, 37 orig: 32, 37 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins rotate: false - xy: 564, 73 + xy: 410, 8 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 852, 226 + xy: 1078, 170 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment rotate: false - xy: 1060, 326 + xy: 852, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 1162, 291 + xy: 1472, 373 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City rotate: false - xy: 1196, 319 + xy: 1506, 371 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+City rotate: false - xy: 1196, 319 + xy: 1506, 371 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+City rotate: false - xy: 1196, 319 + xy: 1506, 371 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1128, 266 + xy: 1540, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 1264, 326 + xy: 1608, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 1366, 326 + xy: 1778, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1400, 326 + xy: 1812, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+City rotate: false - xy: 1434, 321 + xy: 1846, 373 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 +TileSets/FantasyHex/Tiles/Desert+Fallout + rotate: false + xy: 1880, 378 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1468, 326 + xy: 1914, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains rotate: false - xy: 1502, 326 + xy: 1948, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1536, 326 + xy: 920, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Trading post rotate: false - xy: 1570, 326 + xy: 954, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Oasis rotate: false - xy: 1604, 326 + xy: 988, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Trading post rotate: false - xy: 1638, 326 + xy: 1982, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 1672, 326 + xy: 1078, 140 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 1740, 321 + xy: 1234, 343 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 1842, 326 + xy: 1404, 348 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Grassland+Fallout + rotate: false + xy: 1438, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 1876, 326 + xy: 1472, 343 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest rotate: false - xy: 1910, 323 + xy: 1506, 338 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 1944, 323 + xy: 1540, 345 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 1978, 323 + xy: 1574, 345 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle rotate: false - xy: 1332, 290 + xy: 444, 2 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Camp rotate: false - xy: 1366, 290 + xy: 478, 67 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1400, 290 + xy: 478, 31 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Marsh rotate: false - xy: 1434, 290 + xy: 1608, 347 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Trading post rotate: false - xy: 1468, 296 + xy: 1642, 350 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1706, 292 + xy: 1880, 344 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Camp rotate: false - xy: 1740, 287 + xy: 1914, 344 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Customs house rotate: false - xy: 1774, 294 + xy: 1948, 344 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/Hill+Fallout + rotate: false + xy: 1982, 344 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest rotate: false - xy: 1808, 279 + xy: 1164, 205 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Camp rotate: false - xy: 1842, 279 + xy: 1060, 93 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill rotate: false - xy: 1876, 279 + xy: 1060, 46 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Mine rotate: false - xy: 1910, 289 + xy: 1026, 26 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Quarry rotate: false - xy: 1944, 289 + xy: 1060, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill+Terrace Farm rotate: false - xy: 1978, 289 + xy: 1094, 106 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1400, 260 + xy: 1250, 283 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1502, 266 + xy: 1318, 320 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1740, 250 + xy: 1352, 283 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1876, 249 + xy: 1420, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1944, 259 + xy: 1386, 260 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 820, 188 + xy: 1454, 305 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 820, 100 + xy: 1488, 250 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 854, 136 + xy: 1522, 308 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 854, 76 + xy: 1556, 315 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 888, 136 + xy: 1590, 315 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+City rotate: false - xy: 888, 99 + xy: 1590, 278 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 +TileSets/FantasyHex/Tiles/Plains+Fallout + rotate: false + xy: 1590, 248 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 888, 69 + xy: 1624, 317 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest rotate: false - xy: 922, 204 + xy: 1624, 282 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 922, 169 + xy: 1624, 247 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 922, 134 + xy: 1658, 315 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle rotate: false - xy: 922, 97 + xy: 1658, 278 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 922, 60 + xy: 1658, 241 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Trading post rotate: false - xy: 820, 42 + xy: 1556, 225 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 854, 46 + xy: 1590, 218 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Polder rotate: false - xy: 888, 39 + xy: 1624, 217 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 922, 30 + xy: 1658, 211 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 956, 207 + xy: 1692, 286 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 956, 175 + xy: 1726, 316 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 956, 143 + xy: 1692, 254 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Top rotate: false - xy: 956, 111 + xy: 1760, 316 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopLeft rotate: false - xy: 956, 79 + xy: 1726, 284 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-TopRight rotate: false - xy: 956, 47 + xy: 1692, 222 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1024, 206 + xy: 1862, 313 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Camp rotate: false - xy: 1024, 176 + xy: 1862, 283 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+City rotate: false - xy: 1058, 199 + xy: 1862, 246 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 +TileSets/FantasyHex/Tiles/Tundra+Fallout + rotate: false + xy: 1896, 314 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest rotate: false - xy: 1024, 142 + xy: 1896, 280 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1058, 165 + xy: 1930, 310 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1024, 108 + xy: 1896, 246 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Trading post rotate: false - xy: 1058, 135 + xy: 1930, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1060, 236 + xy: 1828, 283 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Aircraft Gun rotate: false - xy: 716, 20 + xy: 2010, 482 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Tank Gun rotate: false - xy: 818, 226 + xy: 1182, 326 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archer rotate: false - xy: 1026, 326 + xy: 1234, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Artillery rotate: false - xy: 750, 20 + xy: 1026, 118 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ballista rotate: false - xy: 1026, 296 + xy: 1130, 222 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battleship rotate: false - xy: 784, 22 + xy: 1182, 298 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 784, 22 + xy: 1182, 298 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berserker rotate: false - xy: 886, 226 + xy: 1268, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bowman rotate: false - xy: 1026, 266 + xy: 1026, 88 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Brute rotate: false - xy: 1060, 296 + xy: 886, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Camel Archer rotate: false - xy: 1094, 326 + xy: 1182, 268 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cannon rotate: false - xy: 1060, 266 + xy: 1302, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 1094, 298 + xy: 1026, 60 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Catapult rotate: false - xy: 1128, 326 + xy: 1336, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cavalry rotate: false - xy: 1094, 268 + xy: 1370, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chariot Archer rotate: false - xy: 1128, 296 + xy: 1404, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 1162, 326 + xy: 1438, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 1230, 326 + xy: 1574, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 1196, 291 + xy: 1642, 380 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1230, 298 + xy: 1676, 380 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1298, 326 + xy: 1710, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1332, 326 + xy: 1744, 378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 1706, 326 + xy: 1130, 192 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 1264, 298 + xy: 1268, 350 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 1774, 328 + xy: 1302, 350 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 1298, 298 + xy: 1336, 350 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 1808, 326 + xy: 1370, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1808, 326 + xy: 1370, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1502, 296 + xy: 1676, 350 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1536, 296 + xy: 1710, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1536, 296 + xy: 1710, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1570, 296 + xy: 1744, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1604, 296 + xy: 1778, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1604, 296 + xy: 1778, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1638, 296 + xy: 1812, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1672, 296 + xy: 1846, 343 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1672, 296 + xy: 1846, 343 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1162, 261 + xy: 1094, 76 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1196, 261 + xy: 1094, 46 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1230, 268 + xy: 1094, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1264, 270 + xy: 478, 3 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1298, 268 + xy: 1164, 175 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 564, 43 + xy: 1216, 313 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1774, 266 + xy: 1216, 285 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1332, 262 + xy: 1216, 257 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1366, 260 + xy: 1250, 313 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1434, 260 + xy: 1250, 253 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1468, 266 + xy: 1284, 320 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1468, 266 + xy: 1284, 320 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1536, 266 + xy: 1284, 290 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1570, 266 + xy: 1284, 260 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1604, 266 + xy: 1318, 290 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1638, 266 + xy: 1318, 260 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1672, 266 + xy: 1112, 162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1706, 264 + xy: 1352, 320 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1774, 236 + xy: 1386, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1808, 249 + xy: 1420, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1842, 251 + xy: 1386, 290 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1910, 259 + xy: 1352, 253 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1978, 259 + xy: 1420, 258 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 820, 158 + xy: 1454, 275 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 854, 196 + xy: 1454, 245 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 820, 130 + xy: 1488, 310 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 854, 166 + xy: 1488, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 820, 72 + xy: 1522, 280 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 854, 106 + xy: 1522, 250 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 888, 196 + xy: 1556, 285 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 888, 166 + xy: 1556, 255 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 818, 12 + xy: 1692, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 990, 222 + xy: 1794, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 990, 192 + xy: 1726, 254 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 990, 164 + xy: 1760, 288 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 990, 136 + xy: 1794, 290 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 990, 106 + xy: 1726, 224 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 990, 76 + xy: 1760, 258 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 990, 48 + xy: 1794, 262 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 956, 17 + xy: 1760, 228 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 990, 18 + xy: 1794, 232 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1026, 236 + xy: 1828, 313 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1094, 238 + xy: 1828, 253 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1128, 238 + xy: 1828, 225 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1024, 80 + xy: 1964, 316 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1058, 105 + xy: 1930, 250 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1024, 52 + xy: 1964, 288 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1058, 77 + xy: 1964, 260 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1024, 24 + xy: 1862, 218 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 -UnitIcons/Swordsman +UnitIcons/Submarine rotate: false - xy: 2, 308 + xy: 104, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Tank +UnitIcons/Swordsman rotate: false xy: 104, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Tank + rotate: false + xy: 2, 2 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Trebuchet - rotate: false - xy: 308, 206 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -UnitIcons/Triplane - rotate: false - xy: 410, 308 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -UnitIcons/Trireme - rotate: false - xy: 512, 409 - size: 100, 101 - orig: 100, 101 - offset: 0, 0 - index: -1 -UnitIcons/Turtle Ship rotate: false xy: 308, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Triplane + rotate: false + xy: 308, 2 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Trireme + rotate: false + xy: 410, 205 + size: 100, 101 + orig: 100, 101 + offset: 0, 0 + index: -1 +UnitIcons/Turtle Ship + rotate: false + xy: 512, 308 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/War Chariot rotate: false - xy: 410, 104 + xy: 716, 410 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Elephant rotate: false - xy: 410, 2 + xy: 512, 104 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 512, 205 + xy: 512, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 818, 410 + xy: 716, 206 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 614, 104 + xy: 818, 308 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Zero rotate: false - xy: 818, 308 + xy: 716, 2 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy rotate: false - xy: 512, 51 + xy: 818, 256 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Air Repair rotate: false - xy: 716, 154 + xy: 920, 358 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush rotate: false - xy: 920, 447 + xy: 410, 38 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 716, 50 + xy: 818, 152 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz rotate: false - xy: 920, 343 + xy: 1126, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding Party rotate: false - xy: 768, 154 + xy: 818, 100 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 768, 102 + xy: 1178, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge rotate: false - xy: 768, 50 + xy: 818, 48 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal Raider rotate: false - xy: 922, 239 + xy: 1334, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Cover rotate: false - xy: 1087, 460 + xy: 1490, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1087, 460 + xy: 1490, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1087, 460 + xy: 1490, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 1191, 460 + xy: 1594, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 1295, 460 + xy: 1698, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1347, 460 + xy: 1750, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1347, 460 + xy: 1750, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Formation rotate: false - xy: 1451, 460 + xy: 1854, 460 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Haka War Dance rotate: false - xy: 1659, 460 + xy: 870, 204 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Heal Instantly rotate: false - xy: 1711, 460 + xy: 870, 152 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect Fire rotate: false - xy: 1815, 460 + xy: 870, 48 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Interception rotate: false - xy: 1919, 460 + xy: 922, 306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics rotate: false - xy: 972, 356 + xy: 922, 150 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/March rotate: false - xy: 1024, 356 + xy: 974, 306 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 1076, 408 + xy: 974, 254 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility rotate: false - xy: 1232, 408 + xy: 1024, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting rotate: false - xy: 1648, 408 + xy: 1856, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry rotate: false - xy: 1648, 408 + xy: 1856, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 1700, 408 + xy: 1960, 408 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 1700, 356 + xy: 1026, 356 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sortie rotate: false - xy: 1752, 408 + xy: 1026, 304 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting rotate: false - xy: 1804, 356 + xy: 1078, 304 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting I (air) rotate: false - xy: 1804, 356 + xy: 1078, 304 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Volley rotate: false - xy: 1960, 408 + xy: 1182, 356 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack rotate: false - xy: 974, 304 + xy: 1078, 200 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman rotate: false - xy: 974, 252 + xy: 1130, 252 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 89f4f31195..00615b4cec 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 5ad14548f5..80043c28b8 100644 Binary files a/android/assets/game2.png and b/android/assets/game2.png differ diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 570f6238b2..425fc93fdc 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -359,6 +359,12 @@ requiredBuildingInAllCities:"Library", requiredTech:"Civil Service" }, + { + name:"Manhattan Project", + isNationalWonder:true, + uniques:["Enables nuclear weapon"], + requiredTech:"Nuclear Fission" + }, { name:"Chichen Itza", culture:1, diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json index bdb1f32f80..843f40c8e6 100644 --- a/android/assets/jsons/Terrains.json +++ b/android/assets/jsons/Terrains.json @@ -111,6 +111,16 @@ defenceBonus: -0.1, occursOn:["Grassland"] }, + { + name:"Fallout", + type:"TerrainFeature", + food:-3, + production:-3, + gold:-3, + movementCost:2, + unbuildable:true, + defenceBonus: -0.15, + }, { name:"Oasis", type:"TerrainFeature", diff --git a/android/assets/jsons/TileImprovements.json b/android/assets/jsons/TileImprovements.json index 0d0b121424..32b3ebb5da 100644 --- a/android/assets/jsons/TileImprovements.json +++ b/android/assets/jsons/TileImprovements.json @@ -104,13 +104,19 @@ terrainsCanBeBuiltOn:["Jungle"], techRequired:"Bronze Working" }, + { + name:"Remove Fallout", + turnsToBuild:8, + terrainsCanBeBuiltOn:["Fallout"], + techRequired:"Agriculture" + }, { name:"Remove Marsh", turnsToBuild:6, terrainsCanBeBuiltOn:["Marsh"], techRequired:"Bronze Working" }, - + // These are unique and have unique in-game checks related to them { name:"Remove Road", diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index 01e613c23d..ad14c1a9f1 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -457,6 +457,8 @@ Polish:"Akademia Narodowa" Czech:"Národní Akademie" } + "Manhattan Project":{ +} "Chichen Itza":{ Italian:"Chichen Itza" @@ -496,6 +498,9 @@ Czech:"Délka Zlatého věku se prodloužila o 50%" } + "Enables nuclear weapon":{ +} + "Lighthouse":{ Spanish:"faro" Italian:"Faro" diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 7354ac731c..ac33bda04b 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -1690,6 +1690,9 @@ Ukrainian:"Обстрілювати" } + "NUKE":{ +} + "Captured!":{// Shown in the battle table when attacking a civilian unit Italian:"Cattura!" Russian:"Захвачен!" diff --git a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json index b0d3190666..2052aa5c8c 100644 --- a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json +++ b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json @@ -160,6 +160,9 @@ Czech:"Bažina" } + "Fallout":{ +} + "Oasis":{ Italian:"Oasi" Russian:"Оазис" @@ -1040,6 +1043,9 @@ Ukrainian:"Висушити болото" } + "Remove Fallout":{ +}, + "Ancient ruins":{ Italian:"Antiche rovine" Romanian:"Ruine străvechi" diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index 377d390ef1..de99320a62 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -1291,6 +1291,9 @@ Czech:"[percent]% šance zabránit leteckým útokům" } + "Requires Manhattan Project":{ +}, + "6 tiles in every direction always visible":{ Italian:"6 caselle in ogni direzione sempre visibili" Simplified_Chinese:"全方向6格视野范围" @@ -1502,14 +1505,12 @@ Italian:"Missile guidato" Czech:"Naváděná střela" } - +*/ "Nuclear Missile":{ Italian:"Missile nucleare" Czech:"Jaderná raketa" } - */ - ////// Great units "Great Artist":{ diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 0e56b8046c..459404e4b7 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -1003,6 +1003,19 @@ hurryCostModifier:20, attackSound:"shot" }, + { + name:"Nuclear Missile", + unitType:"Missile", + movement:1, + strength:300, + rangedStrength:300, + range:12, + cost: 1000, + requiredTech:"Rocketry", + requiredResource:"Uranium", + uniques:["Requires Manhattan Project"], + hurryCostModifier:20, + }, { name:"Landship", unitType:"Armor", diff --git a/core/src/com/unciv/logic/automation/Automation.kt b/core/src/com/unciv/logic/automation/Automation.kt index 30851a6d17..afe9660fb3 100644 --- a/core/src/com/unciv/logic/automation/Automation.kt +++ b/core/src/com/unciv/logic/automation/Automation.kt @@ -93,7 +93,7 @@ class Automation { (it.isCityCenter() && it.getOwner() != city.civInfo) || (it.militaryUnit != null && it.militaryUnit!!.civInfo != city.civInfo) }) // there is absolutely no reason for you to make water units on this body of water. - militaryUnits = militaryUnits.filter { it.unitType.isLandUnit() } + militaryUnits = militaryUnits.filter { it.unitType.isLandUnit() || it.unitType.isAirUnit() } val chosenUnit: BaseUnit if(!city.civInfo.isAtWar() && city.civInfo.cities.any { it.getCenterTile().militaryUnit==null} diff --git a/core/src/com/unciv/logic/automation/ConstructionAutomation.kt b/core/src/com/unciv/logic/automation/ConstructionAutomation.kt index fa94ad2231..86970ba5de 100644 --- a/core/src/com/unciv/logic/automation/ConstructionAutomation.kt +++ b/core/src/com/unciv/logic/automation/ConstructionAutomation.kt @@ -146,6 +146,10 @@ class ConstructionAutomation(val cityConstructions: CityConstructions){ if (preferredVictoryType == VictoryType.Scientific) return 1.5f else return 1.3f } + if (wonder.name == "Manhattan Project") { + if (preferredVictoryType == VictoryType.Domination) return 2f + else return 1.3f + } if (wonder.isStatRelated(Stat.Happiness)) return 1.2f if (wonder.isStatRelated(Stat.Production)) return 1.1f return 1f diff --git a/core/src/com/unciv/logic/automation/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/WorkerAutomation.kt index eb5eb87060..7b8b5ab5a3 100644 --- a/core/src/com/unciv/logic/automation/WorkerAutomation.kt +++ b/core/src/com/unciv/logic/automation/WorkerAutomation.kt @@ -176,6 +176,7 @@ class WorkerAutomation(val unit: MapUnit) { val improvementStringForResource : String ?= when { tile.resource == null || !tile.hasViewableResource(civInfo) -> null tile.terrainFeature == "Marsh" -> "Remove Marsh" + tile.terrainFeature == "Fallout" -> "Remove Fallout" tile.terrainFeature == Constants.jungle -> "Remove Jungle" tile.terrainFeature == Constants.forest && tile.getTileResource().improvement!="Camp" -> "Remove Forest" else -> tile.getTileResource().improvement @@ -188,6 +189,7 @@ class WorkerAutomation(val unit: MapUnit) { tile.containsUnfinishedGreatImprovement() -> null tile.terrainFeature == Constants.jungle -> "Trading post" tile.terrainFeature == "Marsh" -> "Remove Marsh" + tile.terrainFeature == "Fallout" -> "Remove Fallout" tile.terrainFeature == "Oasis" -> null tile.terrainFeature == Constants.forest -> "Lumber mill" tile.baseTerrain == Constants.hill -> "Mine" diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 220f509c5d..ff6b224ce1 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -7,6 +7,7 @@ import com.unciv.logic.automation.UnitAutomation import com.unciv.logic.city.CityInfo import com.unciv.logic.civilization.AlertType import com.unciv.logic.civilization.PopupAlert +import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo import com.unciv.models.gamebasics.unit.UnitType import java.util.* @@ -40,7 +41,10 @@ class Battle(val gameInfo:GameInfo) { var damageToDefender = BattleDamage().calculateDamageToDefender(attacker,defender) var damageToAttacker = BattleDamage().calculateDamageToAttacker(attacker,defender) - if(defender.getUnitType().isCivilian() && attacker.isMelee()){ + if (attacker.getUnitType().isMissileUnit()) { + nuclearBlast(attacker, defender) + } + else if(defender.getUnitType().isCivilian() && attacker.isMelee()){ captureCivilianUnit(attacker,defender) } else if (attacker.isRanged()) { @@ -95,6 +99,15 @@ class Battle(val gameInfo:GameInfo) { if (attacker is MapUnitCombatant && attacker.unit.action != null && attacker.unit.action!!.startsWith("moveTo")) attacker.unit.action = null + + if (attacker is MapUnitCombatant) { + if (attacker.getUnitType().isMissileUnit()) { + attacker.unit.destroy() + } else if (attacker.unit.action != null + && attacker.unit.action!!.startsWith("moveTo")) { + attacker.unit.action = null + } + } } private fun postBattleNotifications(attacker: ICombatant, defender: ICombatant, attackedTile: TileInfo) { @@ -282,6 +295,30 @@ class Battle(val gameInfo:GameInfo) { capturedUnit.updateVisibleTiles() } + private fun nuclearBlast(attacker: ICombatant, defender: ICombatant) { + for (tile in defender.getTile().getTilesInDistance(2)) { + if (tile.isCityCenter()) { //duantao: To Do + val city = tile.getCity()!! + city.health = 1 + if (city.population.population <= 5) { + city.destroyCity() + } else { + city.population.population -= 5 + city.population.unassignExtraPopulation() + continue + } + } + + if (tile.militaryUnit != null) tile.militaryUnit!!.destroy() + if (tile.civilianUnit != null) tile.civilianUnit!!.destroy() + tile.improvement = null + tile.improvementInProgress = null + tile.turnsToImprovement = 0 + tile.roadStatus = RoadStatus.None + if (tile.isLand) tile.terrainFeature = "Fallout" + } + } + private fun tryInterceptAirAttack(attacker:MapUnitCombatant, defender: ICombatant) { val attackedTile = defender.getTile() for (interceptor in defender.getCivInfo().getCivUnits().filter { it.canIntercept(attackedTile) }) { diff --git a/core/src/com/unciv/logic/map/MapGenerator.kt b/core/src/com/unciv/logic/map/MapGenerator.kt index 62d2da9082..4287f53a28 100644 --- a/core/src/com/unciv/logic/map/MapGenerator.kt +++ b/core/src/com/unciv/logic/map/MapGenerator.kt @@ -189,7 +189,7 @@ class MapGenerator { fun addRandomTerrainFeature(tileInfo: TileInfo) { if (tileInfo.getBaseTerrain().canHaveOverlay && Math.random() > 0.7f) { val secondaryTerrains = GameBasics.Terrains.values - .filter { it.type === TerrainType.TerrainFeature && it.occursOn!!.contains(tileInfo.baseTerrain) } + .filter { it.type === TerrainType.TerrainFeature && it.occursOn != null && it.occursOn!!.contains(tileInfo.baseTerrain) } if (secondaryTerrains.any()) tileInfo.terrainFeature = secondaryTerrains.random().name } } diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt index 821dee3c1e..e06d690c9c 100644 --- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt @@ -131,6 +131,10 @@ class BaseUnit : INamed, IConstruction { if (obsoleteTech!=null && civInfo.tech.isResearched(obsoleteTech!!)) return "Obsolete by $obsoleteTech" if (uniqueTo!=null && uniqueTo!=civInfo.civName) return "Unique to $uniqueTo" if (GameBasics.Units.values.any { it.uniqueTo==civInfo.civName && it.replaces==name }) return "Our unique unit replaces this" + if (!civInfo.gameInfo.gameParameters.nuclearWeaponEnabled + && (name == "Manhattan Project" || uniques.contains("Requires Manhattan Project"))) return "Disabled by setting" + if (uniques.contains("Requires Manhattan Project") && !civInfo.containsBuildingUnique("Enables nuclear weapon")) + return "Requires Manhattan Project" if (requiredResource!=null && !civInfo.hasResource(requiredResource!!)) return "Requires [$requiredResource]" if (name == Constants.settler && civInfo.isCityState()) return "No settler for city-states" if (name == Constants.settler && civInfo.isOneCityChallenger()) return "No settler for players in One City Challenge" diff --git a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt index 43296abb44..760401aac4 100644 --- a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt +++ b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt @@ -16,7 +16,8 @@ enum class UnitType{ WaterSubmarine, Fighter, - Bomber; + Bomber, + Missile; fun isMelee(): Boolean { return this == Melee @@ -59,5 +60,10 @@ enum class UnitType{ fun isAirUnit():Boolean{ return this==Bomber || this==Fighter + || this==Missile + } + + fun isMissileUnit():Boolean{ + return this == Missile } } \ No newline at end of file diff --git a/core/src/com/unciv/models/metadata/GameParameters.kt b/core/src/com/unciv/models/metadata/GameParameters.kt index 8811ffc813..f814f60f29 100644 --- a/core/src/com/unciv/models/metadata/GameParameters.kt +++ b/core/src/com/unciv/models/metadata/GameParameters.kt @@ -17,7 +17,8 @@ class GameParameters { // Default values are the default new game var mapType = MapType.pangaea var noBarbarians = false var oneCityChallenge = false - var noRuins = false + var nuclearWeaponEnabled = false + var noRuins = false; var mapFileName: String? = null var victoryTypes: ArrayList = VictoryType.values().toCollection(ArrayList()) // By default, all victory types var startingEra = TechEra.Ancient diff --git a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt index 009c64cc98..114b94cb36 100644 --- a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt +++ b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt @@ -160,7 +160,10 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera val terrain = resource.terrainsCanBeFoundOn.first() val terrainObject = GameBasics.Terrains[terrain]!! if (terrainObject.type == TerrainType.TerrainFeature) { - tileInfo.baseTerrain = terrainObject.occursOn!!.first() + tileInfo.baseTerrain = when { + terrainObject.occursOn == null -> terrainObject.occursOn!!.first() + else -> "Grassland" + } tileInfo.terrainFeature = terrain } else tileInfo.baseTerrain = terrain @@ -177,7 +180,10 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera for (terrain in GameBasics.Terrains.values) { val tileInfo = TileInfo() if (terrain.type == TerrainType.TerrainFeature) { - tileInfo.baseTerrain = terrain.occursOn!!.first() + tileInfo.baseTerrain = when { + terrain.occursOn == null -> terrain.occursOn!!.first() + else -> "Grassland" + } tileInfo.terrainFeature = terrain.name } else tileInfo.baseTerrain = terrain.name diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt index 8cb55cb115..fcb240340e 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreenOptionsTable.kt @@ -28,6 +28,7 @@ class NewGameScreenOptionsTable(val newGameParameters: GameParameters, val onMul addVictoryTypeCheckboxes() addBarbariansCheckbox() addOneCityChallengeCheckbox() + addNuclearWeaponCheckbox() addNoRuinsCheckbox() addIsOnlineMultiplayerCheckbox() @@ -56,6 +57,18 @@ class NewGameScreenOptionsTable(val newGameParameters: GameParameters, val onMul }) add(oneCityChallengeCheckbox).colspan(2).row() } + + private fun addNuclearWeaponCheckbox() { + val nuclearWeaponCheckbox = CheckBox("Enable nuclear weapon".tr(), CameraStageBaseScreen.skin) + nuclearWeaponCheckbox.isChecked = newGameParameters.nuclearWeaponEnabled + nuclearWeaponCheckbox.addListener(object : ChangeListener() { + override fun changed(event: ChangeEvent?, actor: Actor?) { + newGameParameters.nuclearWeaponEnabled = nuclearWeaponCheckbox.isChecked + } + }) + add(nuclearWeaponCheckbox).colspan(2).row() + } + private fun addNoRuinsCheckbox() { val noRuinsCheckbox = CheckBox("No ancient ruins".tr(), CameraStageBaseScreen.skin) noRuinsCheckbox.isChecked = newGameParameters.noRuins diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt index 642e95209e..fad4094272 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt +++ b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt @@ -151,7 +151,11 @@ class BattleTable(val worldScreen: WorldScreen): Table() { } row().pad(5f) - val attackText : String = if (attacker is MapUnitCombatant) "Attack" else "Bombard" + val attackText : String = when { + attacker is MapUnitCombatant && attacker.getUnitType().isMissileUnit() -> "NUKE" + attacker is MapUnitCombatant -> "Attack" + else -> "Bombard" + } val attackButton = TextButton(attackText.tr(), skin).apply { color= Color.RED } var attackableEnemy : UnitAutomation.AttackableTile? = null diff --git a/docs/Credits.md b/docs/Credits.md index 3791d866a9..a531560dd4 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -97,6 +97,8 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [APC](https://thenounproject.com/search/?q=apc&i=9965) By Luke Anthony Firth for Mechanized Infantry * [Military vehicle](https://thenounproject.com/search/?q=Army%20rocket&i=23115) By Luke Anthony Firth For Rocket Artillery * [Modern Armor](https://thenounproject.com/search/?q=tank&i=218) By Public Domain Nouns for Modern Armor +* [Manhattan Project](https://thenounproject.com/search/?q=Nuclear%20Bomb&i=2041074) By corpus delicti, GR +* [Nuclear Missile](https://thenounproject.com/marialuisa.iborra/collection/missiles-bombs/?i=1022574) By Lluisa Iborra, ES ### Great People