From 8b12b80f34eb929f8712b693918be584f704b6aa Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 3 Nov 2018 19:19:30 +0200 Subject: [PATCH] Fixed images of Burial Tomb and Paper Maker Techs now display little icons of their effects --- .../{Burial Tomb.png => Burial Tomb.png} | Bin android/assets/game.atlas | 2330 +++++++++++++++++ android/build.gradle | 4 +- .../com/unciv/ui/cityscreen/CityStatsTable.kt | 2 +- .../ui/pickerscreens/TechPickerScreen.kt | 15 +- .../com/unciv/ui/tilegroups/WorldTileGroup.kt | 2 +- core/src/com/unciv/ui/utils/ImageGetter.kt | 63 +- 7 files changed, 2372 insertions(+), 44 deletions(-) rename android/Images/BuildingIcons/{Burial Tomb.png => Burial Tomb.png} (100%) create mode 100644 android/assets/game.atlas diff --git a/android/Images/BuildingIcons/Burial Tomb.png b/android/Images/BuildingIcons/Burial Tomb.png similarity index 100% rename from android/Images/BuildingIcons/Burial Tomb.png rename to android/Images/BuildingIcons/Burial Tomb.png diff --git a/android/assets/game.atlas b/android/assets/game.atlas new file mode 100644 index 0000000000..c5ea826517 --- /dev/null +++ b/android/assets/game.atlas @@ -0,0 +1,2330 @@ + +game.png +size: 2048,2048 +format: RGBA8888 +filter: MipMapLinearLinear,MipMapLinearLinear +repeat: none +BuildingIcons/Angkor Wat + rotate: false + xy: 1643, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Apollo Program + rotate: false + xy: 1847, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Aqueduct + rotate: false + xy: 334, 757 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Armory + rotate: false + xy: 334, 247 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Bank + rotate: false + xy: 464, 1706 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Barracks + rotate: false + xy: 566, 1706 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Bazaar + rotate: false + xy: 464, 1604 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Broadcast Tower + rotate: false + xy: 668, 1604 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Burial Tomb + rotate: false + xy: 406, 1400 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Castle + rotate: false + xy: 712, 1502 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Chichen Itza + rotate: false + xy: 386, 1196 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Circus + rotate: false + xy: 692, 1196 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Circus Maximus + rotate: false + xy: 386, 1094 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Colloseum + rotate: false + xy: 690, 992 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Cristo Redentor + rotate: false + xy: 436, 584 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Eiffel Tower + rotate: false + xy: 436, 176 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Factory + rotate: false + xy: 538, 176 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Forbidden Palace + rotate: false + xy: 742, 482 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Forge + rotate: false + xy: 742, 380 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Granary + rotate: false + xy: 844, 686 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Hagia Sophia + rotate: false + xy: 872, 1690 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Hanging Gardens + rotate: false + xy: 974, 1690 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Harbor + rotate: false + xy: 436, 74 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Hermitage + rotate: false + xy: 538, 74 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Hospital + rotate: false + xy: 794, 1196 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Hydro Plant + rotate: false + xy: 794, 1094 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Ironworks + rotate: false + xy: 946, 584 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Library + rotate: false + xy: 946, 74 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Lighthouse + rotate: false + xy: 262, 43 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Machu Pichu + rotate: false + xy: 916, 1486 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Market + rotate: false + xy: 1018, 1486 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Military Academy + rotate: false + xy: 1324, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Mint + rotate: false + xy: 1324, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Monastery + rotate: false + xy: 1426, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Monument + rotate: false + xy: 1528, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Museum + rotate: false + xy: 1528, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/National College + rotate: false + xy: 1630, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Notre Dame + rotate: false + xy: 1732, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Nuclear Plant + rotate: false + xy: 1732, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Observatory + rotate: false + xy: 1834, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Opera House + rotate: false + xy: 1834, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Oxford University + rotate: false + xy: 1324, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Palace + rotate: false + xy: 1426, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Paper Maker + rotate: false + xy: 1528, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Porcelain Tower + rotate: false + xy: 1304, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Public School + rotate: false + xy: 1610, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Research Lab + rotate: false + xy: 1304, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/SS Booster + rotate: false + xy: 1916, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/SS Cockpit + rotate: false + xy: 1916, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/SS Engine + rotate: false + xy: 996, 1078 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/SS Stasis Chamber + rotate: false + xy: 1098, 1029 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Sistine Chapel + rotate: false + xy: 1048, 825 + 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 + rotate: false + xy: 1252, 824 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Taj Mahal + rotate: false + xy: 1456, 926 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Temple + rotate: false + xy: 1150, 518 + 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 + rotate: false + xy: 1354, 620 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/University + rotate: false + xy: 1252, 416 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Walls + rotate: false + xy: 1456, 620 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Windmill + rotate: false + xy: 1150, 212 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Workshop + rotate: false + xy: 1558, 620 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +FlagIcons/Dutch + rotate: false + xy: 2, 2 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/English + rotate: false + xy: 204, 832 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/French + rotate: false + xy: 204, 702 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/German + rotate: false + xy: 204, 572 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/Italian + rotate: false + xy: 204, 442 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/Romanian + rotate: false + xy: 204, 312 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/Russian + rotate: false + xy: 204, 182 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/Spanish + rotate: false + xy: 132, 2 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +ImprovementIcons/Academy + rotate: false + xy: 1133, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Ancient ruins + rotate: false + xy: 1541, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Camp + rotate: false + xy: 508, 1400 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/City ruins + rotate: false + xy: 590, 1094 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Customs house + rotate: false + xy: 538, 584 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Farm + rotate: false + xy: 640, 278 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Fishing Boats + rotate: false + xy: 742, 686 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Landmark + rotate: false + xy: 946, 176 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Lumber mill + rotate: false + xy: 916, 1588 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Manufactory + rotate: false + xy: 916, 1384 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Mine + rotate: false + xy: 1324, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Oil well + rotate: false + xy: 1834, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Plantation + rotate: false + xy: 1100, 1233 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Quarry + rotate: false + xy: 1712, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Railroad + rotate: false + xy: 1100, 1131 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Railroad + rotate: false + xy: 1100, 1131 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Road + rotate: false + xy: 1610, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Trading post + rotate: false + xy: 1558, 824 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Circle + rotate: false + xy: 204, 962 + size: 178, 178 + orig: 178, 178 + offset: 0, 0 + index: -1 +OtherIcons/CircleOld + rotate: false + xy: 590, 1196 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/City + rotate: false + xy: 488, 1094 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Crosshair + rotate: false + xy: 640, 788 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/DisbandUnit + rotate: false + xy: 436, 380 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Fire + rotate: false + xy: 742, 890 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/MenuIcon + rotate: false + xy: 1222, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Pentagon + rotate: false + xy: 1834, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Shield + rotate: false + xy: 1812, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Sleep + rotate: false + xy: 1048, 723 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/Star + rotate: false + xy: 1762, 830 + size: 100, 94 + orig: 100, 94 + offset: 0, 0 + index: -1 +OtherIcons/Stop + rotate: false + xy: 1354, 926 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +OtherIcons/civTableBackground + rotate: false + xy: 831, 1792 + size: 300, 50 + orig: 300, 50 + offset: 0, 0 + index: -1 +OtherIcons/tileTableBackground + rotate: false + xy: 204, 1142 + size: 180, 200 + orig: 180, 200 + offset: 0, 0 + index: -1 +OtherIcons/whiteDot + rotate: false + xy: 2043, 2043 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +PolicyIcons/Aristocracy + rotate: false + xy: 996, 1026 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Citizenship + rotate: false + xy: 260, 1548 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Civil Society + rotate: false + xy: 364, 93 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Collective Rule + rotate: false + xy: 814, 1332 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Constitution + rotate: false + xy: 1949, 1792 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Democracy + rotate: false + xy: 896, 1128 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Discipline + rotate: false + xy: 1864, 976 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Entrepreneurship + rotate: false + xy: 1150, 160 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Facism + rotate: false + xy: 1252, 262 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Free Religion + rotate: false + xy: 1354, 364 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Free Speech + rotate: false + xy: 1456, 466 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Free Thought + rotate: false + xy: 1558, 568 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Humanism + rotate: false + xy: 1660, 670 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Landed Elite + rotate: false + xy: 1762, 778 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Legalism + rotate: false + xy: 1864, 924 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Mandate Of Heaven + rotate: false + xy: 1916, 976 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Mercantilism + rotate: false + xy: 1762, 726 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Meritocracy + rotate: false + xy: 1864, 872 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Militarism + rotate: false + xy: 1916, 924 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Military Caste + rotate: false + xy: 1916, 872 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Military Tradition + rotate: false + xy: 312, 1548 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Monarchy + rotate: false + xy: 364, 41 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Oligarchy + rotate: false + xy: 1949, 1740 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Organized Religion + rotate: false + xy: 1202, 160 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Patronage + rotate: false + xy: 1304, 262 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Police State + rotate: false + xy: 1406, 364 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Populism + rotate: false + xy: 1508, 466 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Professional Army + rotate: false + xy: 1610, 568 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Protectionism + rotate: false + xy: 1712, 670 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Reformation + rotate: false + xy: 1814, 778 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Representation + rotate: false + xy: 1814, 726 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Republic + rotate: false + xy: 1150, 108 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Scientific Revolution + rotate: false + xy: 1202, 108 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Secularism + rotate: false + xy: 1968, 976 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Sovereignty + rotate: false + xy: 1968, 924 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Theocracy + rotate: false + xy: 1968, 872 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Total War + rotate: false + xy: 1764, 674 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Trade Unions + rotate: false + xy: 1816, 674 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Universal Suffrage + rotate: false + xy: 1936, 1688 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +PolicyIcons/Warrior Code + rotate: false + xy: 1936, 1636 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +ResourceIcons/Aluminum + rotate: false + xy: 1439, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Bananas + rotate: false + xy: 362, 1706 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Cattle + rotate: false + xy: 406, 1298 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Coal + rotate: false + xy: 588, 992 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Cotton + rotate: false + xy: 640, 890 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Deer + rotate: false + xy: 640, 686 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Dyes + rotate: false + xy: 538, 482 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Fish + rotate: false + xy: 742, 788 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Furs + rotate: false + xy: 742, 278 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Gems + rotate: false + xy: 844, 890 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Gold + rotate: false + xy: 844, 788 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Horses + rotate: false + xy: 844, 74 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Incense + rotate: false + xy: 894, 992 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Iron + rotate: false + xy: 946, 788 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Ivory + rotate: false + xy: 946, 482 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Marble + rotate: false + xy: 1018, 1588 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Oil + rotate: false + xy: 1732, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Pearls + rotate: false + xy: 1732, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Sheep + rotate: false + xy: 1710, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Silk + rotate: false + xy: 1914, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Silver + rotate: false + xy: 1048, 927 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Spices + rotate: false + xy: 1048, 417 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Stone + rotate: false + xy: 1252, 926 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Sugar + rotate: false + xy: 1252, 722 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Uranium + rotate: false + xy: 1354, 518 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Whales + rotate: false + xy: 1660, 824 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Wheat + rotate: false + xy: 1762, 926 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ResourceIcons/Wine + rotate: false + xy: 1252, 314 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +StatIcons/CityConnection + rotate: false + xy: 692, 1094 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +StatIcons/City_Center_(Civ6) + rotate: false + xy: 384, 992 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +StatIcons/Culture + rotate: false + xy: 2, 1344 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/Food + rotate: false + xy: 2, 1142 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/Gold + rotate: false + xy: 2, 940 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/Happiness + rotate: false + xy: 1235, 1844 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/Malcontent + rotate: false + xy: 1437, 1844 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/Movement + rotate: false + xy: 1426, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +StatIcons/Population + rotate: false + xy: 2, 334 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/Production + rotate: false + xy: 1841, 1844 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/RangedStrength + rotate: false + xy: 1202, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +StatIcons/Science + rotate: false + xy: 2, 132 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +StatIcons/Strength + rotate: false + xy: 1150, 620 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Acoustics + rotate: false + xy: 1235, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Agriculture + rotate: false + xy: 1337, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Animal Husbandry + rotate: false + xy: 1745, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Pasture + rotate: false + xy: 1745, 1742 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Archaeology + rotate: false + xy: 334, 655 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Archery + rotate: false + xy: 334, 451 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Architecture + rotate: false + xy: 334, 349 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Astronomy + rotate: false + xy: 260, 1702 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Banking + rotate: false + xy: 362, 1604 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Biology + rotate: false + xy: 668, 1706 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Bronze Working + rotate: false + xy: 406, 1502 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Calendar + rotate: false + xy: 508, 1502 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Chemistry + rotate: false + xy: 712, 1298 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +BuildingIcons/Medical Lab + rotate: false + xy: 712, 1298 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Chivalry + rotate: false + xy: 488, 1196 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Civil Service + rotate: false + xy: 486, 992 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Combustion + rotate: false + xy: 436, 890 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Compass + rotate: false + xy: 538, 890 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Computers + rotate: false + xy: 436, 686 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Construction + rotate: false + xy: 538, 788 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Currency + rotate: false + xy: 436, 482 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Dynamite + rotate: false + xy: 640, 584 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Eccology + rotate: false + xy: 436, 278 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Economics + rotate: false + xy: 538, 380 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Education + rotate: false + xy: 640, 482 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Electricity + rotate: false + xy: 538, 278 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Engineering + rotate: false + xy: 640, 380 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Fertilizer + rotate: false + xy: 640, 176 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Flight + rotate: false + xy: 742, 584 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Future Tech + rotate: false + xy: 742, 176 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Guilds + rotate: false + xy: 844, 176 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Gunpowder + rotate: false + xy: 770, 1690 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Horseback Riding + rotate: false + xy: 640, 74 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Industrialization + rotate: false + xy: 946, 890 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Iron Working + rotate: false + xy: 946, 686 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Machinery + rotate: false + xy: 814, 1384 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Masonry + rotate: false + xy: 1018, 1384 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Mass Media + rotate: false + xy: 1120, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Mathematics + rotate: false + xy: 1120, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Metal Casting + rotate: false + xy: 1120, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Metallurgy + rotate: false + xy: 1222, 1538 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Military Science + rotate: false + xy: 1222, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Mining + rotate: false + xy: 1426, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Nanotechnology + rotate: false + xy: 1528, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Nuclear Fission + rotate: false + xy: 1630, 1436 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Optics + rotate: false + xy: 1222, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Particle Physics + rotate: false + xy: 1630, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Pharmaceuticals + rotate: false + xy: 896, 1282 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Philosophy + rotate: false + xy: 998, 1282 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Physics + rotate: false + xy: 896, 1180 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Plastics + rotate: false + xy: 1202, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Pottery + rotate: false + xy: 1406, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Printing Press + rotate: false + xy: 1508, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Radio + rotate: false + xy: 1814, 1232 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Rifling + rotate: false + xy: 1508, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Robotics + rotate: false + xy: 1712, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Rocketry + rotate: false + xy: 1814, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Sailing + rotate: false + xy: 1200, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Satellites + rotate: false + xy: 1302, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Scientific Theory + rotate: false + xy: 1404, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Steam Power + rotate: false + xy: 1048, 111 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Steel + rotate: false + xy: 1150, 926 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/The Wheel + rotate: false + xy: 1252, 518 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Theology + rotate: false + xy: 1456, 722 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Trapping + rotate: false + xy: 1660, 926 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Writing + rotate: false + xy: 1660, 722 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TerrainIcons/CrosshatchHexagon + rotate: false + xy: 281, 1808 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 +TerrainIcons/CrosshatchHexagon1 + rotate: false + xy: 556, 1808 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 +TerrainIcons/Flood plains + rotate: false + xy: 831, 1844 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +TerrainIcons/Fog + rotate: false + xy: 2, 1546 + size: 256, 256 + orig: 256, 256 + offset: 0, 0 + index: -1 +TerrainIcons/Forest + rotate: false + xy: 1033, 1844 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +TerrainIcons/Hexagon + rotate: false + xy: 2, 1804 + size: 277, 240 + orig: 277, 240 + offset: 0, 0 + index: -1 +TerrainIcons/Jungle + rotate: false + xy: 2, 738 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +TerrainIcons/Marsh + rotate: false + xy: 2, 536 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +TerrainIcons/Oasis + rotate: false + xy: 1639, 1844 + size: 200, 200 + orig: 200, 200 + offset: 0, 0 + index: -1 +TerrainIcons/road + rotate: false + xy: 204, 169 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +UnitIcons/Archer + rotate: false + xy: 334, 553 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Artillery + rotate: false + xy: 334, 145 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Ballista + rotate: false + xy: 260, 1600 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Bowman + rotate: false + xy: 566, 1604 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Cannon + rotate: false + xy: 610, 1502 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Caravel + rotate: false + xy: 610, 1400 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Catapult + rotate: false + xy: 712, 1400 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Cavalry + rotate: false + xy: 508, 1298 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Chariot Archer + rotate: false + xy: 610, 1298 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Companion Cavalry + rotate: false + xy: 436, 788 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Crossbowman + rotate: false + xy: 538, 686 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Galleass + rotate: false + xy: 792, 992 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Great Artist + rotate: false + xy: 844, 584 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Great Engineer + rotate: false + xy: 844, 482 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Great Merchant + rotate: false + xy: 844, 380 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Great Scientist + rotate: false + xy: 844, 278 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Horseman + rotate: false + xy: 742, 74 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Knight + rotate: false + xy: 946, 380 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Lancer + rotate: false + xy: 946, 278 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Longbowman + rotate: false + xy: 814, 1588 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Longswordsman + rotate: false + xy: 814, 1486 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Musketeer + rotate: false + xy: 1630, 1640 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Musketman + rotate: false + xy: 1120, 1335 + size: 100, 99 + orig: 100, 99 + offset: 0, 0 + index: -1 +UnitIcons/Pikeman + rotate: false + xy: 998, 1180 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Rifleman + rotate: false + xy: 1406, 1130 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Scout + rotate: false + xy: 1506, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Settler + rotate: false + xy: 1608, 1028 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Spearman + rotate: false + xy: 1048, 519 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Swordsman + rotate: false + xy: 1354, 824 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Trebuchet + rotate: false + xy: 1150, 314 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Trireme + rotate: false + xy: 334, 859 + size: 100, 101 + orig: 100, 101 + offset: 0, 0 + index: -1 +UnitIcons/Warrior + rotate: false + xy: 1558, 722 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Work Boats + rotate: false + xy: 1354, 416 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitIcons/Worker + rotate: false + xy: 1456, 518 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Accuracy_III_(Civ5) + rotate: false + xy: 384, 970 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Accuracy_II_(Civ5) + rotate: false + xy: 770, 1668 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Accuracy_I_(Civ5) + rotate: false + xy: 792, 1668 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Barrage_III_(Civ5) + rotate: false + xy: 1076, 1770 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Barrage_II_(Civ5) + rotate: false + xy: 1048, 1056 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Barrage_I_(Civ5) + rotate: false + xy: 996, 1004 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Blitz_(Civ5) + rotate: false + xy: 814, 1310 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Charge_(Civ5) + rotate: false + xy: 866, 1362 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Cover_II_(Civ5) + rotate: false + xy: 2001, 1822 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Cover_I_(Civ5) + rotate: false + xy: 896, 1106 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Drill_III_(Civ5) + rotate: false + xy: 948, 1158 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Drill_II_(Civ5) + rotate: false + xy: 262, 21 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Drill_I_(Civ5) + rotate: false + xy: 1252, 240 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Formation_II_(Civ5) + rotate: false + xy: 1354, 342 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Formation_I_(Civ5) + rotate: false + xy: 1456, 444 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Indirect_Fire_(Civ5) + rotate: false + xy: 1558, 546 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Logistics_(Civ5) + rotate: false + xy: 1660, 648 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/March_(Civ5) + rotate: false + xy: 1864, 850 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Mobility_(Civ5) + rotate: false + xy: 1048, 89 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Range_(Civ5) + rotate: false + xy: 1936, 1614 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Scouting_III_(Civ5) + rotate: false + xy: 204, 147 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Scouting_II_(Civ5) + rotate: false + xy: 406, 970 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Scouting_I_(Civ5) + rotate: false + xy: 770, 1646 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Sentry_(Civ5) + rotate: false + xy: 792, 1646 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Shock_III_(Civ5) + rotate: false + xy: 1076, 1748 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Shock_II_(Civ5) + rotate: false + xy: 1098, 1770 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Shock_I_(Civ5) + rotate: false + xy: 1048, 1034 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Siege_(Civ5) + rotate: false + xy: 1070, 1056 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Volley_(Civ5) + rotate: false + xy: 1018, 1004 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 diff --git a/android/build.gradle b/android/build.gradle index df18bc4e50..62db2c6d73 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 154 - versionName "2.9.7" + versionCode 155 + versionName "2.9.8" } buildTypes { release { diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt index 50130afc0a..aab32032ea 100644 --- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt @@ -49,7 +49,7 @@ class CityStatsTable(val cityScreen: CityScreen) : Table(){ val buildingPickButton = Button(CameraStageBaseScreen.skin) val buildingText = city.cityConstructions.getCityProductionTextForCityButton() buildingPickButton.add(ImageGetter.getConstructionImage(city.cityConstructions.currentConstruction)) - .size(40f).padRight(5f) + .size(30f).pad(5f) buildingPickButton.add(Label(buildingText , CameraStageBaseScreen.skin).setFontColor(Color.WHITE)) buildingPickButton.onClick { UnCivGame.Current.screen = ConstructionPickerScreen(city) diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index b9ca7076ef..0135a7f412 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -56,22 +56,25 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() // here we add little images of what the tech gives you val techEnabledIcons = Table() - + techEnabledIcons.defaults().pad(2.5f) for(unit in GameBasics.Units.values.filter { it.requiredTech==techName && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) }) - techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name)).size(25f).pad(2.5f) + techEnabledIcons.add(ImageGetter.IconCircleGroup(30f,ImageGetter.getConstructionImage(unit.name))) for(building in GameBasics.Buildings.values.filter { it.requiredTech==techName && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName)}) - techEnabledIcons.add(ImageGetter.getConstructionImage(building.name)).size(25f).pad(2.5f) + techEnabledIcons.add(ImageGetter.IconCircleGroup(30f,ImageGetter.getConstructionImage(building.name))) - for(improvement in GameBasics.TileImprovements.values.filter { it.techRequired==techName }) { + for(improvement in GameBasics.TileImprovements.values.filter { it.techRequired==techName || it.improvingTech==techName }) { if(improvement.name.startsWith("Remove")) - techEnabledIcons.add(ImageGetter.getImage("OtherIcons/Stop")).size(25f).pad(2.5f) - else techEnabledIcons.add(ImageGetter.getImprovementIcon(improvement.name, 25f)).pad(2.5f) + techEnabledIcons.add(ImageGetter.getImage("OtherIcons/Stop")).size(30f) + else techEnabledIcons.add(ImageGetter.getImprovementIcon(improvement.name, 30f)) } + for(resource in GameBasics.TileResources.values.filter { it.revealedBy==techName }) + techEnabledIcons.add(ImageGetter.getResourceImage(resource.name,30f)) + rightSide.add(techEnabledIcons) add(rightSide) diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt index 3679128340..215f9b1efe 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt @@ -138,7 +138,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) { val circle = ImageGetter.getImage("OtherIcons/Circle") circle.setSize(25f,25f) val image = ImageGetter.getConstructionImage(cityConstructions.currentConstruction) - image.setSize(20f,20f) + image.setSize(18f,18f) image.centerY(group) image.x = group.width-image.width diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index f1d5d0c4a6..39ff78e84e 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -67,24 +67,18 @@ object ImageGetter { } fun getImprovementIcon(improvementName:String, size:Float=20f):Actor{ - val group= Group() - val circle = getImage("OtherIcons/Circle").apply { setSize(size,size) } + val iconGroup = IconCircleGroup(size, getImage("ImprovementIcons/$improvementName")) val improvement = GameBasics.TileImprovements[improvementName]!! when { - improvement.food>0 -> circle.color= Color.GREEN.cpy().lerp(Color.WHITE,0.5f) - improvement.production>0 -> circle.color= Color.BROWN.cpy().lerp(Color.WHITE,0.5f) - improvement.gold>0 -> circle.color= Color.GOLD.cpy().lerp(Color.WHITE,0.5f) - improvement.science>0 -> circle.color= Color.GOLD.cpy().lerp(Color.BLUE,0.5f) - improvement.culture>0 -> circle.color= Color.GOLD.cpy().lerp(Color.PURPLE,0.5f) + improvement.food>0 -> iconGroup.circle.color= Color.GREEN.cpy().lerp(Color.WHITE,0.5f) + improvement.production>0 -> iconGroup.circle.color= Color.BROWN.cpy().lerp(Color.WHITE,0.5f) + improvement.gold>0 -> iconGroup.circle.color= Color.GOLD.cpy().lerp(Color.WHITE,0.5f) + improvement.science>0 -> iconGroup.circle.color= Color.GOLD.cpy().lerp(Color.BLUE,0.5f) + improvement.culture>0 -> iconGroup.circle.color= Color.GOLD.cpy().lerp(Color.PURPLE,0.5f) } - - group.setSize(size,size) - group.addActor(circle) - group.addActor(getImage("ImprovementIcons/$improvementName") - .apply { setSize(size*0.8f,size*0.8f); center(group) }) - return group + return iconGroup } fun getConstructionImage(construction: String): Image { @@ -109,40 +103,29 @@ object ImageGetter { } fun getResourceImage(resourceName: String, size:Float): Actor { - val group= Group() + val iconGroup = IconCircleGroup(size,getImage("ResourceIcons/$resourceName")) val resource = GameBasics.TileResources[resourceName]!! - val circle = getImage("OtherIcons/Circle").apply { setSize(size,size) } - if(resource.food>0) circle.color= Color.GREEN.cpy().lerp(Color.WHITE,0.5f) - else if(resource.production>0) circle.color= Color.BROWN.cpy().lerp(Color.WHITE,0.5f) - else if(resource.gold>0) circle.color= Color.GOLD.cpy().lerp(Color.WHITE,0.5f) + if(resource.food>0) iconGroup.circle.color= Color.GREEN.cpy().lerp(Color.WHITE,0.5f) + else if(resource.production>0) iconGroup.circle.color= Color.BROWN.cpy().lerp(Color.WHITE,0.5f) + else if(resource.gold>0) iconGroup.circle.color= Color.GOLD.cpy().lerp(Color.WHITE,0.5f) - group.setSize(size,size) - group.addActor(circle) - group.addActor(getImage("ResourceIcons/${resourceName}") - .apply { setSize(size*0.8f,size*0.8f); center(group) }) if(resource.resourceType==ResourceType.Luxury){ val happiness = getStatIcon("Happiness") happiness.setSize(size/2,size/2) - happiness.x = group.width-happiness.width - group.addActor(happiness) + happiness.x = iconGroup.width-happiness.width + iconGroup.addActor(happiness) } if(resource.resourceType==ResourceType.Strategic){ val production = getStatIcon("Production") production.setSize(size/2,size/2) - production.x = group.width-production.width - group.addActor(production) + production.x = iconGroup.width-production.width + iconGroup.addActor(production) } - return group + return iconGroup } fun getTechIconGroup(techName: String): Group { - val techIconGroup = Group() - techIconGroup.setSize(60f,60f) - techIconGroup.addActor(ImageGetter.getImage("OtherIcons/Circle").apply { setSize(60f,60f) }) - val techIcon = getImage("TechIcons/$techName").apply { setSize(40f,40f)} - techIcon.center(techIconGroup) - techIconGroup.addActor(techIcon) - return techIconGroup + return IconCircleGroup(60f,getImage("TechIcons/$techName")) } fun getProgressBarVertical(width:Float,height:Float,percentComplete:Float,progressColor:Color,backgroundColor:Color): Table { @@ -153,4 +136,16 @@ object ImageGetter { advancementGroup.pack() return advancementGroup } + + class IconCircleGroup(size:Float, val image:Image):Group(){ + val circle = getImage("OtherIcons/Circle").apply { setSize(size, size) } + init { + setSize(size, size) + addActor(circle) + image.setSize(size * 0.75f, size * 0.75f) + image.center(this) + addActor(image) + } + } + }