mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-08 14:57:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Assign Population Improvements (#6650)

Browse Source 
City management UI to allow focusing automatic worker placement

Improvements to worker / specialist assignment routines
This commit is contained in:
itanasi
2022-05-19 15:12:23 -07:00
committed by GitHub
parent a272e8e7ba
commit a2bc1a1a29
17 changed files with 665 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/Lock.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 14 KiB

488
android/assets/game.atlas
View File

@ -1075,6 +1075,90 @@ TileSets/FantasyHex/Arrows/UnitHasAttacked
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/Generic
rotate: false
xy: 4, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/Generic
rotate: false
xy: 4, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitAttacked
rotate: false
xy: 190, 1164
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitAttacked
rotate: false
xy: 190, 1164
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoved
rotate: false
xy: 298, 1150
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoved
rotate: false
xy: 298, 1150
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoving
rotate: false
xy: 112, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoving
rotate: false
xy: 112, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitTeleported
rotate: false
xy: 622, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitTeleported
rotate: false
xy: 622, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitWithdrew
rotate: false
xy: 730, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitWithdrew
rotate: false
xy: 730, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/AtollOverlay
rotate: false
xy: 4, 830
@ -1082,6 +1166,118 @@ TileSets/Default/AtollOverlay
orig: 100, 100
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1411
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1411
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexOuter
rotate: false
xy: 406, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexOuter
rotate: false
xy: 406, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveInner
rotate: false
xy: 622, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveInner
rotate: false
xy: 622, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveOuter
rotate: false
xy: 1378, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveOuter
rotate: false
xy: 1378, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveInner
rotate: false
xy: 495, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveInner
rotate: false
xy: 495, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveOuter
rotate: false
xy: 711, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveOuter
rotate: false
xy: 711, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexInner
rotate: false
xy: 1378, 1250
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexInner
rotate: false
xy: 1378, 1250
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexOuter
rotate: false
xy: 1467, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexOuter
rotate: false
xy: 1467, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/CityOverlay
rotate: false
xy: 1470, 1944
@ -1089,6 +1285,34 @@ TileSets/Default/CityOverlay
orig: 100, 100
offset: 0, 0
index: -1
TileSets/Default/Crosshair
rotate: false
xy: 482, 1944
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/FantasyHex/Crosshair
rotate: false
xy: 482, 1944
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/Default/CrosshatchHexagon
rotate: false
xy: 4, 1340
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/FantasyHex/CrosshatchHexagon
rotate: false
xy: 4, 1340
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/Default/FalloutOverlay
rotate: false
xy: 590, 1836
@ -1110,6 +1334,20 @@ TileSets/Default/ForestOverlay
orig: 100, 100
offset: 0, 0
index: -1
TileSets/Default/Highlight
rotate: false
xy: 4, 1832
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/FantasyHex/Highlight
rotate: false
xy: 4, 1832
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/Default/HillOverlay
rotate: false
xy: 590, 1728
@ -1175,263 +1413,25 @@ TileSets/Default/Road
index: -1
TileSets/Default/Tiles/River-Bottom
rotate: false
xy: 1574, 735
xy: 1534, 694
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/Default/Tiles/River-BottomLeft
rotate: false
xy: 1574, 699
xy: 1534, 658
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/Default/Tiles/River-BottomRight
rotate: false
xy: 1574, 663
xy: 1534, 622
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/Generic
rotate: false
xy: 4, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/Generic
rotate: false
xy: 4, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitAttacked
rotate: false
xy: 190, 1164
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitAttacked
rotate: false
xy: 190, 1164
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoved
rotate: false
xy: 298, 1150
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoved
rotate: false
xy: 298, 1150
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoving
rotate: false
xy: 112, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoving
rotate: false
xy: 112, 6
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitTeleported
rotate: false
xy: 622, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitTeleported
rotate: false
xy: 622, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitWithdrew
rotate: false
xy: 730, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitWithdrew
rotate: false
xy: 730, 1228
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1411
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1411
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexOuter
rotate: false
xy: 406, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexOuter
rotate: false
xy: 406, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveInner
rotate: false
xy: 622, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveInner
rotate: false
xy: 622, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveOuter
rotate: false
xy: 1378, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveOuter
rotate: false
xy: 1378, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveInner
rotate: false
xy: 495, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveInner
rotate: false
xy: 495, 1165
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveOuter
rotate: false
xy: 711, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveOuter
rotate: false
xy: 711, 1205
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexInner
rotate: false
xy: 1378, 1250
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexInner
rotate: false
xy: 1378, 1250
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexOuter
rotate: false
xy: 1467, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexOuter
rotate: false
xy: 1467, 1273
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Crosshair
rotate: false
xy: 482, 1944
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/Default/Crosshair
rotate: false
xy: 482, 1944
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/FantasyHex/CrosshatchHexagon
rotate: false
xy: 4, 1340
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/Default/CrosshatchHexagon
rotate: false
xy: 4, 1340
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/FantasyHex/Highlight
rotate: false
xy: 4, 1832
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/Default/Highlight
rotate: false
xy: 4, 1832
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/FantasyHex/Railroad
rotate: false
xy: 505, 1728
@ -2316,21 +2316,21 @@ TileSets/FantasyHex/Tiles/Quarry+Stone
index: -1
TileSets/FantasyHex/Tiles/River-Bottom
rotate: false
xy: 1534, 694
xy: 1574, 735
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-BottomLeft
rotate: false
xy: 1534, 658
xy: 1574, 699
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-BottomRight
rotate: false
xy: 1534, 622
xy: 1574, 663
size: 32, 28
orig: 32, 28
offset: 0, 0

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

12
android/assets/jsons/translations/template.properties
View File

@ -929,6 +929,8 @@ Nothing =
Annex city =
Specialist Buildings =
Specialist Allocation =
Manual Specialists =
Auto Specialists =
Specialists =
[specialist] slots =
Food eaten =
@ -956,6 +958,16 @@ Worked by [cityName] =
Lock =
Unlock =
Move to city =
Reset Citizens =
Citizen Management =
Avoid Growth =
Default Focus =
Food Focus =
Production Focus =
Gold Focus =
Science Focus =
Culture Focus =
Happiness Focus =
Please enter a new name for your city =
Please select a tile for this building's [improvement] =