diff --git a/Credits.md b/Credits.md index 19357b3da3..8b30e839c6 100644 --- a/Credits.md +++ b/Credits.md @@ -378,3 +378,5 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Banner](https://thenounproject.com/term/banner/866282/) By Emir Palavan for embarked units * [Arrow](https://thenounproject.com/term/arrow/18123/) By uzeir syarief for moving between idle units * [Replace](https://thenounproject.com/search/?q=replace&i=17858) By Mike Rowe, AU +* [Resistance](https://thenounproject.com/term/revolution/1315305/) By By HeadsOfBirds, GB + diff --git a/android/Images/StatIcons/Resistance.png b/android/Images/StatIcons/Resistance.png new file mode 100644 index 0000000000..e604012f69 Binary files /dev/null and b/android/Images/StatIcons/Resistance.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 4d05fb693a..d52bcd48c7 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -335,182 +335,182 @@ BuildingIcons/Research Lab index: -1 BuildingIcons/SS Booster rotate: false - xy: 1864, 1538 + xy: 1762, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1762, 1334 + xy: 1864, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1864, 1436 + xy: 1864, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1864, 1334 + xy: 1558, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1530, 1130 + xy: 1530, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1530, 824 + xy: 1632, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1734, 1028 + xy: 1836, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1836, 1130 + xy: 1530, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1836, 1028 + xy: 1530, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1530, 620 + xy: 1632, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1836, 926 + xy: 1632, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1734, 722 + xy: 1836, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1836, 824 + xy: 1734, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1632, 518 + xy: 1734, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1734, 518 + xy: 1836, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1836, 518 + xy: 1938, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1938, 1130 + xy: 1938, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1938, 1028 + xy: 1938, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1938, 926 + xy: 1938, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1938, 824 + xy: 1938, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1938, 722 + xy: 1938, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1938, 518 + xy: 143, 376 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 132, 70 + xy: 234, 266 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 234, 164 + xy: 234, 62 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 551, 418 + xy: 653, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 959, 418 + xy: 1061, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -685,14 +685,14 @@ OtherIcons/Railroad index: -1 ImprovementIcons/Road rotate: false - xy: 1762, 1538 + xy: 1660, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 245, 368 + xy: 132, 274 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -762,14 +762,14 @@ OtherIcons/Pentagon index: -1 OtherIcons/Shield rotate: false - xy: 1530, 926 + xy: 1632, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1632, 926 + xy: 1734, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -783,7 +783,7 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 1734, 620 + xy: 1836, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -832,7 +832,7 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1163, 468 + xy: 1265, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -846,245 +846,245 @@ PolicyIcons/Constitution index: -1 PolicyIcons/Democracy rotate: false - xy: 1215, 468 + xy: 1317, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1267, 468 + xy: 1369, 468 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1319, 468 + xy: 347, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1371, 468 + xy: 399, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 347, 366 + xy: 451, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 399, 366 + xy: 503, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 451, 366 + xy: 555, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 503, 366 + xy: 607, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 555, 366 + xy: 659, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 607, 366 + xy: 711, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 659, 366 + xy: 763, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 711, 366 + xy: 815, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 763, 366 + xy: 867, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 815, 366 + xy: 919, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 867, 366 + xy: 971, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 919, 366 + xy: 1023, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 971, 366 + xy: 1075, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1023, 366 + xy: 1127, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1075, 366 + xy: 1179, 366 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1163, 416 + xy: 1265, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1215, 416 + xy: 1317, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1267, 416 + xy: 1369, 416 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1319, 416 + xy: 1966, 1588 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1371, 416 + xy: 1966, 1536 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1423, 467 + xy: 1966, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1475, 467 + xy: 1966, 1432 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1423, 415 + xy: 1966, 1380 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1475, 415 + xy: 1966, 1328 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1527, 466 + xy: 1966, 1276 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1579, 466 + xy: 1421, 467 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1631, 466 + xy: 1473, 467 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1683, 466 + xy: 1421, 415 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1735, 466 + xy: 1473, 415 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1787, 466 + xy: 1525, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1839, 466 + xy: 1577, 466 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1217,70 +1217,70 @@ ResourceIcons/Pearls index: -1 ResourceIcons/Sheep rotate: false - xy: 1632, 1130 + xy: 1530, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1632, 1028 + xy: 1734, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1734, 1130 + xy: 1530, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1734, 926 + xy: 1836, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1632, 620 + xy: 1734, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1836, 620 + xy: 1530, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 234, 266 + xy: 234, 164 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 347, 418 + xy: 449, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 449, 418 + xy: 551, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 653, 418 + xy: 755, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1369,6 +1369,13 @@ StatIcons/RangedStrength orig: 100, 100 offset: 0, 0 index: -1 +StatIcons/Resistance + rotate: false + xy: 1558, 1334 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 StatIcons/Science rotate: false xy: 2, 760 @@ -1378,14 +1385,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1632, 824 + xy: 1734, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1836, 722 + xy: 1836, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1784,84 +1791,84 @@ TechIcons/Replacable Parts index: -1 TechIcons/Rifling rotate: false - xy: 1660, 1436 + xy: 1762, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1660, 1334 + xy: 1762, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1762, 1436 + xy: 1864, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1558, 1232 + xy: 1660, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1660, 1232 + xy: 1762, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1762, 1232 + xy: 1864, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1632, 722 + xy: 1734, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1734, 824 + xy: 1836, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1938, 620 + xy: 1938, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 143, 376 + xy: 245, 368 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 132, 274 + xy: 132, 172 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1061, 418 + xy: 1163, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2148,42 +2155,42 @@ UnitIcons/Pikeman index: -1 UnitIcons/Rifleman rotate: false - xy: 1558, 1334 + xy: 1660, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1864, 1232 + xy: 1530, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1530, 1028 + xy: 1632, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1530, 722 + xy: 1632, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1530, 518 + xy: 1632, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 132, 172 + xy: 132, 70 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2197,21 +2204,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 234, 62 + xy: 347, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 755, 418 + xy: 857, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 857, 418 + xy: 959, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2295,210 +2302,210 @@ UnitPromotionIcons/Bombardment_III_(Civ5) index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 2015, 1822 + xy: 347, 544 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 1966, 1618 + xy: 1981, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 347, 544 + xy: 106, 46 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 1981, 1974 + xy: 1231, 396 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 106, 46 + xy: 2015, 1822 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1127, 396 + xy: 1966, 1254 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1527, 444 + xy: 1966, 1232 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1891, 496 + xy: 1525, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 182, 628 + xy: 1629, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 204, 645 + xy: 182, 628 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1531, 1952 + xy: 204, 645 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 2015, 1800 + xy: 1531, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1966, 1596 + xy: 347, 522 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1988, 1618 + xy: 369, 544 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 347, 522 + xy: 1981, 1952 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 369, 544 + xy: 2003, 1974 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 1981, 1952 + xy: 106, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 2003, 1974 + xy: 106, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 106, 24 + xy: 1231, 374 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 106, 2 + xy: 2015, 1800 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1127, 374 + xy: 1988, 1254 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1527, 422 + xy: 1988, 1232 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1549, 444 + xy: 1525, 422 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1891, 474 + xy: 1547, 444 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1913, 496 + xy: 1629, 474 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 182, 606 + xy: 1651, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 204, 623 + xy: 182, 606 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 226, 645 + xy: 204, 623 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 2015, 1778 + xy: 226, 645 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1966, 1574 + xy: 369, 522 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 934f358042..df9aeb5ae0 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 214b4785a4..6e39b8e65d 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -143,6 +143,8 @@ class Battle(val gameInfo:GameInfo) { } city.moveToCiv(attacker.getCivilization()) + city.resistanceCounter = city.population.population + city.cityStats.update() } if(city.cityConstructions.isBuilt("Palace")){ diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index a0d2cd60bc..38adac4cd9 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -21,6 +21,7 @@ class CityInfo { var location: Vector2 = Vector2.Zero var name: String = "" var health = 200 + var resistanceCounter = 0 var population = PopulationManager() var cityConstructions = CityConstructions() @@ -182,6 +183,7 @@ class CityInfo { } } else population.nextTurn(stats.food) + if (resistanceCounter > 0) resistanceCounter-- if(this in civInfo.cities) { // city was not destroyed health = min(health + 20, getMaxHealth()) diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 35f952e0e4..91913787b1 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -316,7 +316,8 @@ class CityStats { baseStatList = newBaseStatList val newCurrentCityStats = Stats() // again, we don't edit the existing currentCityStats directly, in order to avoid concurrency exceptions - for (stat in baseStatList.values) newCurrentCityStats.add(stat) + if (cityInfo.resistanceCounter <= 0) + for (stat in baseStatList.values) newCurrentCityStats.add(stat) if(newCurrentCityStats.production<1) newCurrentCityStats.production=1f currentCityStats = newCurrentCityStats diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt index 84e40c4324..62767f2333 100644 --- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt @@ -38,6 +38,9 @@ class CityStatsTable(val cityScreen: CityScreen) : Table(){ + " (" + city.expansion.cultureStored + "/" + city.expansion.getCultureToNextTile() + ")") cityStatsValues["Population"] = city.population.getFreePopulation().toString() + "/" + city.population.population cityStatsValues["Happiness"] = city.cityStats.getCityHappiness().values.sum().toInt().toString() + if (city.resistanceCounter > 0) { + cityStatsValues["Resistance"] = city.resistanceCounter.toString() + } for (key in cityStatsValues.keys) { add(ImageGetter.getStatIcon(key)).size(20f).align(Align.right) diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index 5f8e1ebd6b..8d5b6b2e02 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -42,6 +42,11 @@ class CityButton(val city: CityInfo, skin: Skin): Table(skin){ add(healthBar).colspan(3).row() } + if(city.resistanceCounter > 0){ + val resistanceImage = ImageGetter.getImage("StatIcons/Resistance.png") + add(resistanceImage).size(20f).pad(2f).padLeft(5f) + } + if (city.isBeingRazed) { val fireImage = ImageGetter.getImage("OtherIcons/Fire.png") add(fireImage).size(20f).pad(2f).padLeft(5f)