diff --git a/android/Images/TechIcons/Telecommunications.png b/android/Images/TechIcons/Telecommunications.png new file mode 100644 index 0000000000..5423f0d649 Binary files /dev/null and b/android/Images/TechIcons/Telecommunications.png differ diff --git a/android/ImagesToPackSeparately/BuildingIcons/Bomb Shelter.png b/android/ImagesToPackSeparately/BuildingIcons/Bomb Shelter.png new file mode 100644 index 0000000000..8be7008249 Binary files /dev/null and b/android/ImagesToPackSeparately/BuildingIcons/Bomb Shelter.png differ diff --git a/android/assets/BuildingIcons.atlas b/android/assets/BuildingIcons.atlas index 271015c23f..0fe624949b 100644 --- a/android/assets/BuildingIcons.atlas +++ b/android/assets/BuildingIcons.atlas @@ -74,710 +74,717 @@ Big Ben orig: 100, 100 offset: 0, 0 index: -1 -Brandenburg Gate +Bomb Shelter rotate: false xy: 4, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Broadcast Tower +Brandenburg Gate rotate: false xy: 112, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Burial Tomb +Broadcast Tower rotate: false xy: 220, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -CN Tower +Burial Tomb rotate: false xy: 328, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Castle +CN Tower rotate: false xy: 436, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Chichen Itza +Castle rotate: false xy: 4, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Circus +Chichen Itza rotate: false xy: 112, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Circus Maximus +Circus rotate: false xy: 220, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Colosseum +Circus Maximus rotate: false xy: 328, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Colossus +Colosseum rotate: false xy: 436, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Courthouse +Colossus rotate: false xy: 544, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Cristo Redentor +Courthouse rotate: false xy: 4, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Eiffel Tower +Cristo Redentor rotate: false xy: 112, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Factory +Eiffel Tower rotate: false xy: 220, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Floating Gardens +Factory rotate: false xy: 328, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Forbidden Palace +Floating Gardens rotate: false xy: 436, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Forge +Forbidden Palace rotate: false xy: 544, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Garden +Forge rotate: false xy: 652, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Granary +Garden rotate: false xy: 4, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Great Wall +Granary rotate: false xy: 112, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hagia Sophia +Great Wall rotate: false xy: 220, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hanging Gardens +Hagia Sophia rotate: false xy: 328, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hanse +Hanging Gardens rotate: false xy: 436, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Harbor +Hanse rotate: false xy: 544, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hermitage +Harbor rotate: false xy: 652, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Heroic Epic +Hermitage rotate: false xy: 760, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Himeji Castle +Heroic Epic rotate: false xy: 4, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hospital +Himeji Castle rotate: false xy: 112, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hubble Space Telescope +Hospital rotate: false xy: 220, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hydro Plant +Hubble Space Telescope rotate: false xy: 328, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Ironworks +Hydro Plant rotate: false xy: 436, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Kremlin +Ironworks rotate: false xy: 544, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Krepost +Kremlin rotate: false xy: 652, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Leaning Tower of Pisa +Krepost rotate: false xy: 760, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Library +Leaning Tower of Pisa rotate: false xy: 868, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Lighthouse +Library rotate: false xy: 112, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Longhouse +Lighthouse rotate: false xy: 220, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Machu Picchu +Longhouse rotate: false xy: 328, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Manhattan Project +Machu Picchu rotate: false xy: 436, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Market +Manhattan Project rotate: false xy: 544, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mausoleum of Halicarnassus +Market rotate: false xy: 652, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Medical Lab +Mausoleum of Halicarnassus rotate: false xy: 760, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Military Academy +Medical Lab rotate: false xy: 868, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Military Base +Military Academy rotate: false xy: 976, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mint +Military Base rotate: false xy: 220, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Monastery +Mint rotate: false xy: 328, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Monument +Monastery rotate: false xy: 436, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mud Pyramid Mosque +Monument rotate: false xy: 544, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mughal Fort +Mud Pyramid Mosque rotate: false xy: 652, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Museum +Mughal Fort rotate: false xy: 760, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -National College +Museum rotate: false xy: 868, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -National Epic +National College rotate: false xy: 976, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -National Treasury +National Epic rotate: false xy: 1084, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Neuschwanstein +National Treasury rotate: false xy: 328, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Notre Dame +Neuschwanstein rotate: false xy: 436, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Nuclear Plant +Notre Dame rotate: false xy: 544, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Observatory +Nuclear Plant rotate: false xy: 652, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Opera House +Observatory rotate: false xy: 760, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Oxford University +Opera House rotate: false xy: 868, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Palace +Oxford University rotate: false xy: 976, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Paper Maker +Palace rotate: false xy: 1084, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Pentagon +Paper Maker rotate: false xy: 1192, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Petra +Pentagon rotate: false xy: 436, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Porcelain Tower +Petra rotate: false xy: 544, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Public School +Porcelain Tower rotate: false xy: 652, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Research Lab +Public School rotate: false xy: 760, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Booster +Research Lab rotate: false xy: 868, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Cockpit +SS Booster rotate: false xy: 976, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Engine +SS Cockpit rotate: false xy: 1084, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -SS Stasis Chamber +SS Engine rotate: false xy: 1192, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Satrap's Court +SS Stasis Chamber rotate: false xy: 1300, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Seaport +Satrap's Court rotate: false xy: 544, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Sistine Chapel +Seaport rotate: false xy: 652, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Solar Plant +Sistine Chapel rotate: false xy: 760, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Spaceship Factory +Solar Plant rotate: false xy: 868, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stable +Spaceship Factory rotate: false xy: 976, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stadium +Stable rotate: false xy: 1084, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Statue of Liberty +Stadium rotate: false xy: 1192, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Statue of Zeus +Statue of Liberty rotate: false xy: 1300, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stock Exchange +Statue of Zeus rotate: false xy: 1408, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stone Works +Stock Exchange rotate: false xy: 652, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Stonehenge +Stone Works rotate: false xy: 760, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Sydney Opera House +Stonehenge rotate: false xy: 868, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Taj Mahal +Sydney Opera House rotate: false xy: 976, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Temple +Taj Mahal rotate: false xy: 1084, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Temple of Artemis +Temple rotate: false xy: 1192, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Terracotta Army +Temple of Artemis rotate: false xy: 1300, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Great Library +Terracotta Army rotate: false xy: 1408, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Great Lighthouse +The Great Library rotate: false xy: 1516, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Louvre +The Great Lighthouse rotate: false xy: 760, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Oracle +The Louvre rotate: false xy: 868, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -The Pyramids +The Oracle rotate: false xy: 976, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Theatre +The Pyramids rotate: false xy: 1084, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -University +Theatre rotate: false xy: 1192, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Utopia Project +University rotate: false xy: 1300, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Walls +Utopia Project rotate: false xy: 1408, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Walls of Babylon +Walls rotate: false xy: 1516, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Wat +Walls of Babylon rotate: false xy: 1624, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Water Mill +Wat rotate: false xy: 868, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Windmill +Water Mill rotate: false xy: 976, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Workshop +Windmill rotate: false xy: 1084, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +Workshop + rotate: false + xy: 1192, 328 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 diff --git a/android/assets/BuildingIcons.png b/android/assets/BuildingIcons.png index 812ab2c05c..10e8f5c555 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 d4f939c519..a9e0776d1b 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -174,14 +174,14 @@ ImprovementIcons/Road index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 1832, 1188 + xy: 1508, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1832, 1080 + xy: 1508, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -363,21 +363,21 @@ NationIcons/Spain index: -1 NationIcons/The Ottomans rotate: false - xy: 1508, 756 + xy: 1616, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 1508, 482 + xy: 1616, 590 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 1724, 690 + xy: 1832, 798 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -405,7 +405,7 @@ OtherIcons/Border-outer index: -1 OtherIcons/Camera rotate: false - xy: 1880, 694 + xy: 570, 1811 size: 25, 25 orig: 25, 25 offset: 0, 0 @@ -461,7 +461,7 @@ OtherIcons/DisbandUnit index: -1 OtherIcons/Down rotate: false - xy: 1674, 590 + xy: 1782, 698 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -629,21 +629,21 @@ OtherIcons/Up index: -1 OtherIcons/whiteDot rotate: false - xy: 970, 469 + xy: 778, 165 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aesthetics rotate: false - xy: 1724, 806 + xy: 1832, 914 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1724, 748 + xy: 1832, 856 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -671,28 +671,28 @@ PolicyIcons/Collective Rule index: -1 PolicyIcons/Communism rotate: false - xy: 1782, 806 + xy: 1890, 914 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1782, 748 + xy: 1890, 856 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Cultural Diplomacy rotate: false - xy: 1890, 914 + xy: 1566, 482 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1566, 482 + xy: 1674, 590 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -706,7 +706,7 @@ PolicyIcons/Educated Elite index: -1 PolicyIcons/Fascism rotate: false - xy: 1732, 574 + xy: 1840, 682 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1147,28 +1147,28 @@ ResourceIcons/Sugar index: -1 ResourceIcons/Uranium rotate: false - xy: 1616, 756 + xy: 1724, 864 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1724, 864 + xy: 1832, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1832, 972 + xy: 1508, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1508, 540 + xy: 1616, 648 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1810,30 +1810,37 @@ TechIcons/Steel orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/The Wheel +TechIcons/Telecommunications rotate: false - xy: 1616, 864 + xy: 1832, 1188 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Theology +TechIcons/The Wheel rotate: false xy: 1724, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +TechIcons/Theology + rotate: false + xy: 1832, 1080 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 TechIcons/Trapping rotate: false - xy: 1508, 648 + xy: 1616, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1616, 648 + xy: 1724, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1973,42 +1980,42 @@ ImprovementIcons/Railroad index: -1 TileSets/Default/Tiles/River-Bottom rotate: false - xy: 1998, 1153 + xy: 1392, 307 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-Bottom rotate: false - xy: 1998, 1153 + xy: 1392, 307 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/Default/Tiles/River-BottomLeft rotate: false - xy: 1998, 1117 + xy: 1392, 271 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomLeft rotate: false - xy: 1998, 1117 + xy: 1392, 271 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/Default/Tiles/River-BottomRight rotate: false - xy: 1998, 1081 + xy: 1352, 246 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/River-BottomRight rotate: false - xy: 1998, 1081 + xy: 1352, 246 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2050,14 +2057,14 @@ TileSets/FantasyHex/Tiles/Academy-Snow index: -1 TileSets/FantasyHex/Tiles/Aluminum rotate: false - xy: 1832, 878 + xy: 1940, 977 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ancient ruins rotate: false - xy: 1940, 977 + xy: 1616, 554 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2085,14 +2092,14 @@ TileSets/FantasyHex/Tiles/Ancient ruins-Snow index: -1 TileSets/FantasyHex/Tiles/Ancient ruins2 rotate: false - xy: 1616, 554 + xy: 1724, 662 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 1872, 878 + xy: 1656, 554 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2162,7 +2169,7 @@ TileSets/FantasyHex/Tiles/Citadel-Snow index: -1 TileSets/FantasyHex/Tiles/City center rotate: false - xy: 1912, 871 + xy: 1696, 547 size: 32, 35 orig: 32, 35 offset: 0, 0 @@ -2176,833 +2183,833 @@ TileSets/FantasyHex/Tiles/City center-Ancient era index: -1 TileSets/FantasyHex/Tiles/City center-Classical era rotate: false - xy: 1624, 514 + xy: 1948, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Future era rotate: false - xy: 1624, 472 + xy: 1948, 855 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Industrial era rotate: false - xy: 1624, 431 + xy: 1948, 814 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Information era rotate: false - xy: 1664, 510 + xy: 1624, 510 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Medieval era rotate: false - xy: 1664, 470 + xy: 1624, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Modern era rotate: false - xy: 1664, 428 + xy: 1624, 428 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Renaissance era rotate: false - xy: 1840, 838 + xy: 1732, 622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1840, 802 + xy: 1772, 626 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coal rotate: false - xy: 1840, 730 + xy: 850, 418 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 1840, 694 + xy: 676, 186 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cotton rotate: false - xy: 676, 186 + xy: 1108, 472 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 988, 469 + xy: 1228, 467 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer rotate: false - xy: 1028, 476 + xy: 1980, 977 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer+Camp rotate: false - xy: 1068, 476 + xy: 1988, 941 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1108, 472 + xy: 1988, 905 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1148, 476 + xy: 1988, 869 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1188, 469 + xy: 1988, 833 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes rotate: false - xy: 1988, 941 + xy: 774, 288 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes+Plantation rotate: false - xy: 774, 324 + xy: 774, 252 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/El Dorado rotate: false - xy: 774, 287 + xy: 832, 381 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fallout rotate: false - xy: 832, 375 + xy: 658, 143 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fish rotate: false - xy: 774, 251 + xy: 658, 107 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 658, 150 + xy: 658, 71 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Flood plains rotate: false - xy: 658, 114 + xy: 832, 345 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Forest rotate: false - xy: 890, 436 + xy: 930, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 658, 37 + xy: 890, 398 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fountain of Youth rotate: false - xy: 814, 320 + xy: 930, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs rotate: false - xy: 814, 248 + xy: 814, 273 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs+Camp rotate: false - xy: 890, 400 + xy: 814, 237 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gems rotate: false - xy: 716, 190 + xy: 912, 323 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gold Ore rotate: false - xy: 698, 150 + xy: 854, 290 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 698, 110 + xy: 854, 250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 698, 74 + xy: 894, 287 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 698, 38 + xy: 894, 251 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 930, 437 + xy: 716, 219 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Deer+Camp rotate: false - xy: 930, 398 + xy: 716, 180 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Furs+Camp rotate: false - xy: 970, 430 + xy: 756, 213 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 970, 391 + xy: 756, 174 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Farm rotate: false - xy: 1010, 433 + xy: 796, 201 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Camp rotate: false - xy: 1010, 397 + xy: 796, 165 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Lumber mill rotate: false - xy: 1050, 440 + xy: 698, 144 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Trading post rotate: false - xy: 1050, 404 + xy: 698, 108 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1090, 432 + xy: 698, 68 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/GrasslandForest rotate: false - xy: 1090, 393 + xy: 738, 135 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1090, 357 + xy: 658, 35 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1130, 321 + xy: 1050, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillForest+Lumber mill rotate: false - xy: 1170, 325 + xy: 1090, 436 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMarbleQuarry rotate: false - xy: 1210, 325 + xy: 1090, 400 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMine rotate: false - xy: 1624, 395 + xy: 952, 359 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillStoneQuarry rotate: false - xy: 1664, 392 + xy: 952, 323 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 738, 82 + xy: 836, 165 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses+Pasture rotate: false - xy: 738, 42 + xy: 818, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ice rotate: false - xy: 1992, 905 + xy: 818, 16 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 1250, 402 + xy: 1170, 435 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense+Plantation rotate: false - xy: 1250, 366 + xy: 1170, 399 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 1290, 426 + xy: 1210, 395 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 1330, 426 + xy: 974, 251 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory+Camp rotate: false - xy: 1290, 354 + xy: 858, 129 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Jungle rotate: false - xy: 1330, 350 + xy: 858, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 738, 4 + xy: 1330, 424 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1410, 387 + xy: 1370, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1450, 346 + xy: 1330, 380 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1490, 341 + xy: 1410, 343 size: 32, 39 orig: 32, 39 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1530, 352 + xy: 1490, 352 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marsh rotate: false - xy: 1490, 304 + xy: 1570, 351 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1610, 323 + xy: 1570, 315 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1250, 293 + xy: 1610, 315 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1410, 277 + xy: 1998, 1563 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1450, 266 + xy: 1998, 1519 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oasis rotate: false - xy: 1530, 244 + xy: 1998, 1303 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1570, 244 + xy: 1998, 1267 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Offshore Platform rotate: false - xy: 1610, 251 + xy: 1998, 1231 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1650, 248 + xy: 1998, 1195 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1490, 232 + xy: 1998, 1159 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1690, 352 + xy: 1998, 1119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1690, 240 + xy: 992, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1570, 208 + xy: 1032, 364 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1610, 179 + xy: 1072, 328 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1650, 176 + xy: 1112, 328 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1690, 164 + xy: 1152, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1998, 1669 + xy: 1152, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1998, 1629 + xy: 1192, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsForest rotate: false - xy: 1998, 1589 + xy: 1192, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsJungle rotate: false - xy: 1998, 1549 + xy: 1232, 352 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1998, 1513 + xy: 1232, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 1998, 1477 + xy: 1272, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1998, 1441 + xy: 1272, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1998, 1333 + xy: 1352, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1998, 1297 + xy: 1272, 282 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1998, 1261 + xy: 1232, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1998, 1041 + xy: 1392, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1570, 172 + xy: 1512, 244 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep+Pasture rotate: false - xy: 1610, 139 + xy: 1552, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 1690, 128 + xy: 1592, 242 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk+Plantation rotate: false - xy: 872, 364 + xy: 1432, 210 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 912, 362 + xy: 1472, 207 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow rotate: false - xy: 854, 254 + xy: 1592, 206 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow+Farm rotate: false - xy: 854, 218 + xy: 1632, 279 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 894, 290 + xy: 1632, 207 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices+Plantation rotate: false - xy: 894, 254 + xy: 1272, 246 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 894, 218 + xy: 1312, 236 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 934, 326 + xy: 1352, 210 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar+Plantation rotate: false - xy: 934, 290 + xy: 1392, 195 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Terrace farm rotate: false - xy: 894, 182 + xy: 1552, 167 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Trading post rotate: false - xy: 1992, 833 + xy: 1632, 171 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1880, 763 + xy: 1054, 292 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Farm rotate: false - xy: 1880, 727 + xy: 1094, 292 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1920, 824 + xy: 1054, 252 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs rotate: false - xy: 1920, 784 + xy: 1094, 252 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Deer+Camp rotate: false - xy: 1920, 744 + xy: 1134, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1920, 704 + xy: 1134, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/TundraForest rotate: false - xy: 1960, 793 + xy: 1174, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1960, 721 + xy: 1214, 244 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 2000, 689 + xy: 1174, 203 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales+Fishing Boats rotate: false - xy: 1170, 289 + xy: 1214, 208 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 1210, 289 + xy: 1254, 210 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1250, 257 + xy: 1294, 200 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine+Plantation rotate: false - xy: 1290, 246 + xy: 1254, 174 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 934, 182 + xy: 1592, 170 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3051,7 +3058,7 @@ TileSets/FantasyHex/Units/Atlatlist index: -1 TileSets/FantasyHex/Units/Axe Thrower rotate: false - xy: 1656, 554 + xy: 1764, 662 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3184,707 +3191,707 @@ TileSets/FantasyHex/Units/Chu-Ko-Nu index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 1840, 766 + xy: 792, 360 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Comanche Rider rotate: false - xy: 1848, 657 + xy: 908, 475 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 1848, 620 + xy: 948, 475 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Composite Bowman rotate: false - xy: 1848, 584 + xy: 988, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 792, 360 + xy: 1028, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 850, 418 + xy: 1068, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 908, 476 + xy: 1148, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 948, 478 + xy: 1188, 471 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 1228, 474 + xy: 1988, 797 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Dromon rotate: false - xy: 1980, 977 + xy: 774, 324 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 658, 78 + xy: 890, 439 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 814, 284 + xy: 814, 309 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 734, 226 + xy: 872, 362 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 774, 215 + xy: 872, 326 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 814, 212 + xy: 912, 359 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Admiral rotate: false - xy: 1050, 365 + xy: 738, 96 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1010, 361 + xy: 738, 60 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1130, 436 + xy: 698, 32 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Galleass rotate: false - xy: 1130, 400 + xy: 738, 24 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1130, 361 + xy: 778, 126 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1170, 433 + xy: 778, 90 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Musician rotate: false - xy: 1170, 397 + xy: 778, 54 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Prophet rotate: false - xy: 1170, 361 + xy: 778, 18 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1210, 433 + xy: 970, 439 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1210, 397 + xy: 970, 403 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Writer rotate: false - xy: 1210, 361 + xy: 1010, 440 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hakkapeliitta rotate: false - xy: 1050, 329 + xy: 1050, 440 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Helicopter Gunship rotate: false - xy: 1090, 321 + xy: 1010, 404 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1848, 548 + xy: 934, 287 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horse Archer rotate: false - xy: 738, 154 + xy: 934, 251 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 738, 118 + xy: 836, 201 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hussar rotate: false - xy: 1952, 900 + xy: 818, 88 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1952, 864 + xy: 818, 52 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Immortal rotate: false - xy: 1992, 869 + xy: 1130, 436 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Impi rotate: false - xy: 1250, 438 + xy: 1130, 400 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1250, 330 + xy: 1210, 431 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1290, 390 + xy: 974, 287 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1330, 390 + xy: 858, 93 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1370, 426 + xy: 858, 57 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1370, 390 + xy: 1250, 431 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1410, 423 + xy: 1250, 392 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1370, 354 + xy: 1290, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Kris Swordsman rotate: false - xy: 1450, 426 + xy: 1290, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1450, 390 + xy: 1410, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1410, 351 + xy: 1450, 426 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1290, 318 + xy: 1370, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1330, 314 + xy: 1410, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1370, 318 + xy: 1450, 390 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1410, 315 + xy: 1490, 388 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1450, 310 + xy: 1530, 388 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1490, 388 + xy: 1570, 388 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1530, 388 + xy: 1370, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1570, 388 + xy: 1450, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1570, 352 + xy: 1530, 352 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1530, 316 + xy: 1450, 318 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mehal Sefari rotate: false - xy: 1570, 316 + xy: 1490, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Merchant Of Venice rotate: false - xy: 1610, 359 + xy: 1530, 316 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1650, 356 + xy: 1610, 388 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Missile Cruiser rotate: false - xy: 1650, 320 + xy: 1610, 352 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mobile SAM rotate: false - xy: 1290, 282 + xy: 1998, 1673 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Modern Armor rotate: false - xy: 1330, 278 + xy: 1998, 1637 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1370, 282 + xy: 1998, 1601 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1490, 268 + xy: 1998, 1483 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1530, 280 + xy: 1998, 1447 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1570, 280 + xy: 1998, 1411 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Nau rotate: false - xy: 1610, 287 + xy: 1998, 1375 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1650, 284 + xy: 1998, 1339 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1690, 316 + xy: 1998, 1083 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1690, 280 + xy: 1998, 1047 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pathfinder rotate: false - xy: 1530, 208 + xy: 992, 327 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1610, 215 + xy: 1072, 364 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pictish Warrior rotate: false - xy: 1650, 212 + xy: 1032, 328 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1690, 204 + xy: 1112, 364 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pracinha rotate: false - xy: 1998, 1405 + xy: 1312, 344 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Privateer rotate: false - xy: 1998, 1369 + xy: 1312, 308 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Quinquereme rotate: false - xy: 1998, 1225 + xy: 1312, 272 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1998, 1189 + xy: 1352, 282 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1370, 246 + xy: 1432, 282 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Samurai rotate: false - xy: 1410, 241 + xy: 1432, 246 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1450, 230 + xy: 1472, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sea Beggar rotate: false - xy: 1490, 196 + xy: 1512, 280 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1530, 171 + xy: 1472, 243 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1650, 139 + xy: 1592, 278 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Siege Tower rotate: false - xy: 1570, 136 + xy: 1552, 239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 854, 326 + xy: 1512, 206 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 854, 290 + xy: 1552, 203 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 894, 326 + xy: 1632, 243 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 698, 4 + xy: 1998, 1013 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 934, 254 + xy: 1432, 174 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 934, 218 + xy: 1472, 171 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 854, 182 + xy: 1512, 170 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1880, 835 + xy: 1014, 291 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1880, 799 + xy: 1014, 255 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1960, 757 + xy: 1174, 239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 2000, 797 + xy: 1014, 219 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 2000, 761 + xy: 1054, 216 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 2000, 725 + xy: 1094, 216 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1960, 687 + xy: 1134, 205 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Winged Hussar rotate: false - xy: 1330, 242 + xy: 1214, 172 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1370, 210 + xy: 1294, 164 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1410, 205 + xy: 1334, 174 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3898,14 +3905,14 @@ UnitPromotionIcons/Accuracy index: -1 UnitPromotionIcons/Air Repair rotate: false - xy: 1832, 914 + xy: 1508, 482 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush rotate: false - xy: 1616, 590 + xy: 1724, 698 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -3982,14 +3989,14 @@ UnitPromotionIcons/Coastal Raider index: -1 UnitPromotionIcons/Cover rotate: false - xy: 1782, 690 + xy: 1890, 798 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1782, 690 + xy: 1890, 798 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4003,28 +4010,28 @@ UnitPromotionIcons/Drill index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 1732, 632 + xy: 1840, 740 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1790, 632 + xy: 1898, 740 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1790, 632 + xy: 1898, 740 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Flight Deck rotate: false - xy: 1790, 574 + xy: 1898, 682 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 9af1dfba89..b669b46ebe 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 e533fe74d7..81cbdc463e 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -1001,17 +1001,23 @@ // Future Era // Column 15 - /* { "name": "CN Tower", "isWonder": true, "culture": 1, - "greatPersonPoints": {"production": 1} - "providesFreeBuilding": "Broadcast Tower" - "uniques": ["+1 population in each city","+1 happiness in each city"] - "requiredTech": "Telecommunications" // todo doesn't exist yet! + "greatPersonPoints": {"gold": 1}, + "providesFreeBuilding": "Broadcast Tower", + "uniques": ["[+1] population [in all cities]", "[+1 Happiness] [in all cities]"], + "requiredTech": "Telecommunications", + "quote": "'Nothing travels faster than light with the possible exception of bad news, which obeys its own special rules.' – Douglas Adams" + }, + { + "name": "Bomb Shelter", + "cost": 300, + "maintenance": 1, + "requiredTech": "Telecommunications", + "uniques": ["Population loss from nuclear attacks -[75]%"] }, - */ { "name": "SS Cockpit", "requiredResource": "Aluminum", @@ -1022,7 +1028,7 @@ "name": "Hubble Space Telescope", "isWonder": true, "greatPersonPoints": {"science": 1}, - "providesFreeBuilding": "Spaceship Factory", + "providesFreeBuilding": "Spaceship Factory", // If spaceship parts are changed into units, the spaceship part unique should be changed to // "+[25]% Production when constructing [Spaceship part] units [in this city]" "uniques": ["[2] free [Great Scientist] units appear", diff --git a/android/assets/jsons/Civ V - Vanilla/Techs.json b/android/assets/jsons/Civ V - Vanilla/Techs.json index 17783ac26d..29b5fb7779 100644 --- a/android/assets/jsons/Civ V - Vanilla/Techs.json +++ b/android/assets/jsons/Civ V - Vanilla/Techs.json @@ -11,12 +11,12 @@ "quote": "'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster", "uniques": ["Starting tech"] } - ] + ] }, { "columnNumber": 1, "era": "Ancient era", - "techCost": 35, + "techCost": 35, "buildingCost": 60, "wonderCost": 185, "techs": [ @@ -44,13 +44,13 @@ "prerequisites": ["Agriculture"], "quote": "'The meek shall inherit the Earth, but not its mineral rights.' - J. Paul Getty" } - - ] + + ] }, { "columnNumber": 2, "era": "Ancient era", - "techCost": 55, + "techCost": 55, "buildingCost": 75, "wonderCost": 185, "techs": [ @@ -95,13 +95,13 @@ "row": 10, "prerequisites": ["Mining"], "quote": "'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer" - } - ] + } + ] }, { "columnNumber": 3, "era": "Classical era", - "techCost": 105, + "techCost": 105, "buildingCost": 100, "wonderCost": 250, "techs": [ @@ -131,12 +131,12 @@ "prerequisites": ["Masonry","The Wheel"], "quote": "'Three things are to be looked to in a building: that it stands on the right spot; that it be securely founded; that it be successfully executed.' - Johann Wolfgang von Goethe" } - ] + ] }, { "columnNumber": 4, "era": "Classical era", - "techCost": 175, + "techCost": 175, "buildingCost": 100, "wonderCost": 250, "techs": [ @@ -165,7 +165,7 @@ "prerequisites": ["Bronze Working"], "quote": "'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats" } - ] + ] }, { "columnNumber": 5, @@ -205,7 +205,7 @@ { "columnNumber": 6, "era": "Medieval era", - "techCost": 485, + "techCost": 485, "buildingCost": 160, "wonderCost": 400, "techs": [ @@ -248,12 +248,12 @@ "prerequisites": ["Metal Casting"], "quote": "'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man" } - ] + ] }, { "columnNumber": 7, "era": "Renaissance era", - "techCost": 780, + "techCost": 780, "buildingCost": 200, "wonderCost": 500, "techs": [ @@ -288,12 +288,12 @@ "prerequisites": ["Physics","Steel"], "quote": "'The day when two army corps can annihilate each other in one second, all civilized nations, it is to be hoped, will recoil from war and discharge their troops.' - Alfred Nobel" } - ] + ] }, { "columnNumber": 8, "era": "Renaissance era", - "techCost": 1150, + "techCost": 1150, "buildingCost": 250, "wonderCost": 625, "techs": [ @@ -327,7 +327,7 @@ "prerequisites": ["Gunpowder"], "quote": "'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge" } - ] + ] }, { "columnNumber": 9, @@ -372,7 +372,7 @@ "prerequisites": ["Chemistry"], "quote": "'The nation that destroys its soil destroys itself.' - Franklin Delano Roosevelt" } - ] + ] }, { "columnNumber": 10, @@ -406,7 +406,7 @@ "prerequisites": ["Fertilizer","Military Science"], "quote": "'As soon as men decide that all means are permitted to fight an evil, then their good becomes indistinguishable from the evil that they set out to destroy.' - Christopher Dawson" } - ] + ] }, { "columnNumber": 11, @@ -445,7 +445,7 @@ "prerequisites": ["Steam Power","Dynamite"], "quote": "'The introduction of so powerful an agent as steam to a carriage on wheels will make a great change in the situation of man.' - Thomas Jefferson" } - ] + ] }, { "columnNumber": 12, @@ -478,7 +478,7 @@ "prerequisites": ["Railroad"], "quote": "'Any man who can drive safely while kissing a pretty girl is simply not giving the kiss the attention it deserves.' - Albert Einstein" } - ] + ] }, { "columnNumber": 13, @@ -511,7 +511,7 @@ "prerequisites": ["Ballistics","Combustion"], "quote": "'The root of the evil is not the construction of new, more dreadful weapons. It is the spirit of conquest.' - Ludwig von Mises" } - ] + ] }, { "columnNumber": 14, @@ -553,6 +553,12 @@ "buildingCost": 750, "wonderCost": 1250, "techs": [ + { + "name": "Telecommunications", + "row": 2, + "prerequisites": ["Ecology"], + "quote": "'The more we elaborate our means of communication, the less we communicate.' – J.B. Priestly" + }, { "name": "Mobile Tactics", "row": 3, @@ -569,7 +575,7 @@ "name": "Satellites", "row": 6, "prerequisites": ["Rocketry"], - "uniques": ["Reveals the entire map"], + "uniques": ["Reveals the entire map"], "quote": "'Now, somehow, in some new way, the sky seemed almost alien.' - Lyndon B. Johnson" }, { @@ -584,9 +590,9 @@ "prerequisites": ["Computers"], "quote": "'The night is far spent, the day is at hand: let us therefore cast off the works of darkness, and let us put on the armor of light.' - The Holy Bible: Romans, 13:12" } - ] + ] }, - + { "columnNumber": 16, "era": "Future era", @@ -596,8 +602,8 @@ "techs": [ { "name": "Particle Physics", - "row": 4, - "prerequisites": ["Mobile Tactics", "Advanced Ballistics"], + "row": 3, + "prerequisites": ["Telecommunications","Mobile Tactics","Advanced Ballistics"], "quote": "'Every particle of matter is attracted by or gravitates to every other particle of matter with a force inversely proportional to the squares of their distances.' - Isaac Newton" }, { @@ -628,6 +634,6 @@ "uniques": ["Who knows what the future holds?", "Can be continually researched"], "quote": "'I think we agree, the past is over.' - George W. Bush" } - ] + ] } ] diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index a62ec6de4d..b06884ca58 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -15,6 +15,7 @@ import com.unciv.models.ruleset.unit.UnitType import com.unciv.models.stats.Stat import com.unciv.models.translations.tr import java.util.* +import kotlin.math.min import kotlin.math.max /** @@ -113,7 +114,7 @@ object Battle { for (unique in bonusUniques) { if (!defeatedUnit.matchesCategory(unique.params[1])) continue - + val yieldPercent = unique.params[0].toFloat() / 100 val defeatedUnitYieldSourceType = unique.params[2] val yieldTypeSourceAmount = @@ -186,7 +187,7 @@ object Battle { val locations = LocationAction ( if (attackerTile != null && attackerTile.position != attackedTile.position) listOf(attackedTile.position, attackerTile.position) - else listOf(attackedTile.position) + else listOf(attackedTile.position) ) defender.getCivInfo().addNotification(notificationString, locations, attackerIcon, NotificationIcon.War, defenderIcon) } @@ -319,11 +320,11 @@ object Battle { for (unique in attackerCiv.getMatchingUniques("Upon capturing a city, receive [] times its [] production as [] immediately")) { attackerCiv.addStat( - Stat.valueOf(unique.params[2]), + Stat.valueOf(unique.params[2]), unique.params[0].toInt() * city.cityStats.currentCityStats.get(Stat.valueOf(unique.params[1])).toInt() ) } - + if (attackerCiv.isPlayerCivilization()) { attackerCiv.popupAlerts.add(PopupAlert(AlertType.CityConquered, city.id)) UncivGame.Current.settings.addCompletedTutorialTask("Conquer a city") @@ -474,11 +475,11 @@ object Battle { populationLossReduced = true } if (city.population.population < 5 && !populationLossReduced) { - city.population.population = 1 // For cities that cannot be destroyed, such as original capitals + city.population.setPopulation(1) // For cities that cannot be destroyed, such as original capitals city.destroyCity() } else { - city.population.population -= populationLoss.toInt() - if (city.population.population < 1) city.population.population = 1 + city.population.addPopulation(-populationLoss.toInt()) + if (city.population.population < 1) city.population.setPopulation(1) city.population.unassignExtraPopulation() city.health -= ((0.5 + 0.25 * Random().nextFloat()) * city.health * damageModifierFromMissingResource).toInt() if (city.health < 1) city.health = 1 @@ -531,7 +532,7 @@ object Battle { val city = tile.getCity() if (city != null && city.location == tile.position) { if (city.population.population < 5) { - city.population.population = 1 // For cities that cannot be destroyed, such as original capitals + city.population.setPopulation(1) // For cities that cannot be destroyed, such as original capitals city.destroyCity() } else { var populationLoss = city.population.population * (0.6 + Random().nextFloat() * 0.2); @@ -540,9 +541,9 @@ object Battle { populationLoss *= 1 - unique.params[0].toFloat() / 100f populationLossReduced = true } - city.population.population -= populationLoss.toInt() - if (city.population.population < 5 && populationLossReduced) city.population.population = 5 - if (city.population.population < 1) city.population.population = 1 + city.population.addPopulation(-populationLoss.toInt()) + if (city.population.population < 5 && populationLossReduced) city.population.setPopulation(5) + if (city.population.population < 1) city.population.setPopulation(1) city.population.unassignExtraPopulation() city.health -= (0.5 * city.getMaxHealth() * damageModifierFromMissingResource).toInt() if (city.health < 1) city.health = 1 diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index c2fecabb17..746c2e454a 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -361,7 +361,7 @@ class CityInfo { cityConstructions.endTurn(stats) expansion.nextTurn(stats.culture) if (isBeingRazed) { - population.population-- + population.addPopulation(-1) if (population.population <= 0) { // there are strange cases where we get to -1 civInfo.addNotification("[$name] has been razed to the ground!", location, "OtherIcons/Fire") destroyCity() diff --git a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt index cc620b0c39..c7e92312c2 100644 --- a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt +++ b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt @@ -47,7 +47,7 @@ class CityInfoConquestFunctions(val city: CityInfo){ moveToCiv(conqueringCiv) Battle.destroyIfDefeated(oldCiv, conqueringCiv) - if (population.population > 1) population.population -= 1 + population.population / 4 // so from 2-4 population, remove 1, from 5-8, remove 2, etc. + if (population.population > 1) population.addPopulation(-1 - population.population / 4) // so from 2-4 population, remove 1, from 5-8, remove 2, etc. reassignPopulation() if (reconqueredCityWhileStillInResistance || foundingCiv == conqueringCiv.civName) diff --git a/core/src/com/unciv/logic/city/PopulationManager.kt b/core/src/com/unciv/logic/city/PopulationManager.kt index b47066cf3e..6ad756c451 100644 --- a/core/src/com/unciv/logic/city/PopulationManager.kt +++ b/core/src/com/unciv/logic/city/PopulationManager.kt @@ -14,6 +14,7 @@ class PopulationManager { lateinit var cityInfo: CityInfo var population = 1 + private set var foodStored = 0 // In favor of this bad boy @@ -70,6 +71,19 @@ class PopulationManager { private fun getStatsOfSpecialist(name: String) = cityInfo.cityStats.getStatsOfSpecialist(name) + internal fun addPopulation(count: Int) { + population += count + val freePopulation = getFreePopulation() + if (freePopulation < 0) { + unassignExtraPopulation() + } else { + autoAssignPopulation() + } + } + + internal fun setPopulation(count: Int) { + addPopulation(-population + count) + } internal fun autoAssignPopulation(foodWeight: Float = 1f) { for (i in 1..getFreePopulation()) { diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 52c3c489b6..69450c0504 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -700,8 +700,7 @@ class MapUnit { if (civInfo.cities.isNotEmpty()) actions.add { val city = civInfo.cities.random(tileBasedRandom) - city.population.population++ - city.population.autoAssignPopulation() + city.population.addPopulation(1) val locations = LocationAction(listOf(tile.position, city.location)) civInfo.addNotification( "We have found survivors in the ruins - population added to [" + city.name + "]", diff --git a/core/src/com/unciv/models/ruleset/Unique.kt b/core/src/com/unciv/models/ruleset/Unique.kt index 908ceb2058..643f91a895 100644 --- a/core/src/com/unciv/models/ruleset/Unique.kt +++ b/core/src/com/unciv/models/ruleset/Unique.kt @@ -77,10 +77,17 @@ object UniqueTriggerActivation { civInfo.addUnit(greatPerson.name, chosenCity) } } - "+1 population in each city" -> + // Deprecated since 3.15.4 + "+1 population in each city" -> + for (city in civInfo.cities) { + city.population.addPopulation(1) + } + // + "[] population []" -> for (city in civInfo.cities) { - city.population.population += 1 - city.population.autoAssignPopulation() + if (city.matchesFilter(unique.params[1])) { + city.population.addPopulation(unique.params[0].toInt()) + } } "Free Technology" -> if (!civInfo.isSpectator()) civInfo.tech.freeTechs += 1 "[] Free Technologies" -> if (!civInfo.isSpectator()) civInfo.tech.freeTechs += unique.params[0].toInt() diff --git a/docs/Credits.md b/docs/Credits.md index d4f0f74913..d9de208267 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -277,15 +277,18 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Spaceship](https://thenounproject.com/term/spaceship/1444621/) By Dinosoft Labs for Apollo Program * [Build](https://thenounproject.com/term/build/1156478/) By Michael G Brown for Spaceship Factory * [Nuclear Plant](https://thenounproject.com/term/nuclear-plant/1132340/) By Andrejs Kirma -* [CN Tower Toronto](https://thenounproject.com/search/?q=cn%20tower&i=807678) By mikicon * [Pentagon](https://thenounproject.com/search/?q=the%20pentagon&i=1788323) By Maxim Kulikov ### Future Era * [Hubble Telescope](https://thenounproject.com/search/?q=hubble%20space&i=445502) By Scott Lewis for Hubble Space Telescope +* [CN Tower Toronto](https://thenounproject.com/search/?q=cn%20tower&i=807678) By mikicon for CN tower +* [War Shelter](https://www.flaticon.com/free-icon/war-shelter_978661) by [Frepik](www.freepik.com) for Bomb Shelter * [Missile](https://thenounproject.com/term/missile/799922/) By ProSymbols for SS Booster * [Rocket](https://thenounproject.com/term/rocket/937173/) By BomSymbols for SS Cockpit * [Engine](https://thenounproject.com/term/engine/1877958/) By Andre for SS Engine * [Chamber](https://thenounproject.com/term/chamber/1242689/) By IYIKON for SS Stasis Chamber + +### All Era's * [Illuminati](https://thenounproject.com/term/illuminati/1617812) by emilegraphics for the Utopia Project ## Social Policies @@ -459,6 +462,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Electronics](https://thenounproject.com/search/?q=Electronics&i=1565843) By Cuby Design * [Atom](https://thenounproject.com/term/atom/1586852/) By Kelsey Armstrong for Particle Physics * [Thermonuclear fusion](https://thenounproject.com/search/?q=fusion&i=3292735) by Olena Panasovska, UA for Nuclear Fusion +* [telecommunications](https://thenounproject.com/search/?q=telecommunications&i=3191260) by Wichai Wi for Telcommunications * [Information Technology](https://thenounproject.com/term/information-technology/1927668/) By Vectors Markeet for Future Tech ## Terrain