mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 13:18:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Rework of City Screen: new Great People list + misc changes (#8180)

Browse Source 
* Rework of City Screen: new Great People list + misc changes

* Added a bit of padding

* Buildings are united under one tabs, GP font icons replaced by tinted UnitIcons

* Fix color of separators

* Big update to "Detailed stats" UI

* Rebuild pngs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
This commit is contained in:
vegeta1k95
2022-12-21 10:46:35 +01:00
committed by GitHub
parent 47c21216b2
commit 2bc91f1216
19 changed files with 888 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/EmojiIcons/Great Artist.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
android/Images/EmojiIcons/Great Engineer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
android/Images/EmojiIcons/Great General.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
android/Images/EmojiIcons/Great Merchant.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
android/Images/EmojiIcons/Great Scientist.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

569
android/assets/Construction.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/Construction.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 750 KiB

After

Width:  |  Height:  |  Size: 761 KiB

226
android/assets/game.atlas
View File

@ -41,56 +41,91 @@ CityStateIcons/Religious
index: -1
EmojiIcons/Culture
rotate: false
xy: 1270, 1122
xy: 1918, 1770
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Faith
rotate: false
xy: 1378, 1230
xy: 1270, 1020
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Food
rotate: false
xy: 1486, 1344
xy: 1378, 1122
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Gold
rotate: false
xy: 1594, 1452
xy: 1486, 1230
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Great Artist
rotate: false
xy: 1594, 1338
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Great Engineer
rotate: false
xy: 1702, 1446
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Great General
rotate: false
xy: 356, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Great Merchant
rotate: false
xy: 1004, 906
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Great Scientist
rotate: false
xy: 1810, 1604
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Happiness
rotate: false
xy: 1702, 1554
xy: 1976, 1770
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Production
rotate: false
xy: 414, 720
xy: 588, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Science
rotate: false
xy: 530, 720
xy: 762, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
EmojiIcons/Turn
rotate: false
xy: 762, 720
xy: 1868, 1546
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -265,70 +300,70 @@ ImprovementIcons/Railroad
index: -1
ImprovementIcons/Remove Fallout
rotate: false
xy: 250, 0
xy: 1054, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Remove Forest
rotate: false
xy: 350, 0
xy: 1162, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Remove Jungle
rotate: false
xy: 350, 0
xy: 1162, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Remove Marsh
rotate: false
xy: 450, 0
size: 100, 100
orig: 100, 100
xy: 838, 1187
size: 100, 99
orig: 100, 99
offset: 0, 0
index: -1
ImprovementIcons/Remove Railroad
rotate: false
xy: 550, 0
xy: 946, 1288
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Remove Road
rotate: false
xy: 650, 0
xy: 1054, 1396
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Repair
rotate: false
xy: 1270, 1720
xy: 1270, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Road
rotate: false
xy: 1162, 1504
xy: 1054, 1288
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Terrace farm
rotate: false
xy: 1378, 1396
xy: 1162, 1078
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ImprovementIcons/Trading post
rotate: false
xy: 1594, 1618
xy: 1378, 1288
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -403,13 +438,6 @@ StatIcons/Science
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/ConvertScience
rotate: false
xy: 622, 886
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/AirSweep
rotate: false
xy: 4, 369
@ -433,28 +461,28 @@ OtherIcons/Aircraft
index: -1
OtherIcons/ArrowRight
rotate: false
xy: 838, 804
xy: 838, 805
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
NotificationIcons/MoveAutomatedUnits
rotate: false
xy: 838, 804
xy: 838, 805
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
NotificationIcons/NextUnit
rotate: false
xy: 838, 804
xy: 838, 805
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
StatIcons/Movement
rotate: false
xy: 838, 804
xy: 838, 805
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -475,7 +503,7 @@ OtherIcons/Banner
index: -1
OtherIcons/Camera
rotate: false
xy: 896, 829
xy: 1270, 987
size: 25, 25
orig: 25, 25
offset: 0, 0
@ -517,7 +545,7 @@ OtherIcons/Cities
index: -1
OtherIcons/CityState
rotate: false
xy: 1162, 1014
xy: 1810, 1662
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -587,21 +615,14 @@ OtherIcons/Hexagon
index: -1
OtherIcons/Improvements
rotate: false
xy: 1918, 1770
xy: 1062, 906
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
OtherIcons/Unique
rotate: false
xy: 1921, 1655
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Link
rotate: false
xy: 1004, 906
xy: 472, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -671,7 +692,7 @@ OtherIcons/Multiplayer
index: -1
OtherIcons/Nations
rotate: false
xy: 1976, 1770
xy: 530, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -783,140 +804,140 @@ OtherIcons/Quickstart
index: -1
OtherIcons/Remove Heresy
rotate: false
xy: 1054, 1504
xy: 1270, 1720
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Resources
rotate: false
xy: 946, 1288
xy: 838, 1079
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Resume
rotate: false
xy: 1054, 1396
xy: 946, 1180
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Search
rotate: false
xy: 1378, 1720
xy: 1270, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/SecretOptions
rotate: false
xy: 838, 1078
xy: 1378, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Settings
rotate: false
xy: 1054, 1288
xy: 838, 971
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Shield
rotate: false
xy: 1270, 1504
xy: 1054, 1180
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Sleep
rotate: false
xy: 838, 970
xy: 1378, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitActionIcons/Sleep
rotate: false
xy: 838, 970
xy: 1378, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Speaker
rotate: false
xy: 946, 1072
xy: 1486, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Spy
rotate: false
xy: 1270, 1396
xy: 946, 964
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Spy_White
rotate: false
xy: 1378, 1504
xy: 1054, 1072
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Star
rotate: false
xy: 1486, 1618
xy: 1162, 1186
size: 100, 94
orig: 100, 94
offset: 0, 0
index: -1
OtherIcons/Stop
rotate: false
xy: 1054, 1072
xy: 1594, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitActionIcons/Stop
rotate: false
xy: 1054, 1072
xy: 1594, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitActionIcons/StopMove
rotate: false
xy: 1054, 1072
xy: 1594, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Swap
rotate: false
xy: 1270, 1288
xy: 1054, 964
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitActionIcons/Swap
rotate: false
xy: 1270, 1288
xy: 1054, 964
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Terrains
rotate: false
xy: 704, 720
xy: 1868, 1604
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
OtherIcons/Timer
rotate: false
xy: 1486, 1510
xy: 1270, 1186
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -930,35 +951,42 @@ OtherIcons/Triangle
index: -1
OtherIcons/Turn right
rotate: false
xy: 1054, 964
xy: 1594, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Tyrannosaurus
rotate: false
xy: 1162, 1072
xy: 1702, 1612
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Unique
rotate: false
xy: 1810, 1720
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Wait
rotate: false
xy: 1378, 1288
xy: 1270, 1078
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitActionIcons/Wait
rotate: false
xy: 1378, 1288
xy: 1270, 1078
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/Wonders
rotate: false
xy: 1810, 1720
xy: 1702, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -1133,84 +1161,84 @@ ResourceIcons/Porcelain
index: -1
ResourceIcons/Salt
rotate: false
xy: 1270, 1612
xy: 1162, 1396
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Sheep
rotate: false
xy: 1162, 1396
xy: 946, 1072
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Silk
rotate: false
xy: 1378, 1612
xy: 1162, 1288
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Silver
rotate: false
xy: 1486, 1720
xy: 1270, 1396
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Spices
rotate: false
xy: 1162, 1288
xy: 838, 863
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Stone
rotate: false
xy: 946, 964
xy: 1486, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Sugar
rotate: false
xy: 1162, 1180
xy: 1702, 1720
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Truffles
rotate: false
xy: 1702, 1720
xy: 1486, 1396
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Uranium
rotate: false
xy: 1270, 1180
xy: 1162, 970
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Whales
rotate: false
xy: 1486, 1402
xy: 1378, 1180
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Wheat
rotate: false
xy: 1594, 1510
xy: 1486, 1288
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
ResourceIcons/Wine
rotate: false
xy: 1702, 1612
xy: 1594, 1396
size: 100, 100
orig: 100, 100
offset: 0, 0
@ -1250,20 +1278,6 @@ StatIcons/Gold
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/ConvertGold
rotate: false
xy: 298, 1426
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
OtherIcons/ConvertNothing
rotate: false
xy: 1923, 1545
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
StatIcons/Happiness
rotate: false
xy: 514, 1642
@ -1273,7 +1287,7 @@ StatIcons/Happiness
index: -1
StatIcons/InterceptRange
rotate: false
xy: 356, 720
xy: 1810, 1546
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -1294,14 +1308,14 @@ StatIcons/Population
index: -1
StatIcons/Range
rotate: false
xy: 1062, 906
xy: 646, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
StatIcons/RangedStrength
rotate: false
xy: 472, 720
xy: 704, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -1315,21 +1329,21 @@ StatIcons/ReligiousStrength
index: -1
StatIcons/Resistance
rotate: false
xy: 838, 1186
xy: 1378, 1720
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
StatIcons/Specialist
rotate: false
xy: 1054, 1180
xy: 1594, 1720
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
StatIcons/Strength
rotate: false
xy: 646, 720
xy: 1868, 1662
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -1420,7 +1434,7 @@ UnitActionIcons/FoundCity
index: -1
UnitActionIcons/HideMore
rotate: false
xy: 1810, 1662
xy: 414, 720
size: 50, 50
orig: 50, 50
offset: 0, 0
@ -1455,35 +1469,35 @@ UnitActionIcons/Upgrade
index: -1
UnitActionIcons/RemoveHeresy
rotate: false
xy: 1162, 1612
xy: 1162, 1504
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitActionIcons/SetUp
rotate: false
xy: 946, 1180
xy: 1486, 1720
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitActionIcons/ShowMore
rotate: false
xy: 588, 720
xy: 896, 805
size: 50, 50
orig: 50, 50
offset: 0, 0
index: -1
UnitActionIcons/Star
rotate: false
xy: 1594, 1726
xy: 1270, 1294
size: 100, 94
orig: 100, 94
offset: 0, 0
index: -1
UnitActionIcons/StartGoldenAge
rotate: false
xy: 838, 862
xy: 1378, 1396
size: 100, 100
orig: 100, 100
offset: 0, 0

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 520 KiB

After

Width:  |  Height:  |  Size: 579 KiB