terrain mask PSDs

.gitignore

@@ -29,4 +29,5 @@ tmp_*
 *.bin
 *.index
 *.threads
-*_Leak_Suspects.zip
+*_Leak_Suspects.zip
+desktop.ini

src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt

@@ -369,6 +369,8 @@ class UIInventoryFull(
         gameMenuButtons.render(batch, camera)
     }
 
+    private val encumbranceBarBackCol = Color(0xa0a0a0_ff.toInt())
+
     private fun renderScreenInventory(batch: SpriteBatch, camera: Camera) {
         itemList.render(batch, camera)
         equipped.render(batch, camera)
@@ -391,7 +393,7 @@ class UIInventoryFull(
 
         // encumbrance bar background
         blendMul(batch)
-        batch.color = Color(0xa0a0a0_ff.toInt())
+        batch.color = encumbranceBarBackCol
         batch.fillRect(
                 xEnd - 3 - weightBarWidth + inventoryScrOffX,
                 yEnd-20 + 3f,

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

@@ -80,7 +80,7 @@ object SavegameWriter {
 
 
         // worldinfo0..3
-        val worldinfoBytes = WriteWorldInfo(gameworld)
+        val worldinfoBytes = WriteWorldInfo(ingame)
         worldinfoBytes?.forEachIndexed { index, bytes ->
             VDUtil.registerFile(disk, DiskEntry(
                     32766 - index, ROOT, "worldinfo$index".toByteArray(charset),

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

@@ -8,11 +8,7 @@ import com.badlogic.gdx.graphics.PixmapIO2
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.FrameBuffer
 import com.badlogic.gdx.utils.ScreenUtils
-import net.torvald.terrarum.ModMgr
+import net.torvald.terrarum.*
-import net.torvald.terrarum.Terrarum
-import net.torvald.terrarum.gameworld.GameWorld
-import net.torvald.terrarum.inAction
-import net.torvald.terrarum.inUse
 import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension
 import net.torvald.terrarum.modulebasegame.weather.WeatherMixer
 import net.torvald.terrarum.modulebasegame.worldgenerator.RoguelikeRandomiser
@@ -37,7 +33,7 @@ object WriteWorldInfo {
      *
      * @return List of ByteArray64, worldinfo0..worldinfo3; `null` on failure
      */
-    internal operator fun invoke(world: GameWorld): List<ByteArray64>? {
+    internal operator fun invoke(ingame: IngameInstance): List<ByteArray64>? {
 
         //val path = "${AppLoader.defaultSaveDir}/tmp_worldinfo"
 
@@ -82,6 +78,7 @@ object WriteWorldInfo {
         metaOut.write(HASHED_FILES_COUNT)
 
         // world name
+        val world = ingame.world
         val worldNameBytes = world.worldName.toByteArray(Charsets.UTF_8)
         //metaOut.write(worldNameBytes)
         worldNameBytes.forEach {
@@ -125,7 +122,7 @@ object WriteWorldInfo {
         }
 
         // thumbnail
-        val texreg = Terrarum.ingame!!.actorGamer.sprite?.textureRegion
+        val texreg = ingame.actorGamer.sprite?.textureRegion
         if (texreg != null) {
             val batch = SpriteBatch()
             val camera = OrthographicCamera(texreg.tileW.toFloat(), texreg.tileH.toFloat())

src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt

@@ -480,7 +480,7 @@ internal object BlocksDrawer {
                 }
 
 
-                // draw a tile, but only when illuminated
+                // draw a tile
                 try {
                     val nearbyTilesInfo = if (mode == FLUID) {
                         getNearbyTilesInfoFluids(x, y)

work_files/DataFormats/Savegame metadata.txt

@@ -40,3 +40,6 @@ D8        Deflated thumbnail image in TGA format
 p-2       (it's deflated so that it saves faster, so no Lzma)
 p-2       0xFF
 p-1       0xFE
+
+Note: if you're going to add more footer beyond this point, DON'T;
+      instead pack the thumbnail.tga and other footers in TEVD container.