mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-10 19:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

3.2.1-patch1

Browse Source
This commit is contained in:
Yair Morgenstern 2019-11-10 18:34:44 +02:00
parent 3efb0d67f8
commit 91eed3fc02
3 changed files with 94 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
android/assets/game.atlas
View File

@ -2433,44 +2433,51 @@ TileSets/FantasyHex/road
orig: 61, 11
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Atoll
rotate: false
xy: 2122, 528
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/City
rotate: false
xy: 1976, 105
xy: 2028, 179
size: 32, 35
orig: 32, 35
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+City
rotate: false
xy: 1976, 105
xy: 2028, 179
size: 32, 35
orig: 32, 35
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Hill+City
rotate: false
xy: 1976, 105
xy: 2028, 179
size: 32, 35
orig: 32, 35
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Coast
rotate: false
xy: 2028, 186
xy: 2062, 216
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert
rotate: false
xy: 2062, 216
xy: 2028, 149
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+City
rotate: false
xy: 2028, 151
xy: 2062, 181
size: 32, 33
orig: 32, 33
offset: 0, 0
@ -2484,7 +2491,7 @@ TileSets/FantasyHex/Tiles/Desert+Customs house
index: -1
TileSets/FantasyHex/Tiles/Desert+Farm
rotate: false
xy: 2062, 186
xy: 2062, 151
size: 32, 28
orig: 32, 28
offset: 0, 0
@ -2498,147 +2505,147 @@ TileSets/FantasyHex/Tiles/Desert+Flood plains
index: -1
TileSets/FantasyHex/Tiles/Desert+Flood plains+Customs house
rotate: false
xy: 2062, 156
xy: 138, 12
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm
rotate: false
xy: 138, 12
xy: 946, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+Flood plains+Plantation
rotate: false
xy: 946, 18
xy: 980, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+Flood plains+Trading post
rotate: false
xy: 980, 18
xy: 1014, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+Mine
rotate: false
xy: 1014, 18
xy: 1048, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+Oasis
rotate: false
xy: 1048, 18
xy: 1082, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+Plantation
rotate: false
xy: 1082, 18
xy: 1116, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Desert+Trading post
rotate: false
xy: 1116, 18
xy: 1150, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland
rotate: false
xy: 1184, 18
xy: 1218, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Customs house
rotate: false
xy: 1218, 18
xy: 1252, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Farm
rotate: false
xy: 1252, 18
xy: 1286, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Forest
rotate: false
xy: 1286, 15
xy: 1320, 15
size: 32, 31
orig: 32, 31
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Jungle
rotate: false
xy: 1320, 12
xy: 1354, 13
size: 32, 34
orig: 32, 34
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post
rotate: false
xy: 1354, 13
xy: 1388, 13
size: 32, 34
orig: 32, 34
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Landmark
rotate: false
xy: 1388, 11
xy: 1422, 11
size: 32, 36
orig: 32, 36
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Marsh
rotate: false
xy: 1422, 18
xy: 1456, 15
size: 32, 29
orig: 32, 29
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Mine
rotate: false
xy: 172, 12
xy: 1490, 16
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Plantation
rotate: false
xy: 1456, 16
xy: 1524, 16
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Grassland+Trading post
rotate: false
xy: 1490, 16
xy: 1558, 16
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Hill
rotate: false
xy: 206, 14
xy: 240, 14
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Hill+Customs house
rotate: false
xy: 240, 14
xy: 274, 14
size: 32, 32
orig: 32, 32
offset: 0, 0
@ -2652,203 +2659,203 @@ TileSets/FantasyHex/Tiles/Hill+Forest
index: -1
TileSets/FantasyHex/Tiles/Hill+Mine
rotate: false
xy: 274, 14
xy: 308, 14
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Lakes
rotate: false
xy: 342, 20
xy: 946, 1694
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Mountain
rotate: false
xy: 2010, 74
xy: 1592, 2
size: 32, 36
orig: 32, 36
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Ocean
rotate: false
xy: 1958, 15
xy: 1660, 13
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains
rotate: false
xy: 1992, 44
xy: 1958, 52
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+City
rotate: false
xy: 1992, 7
xy: 1992, 45
size: 32, 35
orig: 32, 35
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Customs house
rotate: false
xy: 2026, 44
xy: 1958, 22
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Farm
rotate: false
xy: 2026, 14
xy: 1992, 15
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Forest
rotate: false
xy: 2124, 493
xy: 2026, 47
size: 32, 33
orig: 32, 33
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Jungle
rotate: false
xy: 2124, 456
xy: 2026, 10
size: 32, 35
orig: 32, 35
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post
rotate: false
xy: 2126, 419
xy: 2044, 112
size: 32, 35
orig: 32, 35
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Mine
rotate: false
xy: 2126, 389
xy: 2044, 82
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Plantation
rotate: false
xy: 2126, 359
xy: 2060, 52
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Plains+Trading post
rotate: false
xy: 2126, 329
xy: 2060, 22
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-Bottom
rotate: false
xy: 2126, 267
xy: 2078, 89
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-BottomLeft
rotate: false
xy: 1592, 11
xy: 2112, 124
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-BottomRight
rotate: false
xy: 1626, 11
xy: 2112, 92
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-Top
rotate: false
xy: 1660, 11
xy: 2094, 57
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-TopLeft
rotate: false
xy: 1694, 10
xy: 2094, 25
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-TopRight
rotate: false
xy: 1728, 10
xy: 2128, 60
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra
rotate: false
xy: 2060, 66
xy: 2126, 438
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra+Camp
rotate: false
xy: 2060, 36
xy: 2126, 408
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra+City
rotate: false
xy: 2094, 59
xy: 2126, 371
size: 32, 35
orig: 32, 35
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra+Customs house
rotate: false
xy: 2094, 29
xy: 2126, 341
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest
rotate: false
xy: 2060, 2
xy: 2126, 307
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest+Camp
rotate: false
xy: 2128, 62
xy: 2126, 273
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra+Mine
rotate: false
xy: 2128, 32
xy: 1796, 10
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Tundra+Trading post
rotate: false
xy: 2128, 2
xy: 1830, 10
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/TopBorder
rotate: false
xy: 2078, 96
xy: 2124, 498
size: 32, 28
orig: 32, 28
offset: 0, 0
@ -2883,21 +2890,21 @@ TileSets/FantasyHex/Units/Archer
index: -1
TileSets/FantasyHex/Units/Cannon
rotate: false
xy: 2122, 528
xy: 2028, 216
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Catapult
rotate: false
xy: 2028, 216
xy: 1924, 60
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Chariot Archer
rotate: false
xy: 1924, 60
xy: 1976, 112
size: 32, 28
orig: 32, 28
offset: 0, 0
@ -2918,98 +2925,98 @@ TileSets/FantasyHex/Units/Pikeman
index: -1
TileSets/FantasyHex/Units/Gatling Gun
rotate: false
xy: 1150, 18
xy: 1184, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Machine Gun
rotate: false
xy: 1150, 18
xy: 1184, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Great Artist
rotate: false
xy: 1524, 16
xy: 172, 12
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Great Engineer
rotate: false
xy: 1558, 16
xy: 2096, 216
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Worker
rotate: false
xy: 1558, 16
xy: 2096, 216
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Great Merchant
rotate: false
xy: 2096, 216
xy: 2096, 186
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Settler
rotate: false
xy: 2096, 216
xy: 2096, 186
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Great Scientist
rotate: false
xy: 2096, 186
xy: 2096, 156
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Great War Infantry
rotate: false
xy: 2096, 156
xy: 206, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Infantry
rotate: false
xy: 2096, 156
xy: 206, 18
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Horseman
rotate: false
xy: 946, 1694
xy: 342, 20
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Knight
rotate: false
xy: 308, 18
xy: 376, 20
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/LandUnit
rotate: false
xy: 376, 20
xy: 1976, 82
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Warrior
rotate: false
xy: 376, 20
xy: 1976, 82
size: 32, 28
orig: 32, 28
offset: 0, 0
@ -3023,42 +3030,42 @@ TileSets/FantasyHex/Units/Longbowman
index: -1
TileSets/FantasyHex/Units/Longswordsman
rotate: false
xy: 1976, 75
xy: 2010, 112
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Mechanized Infantry
rotate: false
xy: 2010, 112
xy: 2010, 82
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Musketman
rotate: false
xy: 1958, 45
xy: 1626, 13
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Rifleman
rotate: false
xy: 2126, 299
xy: 2078, 121
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Scout
rotate: false
xy: 1762, 12
xy: 2128, 30
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Spearman
rotate: false
xy: 2062, 126
xy: 1694, 12
size: 32, 28
orig: 32, 28
offset: 0, 0
@ -3072,28 +3079,28 @@ TileSets/FantasyHex/Units/Submarine
index: -1
TileSets/FantasyHex/Units/Swordsman
rotate: false
xy: 2096, 126
xy: 1728, 12
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Tank
rotate: false
xy: 2044, 96
xy: 1762, 12
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/Trebuchet
rotate: false
xy: 2112, 96
xy: 2124, 468
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Units/War Elephant
rotate: false
xy: 2130, 237
xy: 1864, 10
size: 32, 28
orig: 32, 28
offset: 0, 0
@ -3107,7 +3114,7 @@ TileSets/FantasyHex/Units/WaterUnit
index: -1
TileSets/FantasyHex/Units/Work Boats
rotate: false
xy: 2130, 209
xy: 2128, 2
size: 32, 26
orig: 32, 26
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

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app"
minSdkVersion 14
targetSdkVersion 29
versionCode 322
versionName "3.2.0-patch1"
versionCode 324
versionName "3.2.1-patch1"
}
// Had to add this crap for Travis to build, it wanted to sign the app