diff --git a/Credits.md b/Credits.md index e0c8dae1..14b8e6ed 100644 --- a/Credits.md +++ b/Credits.md @@ -136,6 +136,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Storehouse](https://thenounproject.com/term/storehouse/966786/) By Pedro Santos for Granary * [Great Wall Of China](https://thenounproject.com/term/great-wall-of-china/146039/) By Arthur Shlain for Walls +* [Markadan Tower](https://thenounproject.com/search/?q=fortification&i=2107694) by Vectors Market for Walls of Babylon * [Block](https://thenounproject.com/term/block/1711553/) By Monjin Friends for Stone Works * [korean palace](https://thenounproject.com/term/korean-palace/1797542/) By 1516 for Palace * [Obelisk](https://thenounproject.com/term/obelisk/749104/) By Eliricon for Monument diff --git a/android/Images/BuildingIcons/Walls of Babylon.png b/android/Images/BuildingIcons/Walls of Babylon.png new file mode 100644 index 00000000..90ab403c Binary files /dev/null and b/android/Images/BuildingIcons/Walls of Babylon.png differ diff --git a/android/Images/UnitIcons/Chu-Ko-Nu.png b/android/Images/UnitIcons/Chu-Ko-Nu.png new file mode 100644 index 00000000..b54b8809 Binary files /dev/null and b/android/Images/UnitIcons/Chu-Ko-Nu.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 811fa98c..fccbde1f 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -97,70 +97,70 @@ BuildingIcons/Chichen Itza index: -1 BuildingIcons/Circus rotate: false - xy: 306, 742 + xy: 334, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 334, 1540 + xy: 334, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 436, 1336 + xy: 538, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colossus rotate: false - xy: 538, 1438 + xy: 640, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 538, 1234 + xy: 640, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 1048, 1540 + xy: 742, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 1048, 1438 + xy: 1150, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 1150, 1336 + xy: 1048, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 1150, 1234 + xy: 1150, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 1399, 1662 + xy: 1501, 1662 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -195,7 +195,7 @@ BuildingIcons/Harbor index: -1 BuildingIcons/Hermitage rotate: false - xy: 1558, 1560 + xy: 1456, 1458 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -223,385 +223,392 @@ BuildingIcons/Hubble Space Telescope index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 1660, 1544 + xy: 1660, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1864, 1538 + xy: 1762, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Kremlin rotate: false - xy: 1864, 1334 + xy: 1864, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1864, 1232 + xy: 1762, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 336, 435 + xy: 336, 333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 336, 333 + xy: 336, 231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 336, 231 + xy: 336, 129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Picchu rotate: false - xy: 1762, 1028 + xy: 1864, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 388, 538 + xy: 438, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 408, 826 + xy: 612, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 510, 826 + xy: 612, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 612, 826 + xy: 714, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 714, 928 + xy: 918, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 714, 826 + xy: 816, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 816, 826 + xy: 918, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 1122, 1030 + xy: 918, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 918, 826 + xy: 1020, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1224, 1030 + xy: 1020, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1122, 928 + xy: 1326, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1224, 928 + xy: 1224, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1326, 928 + xy: 1326, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1326, 826 + xy: 1428, 948 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1428, 948 + xy: 1530, 948 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1530, 846 + xy: 1632, 932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1530, 744 + xy: 1632, 729 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1836, 722 + xy: 1938, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 796, 724 + xy: 694, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1204, 724 + xy: 1102, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1102, 622 + xy: 1306, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1306, 724 + xy: 1204, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1204, 622 + xy: 1306, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1816, 620 + xy: 1918, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1816, 518 + xy: 1918, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 540, 520 + xy: 642, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 642, 520 + xy: 540, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 642, 418 + xy: 846, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 846, 520 + xy: 540, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 540, 214 + xy: 642, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 948, 520 + xy: 540, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 642, 214 + xy: 744, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 744, 316 + xy: 846, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 846, 316 + xy: 948, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 948, 418 + xy: 1152, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 744, 112 + xy: 846, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Terracotta Army rotate: false - xy: 846, 214 + xy: 948, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 948, 316 + xy: 1050, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1050, 418 + xy: 1254, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1254, 520 + xy: 846, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 846, 112 + xy: 948, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 948, 214 + xy: 1050, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1152, 418 + xy: 948, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1050, 112 + xy: 1152, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1254, 316 + xy: 1152, 112 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Walls of Babylon + rotate: false + xy: 1254, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 540, 10 + xy: 744, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 948, 10 + xy: 1152, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -699,119 +706,119 @@ ImprovementIcons/Camp index: -1 ImprovementIcons/City ruins rotate: false - xy: 334, 1438 + xy: 436, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 538, 1132 + xy: 640, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 1150, 1540 + xy: 844, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 1150, 1438 + xy: 946, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 286, 639 + xy: 286, 537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 1456, 1050 + xy: 1558, 1050 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1864, 1028 + xy: 388, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 510, 928 + xy: 714, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1122, 826 + xy: 1224, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1938, 824 + xy: 1428, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1938, 722 + xy: 490, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 592, 724 + xy: 490, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 592, 724 + xy: 490, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 592, 724 + xy: 490, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/Railroad rotate: false - xy: 592, 724 + xy: 490, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1000, 724 + xy: 898, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1050, 214 + xy: 1152, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -839,21 +846,21 @@ OtherIcons/Circle index: -1 OtherIcons/Crosshair rotate: false - xy: 742, 1438 + xy: 844, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 844, 1438 + xy: 946, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 946, 1234 + xy: 1048, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -888,42 +895,42 @@ TileSets/ThorfMaps/Hexagon index: -1 OtherIcons/MenuIcon rotate: false - xy: 408, 1030 + xy: 408, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1632, 932 + xy: 1734, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 1938, 926 + xy: 1938, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1510, 540 + xy: 1612, 525 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1918, 518 + xy: 540, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 846, 418 + xy: 1050, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -993,238 +1000,238 @@ PolicyIcons/Democracy index: -1 PolicyIcons/Discipline rotate: false - xy: 1152, 60 + xy: 1408, 488 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1152, 60 + xy: 1408, 488 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1408, 488 + xy: 1356, 414 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1356, 414 + xy: 1460, 488 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1204, 60 + xy: 1408, 436 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1460, 488 + xy: 1356, 362 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1408, 436 + xy: 1512, 488 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1356, 362 + xy: 1408, 384 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1256, 60 + xy: 1460, 436 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1512, 488 + xy: 1356, 310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1408, 384 + xy: 1408, 332 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1460, 436 + xy: 1460, 384 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1356, 310 + xy: 1512, 436 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1408, 332 + xy: 1356, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1460, 384 + xy: 1408, 280 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1512, 436 + xy: 1460, 332 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1356, 258 + xy: 1512, 384 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1460, 332 + xy: 1408, 228 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1512, 384 + xy: 1460, 280 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1356, 206 + xy: 1512, 332 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1408, 228 + xy: 1356, 154 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1460, 280 + xy: 1408, 176 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1512, 332 + xy: 1460, 228 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1356, 154 + xy: 1512, 280 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1460, 228 + xy: 1408, 124 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1512, 280 + xy: 1460, 176 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1460, 176 + xy: 1512, 228 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1512, 228 + xy: 1356, 50 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1512, 176 + xy: 1408, 72 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1152, 8 + xy: 1460, 124 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1204, 8 + xy: 1512, 176 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1256, 8 + xy: 1460, 72 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1308, 60 + xy: 1512, 124 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1308, 8 + xy: 1512, 72 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1259,56 +1266,56 @@ ResourceIcons/Cattle index: -1 ResourceIcons/Coal rotate: false - xy: 334, 1234 + xy: 436, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 436, 1132 + xy: 538, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 640, 1234 + xy: 742, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 946, 1540 + xy: 640, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 1048, 1336 + xy: 1150, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 1252, 1540 + xy: 1252, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 1252, 1132 + xy: 1297, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 1297, 1642 + xy: 1399, 1662 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1322,112 +1329,112 @@ ResourceIcons/Horses index: -1 ResourceIcons/Incense rotate: false - xy: 1660, 1442 + xy: 1660, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1660, 1136 + xy: 1762, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1762, 1334 + xy: 1864, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 388, 640 + xy: 388, 538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1326, 1030 + xy: 1122, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1428, 846 + xy: 1530, 846 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1408, 540 + xy: 1510, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1612, 525 + xy: 1714, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1714, 518 + xy: 1816, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 540, 316 + xy: 642, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 540, 112 + xy: 642, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 642, 112 + xy: 744, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1152, 214 + xy: 1254, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1254, 214 + xy: 540, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1254, 112 + xy: 642, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 642, 10 + xy: 846, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1441,14 +1448,14 @@ StatIcons/Acquire index: -1 StatIcons/CityConnection rotate: false - xy: 436, 1540 + xy: 334, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 436, 1438 + xy: 538, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1490,7 +1497,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1408, 280 + xy: 1356, 206 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1511,14 +1518,14 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1408, 176 + xy: 1356, 102 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 694, 622 + xy: 898, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1532,7 +1539,7 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 744, 520 + xy: 540, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1658,119 +1665,119 @@ TechIcons/Chivalry index: -1 TechIcons/Civil Service rotate: false - xy: 538, 1540 + xy: 334, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combined Arms rotate: false - xy: 640, 1540 + xy: 334, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 334, 1132 + xy: 436, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 538, 1336 + xy: 640, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 640, 1438 + xy: 742, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 742, 1540 + xy: 436, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 844, 1540 + xy: 538, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 640, 1132 + xy: 742, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Ecology rotate: false - xy: 742, 1234 + xy: 844, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 844, 1336 + xy: 946, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 946, 1438 + xy: 1048, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 742, 1132 + xy: 844, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electronics rotate: false - xy: 844, 1234 + xy: 946, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 946, 1336 + xy: 1048, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 844, 1132 + xy: 946, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 946, 1132 + xy: 1048, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 1252, 1438 + xy: 1252, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1798,273 +1805,273 @@ TechIcons/Horseback Riding index: -1 TechIcons/Industrialization rotate: false - xy: 1660, 1340 + xy: 1762, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1762, 1538 + xy: 1864, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1660, 1034 + xy: 1762, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 438, 334 + xy: 438, 232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 438, 232 + xy: 438, 130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 438, 130 + xy: 438, 28 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 408, 928 + xy: 510, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 510, 1030 + xy: 408, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 612, 1030 + xy: 510, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 714, 1030 + xy: 510, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1020, 1030 + xy: 816, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 918, 928 + xy: 1122, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1020, 928 + xy: 1224, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1224, 826 + xy: 1326, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1530, 948 + xy: 1428, 846 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1734, 926 + xy: 1836, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1836, 926 + xy: 1734, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1734, 824 + xy: 1836, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1428, 744 + xy: 1530, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1632, 729 + xy: 1734, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1734, 722 + xy: 1836, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 490, 724 + xy: 592, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 490, 622 + xy: 694, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 694, 724 + xy: 592, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 592, 622 + xy: 796, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 796, 622 + xy: 1000, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 898, 622 + xy: 1102, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1000, 622 + xy: 1204, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1306, 622 + xy: 1408, 642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1510, 642 + xy: 1612, 627 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1612, 627 + xy: 1714, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 642, 316 + xy: 744, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 744, 418 + xy: 948, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1050, 316 + xy: 1152, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 948, 112 + xy: 1050, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1152, 316 + xy: 1254, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1050, 10 + xy: 1254, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/CityOverlay rotate: false - xy: 334, 1336 + xy: 436, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/CityOverlay rotate: false - xy: 334, 1336 + xy: 436, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2092,98 +2099,98 @@ TileSets/ThorfMaps/CrosshatchHexagon index: -1 TileSets/Default/Flood plainsOverlay rotate: false - xy: 1048, 1234 + xy: 1150, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/Flood plainsOverlay rotate: false - xy: 1048, 1234 + xy: 1150, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/ForestOverlay rotate: false - xy: 1048, 1132 + xy: 1150, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/ForestOverlay rotate: false - xy: 1048, 1132 + xy: 1150, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/HillOverlay rotate: false - xy: 1456, 1458 + xy: 1558, 1560 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/JungleOverlay rotate: false - xy: 1864, 1436 + xy: 1762, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/JungleOverlay rotate: false - xy: 1864, 1436 + xy: 1762, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/LakesOverlay rotate: false - xy: 1762, 1130 + xy: 1864, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/LakesOverlay rotate: false - xy: 1762, 1130 + xy: 1864, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 438, 436 + xy: 438, 334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/MarshOverlay rotate: false - xy: 438, 436 + xy: 438, 334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 918, 1030 + xy: 714, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 1020, 826 + xy: 1122, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/OasisOverlay rotate: false - xy: 1020, 826 + xy: 1122, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2337,7 +2344,7 @@ TileSets/FantasyHex/Plains index: -1 TileSets/FantasyHex/Plains+City rotate: false - xy: 1356, 117 + xy: 1356, 13 size: 32, 35 orig: 32, 35 offset: 0, 0 @@ -2517,72 +2524,79 @@ UnitIcons/Chariot Archer orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Chu-Ko-Nu + rotate: false + xy: 306, 742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 436, 1234 + xy: 538, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 640, 1336 + xy: 742, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Destroyer rotate: false - xy: 742, 1336 + xy: 844, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Frigate rotate: false - xy: 1150, 1132 + xy: 1252, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 1252, 1336 + xy: 1252, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Gatling Gun rotate: false - xy: 1252, 1234 + xy: 1252, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 1501, 1662 + xy: 1603, 1662 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 1603, 1662 + xy: 1705, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great General rotate: false - xy: 1705, 1646 + xy: 1660, 1136 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1705, 1646 + xy: 1660, 1136 size: 100, 94 orig: 100, 94 offset: 0, 0 @@ -2624,84 +2638,84 @@ UnitIcons/Horseman index: -1 UnitIcons/Infantry rotate: false - xy: 1660, 1238 + xy: 1660, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1762, 1436 + xy: 1660, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1762, 1232 + xy: 1864, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1864, 1130 + xy: 286, 639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 286, 537 + xy: 336, 435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 336, 129 + xy: 336, 27 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 336, 27 + xy: 1456, 1050 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 1558, 1050 + xy: 1660, 1034 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 438, 28 + xy: 408, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 612, 928 + xy: 816, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 816, 1030 + xy: 612, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 816, 928 + xy: 1020, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2715,77 +2729,77 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 1836, 824 + xy: 1938, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 898, 724 + xy: 796, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 1102, 724 + xy: 1000, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1408, 642 + xy: 1510, 642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1714, 620 + xy: 1816, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1918, 620 + xy: 1408, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 540, 418 + xy: 744, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 1050, 520 + xy: 642, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 744, 214 + xy: 846, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 1152, 520 + xy: 744, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1254, 418 + xy: 1050, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2799,21 +2813,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 1152, 112 + xy: 1254, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 744, 10 + xy: 948, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 846, 10 + xy: 1050, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2827,301 +2841,301 @@ UnitPromotionIcons/Accuracy_III_(Civ5) index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 277, 1568 + xy: 1660, 1640 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 386, 1110 + xy: 277, 1568 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 299, 1568 + xy: 386, 1110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 386, 1088 + xy: 1682, 1640 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 1364, 1744 + xy: 299, 1568 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 386, 1066 + xy: 386, 1088 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 1428, 1110 + xy: 1364, 1744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 460, 804 + xy: 386, 1066 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 1408, 154 + xy: 1428, 1110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 2015, 1791 + xy: 460, 804 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 1390, 132 + xy: 1408, 50 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 104, 16 + xy: 2015, 1791 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1564, 322 + xy: 1390, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 1966, 1055 + xy: 104, 16 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 1428, 1088 + xy: 1564, 322 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 460, 782 + xy: 1966, 1055 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1430, 154 + xy: 1428, 1088 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 2015, 1769 + xy: 460, 782 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 1412, 132 + xy: 1430, 50 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 1564, 300 + xy: 2015, 1769 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1966, 1033 + xy: 1412, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1428, 1066 + xy: 1564, 300 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1452, 154 + xy: 1966, 1033 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 2015, 1747 + xy: 1428, 1066 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1434, 132 + xy: 1452, 50 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1564, 278 + xy: 2015, 1747 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1474, 154 + xy: 1434, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1456, 132 + xy: 1564, 278 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1564, 256 + xy: 1474, 50 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1496, 154 + xy: 1456, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1478, 132 + xy: 1564, 256 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1564, 234 + xy: 1496, 50 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1518, 154 + xy: 1478, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1500, 132 + xy: 1564, 234 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1564, 212 + xy: 1518, 50 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1540, 154 + xy: 1500, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 1522, 132 + xy: 1564, 212 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1564, 190 + xy: 1540, 50 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 2020, 700 + xy: 1522, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 2020, 678 + xy: 1564, 190 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 2020, 656 + xy: 1564, 168 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 2020, 634 + xy: 1564, 146 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 2020, 612 + xy: 1564, 124 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 1196a3f7..64f6a209 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 99c54cdc..8a1c3e78 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -82,18 +82,16 @@ hurryCostModifier:25, requiredTech:"Masonry" }, - /* { name:"Walls of Babylon", replaces:"Walls", + cost:65, uniqueTo:"Babylon", cityStrength:6, cityHealth:100, hurryCostModifier:25, requiredTech:"Masonry" - //Babylonian unique building that replaces Walls. }, - */ { name:"The Pyramids", culture:1, diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 7af0bf4f..8270d9c4 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -29,14 +29,6 @@ Simplified_Chinese:"下一回合" Portuguese:"Proximo turno" Japanese:"次のターン" - Polish:"Następna tura" - Indonesian:"Giliran berikutnya" - Philippino:"Susunod na pagliko" - Czech:"Další otočení" - Slovak:"Ďalšie otočenie" - Sloven:"Naslednji zavoj" - Croatian:"Sljedeći red" - Danish:"Næste tur" } "Working...":{ // Displayed when next turn is being...turned @@ -5172,6 +5164,7 @@ Portuguese:"Muralhas" German:"Mauern" } + "Walls of Babylon":{} "The Pyramids":{ Italian:"Grandi Piramidi" @@ -6613,6 +6606,9 @@ German:"Kamel-Bogenschütze" French:"Archer méhariste" } + "Samurai":{} + "Combat very likely to create Great Generals":{} + // Renaissance units "Caravel":{ diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index 9021865f..3301ce02 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -431,9 +431,8 @@ hurryCostModifier:20, attackSound:"arrow" }, - /* { - name:"Chu-ko-nu", + name:"Chu-Ko-Nu", unitType:"Ranged", uniqueTo:"China", movement:2, @@ -444,11 +443,10 @@ requiredTech:"Machinery", upgradesTo:"Gatling Gun", obsoleteTech:"Industrialization", + promotions:["Logistics"], hurryCostModifier:20, attackSound:"arrow" - //Chinese unique unit. It is weaker than Crossbowman but can attack twice. }, - */ { name:"Longbowman", unitType:"Ranged", diff --git a/core/src/com/unciv/ui/NationTable.kt b/core/src/com/unciv/ui/NationTable.kt index b9229de0..d86bda7a 100644 --- a/core/src/com/unciv/ui/NationTable.kt +++ b/core/src/com/unciv/ui/NationTable.kt @@ -60,6 +60,12 @@ class NationTable(val nation: Nation, val newGameParameters: GameParameters, ski textList += " "+unique.tr() if (building.maintenance != originalBuilding.maintenance) textList += " {Maintenance} " + building.maintenance + " vs " + originalBuilding.maintenance + if(building.cost != originalBuilding.cost) + textList += " {Cost} " + building.cost + " vs " + originalBuilding.cost + if(building.cityStrength != originalBuilding.cityStrength) + textList += " {City strength} " + building.cityStrength+ " vs " + originalBuilding.cityStrength + if(building.cityHealth!= originalBuilding.cityHealth) + textList += " {City health} " + building.cityHealth+ " vs " + originalBuilding.cityHealth textList+="" } @@ -78,8 +84,9 @@ class NationTable(val nation: Nation, val newGameParameters: GameParameters, ski textList+= " {Movement} " + unit.movement+ " vs " + originalUnit.movement for(unique in unit.uniques.filterNot { it in originalUnit.uniques }) textList += " "+Translations.translateBonusOrPenalty(unique) - for(promotions in unit.promotions.filter { it !in originalUnit.promotions}) - textList += " "+promotions.tr() + for(promotion in unit.promotions.filter { it !in originalUnit.promotions}) + textList += " "+promotion.tr()+ " ("+Translations.translateBonusOrPenalty(GameBasics.UnitPromotions[promotion]!!.effect)+")" + textList+="" }