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

better buoyancy but still wip

Browse Source
This commit is contained in:
minjaesong
2024-07-17 01:41:32 +09:00
parent e77aa0c33f
commit d72bbb0355
6 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/gameworld/GameWorld.kt
View File

@@ -263,6 +263,8 @@ open class GameWorld(
fun coordInWorldStrict(x: Int, y: Int) = x in 0 until width && y in 0 until height // ROUNDWORLD implementation
fun renumberTilesAfterLoad() {
printdbg(this, "renumberTilesAfterLoad()")
// patch the "old"map
tileNumberToNameMap[0] = Block.AIR
tileNumberToNameMap[1] = Block.UPDATE
@@ -307,6 +309,8 @@ open class GameWorld(
}
BlocksDrawer.rebuildInternalPrecalculations()
printdbg(this, "renumberTilesAfterLoad done!")
}
/**
@@ -769,7 +773,7 @@ open class GameWorld(
val fluidNumber = tileNameToNumberMap[fluidType] ?: throw NullPointerException("No such fluid: $fluidType")
if (fill > WorldSimulator.FLUID_MIN_MASS) {
if (fill > FLUID_MIN_MASS) {
//setTileTerrain(x, y, fluidTypeToBlock(fluidType))
layerFluids.unsafeSetTile(x, y, fluidNumber, fill)
}
@@ -804,7 +808,7 @@ open class GameWorld(
data class FluidInfo(val type: ItemID = Fluid.NULL, val amount: Float = 0f) {
/** test if this fluid should be considered as one */
fun isFluid() = type != Fluid.NULL && amount >= WorldSimulator.FLUID_MIN_MASS
fun isFluid() = type != Fluid.NULL && amount >= FLUID_MIN_MASS
fun getProp() = FluidCodex[type]
override fun toString() = "Fluid type: ${type}, amount: $amount"
}