curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-15 04:54:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

automated avatar building & fix avatar import

Browse Source
This commit is contained in:
minjaesong
2024-09-26 00:44:41 +09:00
parent b344b3b161
commit f89c2618fd
16 changed files with 358 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt
View File

@@ -10,9 +10,9 @@ import net.torvald.terrarum.gameactors.AVKey
object PlayerBuilderTestSubject1 {
operator fun invoke(): IngamePlayer {
val p: IngamePlayer = IngamePlayer(
ModMgr.getGdxFile("basegame", "sprites/test_sprite.properties").path(),
ModMgr.getGdxFile("basegame", "sprites/test_sprite_glow.properties").path(),
ModMgr.getGdxFile("basegame", "sprites/test_sprite_emsv.properties").path(),
ModMgr.getGdxFile("basegame", "sprites/fofu.properties").path(),
ModMgr.getGdxFile("basegame", "sprites/fofu_glow.properties").path(),
ModMgr.getGdxFile("basegame", "sprites/fofu_emsv.properties").path(),
0L // random value thrown
)
InjectCreatureRaw(p.actorValue, "basegame", "CreaturePlayer.json")

19
src/net/torvald/terrarum/modulebasegame/ui/UIImportAvatar.kt
View File

@@ -65,8 +65,9 @@ class UIImportAvatar(val remoCon: UIRemoCon) : Advanceable() {
it.clickOnceListener = { _,_ ->
if (filenameInput.getText().isNotBlank()) {
importReturnCode = doImport()
if (importReturnCode == 0) remoCon.openUI(UILoadSavegame(remoCon))
val (importReturnCode, avatarDisk) = doImport()
this.importReturnCode = importReturnCode
if (importReturnCode == 0) remoCon.openUI(UINewWorld(remoCon, avatarDisk!!))
}
}
}
@@ -143,14 +144,16 @@ class UIImportAvatar(val remoCon: UIRemoCon) : Advanceable() {
override fun advanceMode(button: UIItem) {
}
private fun doImport(): Int {
private fun doImport(): Pair<Int, DiskSkimmer?> {
val file = File("${App.importDir}/${filenameInput.getText().trim()}")
// check file's existence
if (!file.exists()) {
return 1
return 1 to null
}
var retDisk: DiskSkimmer? = null
// try to mount the TEVd
try {
val dom = VDUtil.readDiskArchive(file)
@@ -164,7 +167,7 @@ class UIImportAvatar(val remoCon: UIRemoCon) : Advanceable() {
printdbg(this, "Avatar uuid: $uuid")
if (newFile.exists()) return 2
if (newFile.exists()) return 2 to null
// update playerinfo so that:
// totalPlayTime to zero
@@ -212,6 +215,8 @@ class UIImportAvatar(val remoCon: UIRemoCon) : Advanceable() {
App.sortedPlayers.add(0, playerUUID)
App.savegamePlayersName[playerUUID] = it.getDiskName(Common.CHARSET)
}
retDisk = it
}
catch (e: Throwable) {
printdbgerr(this, e.stackTraceToString())
@@ -220,10 +225,10 @@ class UIImportAvatar(val remoCon: UIRemoCon) : Advanceable() {
catch (e: Throwable) {
// format error
e.printStackTrace()
return -1
return -1 to null
}
return 0
return 0 to retDisk
}
}