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

Mount Fuji artwork by The Bucketeer means it's now in the game!

Browse Source
This commit is contained in:
Yair Morgenstern
2019-12-25 13:01:29 +02:00
parent 8d6a791a74
commit 3dfc6503a1
4 changed files with 79 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Tiles/Mount Fuji.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 812 B

131
android/assets/game.atlas
View File

@ -3412,254 +3412,261 @@ TileSets/FantasyHex/Tiles/Moai
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Mount Fuji
rotate: false
xy: 1556, 199
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/Mountain TileSets/FantasyHex/Tiles/Mountain
rotate: false rotate: false
xy: 1556, 195 xy: 1590, 197
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: 1726, 208 xy: 1760, 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/Oil well TileSets/FantasyHex/Tiles/Oil well
rotate: false rotate: false
xy: 1760, 205 xy: 1794, 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/Tiles/Old Faithful TileSets/FantasyHex/Tiles/Old Faithful
rotate: false rotate: false
xy: 1794, 206 xy: 1828, 202
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/Pasture TileSets/FantasyHex/Tiles/Pasture
rotate: false rotate: false
xy: 1896, 204 xy: 1930, 197
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: 1930, 197 xy: 1964, 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 TileSets/FantasyHex/Tiles/Plains
rotate: false rotate: false
xy: 1556, 165 xy: 1590, 167
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: 1590, 168 xy: 1624, 171
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: 1624, 178 xy: 1658, 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+Farm TileSets/FantasyHex/Tiles/Plains+Farm
rotate: false rotate: false
xy: 1658, 180 xy: 1692, 180
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: 1692, 173 xy: 1726, 173
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: 1726, 173 xy: 1760, 170
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: 1760, 170 xy: 1794, 171
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: 1794, 169 xy: 1828, 165
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: 1828, 167 xy: 1862, 166
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: 1862, 171 xy: 1896, 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/Tiles/Plantation TileSets/FantasyHex/Tiles/Plantation
rotate: false rotate: false
xy: 1896, 174 xy: 1930, 167
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: 1930, 167 xy: 1964, 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/Quarry TileSets/FantasyHex/Tiles/Quarry
rotate: false rotate: false
xy: 1964, 169 xy: 1896, 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/River-Bottom TileSets/FantasyHex/Tiles/River-Bottom
rotate: false rotate: false
xy: 1658, 148 xy: 1930, 135
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: 1692, 141 xy: 1964, 137
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: 1726, 141 xy: 1896, 112
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: 1760, 138 xy: 1930, 103
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: 1794, 137 xy: 1964, 105
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: 1828, 135 xy: 1998, 324
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/Silver TileSets/FantasyHex/Tiles/Silver
rotate: false rotate: false
xy: 1930, 137 xy: 1998, 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/Tiles/Tundra TileSets/FantasyHex/Tiles/Tundra
rotate: false rotate: false
xy: 1998, 178 xy: 1760, 140
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: 1998, 148 xy: 1794, 141
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: 1998, 111 xy: 1828, 128
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: 1026, 142 xy: 1862, 106
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: 1026, 108 xy: 1896, 78
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: 1026, 74 xy: 1930, 69
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: 1026, 40 xy: 1964, 41
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: 1022, 10 xy: 1998, 30
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: 1658, 118 xy: 1794, 111
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: 1998, 266 xy: 1658, 148
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
@ -4093,182 +4100,182 @@ TileSets/FantasyHex/Units/Mohawk Warrior
index: -1 index: -1
TileSets/FantasyHex/Units/Musketeer TileSets/FantasyHex/Units/Musketeer
rotate: false rotate: false
xy: 1590, 205 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/Units/Musketman TileSets/FantasyHex/Units/Musketman
rotate: false rotate: false
xy: 1624, 208 xy: 1658, 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/Units/Naresuan's Elephant TileSets/FantasyHex/Units/Naresuan's Elephant
rotate: false rotate: false
xy: 1658, 210 xy: 1692, 210
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: 1692, 208 xy: 1726, 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/Units/Panzer TileSets/FantasyHex/Units/Panzer
rotate: false rotate: false
xy: 1828, 204 xy: 1862, 203
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: 1862, 201 xy: 1896, 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/Persian Immortal TileSets/FantasyHex/Units/Persian Immortal
rotate: false rotate: false
xy: 1964, 199 xy: 1522, 175
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: 1522, 175 xy: 1556, 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/Units/Rifleman TileSets/FantasyHex/Units/Rifleman
rotate: false rotate: false
xy: 1624, 148 xy: 1862, 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/Rocket Artillery TileSets/FantasyHex/Units/Rocket Artillery
rotate: false rotate: false
xy: 1862, 141 xy: 1998, 294
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: 1896, 144 xy: 1998, 264
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: 1590, 140 xy: 1998, 236
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: 1964, 141 xy: 1998, 178
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: 1896, 114 xy: 1998, 148
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: 1862, 111 xy: 1998, 118
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: 1930, 109 xy: 1998, 90
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: 1964, 111 xy: 1964, 75
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: 1998, 326 xy: 1998, 60
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: 1998, 296 xy: 1692, 150
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: 1998, 236 xy: 1624, 141
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: 1998, 208 xy: 1726, 145
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: 1624, 120 xy: 1022, 2
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: 1692, 111 xy: 1828, 98
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: 1726, 113 xy: 1862, 78
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: 1760, 110 xy: 1056, 2
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: 1794, 109 xy: 1090, 2
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: 289 KiB

After

Width:  |  Height:  |  Size: 290 KiB

20
android/assets/jsons/Terrains.json
View File

@ -191,16 +191,6 @@
unbuildable: true, unbuildable: true,
weight: 10 weight: 10
}, },
/** Yukky tile images
{
name: "Krakatoa",
type: "NaturalWonder",
science: 5,
occursOn: ["Ocean"],
impassable: true,
unbuildable: true,
weight: 10
},
{ {
name: "Mount Fuji", name: "Mount Fuji",
type: "NaturalWonder", type: "NaturalWonder",
@ -211,6 +201,16 @@
unbuildable: true, unbuildable: true,
weight: 10 weight: 10
}, },
/** Yukky tile images
{
name: "Krakatoa",
type: "NaturalWonder",
science: 5,
occursOn: ["Ocean"],
impassable: true,
unbuildable: true,
weight: 10
},
{ {
name: "Rock of Gibraltar", name: "Rock of Gibraltar",
type: "NaturalWonder", type: "NaturalWonder",