Replaced all policy icons!
33
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
|
||||
|
||||
|
|
BIN
android/Images/PolicyIcons/Aristocracy.png
Normal file
After Width: | Height: | Size: 750 B |
Before Width: | Height: | Size: 1.8 KiB |
BIN
android/Images/PolicyIcons/Citizenship.png
Normal file
After Width: | Height: | Size: 696 B |
Before Width: | Height: | Size: 2.6 KiB |
BIN
android/Images/PolicyIcons/Civil Society.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 2.3 KiB |
BIN
android/Images/PolicyIcons/Collective Rule.png
Normal file
After Width: | Height: | Size: 947 B |
Before Width: | Height: | Size: 2 KiB |
BIN
android/Images/PolicyIcons/Constitution.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.2 KiB |
BIN
android/Images/PolicyIcons/Democracy.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.3 KiB |
BIN
android/Images/PolicyIcons/Entrepreneurship.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.2 KiB |
BIN
android/Images/PolicyIcons/Free Religion.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
android/Images/PolicyIcons/Free Speech.png
Normal file
After Width: | Height: | Size: 817 B |
BIN
android/Images/PolicyIcons/Free Thought.png
Normal file
After Width: | Height: | Size: 819 B |
Before Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.5 KiB |
BIN
android/Images/PolicyIcons/Humanism.png
Normal file
After Width: | Height: | Size: 806 B |
Before Width: | Height: | Size: 2.7 KiB |
BIN
android/Images/PolicyIcons/Landed Elite.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2.2 KiB |
BIN
android/Images/PolicyIcons/Legalism.png
Normal file
After Width: | Height: | Size: 670 B |
Before Width: | Height: | Size: 2.1 KiB |
BIN
android/Images/PolicyIcons/Mandate Of Heaven.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 3 KiB |
BIN
android/Images/PolicyIcons/Mercantilism.png
Normal file
After Width: | Height: | Size: 984 B |
Before Width: | Height: | Size: 3.1 KiB |
BIN
android/Images/PolicyIcons/Meritocracy.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.1 KiB |
BIN
android/Images/PolicyIcons/Monarchy.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 3.1 KiB |
BIN
android/Images/PolicyIcons/Oligarchy.png
Normal file
After Width: | Height: | Size: 818 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
android/Images/PolicyIcons/Organized Religion.png
Normal file
After Width: | Height: | Size: 965 B |
Before Width: | Height: | Size: 2 KiB |
BIN
android/Images/PolicyIcons/Patronage.png
Normal file
After Width: | Height: | Size: 886 B |
Before Width: | Height: | Size: 2.9 KiB |
BIN
android/Images/PolicyIcons/Protectionism.png
Normal file
After Width: | Height: | Size: 986 B |
Before Width: | Height: | Size: 2.3 KiB |
BIN
android/Images/PolicyIcons/Reformation.png
Normal file
After Width: | Height: | Size: 388 B |
Before Width: | Height: | Size: 2 KiB |
BIN
android/Images/PolicyIcons/Representation.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.7 KiB |
BIN
android/Images/PolicyIcons/Republic.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 2 KiB |
BIN
android/Images/PolicyIcons/Scientific Revolution.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 2.4 KiB |
BIN
android/Images/PolicyIcons/Secularism.png
Normal file
After Width: | Height: | Size: 520 B |
Before Width: | Height: | Size: 2.2 KiB |
BIN
android/Images/PolicyIcons/Sovereignty.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.3 KiB |
BIN
android/Images/PolicyIcons/Theocracy.png
Normal file
After Width: | Height: | Size: 888 B |
Before Width: | Height: | Size: 2.8 KiB |
BIN
android/Images/PolicyIcons/Trade Unions.png
Normal file
After Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 2.1 KiB |
BIN
android/Images/PolicyIcons/Universal Suffrage.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 669 KiB After Width: | Height: | Size: 625 KiB |
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
|
|