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

block itemimage to use vernal season textures

Browse Source
This commit is contained in:
minjaesong
2023-09-10 20:22:39 +09:00
parent ca155a7e99
commit 5f0e6135e7
4 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
View File

@@ -87,12 +87,17 @@ object PlayerBuilderSigrid {
inventory.add("item@basegame:1", 16) // copper pick
inventory.add("item@basegame:2", 64) // iron pick
inventory.add("item@basegame:3", 256) // steel pick
inventory.add("item@basegame:5", 385930603) // test tiki torch
inventory.add("item@basegame:12", 16) // copper sledgehammer
inventory.add("item@basegame:4", 16) // iron sledgehammer
inventory.add("item@basegame:13", 16) // steel sledgehammer
inventory.add("item@basegame:5", 995) // test tiki torch
inventory.add("item@basegame:6", 95) // storage chest
inventory.add("item@basegame:7", 1) // wire debugger
inventory.add("item@basegame:8", 9995) // power source
inventory.add("item@basegame:9", 1) // wire cutter
inventory.add("item@basegame:11", 10) // calendar
inventory.add("item@basegame:256", 995) // doors
inventory.add("item@basegame:257", 995) // doors
inventory.add("item@basegame:258", 995) // doors

28
src/net/torvald/terrarum/modulebasegame/ui/UILoadManage.kt
View File

@@ -1,5 +1,7 @@
package net.torvald.terrarum.modulebasegame.ui
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input.Keys
import com.badlogic.gdx.graphics.Camera
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.OrthographicCamera
@@ -42,8 +44,10 @@ class UILoadManage(val full: UILoadSavegame) : UICanvas() {
private val buttonRowY = full.buttonRowY - buttonHeight
private val buttonRowY2 = buttonRowY - buttonHeight - buttonGap
private var altDown = false
private val mainGoButton = UIItemTextButton(this,
{ Lang["MENU_IO_LOAD_GAME"] }, buttonX1third, buttonRowY2, buttonWidth * 3 + buttonGap * 2, alignment = UIItemTextButton.Companion.Alignment.CENTRE, hasBorder = true).also {
{ if (altDown) Lang["MENU_LABEL_PREV_SAVES"] else Lang["MENU_IO_LOAD_GAME"] }, buttonX1third, buttonRowY2, buttonWidth * 3 + buttonGap * 2, alignment = UIItemTextButton.Companion.Alignment.CENTRE, hasBorder = true).also {
it.clickOnceListener = { _,_ ->
App.printdbg(this, "Load playerUUID: ${UILoadGovernor.playerUUID}, worldUUID: ${UILoadGovernor.worldUUID}")
@@ -51,15 +55,22 @@ class UILoadManage(val full: UILoadSavegame) : UICanvas() {
full.bringAutosaveSelectorUp()
full.changePanelTo(2)
}
else */if (full.loadables.saveAvaliable()) {
if (full.loadables.newerSaveIsDamaged) {
UILoadGovernor.previousSaveWasLoaded = true
}
else */
if (!altDown) {
if (full.loadables.saveAvaliable()) {
if (full.loadables.newerSaveIsDamaged) {
UILoadGovernor.previousSaveWasLoaded = true
}
// full.takeAutosaveSelectorDown()
full.loadManageSelectedGame = full.loadables.getLoadableSave()!!
full.loadManageSelectedGame = full.loadables.getLoadableSave()!!
mode = MODE_LOAD
mode = MODE_LOAD
}
}
else {
mode = MODE_PREV_SAVES
}
}
}
@@ -152,6 +163,7 @@ class UILoadManage(val full: UILoadSavegame) : UICanvas() {
private val MODE_INIT = 0
private val MODE_DELETE = 16 // are you sure?
private val MODE_RENAME = 32 // show rename dialogue
private val MODE_PREV_SAVES = 48
private val MODE_LOAD = 256 // is needed to make the static loading screen
init {
@@ -185,6 +197,8 @@ class UILoadManage(val full: UILoadSavegame) : UICanvas() {
}
override fun updateUI(delta: Float) {
altDown = Gdx.input.isKeyPressed(Keys.ALT_LEFT) || Gdx.input.isKeyPressed(Keys.ALT_RIGHT)
when (mode) {
MODE_INIT -> {
mainButtons.forEach { it.update(delta) }