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

Grand Mesa artwork by The Bucketeer means it's now in the game!

Browse Source
This commit is contained in:
Yair Morgenstern 2019-12-24 15:28:59 +02:00
parent 982c326ccd
commit 97f3260047
5 changed files with 150 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Tiles/Grand Mesa.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 757 B

267
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 295 KiB

After

Width:  |  Height:  |  Size: 289 KiB

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

@ -180,7 +180,17 @@
impassable: true,
unbuildable: true,
weight: 1
}
},
{
name: "Grand Mesa",
type: "NaturalWonder",
production: 2,
gold: 3,
occursOn: ["Plains","Desert","Tundra"],
impassable: true,
unbuildable: true,
weight: 10
},
/** Yukky tile images
{
name: "Krakatoa",
@ -230,15 +240,5 @@
unbuildable: true,
weight: 10
},
{
name: "Grand Mesa",
type: "NaturalWonder",
production: 2,
gold: 3,
occursOn: ["Plains","Desert","Tundra"],
impassable: true,
unbuildable: true,
weight: 10
},
*/
]

8
core/src/com/unciv/UncivGame.kt
View File

@ -17,13 +17,9 @@ import com.unciv.models.ruleset.Ruleset
import com.unciv.models.translations.TranslationFileReader
import com.unciv.models.translations.Translations
import com.unciv.ui.LanguagePickerScreen
import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.CrashController
import com.unciv.ui.utils.CrashReportSender
import com.unciv.ui.utils.ImageGetter
import com.unciv.ui.utils.center
import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.WorldScreen
import java.util.UUID
import java.util.*
import kotlin.concurrent.thread
class UncivGame(