new player save format writing

src/net/torvald/terrarum/serialise/GameSavingThread.kt

@@ -3,36 +3,31 @@ package net.torvald.terrarum.serialise
 import net.torvald.gdx.graphics.PixmapIO2
 import net.torvald.terrarum.*
 import net.torvald.terrarum.console.Echo
+import net.torvald.terrarum.gameworld.PhysicalStatus
 import net.torvald.terrarum.modulebasegame.IngameRenderer
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
+import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.realestate.LandUtil
 import net.torvald.terrarum.tvda.*
 import java.io.File
 import java.util.zip.GZIPOutputStream
 
+/**
+ * Will happily overwrite existing entry
+ */
+private fun addFile(disk: VirtualDisk, file: DiskEntry) {
+    disk.entries[file.entryID] = file
+    file.parentEntryID = 0
+    val dir = VDUtil.getAsDirectory(disk, 0)
+    if (!dir.contains(file.entryID)) dir.add(file.entryID)
+}
+
 /**
  * Created by minjaesong on 2021-09-14.
  */
-class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: TerrarumIngame, val hasThumbnail: Boolean, val isAuto: Boolean, val callback: () -> Unit) : Runnable {
-
-    /**
-     * Will happily overwrite existing entry
-     */
-    private fun addFile(disk: VirtualDisk, file: DiskEntry) {
-        disk.entries[file.entryID] = file
-        file.parentEntryID = 0
-        val dir = VDUtil.getAsDirectory(disk, 0)
-        if (!dir.contains(file.entryID)) dir.add(file.entryID)
-    }
-
-    private val chunkProgressMultiplier = 1f
-    private val actorProgressMultiplier = 1f
+class WorldSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: TerrarumIngame, val hasThumbnail: Boolean, val isAuto: Boolean, val callback: () -> Unit) : Runnable {
 
     override fun run() {
-        callback()
-        return
-
-        // TODO //
 
         disk.saveMode = 2 * isAuto.toInt() // no quick
 
@@ -42,15 +37,14 @@ class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: Ter
             }
         }
 
+        val playersList: List<IngamePlayer> = listOf(ingame.actorContainerActive, ingame.actorContainerInactive).flatMap{ it.filter { it is IngamePlayer } } as List<IngamePlayer>
         val actorsList = listOf(ingame.actorContainerActive, ingame.actorContainerInactive).flatMap { it.filter { WriteWorld.actorAcceptable(it) } }
         val layers = intArrayOf(0,1).map { ingame.world.getLayer(it) }
         val cw = ingame.world.width / LandUtil.CHUNK_W
         val ch = ingame.world.height / LandUtil.CHUNK_H
 
         WriteSavegame.saveProgress = 0f
-        WriteSavegame.saveProgressMax = 2f +
-                                        (cw * ch * layers.size) * chunkProgressMultiplier +
-                                        actorsList.size * actorProgressMultiplier
+        WriteSavegame.saveProgressMax = 2f + (cw * ch * layers.size) + actorsList.size
 
 
         val tgaout = ByteArray64GrowableOutputStream()
@@ -62,11 +56,6 @@ class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: Ter
         val time_t = App.getTIME_T()
 
 
-        // Write Meta //
-        val metaContent = EntryFile(WriteMeta.encodeToByteArray64(ingame, time_t))
-        val meta = DiskEntry(-1, 0, creation_t, time_t, metaContent)
-        addFile(disk, meta)
-
         if (hasThumbnail) {
             PixmapIO2._writeTGA(gzout, IngameRenderer.fboRGBexport, true, true)
             IngameRenderer.fboRGBexport.dispose()
@@ -114,10 +103,13 @@ class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: Ter
 //        addFile(disk, apocryphas)
 
         // Write World //
-//        val worldNum = ingame.world.worldIndex
-//        val worldMeta = EntryFile(WriteWorld.encodeToByteArray64(ingame, time_t))
-//        val world = DiskEntry(worldNum.toLong(), 0, creation_t, time_t, worldMeta)
-//        addFile(disk, world)
+        // record all player's last position
+        playersList.forEach {
+            ingame.world.playersLastStatus[it.uuid] = PhysicalStatus(it)
+        }
+        val worldMeta = EntryFile(WriteWorld.encodeToByteArray64(ingame, time_t))
+        val world = DiskEntry(-1L, 0, creation_t, time_t, worldMeta)
+        addFile(disk, world)
 
         WriteSavegame.saveProgress += 1f
 
@@ -137,7 +129,7 @@ class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: Ter
                     // "W1L0-92,15"
                     addFile(disk, entry)
 
-                    WriteSavegame.saveProgress += chunkProgressMultiplier
+                    WriteSavegame.saveProgress += 1
                 }
             }
         }
@@ -151,7 +143,7 @@ class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: Ter
             val actor = DiskEntry(it.referenceID.toLong(), 0, creation_t, time_t, actorContent)
             addFile(disk, actor)
 
-            WriteSavegame.saveProgress += actorProgressMultiplier
+            WriteSavegame.saveProgress += 1
         }
 
 
@@ -174,4 +166,23 @@ class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: Ter
 
         callback()
     }
-}
+}
+
+/**
+ * This function called means the "Avatar" was not externally created and thus has no sprite-bodypart-name-to-entry-number-map
+ *
+ * Created by minjaesong on 2021-10-08
+ */
+class PlayerSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: TerrarumIngame, val hasThumbnail: Boolean, val isAuto: Boolean, val callback: () -> Unit) : Runnable {
+
+    override fun run() {
+        disk.saveMode = 2 * isAuto.toInt() // no quick
+        disk.capacity = 0L
+
+        Echo("Writing The Player...")
+        WritePlayer(ingame.actorGamer, disk)
+        VDUtil.dumpToRealMachine(disk, outFile)
+
+        callback()
+    }
+}