diff --git a/Credits.md b/Credits.md index 0592d2b357..e860b8e762 100644 --- a/Credits.md +++ b/Credits.md @@ -5,7 +5,7 @@ Flag Icons made by [Freepik](https://www.flaticon.com/authors/freepik) from [www and licensed by Creative Commons 3.0 -All the following are from [the Noun Project](https://thenounproject.com) licenced under Creative Commons +All the following are from [the Noun Project](https://thenounproject.com) licenced under either Creative Commons or Public Domain ## Units @@ -146,6 +146,37 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Cathedral](https://thenounproject.com/term/cathedral/1325415/) By Dairy Free Design * [Bazaar](https://thenounproject.com/term/bazaar/902288/) By Tokka Elkholy +## Social Policies + +* [social network](https://thenounproject.com/term/social-network/746002/) By Kirby Wu +* [Trade](https://thenounproject.com/term/trade/686718/) By Gregor Cresnar +* [Logic](https://thenounproject.com/term/logic/1269994/) By Jenya K +* [Dialogue](https://thenounproject.com/term/dialogue/1867557/) By ProSymbols +* [Feather](https://thenounproject.com/term/feather/1628/) By Eduardo Souza +* [Voting](https://thenounproject.com/term/voting/981735/) By Nikita Kozin +* [Mic](https://thenounproject.com/term/mic/1666564/) By Aybige +* [Gender Equality](https://thenounproject.com/term/gender-equality/577561/) By corpus delicti +* [Logic](https://thenounproject.com/term/logic/718608/) By Arthur Shlain +* [Torch](https://thenounproject.com/term/torch/589999/) By Hea Poh Lin +* [Painting](https://thenounproject.com/term/painting/387146/) By Mike Rowe +* [Coins](https://thenounproject.com/term/coins/1915881/) By icon 54 +* [Gem](https://thenounproject.com/term/gem/754533/) By Oksana Latysheva +* [Pie Chart](https://thenounproject.com/term/pie-chart/1284359/) By Adrien Coquet +* [Science](https://thenounproject.com/term/science/1788338/) By Three Six Five +* [Graph](https://thenounproject.com/term/graph/1329095/) By Ben Davis +* [Protestantism](https://thenounproject.com/term/protestantism/1524922/) By Evgeni Moryakov +* [Pyramid](https://thenounproject.com/term/pyramid/175066/) By Creative Stall +* [Crown](https://thenounproject.com/term/crown/1567484/) By Alexander Skowalsky +* [Gavel](https://thenounproject.com/term/gavel/225541/) By Rflor +* [Apple](https://thenounproject.com/term/apple/1916523/) By EnQiu +* [Temple](https://thenounproject.com/term/temple/95523/) By N.K.Narasimhan +* [Religion](https://thenounproject.com/term/religion/1307794/) By Ben Avery +* [coat of arms](https://thenounproject.com/term/coat-of-arms/366462/) By Martina Krasnayova +* [People](https://thenounproject.com/term/people/199814/) By Elizabeth Lopez +* [Assembly](https://thenounproject.com/term/assembly/468455/) By Noël Rasendrason +* [People](https://thenounproject.com/term/people/670317/) By Gregor Cresnar +* [People](https://thenounproject.com/term/people/1355818/) By Wilson Joseph +* [Flame](https://thenounproject.com/term/flame/633228/) By Ian Shoobridge ## Others diff --git a/android/Images/PolicyIcons/Aristocracy.png b/android/Images/PolicyIcons/Aristocracy.png new file mode 100644 index 0000000000..9068b8b1d9 Binary files /dev/null and b/android/Images/PolicyIcons/Aristocracy.png differ diff --git a/android/Images/PolicyIcons/Aristocracy_(Civ5).png b/android/Images/PolicyIcons/Aristocracy_(Civ5).png deleted file mode 100644 index 7b31313865..0000000000 Binary files a/android/Images/PolicyIcons/Aristocracy_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Citizenship.png b/android/Images/PolicyIcons/Citizenship.png new file mode 100644 index 0000000000..dbdcef032e Binary files /dev/null and b/android/Images/PolicyIcons/Citizenship.png differ diff --git a/android/Images/PolicyIcons/Citizenship_(Civ5).png b/android/Images/PolicyIcons/Citizenship_(Civ5).png deleted file mode 100644 index 38bb6c9538..0000000000 Binary files a/android/Images/PolicyIcons/Citizenship_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Civil Society.png b/android/Images/PolicyIcons/Civil Society.png new file mode 100644 index 0000000000..76a859a966 Binary files /dev/null and b/android/Images/PolicyIcons/Civil Society.png differ diff --git a/android/Images/PolicyIcons/Civil_Society_(Civ5).png b/android/Images/PolicyIcons/Civil_Society_(Civ5).png deleted file mode 100644 index 1bf4fa2ef7..0000000000 Binary files a/android/Images/PolicyIcons/Civil_Society_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Collective Rule.png b/android/Images/PolicyIcons/Collective Rule.png new file mode 100644 index 0000000000..56398899e2 Binary files /dev/null and b/android/Images/PolicyIcons/Collective Rule.png differ diff --git a/android/Images/PolicyIcons/Collective_Rule_(Civ5).png b/android/Images/PolicyIcons/Collective_Rule_(Civ5).png deleted file mode 100644 index 0824064fb9..0000000000 Binary files a/android/Images/PolicyIcons/Collective_Rule_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Constitution.png b/android/Images/PolicyIcons/Constitution.png new file mode 100644 index 0000000000..32107f0808 Binary files /dev/null and b/android/Images/PolicyIcons/Constitution.png differ diff --git a/android/Images/PolicyIcons/Constitution_(Civ5).png b/android/Images/PolicyIcons/Constitution_(Civ5).png deleted file mode 100644 index 1b44f780c5..0000000000 Binary files a/android/Images/PolicyIcons/Constitution_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Democracy.png b/android/Images/PolicyIcons/Democracy.png new file mode 100644 index 0000000000..94510d9568 Binary files /dev/null and b/android/Images/PolicyIcons/Democracy.png differ diff --git a/android/Images/PolicyIcons/Democracy_(Civ5).png b/android/Images/PolicyIcons/Democracy_(Civ5).png deleted file mode 100644 index ebb6408505..0000000000 Binary files a/android/Images/PolicyIcons/Democracy_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Entrepreneurship.png b/android/Images/PolicyIcons/Entrepreneurship.png new file mode 100644 index 0000000000..47575fa329 Binary files /dev/null and b/android/Images/PolicyIcons/Entrepreneurship.png differ diff --git a/android/Images/PolicyIcons/Entrepreneurship_(Civ5).png b/android/Images/PolicyIcons/Entrepreneurship_(Civ5).png deleted file mode 100644 index e9511b7341..0000000000 Binary files a/android/Images/PolicyIcons/Entrepreneurship_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Free Religion.png b/android/Images/PolicyIcons/Free Religion.png new file mode 100644 index 0000000000..87ad178dea Binary files /dev/null and b/android/Images/PolicyIcons/Free Religion.png differ diff --git a/android/Images/PolicyIcons/Free Speech.png b/android/Images/PolicyIcons/Free Speech.png new file mode 100644 index 0000000000..733feb22ee Binary files /dev/null and b/android/Images/PolicyIcons/Free Speech.png differ diff --git a/android/Images/PolicyIcons/Free Thought.png b/android/Images/PolicyIcons/Free Thought.png new file mode 100644 index 0000000000..a5fbff2a6a Binary files /dev/null and b/android/Images/PolicyIcons/Free Thought.png differ diff --git a/android/Images/PolicyIcons/Free_Religion_(Civ5).png b/android/Images/PolicyIcons/Free_Religion_(Civ5).png deleted file mode 100644 index 9faa19418e..0000000000 Binary files a/android/Images/PolicyIcons/Free_Religion_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Free_Speech_(Civ5).png b/android/Images/PolicyIcons/Free_Speech_(Civ5).png deleted file mode 100644 index cd92bde58b..0000000000 Binary files a/android/Images/PolicyIcons/Free_Speech_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Free_Thought_(Civ5).png b/android/Images/PolicyIcons/Free_Thought_(Civ5).png deleted file mode 100644 index d944f38fc2..0000000000 Binary files a/android/Images/PolicyIcons/Free_Thought_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Humanism.png b/android/Images/PolicyIcons/Humanism.png new file mode 100644 index 0000000000..503169d505 Binary files /dev/null and b/android/Images/PolicyIcons/Humanism.png differ diff --git a/android/Images/PolicyIcons/Humanism_(Civ5).png b/android/Images/PolicyIcons/Humanism_(Civ5).png deleted file mode 100644 index 97d2bc2ff7..0000000000 Binary files a/android/Images/PolicyIcons/Humanism_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Landed Elite.png b/android/Images/PolicyIcons/Landed Elite.png new file mode 100644 index 0000000000..4d8d0dc626 Binary files /dev/null and b/android/Images/PolicyIcons/Landed Elite.png differ diff --git a/android/Images/PolicyIcons/Landed_Elite_(Civ5).png b/android/Images/PolicyIcons/Landed_Elite_(Civ5).png deleted file mode 100644 index 92ce758903..0000000000 Binary files a/android/Images/PolicyIcons/Landed_Elite_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Legalism.png b/android/Images/PolicyIcons/Legalism.png new file mode 100644 index 0000000000..7e3800259b Binary files /dev/null and b/android/Images/PolicyIcons/Legalism.png differ diff --git a/android/Images/PolicyIcons/Legalism_(Civ5).png b/android/Images/PolicyIcons/Legalism_(Civ5).png deleted file mode 100644 index df5377d849..0000000000 Binary files a/android/Images/PolicyIcons/Legalism_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Mandate Of Heaven.png b/android/Images/PolicyIcons/Mandate Of Heaven.png new file mode 100644 index 0000000000..17870761f3 Binary files /dev/null and b/android/Images/PolicyIcons/Mandate Of Heaven.png differ diff --git a/android/Images/PolicyIcons/Mandate_Of_Heaven_(Civ5).png b/android/Images/PolicyIcons/Mandate_Of_Heaven_(Civ5).png deleted file mode 100644 index 34bf810198..0000000000 Binary files a/android/Images/PolicyIcons/Mandate_Of_Heaven_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Mercantilism.png b/android/Images/PolicyIcons/Mercantilism.png new file mode 100644 index 0000000000..57acfae247 Binary files /dev/null and b/android/Images/PolicyIcons/Mercantilism.png differ diff --git a/android/Images/PolicyIcons/Mercantilism_(Civ5).png b/android/Images/PolicyIcons/Mercantilism_(Civ5).png deleted file mode 100644 index 4dd30cc14e..0000000000 Binary files a/android/Images/PolicyIcons/Mercantilism_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Meritocracy.png b/android/Images/PolicyIcons/Meritocracy.png new file mode 100644 index 0000000000..9498c73369 Binary files /dev/null and b/android/Images/PolicyIcons/Meritocracy.png differ diff --git a/android/Images/PolicyIcons/Meritocracy_(Civ5).png b/android/Images/PolicyIcons/Meritocracy_(Civ5).png deleted file mode 100644 index 8fb1be3e86..0000000000 Binary files a/android/Images/PolicyIcons/Meritocracy_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Monarchy.png b/android/Images/PolicyIcons/Monarchy.png new file mode 100644 index 0000000000..360bad347c Binary files /dev/null and b/android/Images/PolicyIcons/Monarchy.png differ diff --git a/android/Images/PolicyIcons/Monarchy_(Civ5).png b/android/Images/PolicyIcons/Monarchy_(Civ5).png deleted file mode 100644 index 5a4cb007ef..0000000000 Binary files a/android/Images/PolicyIcons/Monarchy_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Oligarchy.png b/android/Images/PolicyIcons/Oligarchy.png new file mode 100644 index 0000000000..e1afc84fab Binary files /dev/null and b/android/Images/PolicyIcons/Oligarchy.png differ diff --git a/android/Images/PolicyIcons/Oligarchy_(Civ5).png b/android/Images/PolicyIcons/Oligarchy_(Civ5).png deleted file mode 100644 index 6a540ef423..0000000000 Binary files a/android/Images/PolicyIcons/Oligarchy_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Organized Religion.png b/android/Images/PolicyIcons/Organized Religion.png new file mode 100644 index 0000000000..42e42aecd2 Binary files /dev/null and b/android/Images/PolicyIcons/Organized Religion.png differ diff --git a/android/Images/PolicyIcons/Organized_Religion_(Civ5).png b/android/Images/PolicyIcons/Organized_Religion_(Civ5).png deleted file mode 100644 index 540a779cb7..0000000000 Binary files a/android/Images/PolicyIcons/Organized_Religion_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Patronage.png b/android/Images/PolicyIcons/Patronage.png new file mode 100644 index 0000000000..2569dadf9d Binary files /dev/null and b/android/Images/PolicyIcons/Patronage.png differ diff --git a/android/Images/PolicyIcons/Patronage_(Civ5).png b/android/Images/PolicyIcons/Patronage_(Civ5).png deleted file mode 100644 index 5863bd2a98..0000000000 Binary files a/android/Images/PolicyIcons/Patronage_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Protectionism.png b/android/Images/PolicyIcons/Protectionism.png new file mode 100644 index 0000000000..4179a5a0a8 Binary files /dev/null and b/android/Images/PolicyIcons/Protectionism.png differ diff --git a/android/Images/PolicyIcons/Protectionism_(Civ5).png b/android/Images/PolicyIcons/Protectionism_(Civ5).png deleted file mode 100644 index 60007c8ac9..0000000000 Binary files a/android/Images/PolicyIcons/Protectionism_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Reformation.png b/android/Images/PolicyIcons/Reformation.png new file mode 100644 index 0000000000..d4457a6c61 Binary files /dev/null and b/android/Images/PolicyIcons/Reformation.png differ diff --git a/android/Images/PolicyIcons/Reformation_(Civ5).png b/android/Images/PolicyIcons/Reformation_(Civ5).png deleted file mode 100644 index 0519afb53e..0000000000 Binary files a/android/Images/PolicyIcons/Reformation_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Representation.png b/android/Images/PolicyIcons/Representation.png new file mode 100644 index 0000000000..a5007ba7e9 Binary files /dev/null and b/android/Images/PolicyIcons/Representation.png differ diff --git a/android/Images/PolicyIcons/Representation_(Civ5).png b/android/Images/PolicyIcons/Representation_(Civ5).png deleted file mode 100644 index 80f6fa8c0f..0000000000 Binary files a/android/Images/PolicyIcons/Representation_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Republic.png b/android/Images/PolicyIcons/Republic.png new file mode 100644 index 0000000000..b4e8b7a07a Binary files /dev/null and b/android/Images/PolicyIcons/Republic.png differ diff --git a/android/Images/PolicyIcons/Republic_(Civ5).png b/android/Images/PolicyIcons/Republic_(Civ5).png deleted file mode 100644 index 7781357d95..0000000000 Binary files a/android/Images/PolicyIcons/Republic_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Scientific Revolution.png b/android/Images/PolicyIcons/Scientific Revolution.png new file mode 100644 index 0000000000..3d853fa115 Binary files /dev/null and b/android/Images/PolicyIcons/Scientific Revolution.png differ diff --git a/android/Images/PolicyIcons/Scientific_Revolution_(Civ5).png b/android/Images/PolicyIcons/Scientific_Revolution_(Civ5).png deleted file mode 100644 index 8776fc132b..0000000000 Binary files a/android/Images/PolicyIcons/Scientific_Revolution_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Secularism.png b/android/Images/PolicyIcons/Secularism.png new file mode 100644 index 0000000000..d1650534d4 Binary files /dev/null and b/android/Images/PolicyIcons/Secularism.png differ diff --git a/android/Images/PolicyIcons/Secularism_(Civ5).png b/android/Images/PolicyIcons/Secularism_(Civ5).png deleted file mode 100644 index 916e5be6b1..0000000000 Binary files a/android/Images/PolicyIcons/Secularism_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Sovereignty.png b/android/Images/PolicyIcons/Sovereignty.png new file mode 100644 index 0000000000..0b141a6825 Binary files /dev/null and b/android/Images/PolicyIcons/Sovereignty.png differ diff --git a/android/Images/PolicyIcons/Sovereignty_(Civ5).png b/android/Images/PolicyIcons/Sovereignty_(Civ5).png deleted file mode 100644 index 76d9a342ae..0000000000 Binary files a/android/Images/PolicyIcons/Sovereignty_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Theocracy.png b/android/Images/PolicyIcons/Theocracy.png new file mode 100644 index 0000000000..8b9a4928c2 Binary files /dev/null and b/android/Images/PolicyIcons/Theocracy.png differ diff --git a/android/Images/PolicyIcons/Theocracy_(Civ5).png b/android/Images/PolicyIcons/Theocracy_(Civ5).png deleted file mode 100644 index 1829d6fb4d..0000000000 Binary files a/android/Images/PolicyIcons/Theocracy_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Trade Unions.png b/android/Images/PolicyIcons/Trade Unions.png new file mode 100644 index 0000000000..f93925236a Binary files /dev/null and b/android/Images/PolicyIcons/Trade Unions.png differ diff --git a/android/Images/PolicyIcons/Trade_Unions_(Civ5).png b/android/Images/PolicyIcons/Trade_Unions_(Civ5).png deleted file mode 100644 index eec06e7c66..0000000000 Binary files a/android/Images/PolicyIcons/Trade_Unions_(Civ5).png and /dev/null differ diff --git a/android/Images/PolicyIcons/Universal Suffrage.png b/android/Images/PolicyIcons/Universal Suffrage.png new file mode 100644 index 0000000000..d6ec5ff183 Binary files /dev/null and b/android/Images/PolicyIcons/Universal Suffrage.png differ diff --git a/android/Images/PolicyIcons/Universal_Suffrage_(Civ5).png b/android/Images/PolicyIcons/Universal_Suffrage_(Civ5).png deleted file mode 100644 index d64a45922c..0000000000 Binary files a/android/Images/PolicyIcons/Universal_Suffrage_(Civ5).png and /dev/null differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 301087284f..3d32a5876b 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -272,210 +272,210 @@ BuildingIcons/Nuclear Plant index: -1 BuildingIcons/Observatory rotate: false - xy: 714, 1436 + xy: 538, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1020, 1436 + xy: 742, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1122, 1436 + xy: 538, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1224, 1436 + xy: 640, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper maker rotate: false - xy: 1326, 1436 + xy: 844, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1734, 1436 + xy: 844, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1836, 1480 + xy: 742, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 538, 1335 + xy: 1150, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 742, 1334 + xy: 1252, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 844, 1334 + xy: 1150, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 946, 1334 + xy: 1048, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Statis Chamber rotate: false - xy: 1048, 1334 + xy: 1354, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 640, 1232 + xy: 1456, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 742, 1232 + xy: 1354, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1048, 1232 + xy: 1456, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1150, 1232 + xy: 1660, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1252, 1232 + xy: 1558, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1456, 1232 + xy: 612, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 1558, 1232 + xy: 612, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 714, 1130 + xy: 816, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 612, 926 + xy: 612, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 714, 1028 + xy: 714, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 816, 1130 + xy: 816, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 612, 824 + xy: 918, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 714, 926 + xy: 612, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 816, 1028 + xy: 714, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 714, 824 + xy: 1020, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 918, 1028 + xy: 714, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 714, 722 + xy: 1020, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1020, 1028 + xy: 714, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -594,56 +594,56 @@ ImprovementIcons/Mine index: -1 ImprovementIcons/Oil well rotate: false - xy: 918, 1436 + xy: 538, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 1428, 1436 + xy: 742, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1632, 1436 + xy: 946, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1938, 1480 + xy: 1048, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1836, 1378 + xy: 946, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 1836, 1378 + xy: 946, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 640, 1334 + xy: 946, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 918, 1130 + xy: 816, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -699,21 +699,21 @@ OtherIcons/MenuIcon index: -1 OtherIcons/Shield rotate: false - xy: 1456, 1334 + xy: 1354, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1122, 1136 + xy: 816, 728 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1660, 1232 + xy: 714, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -734,219 +734,219 @@ OtherIcons/tileTableBackground index: -1 OtherIcons/whiteDot rotate: false - xy: 303, 199 + xy: 260, 1801 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -PolicyIcons/Aristocracy_(Civ5) +PolicyIcons/Aristocracy rotate: false - xy: 538, 1204 - size: 28, 27 - orig: 28, 27 + xy: 204, 1494 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Citizenship_(Civ5) +PolicyIcons/Citizenship rotate: false - xy: 1762, 1401 - size: 28, 33 - orig: 28, 33 + xy: 204, 150 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Civil_Society_(Civ5) +PolicyIcons/Civil Society rotate: false - xy: 714, 689 - size: 28, 31 - orig: 28, 31 + xy: 262, 2 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Collective_Rule_(Civ5) +PolicyIcons/Collective Rule rotate: false - xy: 816, 791 - size: 28, 31 - orig: 28, 31 + xy: 1807, 1792 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Constitution_(Civ5) +PolicyIcons/Constitution rotate: false - xy: 568, 1204 - size: 28, 27 - orig: 28, 27 + xy: 314, 2 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Democracy_(Civ5) +PolicyIcons/Democracy rotate: false - xy: 1122, 1104 - size: 28, 30 - orig: 28, 30 + xy: 366, 2 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Entrepreneurship_(Civ5) +PolicyIcons/Entrepreneurship rotate: false - xy: 204, 153 - size: 45, 47 - orig: 45, 47 + xy: 418, 2 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Free_Religion_(Civ5) +PolicyIcons/Free Religion rotate: false - xy: 1224, 1201 - size: 28, 29 - orig: 28, 29 + xy: 470, 2 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Free_Speech_(Civ5) +PolicyIcons/Free Speech rotate: false - xy: 1836, 1602 - size: 28, 36 - orig: 28, 36 + xy: 1836, 1588 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Free_Thought_(Civ5) +PolicyIcons/Free Thought rotate: false - xy: 262, 11 - size: 28, 28 - orig: 28, 28 + xy: 1836, 1536 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Humanism_(Civ5) +PolicyIcons/Humanism rotate: false - xy: 2007, 1980 - size: 28, 27 - orig: 28, 27 + xy: 1762, 1486 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Landed_Elite_(Civ5) +PolicyIcons/Landed Elite rotate: false - xy: 918, 893 - size: 28, 31 - orig: 28, 31 + xy: 918, 874 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Legalism_(Civ5) +PolicyIcons/Legalism rotate: false - xy: 1807, 1775 - size: 28, 28 - orig: 28, 28 + xy: 1020, 976 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Mandate_Of_Heaven_(Civ5) +PolicyIcons/Mandate Of Heaven rotate: false - xy: 2007, 2009 - size: 28, 35 - orig: 28, 35 + xy: 1122, 1078 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Mercantilism_(Civ5) +PolicyIcons/Mercantilism rotate: false - xy: 1807, 1805 - size: 28, 37 - orig: 28, 37 + xy: 1224, 1180 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Meritocracy_(Civ5) +PolicyIcons/Meritocracy rotate: false - xy: 1762, 1372 - size: 28, 27 - orig: 28, 27 + xy: 612, 466 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Monarchy_(Civ5) +PolicyIcons/Monarchy rotate: false - xy: 1866, 1602 - size: 28, 36 - orig: 28, 36 + xy: 714, 568 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Oligarchy_(Civ5) +PolicyIcons/Oligarchy rotate: false - xy: 612, 586 - size: 28, 32 - orig: 28, 32 + xy: 816, 676 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Organized_Religion_(Civ5) +PolicyIcons/Organized Religion rotate: false - xy: 466, 1178 - size: 28, 24 - orig: 28, 24 + xy: 1762, 1434 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Patronage_(Civ5) +PolicyIcons/Patronage rotate: false - xy: 204, 1498 - size: 50, 46 - orig: 50, 46 + xy: 918, 822 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Protectionism_(Civ5) +PolicyIcons/Protectionism rotate: false - xy: 390, 1482 - size: 28, 26 - orig: 28, 26 + xy: 1276, 1180 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Reformation_(Civ5) +PolicyIcons/Reformation rotate: false - xy: 1837, 1814 - size: 28, 28 - orig: 28, 28 + xy: 612, 414 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Representation_(Civ5) +PolicyIcons/Representation rotate: false - xy: 1020, 995 - size: 28, 31 - orig: 28, 31 + xy: 816, 624 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Republic_(Civ5) +PolicyIcons/Republic rotate: false - xy: 436, 1176 - size: 28, 26 - orig: 28, 26 + xy: 1762, 1382 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Scientific_Revolution_(Civ5) +PolicyIcons/Scientific Revolution rotate: false - xy: 510, 156 - size: 28, 26 - orig: 28, 26 + xy: 918, 770 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Secularism_(Civ5) +PolicyIcons/Secularism rotate: false - xy: 251, 171 - size: 28, 29 - orig: 28, 29 + xy: 1328, 1180 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Sovereignty_(Civ5) +PolicyIcons/Sovereignty rotate: false - xy: 568, 55 - size: 28, 25 - orig: 28, 25 + xy: 612, 362 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Theocracy_(Civ5) +PolicyIcons/Theocracy rotate: false - xy: 470, 1623 - size: 28, 37 - orig: 28, 37 + xy: 1762, 1330 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Trade_Unions_(Civ5) +PolicyIcons/Trade Unions rotate: false - xy: 500, 1632 - size: 28, 28 - orig: 28, 28 + xy: 1380, 1180 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -PolicyIcons/Universal_Suffrage_(Civ5) +PolicyIcons/Universal Suffrage rotate: false - xy: 440, 1612 - size: 28, 48 - orig: 28, 48 + xy: 612, 310 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 ResourceIcons/Aluminum @@ -1056,42 +1056,42 @@ ResourceIcons/Marble index: -1 ResourceIcons/Oil rotate: false - xy: 816, 1436 + xy: 640, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1354, 1334 + xy: 1456, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1558, 1334 + xy: 1252, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1660, 1334 + xy: 1558, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 946, 1232 + xy: 1558, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1354, 1232 + xy: 1660, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1105,21 +1105,21 @@ ResourceIcons/Sugar index: -1 ResourceIcons/Uranium rotate: false - xy: 816, 926 + xy: 612, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 612, 620 + xy: 918, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 816, 824 + xy: 1122, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1196,7 +1196,7 @@ StatIcons/Production index: -1 StatIcons/RangedStrength rotate: false - xy: 1938, 1378 + xy: 844, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1210,7 +1210,7 @@ StatIcons/Science index: -1 StatIcons/Strength rotate: false - xy: 612, 1130 + xy: 612, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1266,7 +1266,7 @@ TerrainIcons/Oasis index: -1 TerrainIcons/road rotate: false - xy: 262, 41 + xy: 440, 1649 size: 61, 11 orig: 61, 11 offset: 0, 0 @@ -1413,273 +1413,273 @@ UnitIcons/Musketeer index: -1 UnitIcons/Musketman rotate: false - xy: 612, 1437 + xy: 1888, 1481 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1530, 1436 + xy: 640, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 538, 1233 + xy: 1048, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1150, 1334 + xy: 1252, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1252, 1334 + xy: 1150, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 844, 1232 + xy: 1660, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 612, 1028 + xy: 714, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 612, 722 + xy: 918, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1020, 1130 + xy: 816, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 918, 926 + xy: 612, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 306, 1200 + xy: 1814, 1516 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 540, 162 + xy: 2007, 2024 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 1792, 1414 + xy: 306, 1200 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 1814, 1414 + xy: 390, 1488 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 612, 564 + xy: 256, 180 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 642, 598 + xy: 1807, 1770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 714, 667 + xy: 522, 32 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 744, 700 + xy: 436, 1182 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 816, 769 + xy: 510, 162 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 846, 802 + xy: 568, 60 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 918, 871 + xy: 538, 1210 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 948, 904 + xy: 970, 904 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1020, 973 + xy: 1020, 954 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1050, 1006 + xy: 1072, 1006 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1122, 1082 + xy: 1122, 1056 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1152, 1114 + xy: 1174, 1108 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1224, 1179 + xy: 1224, 1158 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1254, 1210 + xy: 664, 496 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 281, 180 + xy: 714, 546 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 292, 19 + xy: 766, 598 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1807, 1753 + xy: 868, 706 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1837, 1792 + xy: 918, 748 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 530, 1640 + xy: 1762, 1308 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 2007, 1958 + xy: 1432, 1210 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1762, 1350 + xy: 612, 288 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 598, 60 + xy: 440, 1627 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 306, 1178 + xy: 1814, 1494 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1792, 1392 + xy: 1836, 1514 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1814, 1392 + xy: 2007, 2002 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index f50fb6f12b..dbcf1aa743 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 18142e6f84..ed30b80a52 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 133 - versionName "2.8.1" + versionCode 134 + versionName "2.8.2" } buildTypes { release { diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt index 4e78ed4fc4..d8ecfaedb4 100644 --- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt @@ -93,7 +93,8 @@ class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen( private fun getPolicyButton(policy: Policy, image: Boolean): Button { var policyButton = Button(CameraStageBaseScreen.skin) if (image) { - val policyImage = ImageGetter.getImage("PolicyIcons/" + policy.name.replace(" ", "_") + "_(Civ5).png") +// val policyImage = ImageGetter.getImage("PolicyIcons/" + policy.name.replace(" ", "_") + "_(Civ5).png") + val policyImage = ImageGetter.getImage("PolicyIcons/" + policy.name) policyButton.add(policyImage).size(30f) } else { policyButton = TextButton(policy.name.tr(), CameraStageBaseScreen.skin)