diff --git a/Credits.md b/Credits.md index 77b8a207..691189b8 100644 --- a/Credits.md +++ b/Credits.md @@ -200,4 +200,28 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Crosshair](https://thenounproject.com/search/?q=crosshairs&i=916030) By Bakunetsu Kaito * [City](https://thenounproject.com/search/?q=city&i=571332) By Felix Westphal * [Fire](https://thenounproject.com/search/?q=Fire&i=96564) By Lloyd Humphreys -* [Sleep](https://thenounproject.com/search/?q=sleep&i=1760085) By Saeful Muslim \ No newline at end of file +* [Sleep](https://thenounproject.com/search/?q=sleep&i=1760085) By Saeful Muslim + +## Technologies + +### Ancient + +* [Agriculture](https://thenounproject.com/term/agriculture/4221/) By OCHA Visual Information Unit +* [Jug](https://thenounproject.com/term/jug/869999/) By Vladimir Belochkin +* [Archery](https://thenounproject.com/term/archery/213836/) By icon 54 +* [Mining](https://thenounproject.com/term/mining/1400713/) By art shop +* [Sundial](https://thenounproject.com/term/sundial/239627/) By Bonegolem +* [Cuneiform](https://thenounproject.com/term/cuneiform/86669/) By Michael Wohlwend +* [Trap](https://thenounproject.com/term/trap/130049/) By Sergey Demushkin +* [innovative](https://thenounproject.com/term/innovative/30219/) By Matt Brooks +* [Bricks](https://thenounproject.com/term/bricks/1018659/) By Vaibhav Radhakrishnan +* [Mallet](https://thenounproject.com/term/mallet/1306669/) By Ben Avery + +## Classical +* [Horse Riding](https://thenounproject.com/term/horse-riding/583093/) By Hea Poh Lin +* [Abacus](https://thenounproject.com/term/abacus/1943303/) By Yo! Baba +* [Arch](https://thenounproject.com/term/arch/1174168/) By Andrejs Kirma +* [Brain](https://thenounproject.com/term/brain/64073/) By Tony Gines +* [Coins](https://thenounproject.com/term/coins/1806100/) By Adrien Coquet +* [Engineering Blueprint](https://thenounproject.com/term/engineering-blueprint/1588543/) By Sachin Modgekar +* [Metalworking](https://thenounproject.com/term/metalworking/1561383/) By Symbolon \ No newline at end of file diff --git a/android/Images/TechIcons/Agriculture.png b/android/Images/TechIcons/Agriculture.png new file mode 100644 index 00000000..c4124569 Binary files /dev/null and b/android/Images/TechIcons/Agriculture.png differ diff --git a/android/Images/TechIcons/Animal Husbandry.png b/android/Images/TechIcons/Animal Husbandry.png new file mode 100644 index 00000000..4585a93e Binary files /dev/null and b/android/Images/TechIcons/Animal Husbandry.png differ diff --git a/android/Images/TechIcons/Archery.png b/android/Images/TechIcons/Archery.png new file mode 100644 index 00000000..b69fa01f Binary files /dev/null and b/android/Images/TechIcons/Archery.png differ diff --git a/android/Images/TechIcons/Bronze Working.png b/android/Images/TechIcons/Bronze Working.png new file mode 100644 index 00000000..2da29e94 Binary files /dev/null and b/android/Images/TechIcons/Bronze Working.png differ diff --git a/android/Images/TechIcons/Calendar.png b/android/Images/TechIcons/Calendar.png new file mode 100644 index 00000000..b36c6bea Binary files /dev/null and b/android/Images/TechIcons/Calendar.png differ diff --git a/android/Images/TechIcons/Construction.png b/android/Images/TechIcons/Construction.png new file mode 100644 index 00000000..7795b598 Binary files /dev/null and b/android/Images/TechIcons/Construction.png differ diff --git a/android/Images/TechIcons/Currency.png b/android/Images/TechIcons/Currency.png new file mode 100644 index 00000000..1fc29a88 Binary files /dev/null and b/android/Images/TechIcons/Currency.png differ diff --git a/android/Images/TechIcons/Engineering.png b/android/Images/TechIcons/Engineering.png new file mode 100644 index 00000000..53adb025 Binary files /dev/null and b/android/Images/TechIcons/Engineering.png differ diff --git a/android/Images/TechIcons/Horseback Riding.png b/android/Images/TechIcons/Horseback Riding.png new file mode 100644 index 00000000..5dbe21fc Binary files /dev/null and b/android/Images/TechIcons/Horseback Riding.png differ diff --git a/android/Images/TechIcons/Iron Working.png b/android/Images/TechIcons/Iron Working.png new file mode 100644 index 00000000..02abde35 Binary files /dev/null and b/android/Images/TechIcons/Iron Working.png differ diff --git a/android/Images/TechIcons/Masonry.png b/android/Images/TechIcons/Masonry.png new file mode 100644 index 00000000..ca5c2ed8 Binary files /dev/null and b/android/Images/TechIcons/Masonry.png differ diff --git a/android/Images/TechIcons/Mathematics.png b/android/Images/TechIcons/Mathematics.png new file mode 100644 index 00000000..90374269 Binary files /dev/null and b/android/Images/TechIcons/Mathematics.png differ diff --git a/android/Images/TechIcons/Mining.png b/android/Images/TechIcons/Mining.png new file mode 100644 index 00000000..7312829d Binary files /dev/null and b/android/Images/TechIcons/Mining.png differ diff --git a/android/Images/TechIcons/Philosophy.png b/android/Images/TechIcons/Philosophy.png new file mode 100644 index 00000000..0ec22c01 Binary files /dev/null and b/android/Images/TechIcons/Philosophy.png differ diff --git a/android/Images/TechIcons/Pottery.png b/android/Images/TechIcons/Pottery.png new file mode 100644 index 00000000..1e5ea7b7 Binary files /dev/null and b/android/Images/TechIcons/Pottery.png differ diff --git a/android/Images/TechIcons/The Wheel.png b/android/Images/TechIcons/The Wheel.png new file mode 100644 index 00000000..a61893b1 Binary files /dev/null and b/android/Images/TechIcons/The Wheel.png differ diff --git a/android/Images/TechIcons/Trapping.png b/android/Images/TechIcons/Trapping.png new file mode 100644 index 00000000..df5183cb Binary files /dev/null and b/android/Images/TechIcons/Trapping.png differ diff --git a/android/Images/TechIcons/Writing.png b/android/Images/TechIcons/Writing.png new file mode 100644 index 00000000..d67e341b Binary files /dev/null and b/android/Images/TechIcons/Writing.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 2b8879dd..b4e10cf5 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,476 +6,476 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none BuildingIcons/Angkor Wat rotate: false - xy: 1439, 1744 + xy: 1541, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Apollo Program rotate: false - xy: 1541, 1744 + xy: 1745, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Aqueduct rotate: false - xy: 1643, 1744 + xy: 1847, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Armory rotate: false - xy: 1847, 1744 + xy: 334, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bank rotate: false - xy: 334, 556 + xy: 334, 250 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Barracks rotate: false - xy: 334, 454 + xy: 334, 148 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Bazaar rotate: false - xy: 334, 352 + xy: 260, 1704 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Broadcast Tower rotate: false - xy: 334, 148 + xy: 362, 1708 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Burial Tomb rotate: false - xy: 260, 1704 + xy: 362, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Castle rotate: false - xy: 464, 1708 + xy: 566, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Chichen Itza rotate: false - xy: 566, 1606 + xy: 508, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus rotate: false - xy: 406, 1504 + xy: 610, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Circus Maximus rotate: false - xy: 406, 1402 + xy: 712, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Colloseum rotate: false - xy: 712, 1402 + xy: 386, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Cristo Redentor rotate: false - xy: 610, 1300 + xy: 386, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Eiffel Tower rotate: false - xy: 488, 1096 + xy: 436, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Factory rotate: false - xy: 590, 1096 + xy: 538, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forbidden Palace rotate: false - xy: 486, 994 + xy: 640, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Forge rotate: false - xy: 588, 994 + xy: 436, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Granary rotate: false - xy: 538, 892 + xy: 538, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hagia Sophia rotate: false - xy: 538, 688 + xy: 436, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hanging Gardens rotate: false - xy: 640, 790 + xy: 538, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hermitage rotate: false - xy: 436, 484 + xy: 640, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hospital rotate: false - xy: 436, 382 + xy: 538, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Hydro Plant rotate: false - xy: 538, 484 + xy: 640, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Ironworks rotate: false - xy: 538, 382 + xy: 742, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 538, 178 + xy: 742, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Pichu rotate: false - xy: 742, 790 + xy: 844, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 742, 484 + xy: 844, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Medical Lab rotate: false - xy: 742, 382 + xy: 770, 1692 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 742, 178 + xy: 974, 1692 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 844, 892 + xy: 640, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastary rotate: false - xy: 844, 790 + xy: 742, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 844, 688 + xy: 844, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 844, 484 + xy: 794, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 844, 280 + xy: 946, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 844, 178 + xy: 946, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 770, 1692 + xy: 946, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 872, 1692 + xy: 946, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 640, 76 + xy: 946, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 742, 76 + xy: 946, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 844, 76 + xy: 946, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper maker rotate: false - xy: 794, 1198 + xy: 262, 46 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 946, 790 + xy: 814, 1386 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 946, 688 + xy: 916, 1386 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 946, 280 + xy: 1120, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 262, 46 + xy: 1120, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 814, 1590 + xy: 1222, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 814, 1488 + xy: 1324, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Statis Chamber rotate: false - xy: 916, 1590 + xy: 1222, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1120, 1642 + xy: 1528, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1222, 1642 + xy: 1528, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1324, 1642 + xy: 1630, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1222, 1438 + xy: 1732, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1324, 1540 + xy: 1834, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1324, 1438 + xy: 1834, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1426, 1540 + xy: 1834, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1630, 1642 + xy: 1528, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1528, 1438 + xy: 1630, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1630, 1540 + xy: 1732, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1732, 1642 + xy: 1834, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1630, 1438 + xy: 896, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1732, 1540 + xy: 998, 1284 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1834, 1642 + xy: 998, 1182 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1834, 1438 + xy: 1406, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1324, 1336 + xy: 1610, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1630, 1336 + xy: 1202, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 896, 1284 + xy: 1508, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -545,119 +545,112 @@ ImprovementIcons/Academy index: -1 ImprovementIcons/Ancient ruins rotate: false - xy: 1337, 1744 + xy: 1439, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Camp rotate: false - xy: 260, 1602 + xy: 464, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/City ruins rotate: false - xy: 508, 1402 + xy: 406, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Customs house rotate: false - xy: 488, 1198 + xy: 384, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Farm rotate: false - xy: 692, 1096 + xy: 436, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Landmark rotate: false - xy: 640, 382 + xy: 742, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 742, 892 + xy: 844, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 742, 688 + xy: 844, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 792, 994 + xy: 436, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 538, 76 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Pasture - rotate: false - xy: 794, 1096 + xy: 946, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 946, 892 + xy: 916, 1590 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 946, 586 + xy: 1018, 1590 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 946, 484 + xy: 1018, 1488 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 946, 484 + xy: 1018, 1488 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 946, 76 + xy: 1222, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1732, 1438 + xy: 1100, 1235 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -671,70 +664,70 @@ OtherIcons/Circle index: -1 OtherIcons/CircleOld rotate: false - xy: 668, 1606 + xy: 610, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 508, 1504 + xy: 712, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 386, 1198 + xy: 590, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 692, 1198 + xy: 588, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 384, 994 + xy: 538, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 742, 280 + xy: 872, 1692 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1018, 1590 + xy: 1426, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1120, 1540 + xy: 1630, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1120, 1342 + xy: 1100, 1139 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1528, 1642 + xy: 1222, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -790,399 +783,399 @@ PolicyIcons/Collective Rule index: -1 PolicyIcons/Constitution rotate: false - xy: 998, 1334 + xy: 896, 1130 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 896, 1232 + xy: 1712, 1182 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Dicipline rotate: false - xy: 1050, 1334 + xy: 948, 1130 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 896, 1180 + xy: 1764, 1182 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 896, 1128 + xy: 1000, 1130 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1949, 1742 + xy: 1816, 1182 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 312, 1550 + xy: 1949, 1742 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 364, 44 + xy: 312, 1550 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 998, 1282 + xy: 364, 44 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1050, 1282 + xy: 1712, 1130 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1936, 1690 + xy: 1764, 1130 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1936, 1638 + xy: 1816, 1130 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1936, 1586 + xy: 1868, 1182 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1936, 1534 + xy: 1868, 1130 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1936, 1482 + xy: 1936, 1690 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1936, 1430 + xy: 1936, 1638 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1936, 1378 + xy: 1936, 1586 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1936, 1326 + xy: 1936, 1534 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1102, 1290 + xy: 1936, 1482 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1154, 1290 + xy: 1936, 1430 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1206, 1284 + xy: 1936, 1378 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1258, 1284 + xy: 1936, 1326 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1310, 1284 + xy: 1916, 1274 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1362, 1284 + xy: 1968, 1274 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1414, 1284 + xy: 996, 1078 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1466, 1284 + xy: 996, 1026 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1518, 1284 + xy: 1988, 1690 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1570, 1284 + xy: 1988, 1638 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1622, 1284 + xy: 1988, 1586 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1674, 1284 + xy: 1988, 1534 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1726, 1284 + xy: 1988, 1482 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1778, 1284 + xy: 1988, 1430 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1830, 1284 + xy: 1988, 1378 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1882, 1284 + xy: 1988, 1326 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1934, 1274 + xy: 416, 24 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 416, 25 + xy: 468, 24 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum rotate: false - xy: 1235, 1744 + xy: 1337, 1744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Bananas rotate: false - xy: 334, 658 + xy: 334, 352 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cattle rotate: false - xy: 566, 1708 + xy: 406, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Coal rotate: false - xy: 712, 1504 + xy: 712, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Cotton rotate: false - xy: 508, 1300 + xy: 692, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Deer rotate: false - xy: 590, 1198 + xy: 486, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Dyes rotate: false - xy: 386, 1096 + xy: 690, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Furs rotate: false - xy: 690, 994 + xy: 538, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gems rotate: false - xy: 436, 892 + xy: 640, 790 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Gold rotate: false - xy: 436, 790 + xy: 436, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Horses rotate: false - xy: 640, 688 + xy: 640, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 640, 586 + xy: 640, 178 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 436, 280 + xy: 742, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 640, 484 + xy: 742, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 742, 586 + xy: 844, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 974, 1692 + xy: 946, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 916, 1386 + xy: 1324, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1018, 1488 + xy: 1528, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1018, 1386 + xy: 1426, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1222, 1540 + xy: 1732, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1426, 1642 + xy: 1732, 1438 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1196,35 +1189,35 @@ ResourceIcons/Sugar index: -1 ResourceIcons/Uranium rotate: false - xy: 1222, 1336 + xy: 1508, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1528, 1336 + xy: 1814, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1732, 1336 + xy: 1304, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/CityConnection rotate: false - xy: 610, 1504 + xy: 508, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 610, 1402 + xy: 610, 1300 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1266,7 +1259,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 844, 586 + xy: 794, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1287,7 +1280,7 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 946, 382 + xy: 1018, 1386 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1301,7 +1294,140 @@ StatIcons/Science index: -1 StatIcons/Strength rotate: false - xy: 1426, 1438 + xy: 1324, 1336 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Agriculture + rotate: false + xy: 1235, 1744 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Animal Husbandry + rotate: false + xy: 1643, 1744 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Pasture + rotate: false + xy: 1643, 1744 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Archery + rotate: false + xy: 334, 760 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Bronze Working + rotate: false + xy: 464, 1708 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Calendar + rotate: false + xy: 566, 1708 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Construction + rotate: false + xy: 590, 1198 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Currency + rotate: false + xy: 692, 1096 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Engineering + rotate: false + xy: 436, 790 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Horseback Riding + rotate: false + xy: 436, 178 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Iron Working + rotate: false + xy: 742, 790 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Masonry + rotate: false + xy: 844, 280 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Mathematics + rotate: false + xy: 844, 178 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Mining + rotate: false + xy: 538, 76 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Philosophy + rotate: false + xy: 814, 1590 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Pottery + rotate: false + xy: 916, 1488 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/The Wheel + rotate: false + xy: 896, 1182 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Trapping + rotate: false + xy: 1202, 1234 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TechIcons/Writing + rotate: false + xy: 1610, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1378,210 +1504,210 @@ TerrainIcons/road index: -1 UnitIcons/Archer rotate: false - xy: 1745, 1744 + xy: 334, 862 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 334, 862 + xy: 334, 556 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ballista rotate: false - xy: 334, 760 + xy: 334, 454 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 334, 250 + xy: 260, 1602 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 362, 1708 + xy: 668, 1708 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 362, 1606 + xy: 668, 1606 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 464, 1606 + xy: 406, 1402 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 668, 1708 + xy: 508, 1504 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 406, 1300 + xy: 488, 1198 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 712, 1300 + xy: 488, 1096 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 436, 688 + xy: 640, 688 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 538, 790 + xy: 436, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 640, 892 + xy: 538, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 436, 586 + xy: 640, 586 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 538, 586 + xy: 538, 280 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 436, 178 + xy: 742, 484 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 538, 280 + xy: 742, 382 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 640, 280 + xy: 792, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 640, 178 + xy: 844, 892 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 844, 382 + xy: 894, 994 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 436, 77 + xy: 1120, 1337 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 894, 994 + xy: 814, 1488 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 946, 178 + xy: 1120, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 814, 1386 + xy: 1324, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 916, 1488 + xy: 1426, 1642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1120, 1438 + xy: 1630, 1540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1528, 1540 + xy: 1426, 1336 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1834, 1540 + xy: 1304, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1426, 1336 + xy: 1712, 1234 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1834, 1336 + xy: 1406, 1132 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1616,175 +1742,175 @@ UnitPromotionIcons/Barrage_III_(Civ5) index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 2001, 1824 + xy: 814, 1312 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 814, 1312 + xy: 866, 1364 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 866, 1364 + xy: 1052, 1160 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 896, 1106 + xy: 262, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 262, 24 + xy: 262, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 262, 2 + xy: 1916, 1252 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 948, 1262 + xy: 204, 149 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 204, 149 + xy: 896, 1108 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 468, 55 + xy: 996, 1004 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 406, 972 + xy: 2001, 1824 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 770, 1648 + xy: 520, 54 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 792, 1648 + xy: 406, 972 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1076, 1750 + xy: 770, 1648 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1098, 1772 + xy: 792, 1648 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 2001, 1802 + xy: 1076, 1750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 836, 1312 + xy: 1098, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 866, 1342 + xy: 836, 1312 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 918, 1106 + xy: 866, 1342 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 284, 24 + xy: 1052, 1138 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 284, 2 + xy: 1074, 1160 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 970, 1262 + xy: 284, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 948, 1240 + xy: 284, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 226, 149 + xy: 1938, 1252 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 468, 33 + xy: 226, 149 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 490, 55 + xy: 918, 1108 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 66e73acb..ae823f3f 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/build.gradle b/android/build.gradle index 784da4ea..df156ea4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 140 - versionName "2.8.8" + versionCode 141 + versionName "2.8.9" } buildTypes { release { diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index 5f0abf93..347b854d 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -2,21 +2,18 @@ package com.unciv.ui.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Label -import com.badlogic.gdx.scenes.scene2d.ui.TextButton +import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UnCivGame import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.TechManager import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.tech.Technology -import com.unciv.ui.utils.CameraStageBaseScreen -import com.unciv.ui.utils.onClick -import com.unciv.ui.utils.disable -import com.unciv.ui.utils.tr +import com.unciv.ui.utils.* import java.util.* class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() { - private var techNameToButton = HashMap() + private var techNameToButton = HashMap() private var isFreeTechPick: Boolean = false private var selectedTech: Technology? = null private var civTech: TechManager = civInfo.tech @@ -25,13 +22,31 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() // All these are to counter performance problems when updating buttons for all techs. private var researchableTechs = GameBasics.Technologies.keys .filter { civTech.canBeResearched(it) }.toHashSet() - private val lightBlue = Color.BLUE.cpy().lerp(Color.WHITE, 0.3f) + + private val currentTechColor = colorFromRGB(7,46,43) + private val researchedTechColor = colorFromRGB(133,112,39) + private val researchableTechColor = colorFromRGB(28,170,0) + private val queuedTechColor = colorFromRGB(39,114,154) + + private val turnsToTech = GameBasics.Technologies.values.associateBy ({ it.name },{civTech.turnsToTech(it.name)}) constructor(freeTechPick: Boolean, civInfo: CivilizationInfo) : this(civInfo) { isFreeTechPick = freeTechPick } + class TechButton(techName:String) : Table(skin) { + val text=Label("",skin).setFontColor(Color.WHITE) + init { + defaults().pad(10f) + background = ImageGetter.getDrawable("OtherIcons/civTableBackground.png") + if(ImageGetter.techIconExists(techName)) + add(ImageGetter.getTechIcon(techName)).size(40f) + add(text) + pack() + } + } + init { onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } @@ -57,7 +72,8 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() topTable.add() // empty cell else { - val TB = TextButton("", CameraStageBaseScreen.skin) + val TB = TechButton(tech.name) + techNameToButton[tech.name] = TB TB.onClick { selectTechnology(tech) @@ -91,9 +107,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() for (techName in techNameToButton.keys) { val TB = techNameToButton[techName]!! when { - civTech.isResearched(techName) && techName!="Future Tech" -> TB.color = Color.GREEN - techsToResearch.contains(techName) -> TB.color = lightBlue - researchableTechs.contains(techName) -> TB.color = Color.WHITE + civTech.isResearched(techName) && techName!="Future Tech" -> TB.color = researchedTechColor + techsToResearch.isNotEmpty() && techsToResearch.first() == techName -> TB.color = currentTechColor + techsToResearch.contains(techName) -> TB.color = queuedTechColor + researchableTechs.contains(techName) -> TB.color = researchableTechColor else -> TB.color = Color.BLACK } @@ -110,7 +127,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() if (!civTech.isResearched(techName) || techName=="Future Tech") text += "\r\n" + turnsToTech[techName] + " {turns}".tr() - TB.setText(text) + TB.text.setText(text) } } diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index 51cee2e4..d774bce2 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -52,6 +52,14 @@ object ImageGetter { } } + fun techIconExists(techName:String): Boolean { + return atlas.findRegion("TechIcons/$techName")!=null + } + + fun getTechIcon(techName: String): Image { + return getImage("TechIcons/$techName") + } + fun getStatIcon(statName: String): Image { return ImageGetter.getImage("StatIcons/$statName") .apply { setSize(20f,20f)} diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 20b20d11..ed625ef0 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -3,6 +3,7 @@ package com.unciv.ui.worldscreen import com.badlogic.gdx.Gdx import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.math.Vector2 +import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.unciv.UnCivGame @@ -30,7 +31,7 @@ class WorldScreen : CameraStageBaseScreen() { val bottomBar = WorldScreenBottomBar(this) val unitActionsTable = UnitActionsTable(this) - private val techButton = TextButton("", CameraStageBaseScreen.skin).apply { color= Color.BLUE } + private val techButton = Table().apply { background=ImageGetter.getDrawable("OtherIcons/civTableBackground.png").tint(colorFromRGB(7,46,43)); defaults().pad(10f) } val diplomacyButtonWrapper = Table() private val nextTurnButton = createNextTurnButton() @@ -160,11 +161,17 @@ class WorldScreen : CameraStageBaseScreen() { private fun updateTechButton(civInfo: CivilizationInfo) { techButton.isVisible = civInfo.cities.isNotEmpty() + techButton.clearChildren() if (civInfo.tech.currentTechnology() == null) - techButton.setText("{Pick a tech}!".tr()) - else - techButton.setText(civInfo.tech.currentTechnology()!!.tr() + "\r\n" - + civInfo.tech.turnsToTech(civInfo.tech.currentTechnology()!!) + " {turns}".tr()) + techButton.add(Label("{Pick a tech}!".tr(),skin).setFontColor(Color.WHITE).setFont(22)) + else { + val tech = civInfo.tech.currentTechnology()!! + if(ImageGetter.techIconExists(tech)) + techButton.add(ImageGetter.getTechIcon(tech)).size(30f) + techButton.add(Label(tech.tr() + "\r\n" + + civInfo.tech.turnsToTech(tech) + " {turns}".tr(),skin) + .setFontColor(Color.WHITE).setFont(22)) + } techButton.setSize(techButton.prefWidth, techButton.prefHeight) techButton.setPosition(10f, topBar.y - techButton.height - 5f)