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

fixing unlit torch bug

Browse Source
This commit is contained in:
minjaesong
2020-02-29 20:28:55 +09:00
parent facf29b34c
commit aaba6976b3
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/ReferencingRanges.kt
View File

@@ -19,6 +19,6 @@ object ReferencingRanges {
val ACTORS_FRONT = 0x6000_0000..0x6FFF_FFFF // Rendered front (e.g. fake tile) val ACTORS_FRONT = 0x6000_0000..0x6FFF_FFFF // Rendered front (e.g. fake tile)
val ACTORS_OVERLAY = 0x7000_0000..0x7FFF_FFFF // Rendered as screen overlay, not affected by light nor environment overlays val ACTORS_OVERLAY = 0x7000_0000..0x7FFF_FFFF // Rendered as screen overlay, not affected by light nor environment overlays
val VIRTUAL_TILES = -1 downTo -65536 val VIRTUAL_TILES = -2 downTo -65536 // index of -1 breaks things for some reason :(
} }

4
src/net/torvald/terrarum/UIItemInventoryCatBar.kt
View File

@@ -74,8 +74,8 @@ class UIItemInventoryCatBar(
val iconIndex = arrayOf(12, 16, 17, 13) val iconIndex = arrayOf(12, 16, 17, 13)
println("[UIItemInventoryCatBar] relativeStartX: $relativeStartX") //println("[UIItemInventoryCatBar] relativeStartX: $relativeStartX")
println("[UIItemInventoryCatBar] posX: $posX") //println("[UIItemInventoryCatBar] posX: $posX")
sideButtons = Array(iconIndex.size) { index -> sideButtons = Array(iconIndex.size) { index ->
val iconPosX = if (index < 2) val iconPosX = if (index < 2)

3
src/net/torvald/terrarum/blockproperties/BlockCodex.kt
View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.blockproperties
import net.torvald.gdx.graphics.Cvec import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.AppLoader import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.AppLoader.printmsg import net.torvald.terrarum.AppLoader.printmsg
import net.torvald.terrarum.ReferencingRanges import net.torvald.terrarum.ReferencingRanges
import net.torvald.terrarum.gameworld.FluidType import net.torvald.terrarum.gameworld.FluidType
@@ -68,6 +69,8 @@ object BlockCodex {
dynamicToVirtualMap[id] = virtualIDMax dynamicToVirtualMap[id] = virtualIDMax
repeat(DYNAMIC_RANDOM_CASES) { i -> repeat(DYNAMIC_RANDOM_CASES) { i ->
setProp(virtualIDMax - i, it) setProp(virtualIDMax - i, it)
printdbg(this, "Block ID $id -> Virtual ID ${virtualIDMax - i}, baseLum: ${blockProps[virtualIDMax - i]?.baseLumCol}")
virtualPropsCount += 1 virtualPropsCount += 1
} }
} }