mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-10 04:43:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added WLTKD status icon (#8257)

Browse Source 
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95 2022-12-29 12:52:35 +01:00 committed by GitHub
parent 68c6c60f77
commit 8fd561de50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/WLTKD.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 568 B

69
android/assets/game.atlas
View File

@ -41,91 +41,91 @@ CityStateIcons/Religious
index: -1 index: -1
EmojiIcons/Culture EmojiIcons/Culture
rotate: false rotate: false
xy: 946, 1581 xy: 946, 1755
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Faith EmojiIcons/Faith
rotate: false rotate: false
xy: 946, 1523 xy: 946, 1697
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Food EmojiIcons/Food
rotate: false rotate: false
xy: 946, 1465 xy: 946, 1639
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Gold EmojiIcons/Gold
rotate: false rotate: false
xy: 946, 1407 xy: 946, 1581
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Great Artist EmojiIcons/Great Artist
rotate: false rotate: false
xy: 946, 1349 xy: 946, 1523
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Great Engineer EmojiIcons/Great Engineer
rotate: false rotate: false
xy: 946, 1291 xy: 946, 1465
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Great General EmojiIcons/Great General
rotate: false rotate: false
xy: 946, 1233 xy: 946, 1407
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Great Merchant EmojiIcons/Great Merchant
rotate: false rotate: false
xy: 946, 1175 xy: 946, 1349
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Great Scientist EmojiIcons/Great Scientist
rotate: false rotate: false
xy: 946, 1117 xy: 946, 1291
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Happiness EmojiIcons/Happiness
rotate: false rotate: false
xy: 946, 1059 xy: 946, 1233
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Production EmojiIcons/Production
rotate: false rotate: false
xy: 946, 653 xy: 946, 827
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Science EmojiIcons/Science
rotate: false rotate: false
xy: 1004, 1713 xy: 946, 653
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
EmojiIcons/Turn EmojiIcons/Turn
rotate: false rotate: false
xy: 1178, 1771 xy: 1120, 1771
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -475,42 +475,42 @@ UnitActionIcons/AirSweep
index: -1 index: -1
OtherIcons/Aircraft OtherIcons/Aircraft
rotate: false rotate: false
xy: 760, 39 xy: 851, 27
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
OtherIcons/ArrowRight OtherIcons/ArrowRight
rotate: false rotate: false
xy: 946, 1755 xy: 909, 27
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
NotificationIcons/MoveAutomatedUnits NotificationIcons/MoveAutomatedUnits
rotate: false rotate: false
xy: 946, 1755 xy: 909, 27
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
NotificationIcons/NextUnit NotificationIcons/NextUnit
rotate: false rotate: false
xy: 946, 1755 xy: 909, 27
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
StatIcons/Movement StatIcons/Movement
rotate: false rotate: false
xy: 946, 1755 xy: 909, 27
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
OtherIcons/BackArrow OtherIcons/BackArrow
rotate: false rotate: false
xy: 946, 1697 xy: 967, 27
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -573,7 +573,7 @@ OtherIcons/Cities
index: -1 index: -1
OtherIcons/CityState OtherIcons/CityState
rotate: false rotate: false
xy: 946, 1639 xy: 1025, 27
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -643,14 +643,14 @@ OtherIcons/Hexagon
index: -1 index: -1
OtherIcons/Improvements OtherIcons/Improvements
rotate: false rotate: false
xy: 946, 943 xy: 946, 1117
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
OtherIcons/Link OtherIcons/Link
rotate: false rotate: false
xy: 946, 827 xy: 946, 1001
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -671,7 +671,7 @@ OtherIcons/Lock
index: -1 index: -1
OtherIcons/LockSmall OtherIcons/LockSmall
rotate: false rotate: false
xy: 946, 769 xy: 946, 943
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -706,7 +706,7 @@ OtherIcons/Multiplayer
index: -1 index: -1
OtherIcons/Nations OtherIcons/Nations
rotate: false rotate: false
xy: 946, 711 xy: 946, 885
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -944,7 +944,7 @@ UnitActionIcons/Swap
index: -1 index: -1
OtherIcons/Terrains OtherIcons/Terrains
rotate: false rotate: false
xy: 1004, 1655 xy: 1004, 1713
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -984,6 +984,13 @@ OtherIcons/Unique
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
OtherIcons/WLTKD
rotate: false
xy: 760, 24
size: 83, 65
orig: 83, 65
offset: 0, 0
index: -1
OtherIcons/Wait OtherIcons/Wait
rotate: false rotate: false
xy: 1403, 1829 xy: 1403, 1829
@ -1301,7 +1308,7 @@ StatIcons/Happiness
index: -1 index: -1
StatIcons/InterceptRange StatIcons/InterceptRange
rotate: false rotate: false
xy: 946, 885 xy: 946, 1059
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -1322,14 +1329,14 @@ StatIcons/Population
index: -1 index: -1
StatIcons/Range StatIcons/Range
rotate: false rotate: false
xy: 1004, 1771 xy: 946, 769
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
index: -1 index: -1
StatIcons/RangedStrength StatIcons/RangedStrength
rotate: false rotate: false
xy: 1062, 1771 xy: 946, 711
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -1357,7 +1364,7 @@ StatIcons/Specialist
index: -1 index: -1
StatIcons/Strength StatIcons/Strength
rotate: false rotate: false
xy: 1062, 1713 xy: 1062, 1771
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -1448,7 +1455,7 @@ UnitActionIcons/FoundCity
index: -1 index: -1
UnitActionIcons/HideMore UnitActionIcons/HideMore
rotate: false rotate: false
xy: 946, 1001 xy: 946, 1175
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0
@ -1497,7 +1504,7 @@ UnitActionIcons/SetUp
index: -1 index: -1
UnitActionIcons/ShowMore UnitActionIcons/ShowMore
rotate: false rotate: false
xy: 1120, 1771 xy: 1004, 1771
size: 50, 50 size: 50, 50
orig: 50, 50 orig: 50, 50
offset: 0, 0 offset: 0, 0

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 578 KiB

After

Width:  |  Height:  |  Size: 580 KiB

6
core/src/com/unciv/ui/tilegroups/CityButton.kt
View File

@ -265,6 +265,12 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
val fireImage = ImageGetter.getImage("OtherIcons/Fire") val fireImage = ImageGetter.getImage("OtherIcons/Fire")
table.add(fireImage).size(16f).padLeft(2f) table.add(fireImage).size(16f).padLeft(2f)
} }
if (belongsToViewingCiv() && city.isWeLoveTheKingDayActive()) {
val wtlkdImage = ImageGetter.getImage("OtherIcons/WLTKD")
table.add(wtlkdImage).size(16f).padLeft(2f)
}
return table return table
} }

1
docs/Credits.md
View File

@ -696,6 +696,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
- [Footprints](https://thenounproject.com/icon/footprints-1393611/) by Abdul Wahhab for movement overlay toggle, slightly modified. Currently unused. - [Footprints](https://thenounproject.com/icon/footprints-1393611/) by Abdul Wahhab for movement overlay toggle, slightly modified. Currently unused.
- Arrows.svg by Intralexical (@will-ca), CC0. - Arrows.svg by Intralexical (@will-ca), CC0.
- [favor](https://thenounproject.com/icon/favor-1029350/) by MICHAEL G BROWN for WLTK marker on City Overview - [favor](https://thenounproject.com/icon/favor-1029350/) by MICHAEL G BROWN for WLTK marker on City Overview
- WLTKD by [vegeta1k95](https://github.com/vegeta1k95) based on [favor](https://thenounproject.com/icon/favor-1029350/) by MICHAEL G BROWN for WLTKD status icon
- [Party](https://thenounproject.com/icon/party-1784941/) by Adrien Coquet for WLTK header on City Overview - [Party](https://thenounproject.com/icon/party-1784941/) by Adrien Coquet for WLTK header on City Overview
- [Party](https://thenounproject.com/icon/party-2955155/) by Lars Meiertoberens as additional WLKT decoration - [Party](https://thenounproject.com/icon/party-2955155/) by Lars Meiertoberens as additional WLKT decoration
- [spy](https://thenounproject.com/icon/spy-2905374/) by Vectorstall for Spy - [spy](https://thenounproject.com/icon/spy-2905374/) by Vectorstall for Spy