curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-17 00:56:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

fixing loadscreen visual

Browse Source
This commit is contained in:
minjaesong
2021-02-25 11:23:07 +09:00
parent 795f0ab853
commit 2a72cc03bb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/modulebasegame/WorldgenLoadScreen.kt
View File

@@ -7,6 +7,8 @@ import com.badlogic.gdx.graphics.Pixmap
import com.badlogic.gdx.graphics.Texture import com.badlogic.gdx.graphics.Texture
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.AppLoader.printdbg import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.blockproperties.BlockProp
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.util.CircularArray import net.torvald.util.CircularArray
import kotlin.math.roundToInt import kotlin.math.roundToInt
@@ -93,7 +95,9 @@ class WorldgenLoadScreen(screenToBeLoaded: IngameInstance, private val worldwidt
val wx = (world.width.toFloat() / previewWidth * x).roundToInt() val wx = (world.width.toFloat() / previewWidth * x).roundToInt()
val wy = (world.height.toFloat() / previewHeight * y).roundToInt() val wy = (world.height.toFloat() / previewHeight * y).roundToInt()
val outCol = if (world.getTileNumFromTerrain(wx, wy) > 0) COL_TERR else if (world.getTileNumFromWall(wx, wy) > 0) COL_WALLED else COL_AIR val outCol = if (BlockCodex[world.getTileFromTerrain(wx, wy)].isSolid) COL_TERR
else if (BlockCodex[world.getTileFromWall(wx, wy)].isSolid) COL_WALLED
else COL_AIR
previewPixmap.setColor(outCol) previewPixmap.setColor(outCol)
previewPixmap.drawPixel(x, previewHeight - 1 - y) // this flips Y previewPixmap.drawPixel(x, previewHeight - 1 - y) // this flips Y

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

@@ -92,7 +92,7 @@ object PlayerBuilderSigrid {
inventory.add("item@basegame:3") // steel pick inventory.add("item@basegame:3") // steel pick
inventory.add("item@basegame:4", 9995) // wire piece inventory.add("item@basegame:4", 9995) // wire piece
inventory.add("item@basegame:5", 385930603) // test tiki torch inventory.add("item@basegame:5", 385930603) // test tiki torch
//inventory.add("item@basegame:6", 95) // crafting table inventory.add("item@basegame:6", 95) // crafting table
} }
} }