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

still wip

Browse Source
This commit is contained in:
minjaesong
2021-10-11 19:02:51 +09:00
parent ef603ec5d5
commit 8dbedd270e
11 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/torvald/terrarum/modulebasegame/console/Load.kt
View File

@@ -1,22 +1,9 @@
package net.torvald.terrarum.modulebasegame.console
import net.torvald.ELLIPSIS
import net.torvald.terrarum.App
import net.torvald.terrarum.ccC
import net.torvald.terrarum.ccG
import net.torvald.terrarum.ccR
import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.tvda.VDUtil
import net.torvald.terrarum.serialise.*
import java.io.File
import java.io.IOException
import java.util.logging.Level
/**
* Created by minjaesong on 2021-08-30.
*/
object Load : ConsoleCommand {
/*object Load : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2) {
@@ -43,4 +30,4 @@ object Load : ConsoleCommand {
Echo("Usage: load <filename>")
}
}
}*/

9
src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
View File

@@ -14,14 +14,15 @@ import net.torvald.terrarum.*
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.serialise.Common
import net.torvald.terrarum.serialise.LoadSavegame
import net.torvald.terrarum.tvda.*
import net.torvald.terrarum.tvda.ByteArray64InputStream
import net.torvald.terrarum.tvda.ByteArray64Reader
import net.torvald.terrarum.tvda.DiskSkimmer
import net.torvald.terrarum.tvda.EntryFile
import net.torvald.terrarum.ui.*
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import java.time.Instant
import java.time.format.DateTimeFormatter
import java.util.*
import java.util.logging.Level
import java.util.zip.GZIPInputStream
import kotlin.math.roundToInt
@@ -404,7 +405,7 @@ class UIItemWorldCells(
}
override var clickOnceListener: ((Int, Int, Int) -> Unit)? = { _: Int, _: Int, _: Int ->
LoadSavegame(VDUtil.readDiskArchive(skimmer.diskFile, Level.INFO))
TODO()
}
internal var hasTexture = false

3
src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt
View File

@@ -37,6 +37,7 @@ object UITitleRemoConYaml {
operator fun invoke(hasSave: Boolean) =
Yaml((if (!hasSave) menuWithSavefile else menuNewGame) + menuBase).parse()
//Yaml((if (hasSave) menuWithSavefile else menuNewGame) + menuBase).parse()
Yaml((if (true) menuWithSavefile else menuNewGame) + menuBase).parse()
}