diff --git a/android/Images/BuildingIcons/Solar Plant.png b/android/Images/BuildingIcons/Solar Plant.png index fd0c9cb337..5d1d93e125 100644 Binary files a/android/Images/BuildingIcons/Solar Plant.png and b/android/Images/BuildingIcons/Solar Plant.png differ diff --git a/android/Images/TechIcons/Eccology.png b/android/Images/TechIcons/Ecology.png similarity index 100% rename from android/Images/TechIcons/Eccology.png rename to android/Images/TechIcons/Ecology.png diff --git a/android/assets/game.atlas b/android/assets/game.atlas index c5ea826517..daf7a71079 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,497 +6,497 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 1643, 1742 + xy: 1439, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 1847, 1742 + xy: 1643, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 334, 757 + xy: 1745, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 334, 247 + xy: 334, 756 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 464, 1706 + xy: 334, 246 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 566, 1706 + xy: 260, 1600 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 464, 1604 + xy: 362, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 668, 1604 + xy: 566, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 406, 1400 + xy: 668, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 712, 1502 + xy: 488, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 386, 1196 + xy: 386, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 692, 1196 + xy: 692, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 386, 1094 + xy: 384, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 690, 992 + xy: 436, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 436, 584 + xy: 538, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 436, 176 + xy: 538, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 538, 176 + xy: 640, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 742, 482 + xy: 742, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 742, 380 + xy: 742, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 844, 686 + xy: 844, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 872, 1690 + xy: 770, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 974, 1690 + xy: 872, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Harbor rotate: false - xy: 436, 74 + xy: 974, 1690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 538, 74 + xy: 436, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 794, 1196 + xy: 844, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 794, 1094 + xy: 794, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 946, 584 + xy: 896, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 946, 74 + xy: 1100, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 262, 43 + xy: 1202, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 916, 1486 + xy: 1304, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 1018, 1486 + xy: 1406, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1324, 1640 + xy: 1712, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1324, 1436 + xy: 1712, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 1426, 1538 + xy: 1814, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 1528, 1640 + xy: 1814, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 1528, 1538 + xy: 1202, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1630, 1538 + xy: 1508, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1732, 1640 + xy: 1610, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 1732, 1538 + xy: 1814, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1834, 1640 + xy: 1916, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1834, 1436 + xy: 1916, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1324, 1334 + xy: 996, 1282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1426, 1334 + xy: 1200, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1528, 1334 + xy: 1302, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1304, 1232 + xy: 946, 874 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1610, 1232 + xy: 946, 568 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 1304, 1130 + xy: 1048, 1131 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1916, 1232 + xy: 1048, 519 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1916, 1130 + xy: 1048, 417 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 996, 1078 + xy: 1048, 315 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1098, 1029 + xy: 1048, 213 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1048, 825 + xy: 1354, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant - rotate: false - xy: 204, 1344 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -BuildingIcons/Spaceship Factory - rotate: false - xy: 1048, 621 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stable - rotate: false - xy: 1048, 315 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stadium - rotate: false - xy: 1048, 213 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stock Exchange - rotate: false - xy: 1150, 824 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/Stone Works rotate: false xy: 1150, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Stonehenge +BuildingIcons/Spaceship Factory rotate: false xy: 1252, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Taj Mahal +BuildingIcons/Stable + rotate: false + xy: 1558, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Stadium + rotate: false + xy: 1150, 620 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Stock Exchange rotate: false xy: 1456, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Temple +BuildingIcons/Stone Works + rotate: false + xy: 1660, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Stonehenge rotate: false xy: 1150, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +BuildingIcons/Taj Mahal + rotate: false + xy: 1660, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Temple + rotate: false + xy: 1762, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/The Great Library - rotate: false - xy: 1252, 620 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Great Lighthouse - rotate: false - xy: 1354, 722 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Louvre - rotate: false - xy: 1456, 824 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Oracle - rotate: false - xy: 1558, 926 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -BuildingIcons/The Pyramids rotate: false xy: 1150, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Theatre +BuildingIcons/The Great Lighthouse + rotate: false + xy: 1252, 518 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/The Louvre rotate: false xy: 1354, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/University +BuildingIcons/The Oracle rotate: false - xy: 1252, 416 + xy: 1456, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Walls +BuildingIcons/The Pyramids + rotate: false + xy: 1558, 824 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Theatre + rotate: false + xy: 1762, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/University rotate: false xy: 1456, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +BuildingIcons/Walls + rotate: false + xy: 1660, 824 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/Windmill rotate: false - xy: 1150, 212 + xy: 1252, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1558, 620 + xy: 1660, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -510,84 +510,84 @@ FlagIcons/Dutch index: -1 FlagIcons/English rotate: false - xy: 204, 832 + xy: 204, 1034 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 204, 702 + xy: 204, 904 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 204, 572 + xy: 204, 774 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 204, 442 + xy: 204, 644 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 204, 312 + xy: 204, 514 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 204, 182 + xy: 204, 384 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 132, 2 + xy: 204, 254 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy rotate: false - xy: 1133, 1742 + xy: 132, 30 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 1541, 1742 + xy: 1337, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 508, 1400 + xy: 668, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 590, 1094 + xy: 588, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 538, 584 + xy: 640, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -601,168 +601,168 @@ ImprovementIcons/Farm index: -1 ImprovementIcons/Fishing Boats rotate: false - xy: 742, 686 + xy: 742, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 946, 176 + xy: 1100, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 916, 1588 + xy: 1304, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 916, 1384 + xy: 1406, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 1324, 1538 + xy: 1712, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1834, 1538 + xy: 1916, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1100, 1233 + xy: 946, 1078 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1712, 1232 + xy: 946, 466 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1100, 1131 + xy: 946, 262 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1100, 1131 + xy: 946, 262 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1610, 1130 + xy: 1048, 825 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1558, 824 + xy: 1150, 314 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 204, 962 + xy: 204, 1164 size: 178, 178 orig: 178, 178 offset: 0, 0 index: -1 OtherIcons/CircleOld rotate: false - xy: 590, 1196 + xy: 590, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 488, 1094 + xy: 486, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 640, 788 + xy: 436, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 436, 380 + xy: 538, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 742, 890 + xy: 742, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 1222, 1640 + xy: 1610, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1834, 1334 + xy: 1608, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1812, 1028 + xy: 1354, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1048, 723 + xy: 1456, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1762, 830 + xy: 1864, 932 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1354, 926 + xy: 1252, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -776,7 +776,7 @@ OtherIcons/civTableBackground index: -1 OtherIcons/tileTableBackground rotate: false - xy: 204, 1142 + xy: 204, 1344 size: 180, 200 orig: 180, 200 offset: 0, 0 @@ -790,7 +790,7 @@ OtherIcons/whiteDot index: -1 PolicyIcons/Aristocracy rotate: false - xy: 996, 1026 + xy: 894, 1230 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -804,476 +804,476 @@ PolicyIcons/Citizenship index: -1 PolicyIcons/Civil Society rotate: false - xy: 364, 93 + xy: 1949, 1792 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 814, 1332 + xy: 794, 1332 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1949, 1792 + xy: 1150, 160 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 896, 1128 + xy: 1252, 262 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1864, 976 + xy: 1354, 364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1150, 160 + xy: 1456, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1252, 262 + xy: 1558, 568 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1354, 364 + xy: 1660, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1456, 466 + xy: 1762, 772 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1558, 568 + xy: 1864, 880 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1660, 670 + xy: 1864, 828 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1762, 778 + xy: 1966, 1180 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1864, 924 + xy: 1966, 1128 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1916, 976 + xy: 1966, 1076 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1762, 726 + xy: 1966, 1024 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1864, 872 + xy: 1966, 972 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1916, 924 + xy: 312, 1548 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1916, 872 + xy: 1202, 160 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 312, 1548 + xy: 1304, 262 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 364, 41 + xy: 1406, 364 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1949, 1740 + xy: 1508, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1202, 160 + xy: 1610, 568 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1304, 262 + xy: 1712, 670 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1406, 364 + xy: 1814, 772 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1508, 466 + xy: 1916, 880 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1610, 568 + xy: 1916, 828 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1712, 670 + xy: 1150, 108 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1814, 778 + xy: 1202, 108 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1814, 726 + xy: 1866, 776 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1150, 108 + xy: 1918, 776 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1202, 108 + xy: 306, 194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1968, 976 + xy: 358, 194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1968, 924 + xy: 1968, 920 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1968, 872 + xy: 1968, 868 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1764, 674 + xy: 1970, 816 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1816, 674 + xy: 1970, 764 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1936, 1688 + xy: 336, 142 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1936, 1636 + xy: 336, 90 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1439, 1742 + xy: 1235, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 362, 1706 + xy: 334, 348 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 406, 1298 + xy: 590, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 588, 992 + xy: 538, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 640, 890 + xy: 436, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 640, 686 + xy: 436, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 538, 482 + xy: 640, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Fish rotate: false - xy: 742, 788 + xy: 742, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 742, 278 + xy: 742, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 844, 890 + xy: 844, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 844, 788 + xy: 844, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 844, 74 + xy: 742, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 894, 992 + xy: 794, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 946, 788 + xy: 794, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 946, 482 + xy: 998, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1018, 1588 + xy: 1304, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1732, 1436 + xy: 1916, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1732, 1334 + xy: 1506, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1710, 1028 + xy: 1252, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1914, 1028 + xy: 1150, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1048, 927 + xy: 1252, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1048, 417 + xy: 1456, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1252, 926 + xy: 1558, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1252, 722 + xy: 1456, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1354, 518 + xy: 1558, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1660, 824 + xy: 1864, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1762, 926 + xy: 1150, 212 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1252, 314 + xy: 1354, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 692, 1094 + xy: 690, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 384, 992 + xy: 436, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1315,7 +1315,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1426, 1436 + xy: 1100, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1336,7 +1336,7 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1202, 1130 + xy: 946, 160 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1350,469 +1350,469 @@ StatIcons/Science index: -1 StatIcons/Strength rotate: false - xy: 1150, 620 + xy: 1354, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Acoustics rotate: false - xy: 1235, 1742 + xy: 234, 49 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Agriculture rotate: false - xy: 1337, 1742 + xy: 1133, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Animal Husbandry rotate: false - xy: 1745, 1742 + xy: 1541, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 1745, 1742 + xy: 1541, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archaeology rotate: false - xy: 334, 655 + xy: 1847, 1742 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Archery rotate: false - xy: 334, 451 + xy: 334, 960 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Architecture rotate: false - xy: 334, 349 + xy: 334, 858 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Astronomy rotate: false - xy: 260, 1702 + xy: 334, 552 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Banking rotate: false - xy: 362, 1604 + xy: 260, 1702 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Biology rotate: false - xy: 668, 1706 + xy: 464, 1706 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Bronze Working rotate: false - xy: 406, 1502 + xy: 464, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Calendar rotate: false - xy: 508, 1502 + xy: 566, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chemistry rotate: false - xy: 712, 1298 + xy: 692, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 712, 1298 + xy: 692, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Chivalry rotate: false - xy: 488, 1196 + xy: 488, 1298 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Civil Service rotate: false - xy: 486, 992 + xy: 436, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Combustion rotate: false - xy: 436, 890 + xy: 538, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Compass rotate: false - xy: 538, 890 + xy: 436, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Computers rotate: false - xy: 436, 686 + xy: 538, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Construction rotate: false - xy: 538, 788 + xy: 640, 992 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Currency rotate: false - xy: 436, 482 + xy: 538, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Dynamite rotate: false - xy: 640, 584 + xy: 436, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Eccology +TechIcons/Ecology rotate: false - xy: 436, 278 + xy: 538, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Economics rotate: false - xy: 538, 380 + xy: 640, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Education rotate: false - xy: 640, 482 + xy: 436, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Electricity rotate: false - xy: 538, 278 + xy: 640, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Engineering rotate: false - xy: 640, 380 + xy: 538, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Fertilizer rotate: false - xy: 640, 176 + xy: 742, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Flight rotate: false - xy: 742, 584 + xy: 742, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Future Tech rotate: false - xy: 742, 176 + xy: 742, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Guilds rotate: false - xy: 844, 176 + xy: 844, 380 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Gunpowder rotate: false - xy: 770, 1690 + xy: 844, 278 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Horseback Riding rotate: false - xy: 640, 74 + xy: 538, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 946, 890 + xy: 896, 1588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 946, 686 + xy: 896, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 814, 1384 + xy: 1202, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 1018, 1384 + xy: 1508, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 1120, 1640 + xy: 1406, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 1120, 1538 + xy: 1508, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 1120, 1436 + xy: 1508, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 1222, 1538 + xy: 1610, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1222, 1436 + xy: 1610, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1426, 1640 + xy: 1814, 1640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 1528, 1436 + xy: 1406, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1630, 1436 + xy: 1712, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1222, 1334 + xy: 894, 1282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1630, 1334 + xy: 1404, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 896, 1282 + xy: 1710, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 998, 1282 + xy: 1812, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 896, 1180 + xy: 1914, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1202, 1232 + xy: 946, 976 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1406, 1232 + xy: 946, 772 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1508, 1232 + xy: 946, 670 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1814, 1232 + xy: 946, 364 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1508, 1130 + xy: 1048, 927 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1712, 1130 + xy: 1048, 723 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1814, 1130 + xy: 1048, 621 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1200, 1028 + xy: 1048, 111 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1302, 1028 + xy: 1150, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1404, 1028 + xy: 1150, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1048, 111 + xy: 1252, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1150, 926 + xy: 1354, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1252, 518 + xy: 1660, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1456, 722 + xy: 1864, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1660, 926 + xy: 1252, 416 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1660, 722 + xy: 1762, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1882,301 +1882,301 @@ TerrainIcons/Oasis index: -1 TerrainIcons/road rotate: false - xy: 204, 169 + xy: 132, 17 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 334, 553 + xy: 334, 1062 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 334, 145 + xy: 334, 654 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 260, 1600 + xy: 334, 450 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 566, 1604 + xy: 362, 1604 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 610, 1502 + xy: 386, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Caravel rotate: false - xy: 610, 1400 + xy: 386, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 712, 1400 + xy: 488, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 508, 1298 + xy: 590, 1400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 610, 1298 + xy: 692, 1502 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 436, 788 + xy: 640, 1094 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 538, 686 + xy: 640, 890 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Galleass rotate: false - xy: 792, 992 + xy: 792, 1196 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 844, 584 + xy: 844, 788 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 844, 482 + xy: 844, 686 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 844, 380 + xy: 844, 584 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 844, 278 + xy: 844, 482 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 742, 74 + xy: 640, 176 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 946, 380 + xy: 998, 1486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 946, 278 + xy: 998, 1384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 814, 1588 + xy: 1100, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 814, 1486 + xy: 1202, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 1630, 1640 + xy: 1304, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1120, 1335 + xy: 1098, 1233 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 998, 1180 + xy: 946, 1180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1406, 1130 + xy: 1048, 1029 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1506, 1028 + xy: 1252, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1608, 1028 + xy: 1150, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1048, 519 + xy: 1354, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1354, 824 + xy: 1558, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1150, 314 + xy: 1354, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 334, 859 + xy: 204, 151 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1558, 722 + xy: 1762, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1354, 416 + xy: 1456, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1456, 518 + xy: 1558, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 384, 970 + xy: 364, 1582 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 770, 1668 + xy: 364, 1560 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 792, 1668 + xy: 384, 1174 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 1076, 1770 + xy: 770, 1668 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 1048, 1056 + xy: 1076, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 996, 1004 + xy: 894, 1208 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 814, 1310 + xy: 1048, 1260 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 866, 1362 + xy: 1949, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2190,91 +2190,91 @@ UnitPromotionIcons/Cover_II_(Civ5) index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 896, 1106 + xy: 794, 1310 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 948, 1158 + xy: 846, 1362 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 262, 21 + xy: 1252, 240 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1252, 240 + xy: 1354, 342 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1354, 342 + xy: 1456, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1456, 444 + xy: 1558, 546 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1558, 546 + xy: 1660, 648 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1660, 648 + xy: 410, 224 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1864, 850 + xy: 1762, 750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1048, 89 + xy: 306, 172 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1936, 1614 + xy: 388, 172 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 204, 147 + xy: 336, 68 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 406, 970 + xy: 406, 1174 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -2288,42 +2288,42 @@ UnitPromotionIcons/Scouting_I_(Civ5) index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 792, 1646 + xy: 1076, 1748 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1076, 1748 + xy: 1098, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1098, 1770 + xy: 916, 1208 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1048, 1034 + xy: 1048, 1238 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1070, 1056 + xy: 1070, 1260 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1018, 1004 + xy: 1949, 1748 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 5b96d51f14..b623f5b344 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index 0135a7f412..134b05be69 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table +import com.badlogic.gdx.utils.Align import com.unciv.UnCivGame import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.TechManager @@ -37,7 +38,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() } class TechButton(techName:String, val techManager:TechManager) : Table(skin) { - val text=Label("",skin).setFontColor(Color.WHITE) + val text=Label("",skin).setFontColor(Color.WHITE).apply { setAlignment(Align.center) } init { touchable = Touchable.enabled defaults().pad(10f) @@ -50,13 +51,13 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() val remainingTech = techManager.remainingScienceToTech(techName) if(techCost!=remainingTech){ val percentComplete = (techCost-remainingTech)/techCost.toFloat() - add(ImageGetter.getProgressBarVertical(2f,30f,percentComplete, Color.BLUE, Color.WHITE)) + add(ImageGetter.getProgressBarVertical(2f,50f,percentComplete, Color.BLUE, Color.WHITE)) } rightSide.add(text).row() // here we add little images of what the tech gives you val techEnabledIcons = Table() - techEnabledIcons.defaults().pad(2.5f) + techEnabledIcons.defaults().pad(5f) for(unit in GameBasics.Units.values.filter { it.requiredTech==techName && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) }) diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 493f551cdb..b8b9304516 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -31,7 +31,7 @@ class WorldScreen : CameraStageBaseScreen() { val bottomBar = WorldScreenBottomBar(this) val unitActionsTable = UnitActionsTable(this) - private val techButton = Table().apply { background=ImageGetter.getDrawable("OtherIcons/civTableBackground.png").tint(colorFromRGB(7,46,43)); defaults().pad(10f) } + private val techButton = Table() val diplomacyButtonWrapper = Table() private val nextTurnButton = createNextTurnButton() @@ -170,19 +170,20 @@ class WorldScreen : CameraStageBaseScreen() { techButton.isVisible = civInfo.cities.isNotEmpty() techButton.clearChildren() - if (civInfo.tech.currentTechnology() == null) - techButton.add(Label("{Pick a tech}!".tr(),skin).setFontColor(Color.WHITE).setFont(22)) + + if (civInfo.tech.currentTechnology() == null) { + val buttonPic = Table().apply { background = ImageGetter.getDrawable("OtherIcons/civTableBackground.png").tint(colorFromRGB(7, 46, 43)); defaults().pad(10f) } + buttonPic.add(Label("{Pick a tech}!".tr(), skin).setFontColor(Color.WHITE).setFont(22)) + techButton.add(buttonPic) + } else { - val tech = civInfo.tech.currentTechnology()!! - if(ImageGetter.techIconExists(tech)) - techButton.add(ImageGetter.getTechIconGroup(tech)) - val costOfTech = civInfo.tech.costOfTech(tech).toFloat() - val percentComplete = (costOfTech-civInfo.tech.remainingScienceToTech(tech)) / costOfTech - techButton.add(ImageGetter.getProgressBarVertical(2f,30f,percentComplete, Color.BLUE, Color.WHITE)) - val turnsToTech = civInfo.tech.turnsToTech(tech) - techButton.add(Label(tech.tr() + "\r\n" - + turnsToTech + (if(turnsToTech>1) " {turns}".tr() else " {turn}".tr()),skin) - .setFontColor(Color.WHITE).setFont(22)) + val currentTech = civInfo.tech.currentTechnology()!! + val innerButton = TechPickerScreen.TechButton(currentTech,civInfo.tech) + innerButton.color = colorFromRGB(7, 46, 43) + techButton.add(innerButton) + val turnsToTech = civInfo.tech.turnsToTech(currentTech) + innerButton.text.setText(currentTech.tr() + "\r\n" + turnsToTech + + (if(turnsToTech>1) " {turns}".tr() else " {turn}".tr())) } techButton.setSize(techButton.prefWidth, techButton.prefHeight)