From 1b71aa1760bb2cde1e14bdf0211640c81f1fbccc Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Tue, 14 Sep 2021 22:57:03 +0900
Subject: [PATCH] save progress wheel itself is working but still wip

---
 .../terrarum/modulebasegame/ui/UIInventoryEscMenu.kt        | 6 ++++++
 src/net/torvald/terrarum/modulebasegame/ui/UIItemSaving.kt  | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
index 088e8aa46..1937b9bed 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
@@ -5,13 +5,17 @@ import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.terrarum.App
+import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.TitleScreen
 import net.torvald.terrarum.blendNormal
+import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTORY_CELLS_OFFSET_Y
 import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTORY_CELLS_UI_HEIGHT
+import net.torvald.terrarum.serialise.WriteSavegame
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.ui.UIItemTextButtonList
 import net.torvald.terrarum.ui.UIItemTextButtonList.Companion.DEFAULT_LINE_HEIGHT
+import java.io.File
 
 class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
 
@@ -79,6 +83,8 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
             when (new) {
                 0 -> {
                     screen = 3; gameMenuButtons.deselect()
+                    // save the game
+                    WriteSavegame(Terrarum.ingame!!.savegameArchive, File(App.defaultSaveDir, "${App.getTIME_T()}"), Terrarum.ingame!! as TerrarumIngame)
                 }
                 4 -> {
                     screen = 2; gameMenuButtons.deselect()
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemSaving.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemSaving.kt
index 05581ddf9..a212113f1 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemSaving.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemSaving.kt
@@ -5,8 +5,10 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.terrarum.App
 import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.langpack.Lang
+import net.torvald.terrarum.serialise.WriteSavegame
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.ui.UIItem
+import kotlin.math.roundToInt
 
 /**
  * Created by minjaesong on 2021-09-14.
@@ -33,7 +35,7 @@ class UIItemSaving(parentUI: UICanvas, initialX: Int, initialY: Int) : UIItem(pa
         App.fontGame.draw(batch, t, (posX + (width - tlen) / 2).toFloat(), posY.toFloat())
 
         // -1..63
-        val index = (App.GLOBAL_RENDER_TIMER % 256) / 4 //((WriteSavegame.saveProgress / WriteSavegame.saveProgressMax) * circles).roundToInt() - 1
+        val index = ((WriteSavegame.saveProgress / WriteSavegame.saveProgressMax) * circles).roundToInt() - 1
         if (index >= 0) {
             val sx = index % circleSheet.horizontalCount
             val sy = index / circleSheet.horizontalCount