diff --git a/Credits.md b/Credits.md index 9389847c76..77b8a207c3 100644 --- a/Credits.md +++ b/Credits.md @@ -79,8 +79,11 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Pickaxe](https://thenounproject.com/term/pickaxe/175792/) By Creative Stall * [Food stall](https://thenounproject.com/term/food-stall/1618358/) By I Putu Kharismayadi * [Road](https://thenounproject.com/term/road/1600491/) By REVA +* [Ruins](https://thenounproject.com/term/ruins/175277/) By Creative Stall +* [Ruins](https://thenounproject.com/term/ruins/3849/) By Paulo Volkova ## Buildings + * [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516 * [Factory](https://thenounproject.com/term/factory/545906/) By icon 54 * [Factory](https://thenounproject.com/term/factory/1624235/) By Maxim Kulikov diff --git a/android/Images/ImprovementIcons/Ancient ruins.png b/android/Images/ImprovementIcons/Ancient ruins.png new file mode 100644 index 0000000000..d19fe61ff4 Binary files /dev/null and b/android/Images/ImprovementIcons/Ancient ruins.png differ diff --git a/android/Images/ImprovementIcons/City ruins.png b/android/Images/ImprovementIcons/City ruins.png new file mode 100644 index 0000000000..2a1777da95 Binary files /dev/null and b/android/Images/ImprovementIcons/City ruins.png differ diff --git a/android/Images/ImprovementIcons/Customs_house.png b/android/Images/ImprovementIcons/Customs house.png similarity index 100% rename from android/Images/ImprovementIcons/Customs_house.png rename to android/Images/ImprovementIcons/Customs house.png diff --git a/android/assets/game.atlas b/android/assets/game.atlas index a08655b6ea..0b854f32a2 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,476 +6,476 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 204, 916 + xy: 204, 814 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 204, 814 + xy: 204, 712 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 204, 712 + xy: 204, 610 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 204, 508 + xy: 204, 406 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 334, 1380 + xy: 334, 1278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 334, 1278 + xy: 334, 1176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 334, 1176 + xy: 306, 1074 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 306, 972 + xy: 306, 870 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 306, 870 + xy: 306, 768 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 306, 564 + xy: 306, 462 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 583, 1742 + xy: 685, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 787, 1742 + xy: 889, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 889, 1742 + xy: 991, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 1399, 1742 + xy: 1603, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 1705, 1742 + xy: 672, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 1182, 1640 + xy: 1386, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 1284, 1640 + xy: 1488, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 1590, 1640 + xy: 390, 1510 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 1692, 1640 + xy: 262, 54 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 408, 1074 + xy: 408, 870 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 408, 564 + xy: 408, 360 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 408, 462 + xy: 408, 258 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 408, 360 + xy: 408, 156 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 466, 54 + xy: 436, 1306 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 436, 1408 + xy: 436, 1204 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 1794, 1640 + xy: 1896, 1582 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 510, 898 + xy: 510, 694 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 510, 490 + xy: 510, 286 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 510, 184 + xy: 612, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 568, 82 + xy: 714, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 714, 1538 + xy: 918, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 918, 1538 + xy: 1122, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastary rotate: false - xy: 1020, 1538 + xy: 1224, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1122, 1538 + xy: 1326, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1326, 1538 + xy: 1530, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1530, 1538 + xy: 1734, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1632, 1538 + xy: 538, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1734, 1538 + xy: 640, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 538, 1436 + xy: 538, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 742, 1436 + xy: 640, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 538, 1232 + xy: 844, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 640, 1334 + xy: 742, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper maker rotate: false - xy: 844, 1436 + xy: 640, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 844, 1334 + xy: 1048, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 742, 1232 + xy: 946, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1150, 1436 + xy: 946, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1252, 1436 + xy: 1048, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1150, 1334 + xy: 1354, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1048, 1232 + xy: 1252, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Statis Chamber rotate: false - xy: 1354, 1436 + xy: 1150, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1456, 1334 + xy: 1660, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1660, 1436 + xy: 1456, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1660, 1334 + xy: 1660, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1558, 1232 + xy: 612, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1660, 1232 + xy: 612, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 612, 1028 + xy: 612, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 714, 1130 + xy: 714, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 612, 824 + xy: 816, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 714, 926 + xy: 918, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 816, 1028 + xy: 612, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 918, 1130 + xy: 714, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 612, 722 + xy: 816, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 714, 824 + xy: 918, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 816, 926 + xy: 1020, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 612, 620 + xy: 816, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 816, 824 + xy: 1020, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1122, 1130 + xy: 714, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 816, 722 + xy: 1020, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -543,107 +543,121 @@ ImprovementIcons/Academy orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Camp +ImprovementIcons/Ancient ruins rotate: false - xy: 306, 768 + xy: 204, 916 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -ImprovementIcons/Customs_house +ImprovementIcons/Camp rotate: false - xy: 774, 1640 + xy: 306, 666 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/City ruins + rotate: false + xy: 1195, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Customs house + rotate: false + xy: 978, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 1386, 1640 + xy: 1590, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 510, 1000 + xy: 510, 796 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 510, 592 + xy: 510, 388 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 510, 388 + xy: 510, 184 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 816, 1538 + xy: 1020, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 538, 1334 + xy: 538, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 742, 1334 + xy: 946, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 946, 1436 + xy: 742, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1048, 1436 + xy: 844, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 946, 1334 + xy: 1150, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 946, 1334 + xy: 1150, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 946, 1232 + xy: 1150, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 918, 1028 + xy: 612, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -657,70 +671,70 @@ OtherIcons/Circle index: -1 OtherIcons/CircleOld rotate: false - xy: 685, 1742 + xy: 787, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 991, 1742 + xy: 1093, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 672, 1640 + xy: 876, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 978, 1640 + xy: 1182, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 1488, 1640 + xy: 1692, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 612, 1538 + xy: 816, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1354, 1334 + xy: 1558, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1354, 1232 + xy: 1558, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 918, 830 + xy: 1122, 1034 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 612, 926 + xy: 816, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -825,49 +839,49 @@ PolicyIcons/Free Speech index: -1 PolicyIcons/Free Thought rotate: false - xy: 1020, 976 + xy: 1224, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1122, 1078 + xy: 612, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1224, 1180 + xy: 714, 568 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 612, 466 + xy: 816, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 714, 568 + xy: 918, 772 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 816, 670 + xy: 1020, 874 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 918, 778 + xy: 1122, 982 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -881,7 +895,7 @@ PolicyIcons/Militarism index: -1 PolicyIcons/Military Caste rotate: false - xy: 1020, 924 + xy: 1224, 1128 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -902,7 +916,7 @@ PolicyIcons/Monarchy index: -1 PolicyIcons/Oligarchy rotate: false - xy: 918, 726 + xy: 1122, 930 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -916,112 +930,112 @@ PolicyIcons/Organized Religion index: -1 PolicyIcons/Patronage rotate: false - xy: 1020, 872 + xy: 1224, 1076 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1328, 1180 + xy: 1276, 1128 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 612, 362 + xy: 1328, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1762, 1330 + xy: 612, 362 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1380, 1180 + xy: 1762, 1330 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 612, 310 + xy: 1276, 1076 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1762, 1278 + xy: 1328, 1128 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1432, 1180 + xy: 1380, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 612, 258 + xy: 612, 310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1484, 1180 + xy: 1762, 1278 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 612, 206 + xy: 1328, 1076 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1536, 1180 + xy: 1380, 1128 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1588, 1180 + xy: 1432, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1640, 1180 + xy: 612, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1692, 1180 + xy: 1380, 1076 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1072, 976 + xy: 1432, 1128 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1035,140 +1049,140 @@ ResourceIcons/Aluminum index: -1 ResourceIcons/Bananas rotate: false - xy: 204, 202 + xy: 334, 1380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 306, 360 + xy: 306, 258 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 1297, 1742 + xy: 1501, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 1603, 1742 + xy: 570, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 876, 1640 + xy: 1080, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 1080, 1640 + xy: 1284, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 390, 1510 + xy: 364, 54 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 262, 54 + xy: 408, 1074 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 364, 54 + xy: 408, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 408, 156 + xy: 436, 1408 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 436, 1306 + xy: 1794, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 436, 1204 + xy: 1896, 1684 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1896, 1684 + xy: 510, 1102 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 510, 286 + xy: 568, 82 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 640, 1436 + xy: 742, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1456, 1436 + xy: 1252, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1252, 1232 + xy: 1456, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1558, 1436 + xy: 1354, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1456, 1232 + xy: 1558, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 612, 1130 + xy: 714, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1182,35 +1196,35 @@ ResourceIcons/Sugar index: -1 ResourceIcons/Uranium rotate: false - xy: 714, 722 + xy: 918, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1020, 1028 + xy: 612, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 612, 518 + xy: 816, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 1093, 1742 + xy: 1297, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 1195, 1742 + xy: 1399, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1252,7 +1266,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1224, 1538 + xy: 1428, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1273,7 +1287,7 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 844, 1232 + xy: 1048, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1287,7 +1301,7 @@ StatIcons/Science index: -1 StatIcons/Strength rotate: false - xy: 714, 1028 + xy: 612, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1350,140 +1364,140 @@ TerrainIcons/road index: -1 UnitIcons/Archer rotate: false - xy: 204, 610 + xy: 204, 508 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 204, 406 + xy: 204, 304 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 204, 304 + xy: 204, 202 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 306, 1074 + xy: 306, 972 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 306, 666 + xy: 306, 564 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 306, 462 + xy: 306, 360 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 306, 258 + xy: 306, 156 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 306, 156 + xy: 583, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 1501, 1742 + xy: 1705, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 570, 1640 + xy: 774, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 408, 972 + xy: 408, 768 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 408, 870 + xy: 408, 666 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 408, 768 + xy: 408, 564 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 408, 666 + xy: 408, 462 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 408, 258 + xy: 466, 54 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1896, 1582 + xy: 510, 1000 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 510, 1102 + xy: 510, 898 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 510, 796 + xy: 510, 592 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 510, 694 + xy: 510, 490 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1428, 1538 + xy: 1632, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1497,217 +1511,217 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 640, 1232 + xy: 844, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1048, 1334 + xy: 1252, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1252, 1334 + xy: 1456, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1150, 1232 + xy: 1354, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1558, 1334 + xy: 1660, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 816, 1130 + xy: 714, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1020, 1130 + xy: 714, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 918, 926 + xy: 1122, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 714, 620 + xy: 918, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 612, 184 + xy: 1814, 1516 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 634, 184 + xy: 2007, 2024 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 1814, 1516 + xy: 306, 1200 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 2007, 2024 + xy: 390, 1488 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 306, 1200 + xy: 256, 180 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 390, 1488 + xy: 1807, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 256, 180 + xy: 522, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1807, 1770 + xy: 436, 1182 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 522, 32 + xy: 510, 162 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 436, 1182 + xy: 568, 60 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 510, 162 + xy: 538, 1210 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 568, 60 + xy: 664, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 538, 1210 + xy: 714, 546 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1174, 1108 + xy: 766, 598 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1224, 1158 + xy: 816, 648 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 664, 496 + xy: 868, 700 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 714, 546 + xy: 918, 750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 766, 598 + xy: 970, 802 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 816, 648 + xy: 1020, 852 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 868, 700 + xy: 1072, 904 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 970, 808 + xy: 1174, 1012 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1020, 850 + xy: 1224, 1054 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1721,28 +1735,28 @@ UnitPromotionIcons/Scouting_I_(Civ5) index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1072, 954 + xy: 1484, 1210 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1122, 1056 + xy: 612, 236 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 440, 1627 + xy: 1432, 1106 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 656, 184 + xy: 440, 1627 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 53c30b1aab..fb33918325 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/TileImprovements.json b/android/assets/jsons/TileImprovements.json index 09594dd5a1..a71b4a3135 100644 --- a/android/assets/jsons/TileImprovements.json +++ b/android/assets/jsons/TileImprovements.json @@ -126,5 +126,12 @@ gold:4, improvingTech:"Economics", improvingTechStats:{gold:1} + }, + + { + name:"Ancient ruins" + }, + { + name:"City ruins" } ] \ No newline at end of file diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 433b85b3d1..9488003886 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -186,6 +186,7 @@ class CityInfo { fun destroyCity() { civInfo.cities.remove(this) getTiles().forEach { expansion.relinquishOwnership(it) } + getCenterTile().improvement="City ruins" } fun moveToCiv(newCivInfo: CivilizationInfo){