diff --git a/android/Images/TechIcons/Drama and Poetry.png b/android/Images/TechIcons/Drama and Poetry.png new file mode 100644 index 0000000000..40b65d9668 Binary files /dev/null and b/android/Images/TechIcons/Drama and Poetry.png differ diff --git a/android/ImagesToPackSeparately/BuildingIcons/Amphitheater.png b/android/ImagesToPackSeparately/BuildingIcons/Amphitheater.png new file mode 100644 index 0000000000..4344880519 Binary files /dev/null and b/android/ImagesToPackSeparately/BuildingIcons/Amphitheater.png differ diff --git a/android/assets/BuildingIcons.atlas b/android/assets/BuildingIcons.atlas index 0fe624949b..2e3a5d286d 100644 --- a/android/assets/BuildingIcons.atlas +++ b/android/assets/BuildingIcons.atlas @@ -11,780 +11,787 @@ Alhambra orig: 100, 100 offset: 0, 0 index: -1 -Angkor Wat +Amphitheater rotate: false xy: 4, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Apollo Program +Angkor Wat rotate: false xy: 112, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Aqueduct +Apollo Program rotate: false xy: 4, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Armory +Aqueduct rotate: false xy: 112, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Arsenal +Armory rotate: false xy: 220, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Bank +Arsenal rotate: false xy: 4, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Barracks +Bank rotate: false xy: 112, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Bazaar +Barracks rotate: false xy: 220, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Big Ben +Bazaar rotate: false xy: 328, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Bomb Shelter +Big Ben rotate: false xy: 4, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Brandenburg Gate +Bomb Shelter rotate: false xy: 112, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Broadcast Tower +Brandenburg Gate rotate: false xy: 220, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Burial Tomb +Broadcast Tower rotate: false xy: 328, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -CN Tower +Burial Tomb rotate: false xy: 436, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Castle +CN Tower rotate: false xy: 4, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Chichen Itza +Castle rotate: false xy: 112, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Circus +Chichen Itza rotate: false xy: 220, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Circus Maximus +Circus rotate: false xy: 328, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Colosseum +Circus Maximus rotate: false xy: 436, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Colossus +Colosseum rotate: false xy: 544, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Courthouse +Colossus rotate: false xy: 4, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Cristo Redentor +Courthouse rotate: false xy: 112, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Eiffel Tower +Cristo Redentor rotate: false xy: 220, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Factory +Eiffel Tower rotate: false xy: 328, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Floating Gardens +Factory rotate: false xy: 436, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Forbidden Palace +Floating Gardens rotate: false xy: 544, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Forge +Forbidden Palace rotate: false xy: 652, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Garden +Forge rotate: false xy: 4, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Granary +Garden rotate: false xy: 112, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Great Wall +Granary rotate: false xy: 220, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hagia Sophia +Great Wall rotate: false xy: 328, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hanging Gardens +Hagia Sophia rotate: false xy: 436, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hanse +Hanging Gardens rotate: false xy: 544, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Harbor +Hanse rotate: false xy: 652, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hermitage +Harbor rotate: false xy: 760, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Heroic Epic +Hermitage rotate: false xy: 4, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Himeji Castle +Heroic Epic rotate: false xy: 112, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hospital +Himeji Castle rotate: false xy: 220, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hubble Space Telescope +Hospital rotate: false xy: 328, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hydro Plant +Hubble Space Telescope rotate: false xy: 436, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Ironworks +Hydro Plant rotate: false xy: 544, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Kremlin +Ironworks rotate: false xy: 652, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Krepost +Kremlin rotate: false xy: 760, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Leaning Tower of Pisa +Krepost rotate: false xy: 868, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Library +Leaning Tower of Pisa rotate: false xy: 112, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Lighthouse +Library rotate: false xy: 220, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Longhouse +Lighthouse rotate: false xy: 328, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Machu Picchu +Longhouse rotate: false xy: 436, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Manhattan Project +Machu Picchu rotate: false xy: 544, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Market +Manhattan Project rotate: false xy: 652, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mausoleum of Halicarnassus +Market rotate: false xy: 760, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Medical Lab +Mausoleum of Halicarnassus rotate: false xy: 868, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Military Academy +Medical Lab rotate: false xy: 976, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Military Base +Military Academy rotate: false xy: 220, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mint +Military Base rotate: false xy: 328, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Monastery +Mint rotate: false xy: 436, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Monument +Monastery rotate: false xy: 544, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mud Pyramid Mosque +Monument rotate: false xy: 652, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mughal Fort +Mud Pyramid Mosque rotate: false xy: 760, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Museum +Mughal Fort rotate: false xy: 868, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -National College +Museum rotate: false xy: 976, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -National Epic +National College rotate: false xy: 1084, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -National Treasury +National Epic rotate: false xy: 328, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Neuschwanstein +National Treasury rotate: false xy: 436, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Notre Dame +Neuschwanstein rotate: false xy: 544, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Nuclear Plant +Notre Dame rotate: false xy: 652, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Observatory +Nuclear Plant rotate: false xy: 760, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Opera House +Observatory rotate: false xy: 868, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Oxford University +Opera House rotate: false xy: 976, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Palace +Oxford University rotate: false xy: 1084, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Paper Maker +Palace rotate: false xy: 1192, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Pentagon +Paper Maker rotate: false xy: 436, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Petra +Pentagon rotate: false xy: 544, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Porcelain Tower +Petra rotate: false xy: 652, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Public School +Porcelain Tower rotate: false xy: 760, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Research Lab +Public School rotate: false xy: 868, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Booster +Research Lab rotate: false xy: 976, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Cockpit +SS Booster rotate: false xy: 1084, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Engine +SS Cockpit rotate: false xy: 1192, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Stasis Chamber +SS Engine rotate: false xy: 1300, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Satrap's Court +SS Stasis Chamber rotate: false xy: 544, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Seaport +Satrap's Court rotate: false xy: 652, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Sistine Chapel +Seaport rotate: false xy: 760, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Solar Plant +Sistine Chapel rotate: false xy: 868, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Spaceship Factory +Solar Plant rotate: false xy: 976, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stable +Spaceship Factory rotate: false xy: 1084, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stadium +Stable rotate: false xy: 1192, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Statue of Liberty +Stadium rotate: false xy: 1300, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Statue of Zeus +Statue of Liberty rotate: false xy: 1408, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stock Exchange +Statue of Zeus rotate: false xy: 652, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stone Works +Stock Exchange rotate: false xy: 760, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stonehenge +Stone Works rotate: false xy: 868, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Sydney Opera House +Stonehenge rotate: false xy: 976, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Taj Mahal +Sydney Opera House rotate: false xy: 1084, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Temple +Taj Mahal rotate: false xy: 1192, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Temple of Artemis +Temple rotate: false xy: 1300, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Terracotta Army +Temple of Artemis rotate: false xy: 1408, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Great Library +Terracotta Army rotate: false xy: 1516, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Great Lighthouse +The Great Library rotate: false xy: 760, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Louvre +The Great Lighthouse rotate: false xy: 868, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Oracle +The Louvre rotate: false xy: 976, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Pyramids +The Oracle rotate: false xy: 1084, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Theatre +The Pyramids rotate: false xy: 1192, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -University +Theatre rotate: false xy: 1300, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Utopia Project +University rotate: false xy: 1408, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Walls +Utopia Project rotate: false xy: 1516, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Walls of Babylon +Walls rotate: false xy: 1624, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Wat +Walls of Babylon rotate: false xy: 868, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Water Mill +Wat rotate: false xy: 976, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Windmill +Water Mill rotate: false xy: 1084, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Workshop +Windmill rotate: false xy: 1192, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +Workshop + rotate: false + xy: 1300, 436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 diff --git a/android/assets/BuildingIcons.png b/android/assets/BuildingIcons.png index 10e8f5c555..d67b548b0e 100644 Binary files a/android/assets/BuildingIcons.png and b/android/assets/BuildingIcons.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index a9e0776d1b..780835965d 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,21 +6,21 @@ filter: MipMapLinearLinear, MipMapLinearLinear repeat: none EmojiIcons/Gold rotate: false - xy: 328, 338 + xy: 328, 106 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Production rotate: false - xy: 386, 98 + xy: 444, 98 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 792, 490 + xy: 792, 432 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -83,105 +83,119 @@ ImprovementIcons/Customs house index: -1 ImprovementIcons/Farm rotate: false - xy: 536, 944 + xy: 536, 836 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 644, 1520 + xy: 644, 1412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fort rotate: false - xy: 752, 1412 + xy: 860, 1520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 644, 656 + xy: 752, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1076, 1088 + xy: 752, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 860, 764 + xy: 968, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1184, 1304 + xy: 1184, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 1184, 1088 + xy: 1184, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1400, 1542 + xy: 1400, 1434 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 1400, 1110 + xy: 1400, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 968, 548 + xy: 1076, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 220, 368 + xy: 220, 260 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Railroad + rotate: false + xy: 1469, 1728 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/Railroad + rotate: false + xy: 1469, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1508, 1512 + xy: 1616, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 1508, 756 + xy: 1616, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1508, 648 + xy: 1616, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -237,147 +251,147 @@ NationIcons/Denmark index: -1 NationIcons/Egypt rotate: false - xy: 428, 620 + xy: 536, 1484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/England rotate: false - xy: 536, 1160 + xy: 536, 1052 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/France rotate: false - xy: 860, 1520 + xy: 644, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Germany rotate: false - xy: 968, 1520 + xy: 644, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Greece rotate: false - xy: 752, 1196 + xy: 860, 1304 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Inca rotate: false - xy: 968, 1304 + xy: 1076, 1412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/India rotate: false - xy: 644, 872 + xy: 752, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Iroquois rotate: false - xy: 1076, 1304 + xy: 644, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Japan rotate: false - xy: 752, 872 + xy: 860, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Korea rotate: false - xy: 968, 1088 + xy: 1076, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Mongolia rotate: false - xy: 1184, 764 + xy: 1184, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Persia rotate: false - xy: 1400, 786 + xy: 1400, 678 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Polynesia rotate: false - xy: 1184, 548 + xy: 1292, 570 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 1616, 1512 + xy: 1724, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 1724, 1620 + xy: 1508, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Siam rotate: false - xy: 1616, 1296 + xy: 1724, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Songhai rotate: false - xy: 1616, 1188 + xy: 1724, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Spain rotate: false - xy: 1724, 1296 + xy: 1832, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 1616, 864 + xy: 1724, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 1616, 590 + xy: 1724, 698 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 1832, 798 + xy: 1940, 1477 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -461,133 +475,133 @@ OtherIcons/DisbandUnit index: -1 OtherIcons/Down rotate: false - xy: 1782, 698 + xy: 1566, 424 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 536, 728 + xy: 536, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Hexagon rotate: false - xy: 4, 1804 + xy: 4, 1556 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 860, 872 + xy: 968, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Lock rotate: false - xy: 968, 980 + xy: 1076, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 968, 872 + xy: 1076, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1076, 764 + xy: 1076, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 1184, 872 + xy: 1184, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 1292, 1542 + xy: 1292, 1434 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 1292, 1110 + xy: 1292, 1002 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 1400, 1326 + xy: 1400, 1218 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1400, 894 + xy: 1400, 786 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 860, 548 + xy: 968, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 220, 476 + xy: 220, 368 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quest rotate: false - xy: 220, 260 + xy: 220, 152 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 220, 152 + xy: 220, 44 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 1901, 1728 + xy: 1508, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1508, 1188 + xy: 1616, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1508, 1080 + xy: 1616, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -601,14 +615,14 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 1508, 864 + xy: 1616, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 1724, 1080 + xy: 1832, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -622,357 +636,357 @@ OtherIcons/Triangle index: -1 OtherIcons/Up rotate: false - xy: 734, 374 + xy: 676, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 778, 165 + xy: 190, 715 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aesthetics rotate: false - xy: 1832, 914 + xy: 1508, 482 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1832, 856 + xy: 1940, 1593 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 1940, 1187 + xy: 1940, 1071 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 1940, 1129 + xy: 1940, 1013 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1940, 1013 + xy: 1940, 897 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Communism rotate: false - xy: 1890, 914 + xy: 1566, 482 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1890, 856 + xy: 1674, 590 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Cultural Diplomacy rotate: false - xy: 1566, 482 + xy: 1890, 806 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1674, 590 + xy: 1508, 424 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Educated Elite rotate: false - xy: 1566, 424 + xy: 1948, 781 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Fascism rotate: false - xy: 1840, 682 + xy: 328, 454 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 328, 512 + xy: 328, 280 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 328, 454 + xy: 328, 222 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 328, 396 + xy: 328, 164 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 328, 106 + xy: 444, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 444, 562 + xy: 386, 388 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 386, 446 + xy: 444, 446 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 502, 562 + xy: 560, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 502, 504 + xy: 502, 446 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Merchant Navy rotate: false - xy: 560, 562 + xy: 560, 504 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 386, 330 + xy: 386, 272 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 444, 388 + xy: 444, 330 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 502, 446 + xy: 502, 388 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 560, 504 + xy: 560, 446 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 444, 330 + xy: 444, 272 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Nationalism rotate: false - xy: 386, 214 + xy: 386, 156 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Naval Tradition rotate: false - xy: 444, 272 + xy: 444, 214 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 502, 330 + xy: 502, 272 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 560, 388 + xy: 560, 330 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Philantropy rotate: false - xy: 386, 156 + xy: 386, 98 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Planned Economy rotate: false - xy: 444, 214 + xy: 444, 156 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 502, 272 + xy: 502, 214 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 560, 330 + xy: 560, 272 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 444, 156 + xy: 502, 156 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 502, 214 + xy: 560, 214 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 502, 156 + xy: 560, 98 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 502, 98 + xy: 444, 40 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 560, 156 + xy: 502, 40 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scholasticism rotate: false - xy: 560, 98 + xy: 560, 40 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 386, 40 + xy: 618, 490 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 502, 40 + xy: 676, 490 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Socialism rotate: false - xy: 618, 432 + xy: 734, 490 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 618, 374 + xy: 676, 374 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 618, 316 + xy: 618, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 676, 374 + xy: 676, 316 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 734, 432 + xy: 734, 374 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/United Front rotate: false - xy: 618, 258 + xy: 850, 490 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 676, 316 + xy: 618, 200 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 850, 490 + xy: 792, 374 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1021,154 +1035,154 @@ ResourceIcons/Deer index: -1 ResourceIcons/Dyes rotate: false - xy: 428, 1160 + xy: 428, 1052 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 536, 620 + xy: 644, 1520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 644, 1196 + xy: 752, 1304 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 860, 1412 + xy: 968, 1520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold Ore rotate: false - xy: 644, 1088 + xy: 752, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 752, 1088 + xy: 860, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1076, 1412 + xy: 644, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 860, 1088 + xy: 968, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 644, 764 + xy: 752, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1076, 980 + xy: 860, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1292, 678 + xy: 1400, 1542 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1400, 1002 + xy: 1400, 894 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1832, 1620 + xy: 1508, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1724, 1404 + xy: 1832, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1832, 1512 + xy: 1508, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1508, 972 + xy: 1616, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1832, 1296 + xy: 1508, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1616, 972 + xy: 1724, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1724, 864 + xy: 1832, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1832, 972 + xy: 1508, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1508, 540 + xy: 1616, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1616, 648 + xy: 1724, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1224,7 +1238,7 @@ StatIcons/Happiness index: -1 StatIcons/InterceptRange rotate: false - xy: 386, 562 + xy: 444, 504 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1238,7 +1252,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 560, 446 + xy: 560, 388 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1259,21 +1273,21 @@ StatIcons/Production index: -1 StatIcons/Range rotate: false - xy: 560, 272 + xy: 502, 98 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 444, 98 + xy: 560, 156 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 1793, 1728 + xy: 1901, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1287,14 +1301,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1832, 1404 + xy: 1508, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 676, 432 + xy: 734, 432 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1460,387 +1474,394 @@ TechIcons/Currency orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Dynamite +TechIcons/Drama and Poetry rotate: false - xy: 428, 1052 + xy: 428, 1160 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Ecology +TechIcons/Dynamite rotate: false xy: 428, 944 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Economics +TechIcons/Ecology rotate: false xy: 428, 836 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Education +TechIcons/Economics rotate: false xy: 428, 728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Electricity +TechIcons/Education rotate: false - xy: 536, 1484 + xy: 428, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Electronics +TechIcons/Electricity rotate: false xy: 536, 1376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Engineering +TechIcons/Electronics rotate: false xy: 536, 1268 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +TechIcons/Engineering + rotate: false + xy: 536, 1160 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 TechIcons/Fertilizer rotate: false - xy: 536, 836 + xy: 536, 728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 644, 1412 + xy: 752, 1520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 752, 1304 + xy: 860, 1412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 860, 1304 + xy: 968, 1412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 968, 1412 + xy: 1076, 1520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 644, 980 + xy: 752, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 752, 980 + xy: 860, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 968, 1196 + xy: 1076, 1304 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Lasers rotate: false - xy: 752, 764 + xy: 860, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 752, 656 + xy: 860, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 968, 764 + xy: 1076, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 1076, 872 + xy: 968, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 968, 656 + xy: 1076, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1076, 656 + xy: 1184, 1520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1184, 1520 + xy: 1184, 1412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1184, 1412 + xy: 1184, 1304 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1184, 1196 + xy: 1184, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 1184, 980 + xy: 1184, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1292, 1434 + xy: 1292, 1326 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 1292, 1218 + xy: 1292, 1110 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1292, 1002 + xy: 1292, 894 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fusion rotate: false - xy: 1292, 894 + xy: 1292, 786 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1400, 1434 + xy: 1400, 1326 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1400, 1218 + xy: 1400, 1110 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1400, 678 + xy: 644, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 644, 548 + xy: 752, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 752, 548 + xy: 860, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1076, 548 + xy: 1184, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1292, 570 + xy: 1400, 570 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1400, 570 + xy: 220, 476 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 220, 44 + xy: 1292, 462 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1292, 462 + xy: 1400, 462 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 1400, 462 + xy: 1577, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1577, 1728 + xy: 1685, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 1685, 1728 + xy: 1793, 1728 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1508, 1620 + xy: 1508, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1616, 1620 + xy: 1508, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1508, 1404 + xy: 1616, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1508, 1296 + xy: 1616, 1404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1616, 1404 + xy: 1724, 1512 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1724, 1512 + xy: 1832, 1620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1616, 1080 + xy: 1724, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1724, 1188 + xy: 1832, 1296 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Telecommunications rotate: false - xy: 1832, 1188 + xy: 1508, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1724, 972 + xy: 1832, 1080 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1832, 1080 + xy: 1508, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1616, 756 + xy: 1724, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1724, 756 + xy: 1832, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1875,147 +1896,133 @@ TileSets/FantasyHex/CrosshatchHexagon index: -1 TileSets/Default/FalloutOverlay rotate: false - xy: 536, 1052 + xy: 536, 944 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Flood plainsOverlay rotate: false - xy: 752, 1520 + xy: 644, 1304 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/ForestOverlay rotate: false - xy: 644, 1304 + xy: 752, 1412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Hexagon rotate: false - xy: 4, 1556 + xy: 4, 1804 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TileSets/FantasyHex/Hexagon rotate: false - xy: 4, 1556 + xy: 4, 1804 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TileSets/Default/HillOverlay rotate: false - xy: 1076, 1520 + xy: 644, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/IceOverlay rotate: false - xy: 860, 1196 + xy: 968, 1304 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/JungleOverlay rotate: false - xy: 860, 980 + xy: 968, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/LakesOverlay rotate: false - xy: 1076, 1196 + xy: 644, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 860, 656 + xy: 968, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 1184, 656 + xy: 1292, 1542 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/NaturalWonderOverlay rotate: false - xy: 1292, 1326 + xy: 1292, 1218 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 1292, 786 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/Railroad - rotate: false - xy: 1469, 1728 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 1469, 1728 + xy: 1292, 678 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Tiles/River-Bottom rotate: false - xy: 1392, 307 + xy: 1490, 312 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1392, 307 + xy: 1490, 312 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/Default/Tiles/River-BottomLeft rotate: false - xy: 1392, 271 + xy: 1530, 312 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 1392, 271 + xy: 1530, 312 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/Default/Tiles/River-BottomRight rotate: false - xy: 1352, 246 + xy: 1570, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 1352, 246 + xy: 1570, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2057,63 +2064,63 @@ TileSets/FantasyHex/Tiles/Academy-Snow index: -1 TileSets/FantasyHex/Tiles/Aluminum rotate: false - xy: 1940, 977 + xy: 1616, 554 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins rotate: false - xy: 1616, 554 + xy: 1724, 662 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins-Jungle rotate: false - xy: 734, 334 + xy: 618, 160 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins-Sand rotate: false - xy: 792, 396 + xy: 676, 222 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins-Snow rotate: false - xy: 850, 454 + xy: 734, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins2 rotate: false - xy: 1724, 662 + xy: 1832, 770 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 1656, 554 + xy: 1998, 1973 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bananas rotate: false - xy: 948, 512 + xy: 1872, 770 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment rotate: false - xy: 618, 128 + xy: 618, 124 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2127,7 +2134,7 @@ TileSets/FantasyHex/Tiles/Barbarian encampment-Snow index: -1 TileSets/FantasyHex/Tiles/Barringer Crater rotate: false - xy: 192, 4 + xy: 1006, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2141,7 +2148,7 @@ TileSets/FantasyHex/Tiles/Cattle index: -1 TileSets/FantasyHex/Tiles/Cattle+Pasture rotate: false - xy: 1108, 508 + xy: 1166, 508 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2155,861 +2162,861 @@ TileSets/FantasyHex/Tiles/Cerro de Potosi index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 1188, 505 + xy: 1246, 505 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel-Snow rotate: false - xy: 1228, 510 + xy: 1696, 552 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center rotate: false - xy: 1696, 547 + xy: 1804, 655 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Ancient era rotate: false - xy: 1948, 937 + xy: 1624, 514 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Classical era rotate: false - xy: 1948, 897 + xy: 1624, 474 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Future era rotate: false - xy: 1948, 855 + xy: 1624, 432 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Industrial era rotate: false - xy: 1948, 814 + xy: 1840, 729 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Information era rotate: false - xy: 1624, 510 + xy: 1880, 726 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Medieval era rotate: false - xy: 1624, 470 + xy: 1732, 622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Modern era rotate: false - xy: 1624, 428 + xy: 676, 180 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Renaissance era rotate: false - xy: 1732, 622 + xy: 734, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1772, 626 + xy: 792, 302 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coal rotate: false - xy: 850, 418 + xy: 908, 418 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 676, 186 + xy: 966, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cotton rotate: false - xy: 1108, 472 + xy: 1206, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 1228, 467 + xy: 658, 103 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer rotate: false - xy: 1980, 977 + xy: 658, 67 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer+Camp rotate: false - xy: 1988, 941 + xy: 716, 204 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1988, 905 + xy: 716, 168 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1988, 869 + xy: 774, 266 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1988, 833 + xy: 774, 230 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes rotate: false - xy: 774, 288 + xy: 890, 382 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes+Plantation rotate: false - xy: 774, 252 + xy: 890, 346 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/El Dorado rotate: false - xy: 832, 381 + xy: 948, 439 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fallout rotate: false - xy: 658, 143 + xy: 698, 125 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fish rotate: false - xy: 658, 107 + xy: 698, 89 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 658, 71 + xy: 698, 53 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Flood plains rotate: false - xy: 832, 345 + xy: 658, 31 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Forest rotate: false - xy: 930, 435 + xy: 756, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 890, 398 + xy: 814, 247 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fountain of Youth rotate: false - xy: 930, 395 + xy: 872, 306 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs rotate: false - xy: 814, 273 + xy: 948, 403 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs+Camp rotate: false - xy: 814, 237 + xy: 988, 439 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gems rotate: false - xy: 912, 323 + xy: 1068, 439 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gold Ore rotate: false - xy: 854, 290 + xy: 1068, 403 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 854, 250 + xy: 738, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 894, 287 + xy: 738, 78 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 894, 251 + xy: 738, 42 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 716, 219 + xy: 930, 364 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Deer+Camp rotate: false - xy: 716, 180 + xy: 970, 364 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Furs+Camp rotate: false - xy: 756, 213 + xy: 1010, 364 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 756, 174 + xy: 1050, 364 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Farm rotate: false - xy: 796, 201 + xy: 738, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Camp rotate: false - xy: 796, 165 + xy: 872, 270 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Lumber mill rotate: false - xy: 698, 144 + xy: 930, 328 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Trading post rotate: false - xy: 698, 108 + xy: 970, 328 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 698, 68 + xy: 1010, 324 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/GrasslandForest rotate: false - xy: 738, 135 + xy: 1050, 325 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 658, 35 + xy: 912, 253 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1050, 400 + xy: 836, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillForest+Lumber mill rotate: false - xy: 1090, 436 + xy: 876, 145 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMarbleQuarry rotate: false - xy: 1090, 400 + xy: 876, 109 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMine rotate: false - xy: 952, 359 + xy: 778, 103 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillStoneQuarry rotate: false - xy: 952, 323 + xy: 778, 67 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 836, 165 + xy: 818, 14 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses+Pasture rotate: false - xy: 818, 125 + xy: 858, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ice rotate: false - xy: 818, 16 + xy: 1108, 403 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 1170, 435 + xy: 1148, 436 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense+Plantation rotate: false - xy: 1170, 399 + xy: 1148, 400 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 1210, 395 + xy: 1130, 328 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 974, 251 + xy: 1032, 252 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory+Camp rotate: false - xy: 858, 129 + xy: 934, 217 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Jungle rotate: false - xy: 858, 17 + xy: 916, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 1330, 424 + xy: 898, 31 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1370, 426 + xy: 956, 102 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1330, 380 + xy: 1188, 428 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1410, 343 + xy: 996, 127 size: 32, 39 orig: 32, 39 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1490, 352 + xy: 978, 55 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marsh rotate: false - xy: 1570, 351 + xy: 1210, 355 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1570, 315 + xy: 1072, 289 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1610, 315 + xy: 1112, 255 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1998, 1563 + xy: 1192, 245 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1998, 1519 + xy: 1232, 275 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oasis rotate: false - xy: 1998, 1303 + xy: 1428, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1998, 1267 + xy: 1468, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Offshore Platform rotate: false - xy: 1998, 1231 + xy: 1268, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1998, 1195 + xy: 1308, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1998, 1159 + xy: 1348, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1998, 1119 + xy: 1388, 386 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 992, 363 + xy: 1508, 384 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1032, 364 + xy: 1588, 388 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1072, 328 + xy: 1330, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1112, 328 + xy: 1370, 350 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1152, 359 + xy: 1036, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1152, 319 + xy: 1036, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1192, 355 + xy: 1054, 212 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsForest rotate: false - xy: 1192, 315 + xy: 1094, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsJungle rotate: false - xy: 1232, 352 + xy: 1134, 208 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1232, 316 + xy: 1174, 209 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 1272, 354 + xy: 1410, 350 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1272, 318 + xy: 1450, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1352, 318 + xy: 1490, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1272, 282 + xy: 1530, 348 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1232, 280 + xy: 1570, 352 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1392, 231 + xy: 1610, 312 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1512, 244 + xy: 1272, 276 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep+Pasture rotate: false - xy: 1552, 275 + xy: 1294, 199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 1592, 242 + xy: 1334, 203 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk+Plantation rotate: false - xy: 1432, 210 + xy: 1998, 1673 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1472, 207 + xy: 1998, 1637 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow rotate: false - xy: 1592, 206 + xy: 1998, 1527 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow+Farm rotate: false - xy: 1632, 279 + xy: 1998, 1491 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 1632, 207 + xy: 1998, 1419 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices+Plantation rotate: false - xy: 1272, 246 + xy: 1998, 1383 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1312, 236 + xy: 1998, 1347 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 1352, 210 + xy: 1998, 1311 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar+Plantation rotate: false - xy: 1392, 195 + xy: 1998, 1275 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Terrace farm rotate: false - xy: 1552, 167 + xy: 1998, 1131 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Trading post rotate: false - xy: 1632, 171 + xy: 1998, 1059 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1054, 292 + xy: 1998, 951 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Farm rotate: false - xy: 1094, 292 + xy: 1998, 915 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1054, 252 + xy: 1290, 314 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs rotate: false - xy: 1094, 252 + xy: 1330, 314 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Deer+Camp rotate: false - xy: 1134, 279 + xy: 1370, 310 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1134, 239 + xy: 1410, 310 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/TundraForest rotate: false - xy: 1174, 275 + xy: 1352, 270 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1214, 244 + xy: 1450, 282 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 1174, 203 + xy: 1094, 177 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales+Fishing Boats rotate: false - xy: 1214, 208 + xy: 2006, 843 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 1254, 210 + xy: 2006, 807 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1294, 200 + xy: 1134, 172 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine+Plantation rotate: false - xy: 1254, 174 + xy: 1174, 173 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1592, 170 + xy: 1998, 1095 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3023,77 +3030,77 @@ TileSets/FantasyHex/Units/African Forest Elephant index: -1 TileSets/FantasyHex/Units/Anti-Aircraft Gun rotate: false - xy: 908, 512 + xy: 792, 338 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Anti-Tank Gun rotate: false - xy: 618, 164 + xy: 850, 396 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archer rotate: false - xy: 676, 222 + xy: 908, 454 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Artillery rotate: false - xy: 152, 4 + xy: 966, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Atlatlist rotate: false - xy: 1998, 1973 + xy: 152, 4 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Axe Thrower rotate: false - xy: 1764, 662 + xy: 1656, 554 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ballista rotate: false - xy: 734, 298 + xy: 1764, 662 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battering Ram rotate: false - xy: 734, 262 + xy: 192, 4 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battleship rotate: false - xy: 988, 512 + xy: 618, 88 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bazooka rotate: false - xy: 618, 92 + xy: 1998, 1900 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berber Cavalry rotate: false - xy: 1998, 1900 + xy: 1046, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3107,21 +3114,21 @@ TileSets/FantasyHex/Units/Berserker index: -1 TileSets/FantasyHex/Units/Bowman rotate: false - xy: 1028, 512 + xy: 618, 52 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Brute rotate: false - xy: 618, 56 + xy: 1998, 1864 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Camel Archer rotate: false - xy: 1998, 1863 + xy: 1086, 511 size: 32, 29 orig: 32, 29 offset: 0, 0 @@ -3135,7 +3142,7 @@ TileSets/FantasyHex/Units/Cannon index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 1068, 512 + xy: 1126, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3184,714 +3191,714 @@ TileSets/FantasyHex/Units/Chariot Archer index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 1148, 512 + xy: 1206, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 792, 360 + xy: 850, 360 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Comanche Rider rotate: false - xy: 908, 475 + xy: 1006, 475 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 948, 475 + xy: 1046, 475 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Composite Bowman rotate: false - xy: 988, 476 + xy: 1086, 475 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1028, 476 + xy: 1126, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1068, 476 + xy: 1166, 472 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1148, 476 + xy: 1246, 469 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 1188, 471 + xy: 658, 146 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 1988, 797 + xy: 832, 324 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Dromon rotate: false - xy: 774, 324 + xy: 832, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 890, 439 + xy: 698, 17 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 814, 309 + xy: 756, 154 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 872, 362 + xy: 988, 403 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 872, 326 + xy: 1028, 439 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 912, 359 + xy: 1028, 403 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Admiral rotate: false - xy: 738, 96 + xy: 912, 289 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 738, 60 + xy: 952, 292 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 698, 32 + xy: 952, 256 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Galleass rotate: false - xy: 738, 24 + xy: 992, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 778, 126 + xy: 992, 249 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 778, 90 + xy: 814, 211 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Musician rotate: false - xy: 778, 54 + xy: 854, 234 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Prophet rotate: false - xy: 778, 18 + xy: 854, 198 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 970, 439 + xy: 894, 217 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 970, 403 + xy: 894, 181 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Writer rotate: false - xy: 1010, 440 + xy: 796, 175 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hakkapeliitta rotate: false - xy: 1050, 440 + xy: 796, 139 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Helicopter Gunship rotate: false - xy: 1010, 404 + xy: 836, 162 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 934, 287 + xy: 778, 31 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horse Archer rotate: false - xy: 934, 251 + xy: 818, 86 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 836, 201 + xy: 818, 50 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hussar rotate: false - xy: 818, 88 + xy: 858, 32 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 818, 52 + xy: 1108, 439 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Immortal rotate: false - xy: 1130, 436 + xy: 1090, 367 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Impi rotate: false - xy: 1130, 400 + xy: 1090, 331 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1210, 431 + xy: 1130, 364 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 974, 287 + xy: 1032, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 858, 93 + xy: 934, 181 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 858, 57 + xy: 916, 145 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1250, 431 + xy: 974, 213 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1250, 392 + xy: 974, 174 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1290, 426 + xy: 898, 69 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Kris Swordsman rotate: false - xy: 1290, 390 + xy: 956, 138 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1410, 426 + xy: 938, 66 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1450, 426 + xy: 938, 30 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1370, 390 + xy: 1188, 392 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1410, 390 + xy: 1228, 433 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1450, 390 + xy: 1228, 397 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1490, 388 + xy: 1170, 356 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1530, 388 + xy: 1170, 320 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1570, 388 + xy: 1014, 213 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1370, 354 + xy: 1014, 177 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1450, 354 + xy: 996, 91 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1530, 352 + xy: 978, 19 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1450, 318 + xy: 1210, 319 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mehal Sefari rotate: false - xy: 1490, 316 + xy: 1018, 55 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Merchant Of Venice rotate: false - xy: 1530, 316 + xy: 1018, 19 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1610, 388 + xy: 1072, 253 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Missile Cruiser rotate: false - xy: 1610, 352 + xy: 1112, 292 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mobile SAM rotate: false - xy: 1998, 1673 + xy: 1152, 284 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Modern Armor rotate: false - xy: 1998, 1637 + xy: 1152, 248 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1998, 1601 + xy: 1192, 283 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1998, 1483 + xy: 1232, 239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1998, 1447 + xy: 1268, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1998, 1411 + xy: 1308, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Nau rotate: false - xy: 1998, 1375 + xy: 1348, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1998, 1339 + xy: 1388, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1998, 1083 + xy: 1428, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1998, 1047 + xy: 1468, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pathfinder rotate: false - xy: 992, 327 + xy: 1548, 388 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1072, 364 + xy: 1628, 396 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pictish Warrior rotate: false - xy: 1032, 328 + xy: 1250, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1112, 364 + xy: 1290, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pracinha rotate: false - xy: 1312, 344 + xy: 1214, 203 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Privateer rotate: false - xy: 1312, 308 + xy: 1254, 203 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Quinquereme rotate: false - xy: 1312, 272 + xy: 1610, 352 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1352, 282 + xy: 1450, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1432, 282 + xy: 1058, 61 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Samurai rotate: false - xy: 1432, 246 + xy: 1058, 25 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1472, 280 + xy: 1570, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sea Beggar rotate: false - xy: 1512, 280 + xy: 1610, 276 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1472, 243 + xy: 1272, 239 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1592, 278 + xy: 1312, 239 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Siege Tower rotate: false - xy: 1552, 239 + xy: 1312, 276 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1512, 206 + xy: 1998, 1599 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1552, 203 + xy: 1998, 1563 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1632, 243 + xy: 1998, 1455 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1998, 1013 + xy: 1250, 320 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1432, 174 + xy: 1998, 1239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1472, 171 + xy: 1998, 1203 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1512, 170 + xy: 1998, 1167 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1014, 291 + xy: 1998, 1023 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1014, 255 + xy: 1998, 987 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1174, 239 + xy: 1392, 274 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1014, 219 + xy: 1490, 276 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1054, 216 + xy: 1530, 276 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1094, 216 + xy: 2006, 879 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1134, 205 + xy: 1054, 178 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Winged Hussar rotate: false - xy: 1214, 172 + xy: 1214, 167 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1294, 164 + xy: 1254, 167 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1334, 174 + xy: 1294, 163 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3905,14 +3912,14 @@ UnitPromotionIcons/Accuracy index: -1 UnitPromotionIcons/Air Repair rotate: false - xy: 1508, 482 + xy: 1616, 590 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush rotate: false - xy: 1724, 698 + xy: 1832, 806 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -3926,273 +3933,273 @@ UnitPromotionIcons/Amphibious index: -1 UnitPromotionIcons/Armor Plating rotate: false - xy: 1940, 1593 + xy: 1940, 1535 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 1940, 1535 + xy: 1940, 1419 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Besiege rotate: false - xy: 1940, 1477 + xy: 1940, 1361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 1940, 1477 + xy: 1940, 1361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz rotate: false - xy: 1940, 1419 + xy: 1940, 1303 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding Party rotate: false - xy: 1940, 1361 + xy: 1940, 1245 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 1940, 1303 + xy: 1940, 1187 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge rotate: false - xy: 1940, 1245 + xy: 1940, 1129 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal Raider rotate: false - xy: 1940, 1071 + xy: 1940, 955 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Cover rotate: false - xy: 1890, 798 + xy: 1782, 698 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1890, 798 + xy: 1782, 698 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 1508, 424 + xy: 1948, 839 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 1840, 740 + xy: 328, 570 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1898, 740 + xy: 328, 512 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1898, 740 + xy: 328, 512 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Flight Deck rotate: false - xy: 1898, 682 + xy: 328, 396 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Formation rotate: false - xy: 328, 570 + xy: 328, 338 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Great Generals rotate: false - xy: 328, 280 + xy: 328, 48 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Quick Study rotate: false - xy: 328, 280 + xy: 328, 48 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Haka War Dance rotate: false - xy: 328, 222 + xy: 386, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Heal Instantly rotate: false - xy: 328, 164 + xy: 386, 504 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect Fire rotate: false - xy: 328, 48 + xy: 386, 446 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Interception rotate: false - xy: 386, 504 + xy: 502, 562 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics rotate: false - xy: 444, 504 + xy: 502, 504 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/March rotate: false - xy: 386, 388 + xy: 386, 330 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 444, 446 + xy: 444, 388 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility rotate: false - xy: 386, 272 + xy: 386, 214 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Morale rotate: false - xy: 502, 388 + xy: 502, 330 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Rejuvenation rotate: false - xy: 560, 214 + xy: 386, 40 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting rotate: false - xy: 444, 40 + xy: 618, 432 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry rotate: false - xy: 444, 40 + xy: 618, 432 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 560, 40 + xy: 618, 374 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Slinger Withdraw rotate: false - xy: 618, 490 + xy: 676, 432 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sortie rotate: false - xy: 676, 490 + xy: 618, 316 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting rotate: false - xy: 734, 490 + xy: 792, 490 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting I (air) rotate: false - xy: 734, 490 + xy: 792, 490 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Volley rotate: false - xy: 792, 432 + xy: 734, 316 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack rotate: false - xy: 618, 200 + xy: 850, 432 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman rotate: false - xy: 676, 258 + xy: 908, 490 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index b669b46ebe..e3fefe6ff2 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index 3d012a5aed..dd097dc069 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -257,38 +257,18 @@ "quote": "'Regard your soldiers as your children, and they will follow you into the deepest valleys; look on them as your own beloved sons, and they will stand by you even unto death.' - Sun Tzu" }, // Column 4 + /* + // Temple and its replacements are religious buildings in G&K { "name": "Temple", - "culture": 3, - "specialistSlots": {"Artist": 1}, - "requiredBuilding": "Monument", + "faith": 2, + "requiredBuilding": "Shrine", "maintenance": 2, "hurryCostModifier": 25, - "requiredTech": "Philosophy" - }, - { - "name": "Burial Tomb", - "replaces": "Temple", - "uniqueTo": "Egypt", - "uniques": ["Doubles Gold given to enemy if city is captured"], - "culture": 2, - "happiness": 2, - "specialistSlots": {"Artist": 1}, - "requiredBuilding": "Monument", - "hurryCostModifier": 25, - "requiredTech": "Philosophy" - }, - { - "name": "Mud Pyramid Mosque", - "replaces": "Temple", - "uniqueTo": "Songhai", - "maintenance": 0, - "specialistSlots": {"Artist": 1}, - "hurryCostModifier": 25, - "culture": 4, - "requiredBuilding": "Monument", - "requiredTech": "Philosophy" + "requiredTech": "Philosophy", + "uniques": "" }, + */ { "name": "National College", "cost": 125, @@ -299,14 +279,6 @@ "uniques": ["Requires a [Library] in all cities", "Cost increases by [30] per owned city"], "requiredTech": "Philosophy" }, - { - "name": "National Epic", - "cost": 125, - "culture": 1, - "isNationalWonder": true, - "uniques": ["Requires a [Monument] in all cities", "+[25]% great person generation in this city", "Cost increases by [30] per owned city"], - "requiredTech": "Philosophy" - }, { "name": "The Oracle", "culture": 3, @@ -316,6 +288,62 @@ "requiredTech": "Philosophy", "quote": "'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing' - Socrates" }, + { + "name": "Amphitheater", + "culture": 3, + "specialistSlots": {"Artist": 1}, + "requiredBuilding": "Monument", + "maintenance": 2, + "hurryCostModifier": 25, + "requiredTech": "Drama and Poetry" + }, + { + "name": "Burial Tomb", + "replaces": "Amphitheater", + "uniqueTo": "Egypt", + "uniques": ["Doubles Gold given to enemy if city is captured"], + "culture": 2, + "happiness": 2, + "specialistSlots": {"Artist": 1}, + "requiredBuilding": "Monument", + "hurryCostModifier": 25, + "requiredTech": "Drama and Poetry" + // In Vanilla, this replaces Temple and requires Philosophy and a Monument. + // In G&K, this still replaces Temple and requires Philosophy, but becomes a faith building + // (alongside Temple) and thus requires a Shrine instead of a Monument. + // Since faith is not yet implemented, but G&K's Drama and Poetry (which provides the + // Amphiteater, a building with the properties of the vanilla Temple) is, this building + // temporarily replaces Drama and Poetry and requires a Monument while having its Vanilla + // stats, so it's a mish-mash of vanilla and G&K. It should be changed when faith is + // implemented. + }, + { + "name": "Mud Pyramid Mosque", + "replaces": "Amphitheater", + "uniqueTo": "Songhai", + "maintenance": 0, + "specialistSlots": {"Artist": 1}, + "hurryCostModifier": 25, + "culture": 4, + "requiredBuilding": "Monument", + "requiredTech": "Drama and Poetry" + // In Vanilla, this replaces Temple and requires Philosophy and a Monument. + // In G&K, this still replaces Temple and requires Philosophy, but becomes a faith building + // (alongside Temple) and thus requires a Shrine instead of a Monument. + // Since faith is not yet implemented, but G&K's Drama and Poetry (which provides the + // Amphiteater, a building with the properties of the vanilla Temple) is, this building + // temporarily replaces Drama and Poetry and requires a Monument while having its Vanilla + // stats, so it's a mish-mash of vanilla and G&K. It should be changed when faith is + // implemented. + }, + { + "name": "National Epic", + "cost": 125, + "culture": 1, + "isNationalWonder": true, + "uniques": ["Requires a [Monument] in all cities", "+[25]% great person generation in this city", "Cost increases by [30] per owned city"], + "requiredTech": "Drama and Poetry" + }, { "name": "Market", "gold": 2, @@ -608,7 +636,7 @@ "culture": 4, "specialistSlots": {"Artist": 1}, "hurryCostModifier": 10, - "requiredBuilding": "Temple", + "requiredBuilding": "Amphitheater", "maintenance": 2, "requiredTech": "Acoustics" }, diff --git a/android/assets/jsons/Civ V - Vanilla/Techs.json b/android/assets/jsons/Civ V - Vanilla/Techs.json index 99171bc17c..8c727cfc8b 100644 --- a/android/assets/jsons/Civ V - Vanilla/Techs.json +++ b/android/assets/jsons/Civ V - Vanilla/Techs.json @@ -142,10 +142,16 @@ "techs": [ { "name": "Philosophy", - "row": 3, + "row": 2, "prerequisites": ["Writing","Calendar"], "quote": "'There is only one good, knowledge, and one evil, ignorance.' - Socrates" }, + { + "name": "Drama and Poetry", + "row": 3, + "prerequisites": ["Writing"], + "quote": "'What is drama but life with the dull bits cut out.' - Alfred Hitchcock" + }, { "name": "Currency", "row": 7, @@ -177,13 +183,13 @@ { "name": "Theology", "row": 2, - "prerequisites": ["Philosophy"], + "prerequisites": ["Philosophy", "Drama and Poetry"], "quote": "'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas" }, { "name": "Civil Service", "row": 5, - "prerequisites": ["Currency","Horseback Riding","Philosophy"], + "prerequisites": ["Currency","Horseback Riding","Drama and Poetry"], "uniques": ["Enables Open Borders agreements"], "quote": "'The only thing that saves us from the bureaucracy is its inefficiency' - Eugene McCarthy" }, diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index ad02b1c616..6e2e7cd42e 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -346,6 +346,12 @@ class GameInfo { } for (city in civilizations.asSequence().flatMap { it.cities.asSequence() }) { + // Temple was replaced by Amphitheater in 3.15.6. For backwards compatibility, we + // replace existing temples with amphitheaters. This replacement should be removed + // when temples are reintroduced as faith buildings. + changeBuildingNameIfNotInRuleset(city.cityConstructions, "Temple", "Amphitheater") + + for (building in city.cityConstructions.builtBuildings.toHashSet()) if (!ruleSet.buildings.containsKey(building)) city.cityConstructions.builtBuildings.remove(building) @@ -379,14 +385,29 @@ class GameInfo { } } - private fun changeBuildingName(cityConstructions: CityConstructions, oldBuildingName: String, newBuildingName: String) { + /** + * Replaces all occurrences of [oldBuildingName] in [cityConstructions] with [newBuildingName] + * if the former is not contained in the ruleset. + * This function can be used for backwards compatibility with older save files when a building + * name is changed. + */ + private fun changeBuildingNameIfNotInRuleset(cityConstructions: CityConstructions, oldBuildingName: String, newBuildingName: String) { + if (ruleSet.buildings.containsKey(oldBuildingName)) + return + // Replace in built buildings if (cityConstructions.builtBuildings.contains(oldBuildingName)) { cityConstructions.builtBuildings.remove(oldBuildingName) cityConstructions.builtBuildings.add(newBuildingName) } - cityConstructions.constructionQueue.replaceAll { if (it == oldBuildingName) newBuildingName else it } + // Replace in construction queue + if (!cityConstructions.builtBuildings.contains(newBuildingName) && !cityConstructions.constructionQueue.contains(newBuildingName)) + cityConstructions.constructionQueue = cityConstructions.constructionQueue.map{ if (it == oldBuildingName) newBuildingName else it }.toMutableList() + else + cityConstructions.constructionQueue.remove(oldBuildingName) + // Replace in in-progress constructions if (cityConstructions.inProgressConstructions.containsKey(oldBuildingName)) { - cityConstructions.inProgressConstructions[newBuildingName] = cityConstructions.inProgressConstructions[oldBuildingName]!! + if (!cityConstructions.builtBuildings.contains(newBuildingName) && !cityConstructions.inProgressConstructions.containsKey(newBuildingName)) + cityConstructions.inProgressConstructions[newBuildingName] = cityConstructions.inProgressConstructions[oldBuildingName]!! cityConstructions.inProgressConstructions.remove(oldBuildingName) } }