AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 13:27:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Can now display pixel resources on the map!

Browse Source
This commit is contained in:
Yair Morgenstern 2019-12-29 17:51:39 +02:00
parent 050db70fff
commit 4dd3a69a72
6 changed files with 138 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Tiles/Hill+Customs house.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

209
android/assets/game.atlas
View File

@ -2581,7 +2581,7 @@ OtherIcons/TableBackground
index: -1 index: -1
OtherIcons/whiteDot OtherIcons/whiteDot
rotate: false rotate: false
xy: 512, 5 xy: 818, 10
size: 1, 1 size: 1, 1
orig: 1, 1 orig: 1, 1
offset: 0, 0 offset: 0, 0
@ -3335,373 +3335,366 @@ TileSets/FantasyHex/Tiles/Hill+Camp
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Customs house TileSets/FantasyHex/Tiles/Hill+Fallout
rotate: false rotate: false
xy: 1828, 259 xy: 1828, 259
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Fallout
rotate: false
xy: 1862, 254
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Hill+Forest TileSets/FantasyHex/Tiles/Hill+Forest
rotate: false rotate: false
xy: 1896, 246 xy: 1862, 241
size: 32, 45 size: 32, 45
orig: 32, 45 orig: 32, 45
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Forest+Camp TileSets/FantasyHex/Tiles/Hill+Forest+Camp
rotate: false rotate: false
xy: 1930, 246 xy: 1896, 246
size: 32, 45 size: 32, 45
orig: 32, 45 orig: 32, 45
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill TileSets/FantasyHex/Tiles/Hill+Forest+Lumber mill
rotate: false rotate: false
xy: 1964, 248 xy: 1930, 246
size: 32, 45 size: 32, 45
orig: 32, 45 orig: 32, 45
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Mine TileSets/FantasyHex/Tiles/Hill+Mine
rotate: false rotate: false
xy: 1760, 233 xy: 1964, 261
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Quarry TileSets/FantasyHex/Tiles/Hill+Quarry
rotate: false rotate: false
xy: 1794, 218 xy: 1828, 225
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Terrace Farm TileSets/FantasyHex/Tiles/Hill+Terrace Farm
rotate: false rotate: false
xy: 1828, 225 xy: 1760, 233
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Iron TileSets/FantasyHex/Tiles/Iron
rotate: false rotate: false
xy: 1964, 218 xy: 1930, 216
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Krakatoa TileSets/FantasyHex/Tiles/Krakatoa
rotate: false rotate: false
xy: 1280, 199 xy: 1964, 194
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Lakes TileSets/FantasyHex/Tiles/Lakes
rotate: false rotate: false
xy: 1314, 206 xy: 1284, 236
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Landmark TileSets/FantasyHex/Tiles/Landmark
rotate: false rotate: false
xy: 1522, 236 xy: 1386, 234
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Manufactory TileSets/FantasyHex/Tiles/Manufactory
rotate: false rotate: false
xy: 1760, 196 xy: 1522, 229
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Mine TileSets/FantasyHex/Tiles/Mine
rotate: false rotate: false
xy: 1862, 194 xy: 1658, 236
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Moai TileSets/FantasyHex/Tiles/Moai
rotate: false rotate: false
xy: 1930, 186 xy: 1726, 229
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Mount Fuji TileSets/FantasyHex/Tiles/Mount Fuji
rotate: false rotate: false
xy: 1026, 138 xy: 1280, 172
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Mountain TileSets/FantasyHex/Tiles/Mountain
rotate: false rotate: false
xy: 1026, 100 xy: 1314, 168
size: 32, 36 size: 32, 36
orig: 32, 36 orig: 32, 36
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Ocean TileSets/FantasyHex/Tiles/Ocean
rotate: false rotate: false
xy: 1862, 164 xy: 1828, 165
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Oil well TileSets/FantasyHex/Tiles/Oil well
rotate: false rotate: false
xy: 1896, 156 xy: 1862, 153
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Old Faithful TileSets/FantasyHex/Tiles/Old Faithful
rotate: false rotate: false
xy: 1930, 152 xy: 1896, 154
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pasture TileSets/FantasyHex/Tiles/Pasture
rotate: false rotate: false
xy: 1556, 202 xy: 1420, 208
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pasture2 TileSets/FantasyHex/Tiles/Pasture2
rotate: false rotate: false
xy: 1590, 205 xy: 1416, 178
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains TileSets/FantasyHex/Tiles/Plains
rotate: false rotate: false
xy: 1692, 200 xy: 1522, 199
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+City TileSets/FantasyHex/Tiles/Plains+City
rotate: false rotate: false
xy: 1998, 319 xy: 1556, 195
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Fallout TileSets/FantasyHex/Tiles/Plains+Fallout
rotate: false rotate: false
xy: 1998, 289 xy: 1590, 205
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Farm TileSets/FantasyHex/Tiles/Plains+Farm
rotate: false rotate: false
xy: 1998, 259 xy: 1624, 208
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest TileSets/FantasyHex/Tiles/Plains+Forest
rotate: false rotate: false
xy: 1998, 224 xy: 1658, 201
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest+Camp TileSets/FantasyHex/Tiles/Plains+Forest+Camp
rotate: false rotate: false
xy: 1998, 189 xy: 1692, 195
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill
rotate: false rotate: false
xy: 1998, 154 xy: 1726, 194
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Jungle TileSets/FantasyHex/Tiles/Plains+Jungle
rotate: false rotate: false
xy: 1964, 123 xy: 1760, 168
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post
rotate: false rotate: false
xy: 1998, 117 xy: 1794, 155
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Trading post TileSets/FantasyHex/Tiles/Plains+Trading post
rotate: false rotate: false
xy: 1280, 169 xy: 1828, 135
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation TileSets/FantasyHex/Tiles/Plantation
rotate: false rotate: false
xy: 1314, 176 xy: 1450, 171
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Polder TileSets/FantasyHex/Tiles/Polder
rotate: false rotate: false
xy: 1420, 208 xy: 1484, 171
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Quarry TileSets/FantasyHex/Tiles/Quarry
rotate: false rotate: false
xy: 1454, 201 xy: 1518, 169
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-Bottom TileSets/FantasyHex/Tiles/River-Bottom
rotate: false rotate: false
xy: 1522, 174 xy: 1862, 121
size: 32, 30 size: 32, 30
orig: 32, 30 orig: 32, 30
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-BottomLeft TileSets/FantasyHex/Tiles/River-BottomLeft
rotate: false rotate: false
xy: 1556, 170 xy: 1896, 122
size: 32, 30 size: 32, 30
orig: 32, 30 orig: 32, 30
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-BottomRight TileSets/FantasyHex/Tiles/River-BottomRight
rotate: false rotate: false
xy: 1590, 173 xy: 1930, 126
size: 32, 30 size: 32, 30
orig: 32, 30 orig: 32, 30
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-Top TileSets/FantasyHex/Tiles/River-Top
rotate: false rotate: false
xy: 1624, 174 xy: 1964, 132
size: 32, 30 size: 32, 30
orig: 32, 30 orig: 32, 30
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-TopLeft TileSets/FantasyHex/Tiles/River-TopLeft
rotate: false rotate: false
xy: 1658, 174 xy: 1416, 146
size: 32, 30 size: 32, 30
orig: 32, 30 orig: 32, 30
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-TopRight TileSets/FantasyHex/Tiles/River-TopRight
rotate: false rotate: false
xy: 1692, 168 xy: 1450, 139
size: 32, 30 size: 32, 30
orig: 32, 30 orig: 32, 30
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Rock of Gibraltar TileSets/FantasyHex/Tiles/Rock of Gibraltar
rotate: false rotate: false
xy: 1726, 167 xy: 1484, 137
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Silver TileSets/FantasyHex/Tiles/Silver
rotate: false rotate: false
xy: 1862, 134 xy: 1382, 144
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra TileSets/FantasyHex/Tiles/Tundra
rotate: false rotate: false
xy: 1386, 206 xy: 1896, 92
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Camp TileSets/FantasyHex/Tiles/Tundra+Camp
rotate: false rotate: false
xy: 1348, 180 xy: 1930, 96
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+City TileSets/FantasyHex/Tiles/Tundra+City
rotate: false rotate: false
xy: 1348, 143 xy: 1964, 95
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Fallout TileSets/FantasyHex/Tiles/Tundra+Fallout
rotate: false rotate: false
xy: 1382, 176 xy: 1586, 117
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest TileSets/FantasyHex/Tiles/Tundra+Forest
rotate: false rotate: false
xy: 1382, 142 xy: 1998, 322
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest+Camp TileSets/FantasyHex/Tiles/Tundra+Forest+Camp
rotate: false rotate: false
xy: 1420, 174 xy: 1998, 288
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill
rotate: false rotate: false
xy: 1454, 167 xy: 1998, 254
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Trading post TileSets/FantasyHex/Tiles/Tundra+Trading post
rotate: false rotate: false
xy: 1488, 169 xy: 1998, 224
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Uranium TileSets/FantasyHex/Tiles/Uranium
rotate: false rotate: false
xy: 1450, 137 xy: 1998, 166
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/TopBorder TileSets/FantasyHex/TopBorder
rotate: false rotate: false
xy: 2010, 392 xy: 1794, 125
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
@ -3974,21 +3967,21 @@ TileSets/FantasyHex/Units/Infantry
index: -1 index: -1
TileSets/FantasyHex/Units/Hoplite TileSets/FantasyHex/Units/Hoplite
rotate: false rotate: false
xy: 1862, 224 xy: 1794, 222
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Horseman TileSets/FantasyHex/Units/Horseman
rotate: false rotate: false
xy: 1896, 216 xy: 1862, 211
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Hwach'a TileSets/FantasyHex/Units/Hwach'a
rotate: false rotate: false
xy: 1930, 216 xy: 1896, 216
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
@ -4002,315 +3995,315 @@ TileSets/FantasyHex/Units/Ironclad
index: -1 index: -1
TileSets/FantasyHex/Units/Jaguar TileSets/FantasyHex/Units/Jaguar
rotate: false rotate: false
xy: 1284, 236 xy: 1964, 231
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Janissary TileSets/FantasyHex/Units/Janissary
rotate: false rotate: false
xy: 1318, 236 xy: 1828, 195
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Keshik TileSets/FantasyHex/Units/Keshik
rotate: false rotate: false
xy: 1352, 238 xy: 1862, 183
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Khan TileSets/FantasyHex/Units/Khan
rotate: false rotate: false
xy: 1386, 236 xy: 1896, 188
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Knight TileSets/FantasyHex/Units/Knight
rotate: false rotate: false
xy: 1420, 238 xy: 1930, 186
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Lancer TileSets/FantasyHex/Units/Lancer
rotate: false rotate: false
xy: 1454, 231 xy: 1318, 236
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/LandUnit TileSets/FantasyHex/Units/LandUnit
rotate: false rotate: false
xy: 1488, 229 xy: 1352, 236
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Warrior TileSets/FantasyHex/Units/Warrior
rotate: false rotate: false
xy: 1488, 229 xy: 1352, 236
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Landship TileSets/FantasyHex/Units/Landship
rotate: false rotate: false
xy: 1556, 232 xy: 1420, 238
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Landsknecht TileSets/FantasyHex/Units/Landsknecht
rotate: false rotate: false
xy: 1590, 235 xy: 1280, 206
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Legion TileSets/FantasyHex/Units/Legion
rotate: false rotate: false
xy: 1624, 236 xy: 1314, 206
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Longbowman TileSets/FantasyHex/Units/Longbowman
rotate: false rotate: false
xy: 1658, 236 xy: 1348, 206
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Longswordsman TileSets/FantasyHex/Units/Longswordsman
rotate: false rotate: false
xy: 1692, 230 xy: 1454, 231
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Mandekalu Cavalry TileSets/FantasyHex/Units/Mandekalu Cavalry
rotate: false rotate: false
xy: 1726, 231 xy: 1488, 231
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Maori Warrior TileSets/FantasyHex/Units/Maori Warrior
rotate: false rotate: false
xy: 1726, 201 xy: 1556, 232
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Marine TileSets/FantasyHex/Units/Marine
rotate: false rotate: false
xy: 1794, 188 xy: 1590, 235
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Mechanized Infantry TileSets/FantasyHex/Units/Mechanized Infantry
rotate: false rotate: false
xy: 1828, 197 xy: 1624, 238
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Minuteman TileSets/FantasyHex/Units/Minuteman
rotate: false rotate: false
xy: 1896, 186 xy: 1692, 230
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Mohawk Warrior TileSets/FantasyHex/Units/Mohawk Warrior
rotate: false rotate: false
xy: 1964, 188 xy: 1382, 204
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Musketeer TileSets/FantasyHex/Units/Musketeer
rotate: false rotate: false
xy: 1026, 70 xy: 1348, 176
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Musketman TileSets/FantasyHex/Units/Musketman
rotate: false rotate: false
xy: 1026, 40 xy: 1382, 174
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Naresuan's Elephant TileSets/FantasyHex/Units/Naresuan's Elephant
rotate: false rotate: false
xy: 1022, 12 xy: 1760, 205
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Norwegian Ski Infantry TileSets/FantasyHex/Units/Norwegian Ski Infantry
rotate: false rotate: false
xy: 1828, 167 xy: 1794, 192
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Panzer TileSets/FantasyHex/Units/Panzer
rotate: false rotate: false
xy: 1964, 160 xy: 1930, 158
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Paratrooper TileSets/FantasyHex/Units/Paratrooper
rotate: false rotate: false
xy: 1522, 206 xy: 1964, 164
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Persian Immortal TileSets/FantasyHex/Units/Persian Immortal
rotate: false rotate: false
xy: 1624, 206 xy: 1454, 201
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Pikeman TileSets/FantasyHex/Units/Pikeman
rotate: false rotate: false
xy: 1658, 206 xy: 1488, 201
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Rifleman TileSets/FantasyHex/Units/Rifleman
rotate: false rotate: false
xy: 1488, 199 xy: 1552, 165
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Rocket Artillery TileSets/FantasyHex/Units/Rocket Artillery
rotate: false rotate: false
xy: 1760, 166 xy: 1518, 139
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Scout TileSets/FantasyHex/Units/Scout
rotate: false rotate: false
xy: 1794, 158 xy: 1552, 135
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Ship of the Line TileSets/FantasyHex/Units/Ship of the Line
rotate: false rotate: false
xy: 1828, 139 xy: 1348, 148
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Sipahi TileSets/FantasyHex/Units/Sipahi
rotate: false rotate: false
xy: 1896, 128 xy: 1590, 177
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Slinger TileSets/FantasyHex/Units/Slinger
rotate: false rotate: false
xy: 1930, 122 xy: 1624, 178
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Spearman TileSets/FantasyHex/Units/Spearman
rotate: false rotate: false
xy: 1314, 146 xy: 1658, 171
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Submarine TileSets/FantasyHex/Units/Submarine
rotate: false rotate: false
xy: 1964, 95 xy: 1692, 167
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Swordsman TileSets/FantasyHex/Units/Swordsman
rotate: false rotate: false
xy: 1998, 87 xy: 1726, 164
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Tank TileSets/FantasyHex/Units/Tank
rotate: false rotate: false
xy: 2010, 452 xy: 1586, 147
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Tercio TileSets/FantasyHex/Units/Tercio
rotate: false rotate: false
xy: 2010, 422 xy: 1760, 138
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Trebuchet TileSets/FantasyHex/Units/Trebuchet
rotate: false rotate: false
xy: 2010, 362 xy: 1828, 105
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Trireme TileSets/FantasyHex/Units/Trireme
rotate: false rotate: false
xy: 1352, 210 xy: 1862, 93
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Turtle Ship TileSets/FantasyHex/Units/Turtle Ship
rotate: false rotate: false
xy: 1416, 146 xy: 1998, 196
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/War Chariot TileSets/FantasyHex/Units/War Chariot
rotate: false rotate: false
xy: 1416, 116 xy: 1998, 136
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/War Elephant TileSets/FantasyHex/Units/War Elephant
rotate: false rotate: false
xy: 1450, 109 xy: 1998, 108
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/WaterUnit TileSets/FantasyHex/Units/WaterUnit
rotate: false rotate: false
xy: 1522, 146 xy: 1998, 80
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Work Boats TileSets/FantasyHex/Units/Work Boats
rotate: false rotate: false
xy: 1488, 141 xy: 1416, 118
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0

BIN
android/assets/game2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 KiB

After

Width:  |  Height:  |  Size: 297 KiB

1
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -22,6 +22,7 @@ class GameSettings {
var showMinimap: Boolean = true var showMinimap: Boolean = true
var showPixelUnits: Boolean = false var showPixelUnits: Boolean = false
var showPixelImprovements: Boolean = true var showPixelImprovements: Boolean = true
var showPixelResources: Boolean = true
var nuclearWeaponEnabled = false var nuclearWeaponEnabled = false
var userId = "" var userId = ""

45
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -90,7 +90,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
this.addActor(cityButtonLayerGroup) this.addActor(cityButtonLayerGroup)
this.addActor(circleCrosshairFogLayerGroup) this.addActor(circleCrosshairFogLayerGroup)
updateTileImage(false) updateTileImage(null)
addCircleImage() addCircleImage()
addFogImage(groupSize) addFogImage(groupSize)
@ -132,8 +132,9 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
} }
fun getTileBaseImageLocations(isRevealed: Boolean): List<String>{ fun getTileBaseImageLocations(viewingCiv: CivilizationInfo?): List<String>{
if (!isRevealed) return listOf(tileSetStrings.hexagon) if (viewingCiv==null) return listOf(tileSetStrings.hexagon)
if (tileInfo.isCityCenter()) { if (tileInfo.isCityCenter()) {
val terrainAndCity = tileSetStrings.getCityTile(tileInfo.baseTerrain) val terrainAndCity = tileSetStrings.getCityTile(tileInfo.baseTerrain)
if (ImageGetter.imageExists(terrainAndCity)) if (ImageGetter.imageExists(terrainAndCity))
@ -141,6 +142,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
if (ImageGetter.imageExists(tileSetStrings.cityTile)) if (ImageGetter.imageExists(tileSetStrings.cityTile))
return listOf(tileSetStrings.cityTile) return listOf(tileSetStrings.cityTile)
} }
if (tileInfo.isNaturalWonder()) if (tileInfo.isNaturalWonder())
{ {
val naturalWonder = tileSetStrings.getTile(tileInfo.naturalWonder!!) val naturalWonder = tileSetStrings.getTile(tileInfo.naturalWonder!!)
@ -148,19 +150,32 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
return listOf(naturalWonder) return listOf(naturalWonder)
} }
val shouldShowImprovement = tileInfo.improvement!=null && UncivGame.Current.settings.showPixelImprovements val shouldShowImprovement = tileInfo.improvement!=null && UncivGame.Current.settings.showPixelImprovements
val baseTerrainTileLocation = tileSetStrings.getTile(tileInfo.baseTerrain) val shouldShowResource = UncivGame.Current.settings.showPixelImprovements
&& ((tileInfo.resource!=null && UncivGame.Current.viewEntireMapForDebug) || tileInfo.hasViewableResource(viewingCiv))
val baseTerrainTileLocation = tileSetStrings.getTile(tileInfo.baseTerrain) // e.g. Grassland
if (tileInfo.terrainFeature != null) { if (tileInfo.terrainFeature != null) {
// e.g. Grassland+Forest
val baseTerrainAndFeatureTileLocation = "$baseTerrainTileLocation+${tileInfo.terrainFeature}" val baseTerrainAndFeatureTileLocation = "$baseTerrainTileLocation+${tileInfo.terrainFeature}"
if(shouldShowImprovement){ if(shouldShowImprovement){
val basefeatureAndImprovementTileLocation = "$baseTerrainAndFeatureTileLocation+${tileInfo.improvement}" // e.g. Grassland+Forest+Lumber mill
if (ImageGetter.imageExists(basefeatureAndImprovementTileLocation)) val baseFeatureAndImprovementTileLocation = "$baseTerrainAndFeatureTileLocation+${tileInfo.improvement}"
return listOf(basefeatureAndImprovementTileLocation) if (ImageGetter.imageExists(baseFeatureAndImprovementTileLocation))
return listOf(baseFeatureAndImprovementTileLocation)
}
if(shouldShowResource){
// e.g. Grassland+Forest+Silver
val baseTerrainFeatureAndResourceLocation = "$baseTerrainAndFeatureTileLocation+${tileInfo.resource}"
if (ImageGetter.imageExists(baseTerrainFeatureAndResourceLocation))
return listOf(baseTerrainFeatureAndResourceLocation)
} }
if (ImageGetter.imageExists(baseTerrainAndFeatureTileLocation)) { if (ImageGetter.imageExists(baseTerrainAndFeatureTileLocation)) {
if(shouldShowImprovement){ if(shouldShowImprovement){
val improvementImageLocation = tileSetStrings.getTile(tileInfo.improvement!!) val improvementImageLocation = tileSetStrings.getTile(tileInfo.improvement!!)
// E.g. (Desert+Flood plains, Moai)
if(ImageGetter.imageExists(improvementImageLocation)) if(ImageGetter.imageExists(improvementImageLocation))
return listOf(baseTerrainAndFeatureTileLocation, improvementImageLocation) return listOf(baseTerrainAndFeatureTileLocation, improvementImageLocation)
} }
@ -168,7 +183,9 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
} }
} }
// No terrain feature
if(shouldShowImprovement){ if(shouldShowImprovement){
// E.g. Grassland+Farm
val baseTerrainAndImprovement = "$baseTerrainTileLocation+${tileInfo.improvement}" val baseTerrainAndImprovement = "$baseTerrainTileLocation+${tileInfo.improvement}"
if (ImageGetter.imageExists(baseTerrainAndImprovement)) if (ImageGetter.imageExists(baseTerrainAndImprovement))
return listOf(baseTerrainAndImprovement) return listOf(baseTerrainAndImprovement)
@ -177,9 +194,17 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
if (ImageGetter.imageExists(baseTerrainTileLocation)){ if (ImageGetter.imageExists(baseTerrainTileLocation)){
if(shouldShowImprovement){ if(shouldShowImprovement){
val improvementImageLocation = tileSetStrings.getTile(tileInfo.improvement!!) val improvementImageLocation = tileSetStrings.getTile(tileInfo.improvement!!)
// E.g. (Desert, Mine)
if(ImageGetter.imageExists(improvementImageLocation)) if(ImageGetter.imageExists(improvementImageLocation))
return listOf(baseTerrainTileLocation, improvementImageLocation) return listOf(baseTerrainTileLocation, improvementImageLocation)
} }
if(shouldShowResource){
// e.g. (Plains, Gems)
val resourceImageLocation = tileSetStrings.getTile(tileInfo.resource!!)
if (ImageGetter.imageExists(resourceImageLocation))
return listOf(baseTerrainTileLocation, resourceImageLocation)
}
return listOf(baseTerrainTileLocation) return listOf(baseTerrainTileLocation)
} }
return listOf(tileSetStrings.hexagon) return listOf(tileSetStrings.hexagon)
@ -195,8 +220,8 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
hexagonImage.y = -groupSize / 6 hexagonImage.y = -groupSize / 6
} }
private fun updateTileImage(isRevealed: Boolean) { private fun updateTileImage(viewingCiv: CivilizationInfo?) {
val tileBaseImageLocations = getTileBaseImageLocations(isRevealed) val tileBaseImageLocations = getTileBaseImageLocations(viewingCiv)
val identifier = tileBaseImageLocations.joinToString(";") val identifier = tileBaseImageLocations.joinToString(";")
if (identifier == tileImagesIdentifier) return if (identifier == tileImagesIdentifier) return
@ -230,7 +255,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val tileIsViewable = viewingCiv == null || isViewable(viewingCiv) val tileIsViewable = viewingCiv == null || isViewable(viewingCiv)
val showMilitaryUnit = viewingCiv == null || showMilitaryUnit(viewingCiv) val showMilitaryUnit = viewingCiv == null || showMilitaryUnit(viewingCiv)
updateTileImage(true) updateTileImage(viewingCiv)
updateRivers(tileInfo.hasBottomRightRiver, tileInfo.hasBottomRiver, tileInfo.hasBottomLeftRiver) updateRivers(tileInfo.hasBottomRightRiver, tileInfo.hasBottomRiver, tileInfo.hasBottomLeftRiver)
updateTerrainBaseImage() updateTerrainBaseImage()
updateTerrainFeatureImage() updateTerrainFeatureImage()

1
core/src/com/unciv/ui/tilegroups/TileSetStrings.kt
View File

@ -24,6 +24,7 @@ class TileSetStrings {
val waterUnit = unitsLocation+"WaterUnit" val waterUnit = unitsLocation+"WaterUnit"
private val baseTerrainToTile = HashMap<String,String>() private val baseTerrainToTile = HashMap<String,String>()
fun getTile(baseTerrain:String): String { fun getTile(baseTerrain:String): String {
if(!baseTerrainToTile.containsKey(baseTerrain)) if(!baseTerrainToTile.containsKey(baseTerrain))
baseTerrainToTile[baseTerrain] = "$tilesLocation$baseTerrain" baseTerrainToTile[baseTerrain] = "$tilesLocation$baseTerrain"