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

removed FLUID prop from the blocks

Browse Source
This commit is contained in:
Minjae Song
2018-12-29 21:04:27 +09:00
parent 59531ea1ba
commit 3765678735
11 changed files with 210 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt
View File

@@ -491,11 +491,8 @@ internal object BlocksDrawer {
if (mode == FLUID) {
writeToBuffer(mode, bufferX, bufferY, thisTileX, thisTileY, 0)
}
else if (!BlockCodex[thisTile].isFluid) {
writeToBuffer(mode, bufferX, bufferY, thisTileX, thisTileY, breakingStage)
}
else {
writeToBuffer(mode, bufferX, bufferY, 0, 0, 0)
writeToBuffer(mode, bufferX, bufferY, thisTileX, thisTileY, breakingStage)
}
} catch (e: NullPointerException) {
// do nothing. WARNING: This exception handling may hide erratic behaviour completely.
@@ -580,10 +577,9 @@ internal object BlocksDrawer {
//return ret
val upTile = world.getTileFromTerrain(x , y - 1) ?: Block.NULL
return if (ret == 15 || ret == 10)
ret
else if (world.getFluid(x, y-1).isFluid())
else if (world.getFluid(x, y-1).isFluid()) // if tile above is a fluid
0
else
1

11
src/net/torvald/terrarum/worlddrawer/BlocksDrawer_old.kt
View File

@@ -5,12 +5,11 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.Pixmap
import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.gameworld.PairedMapLayer
import net.torvald.terrarum.*
import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.blockproperties.BlockCodex
import net.torvald.terrarum.*
import net.torvald.terrarum.roundInt
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.gameworld.PairedMapLayer
import net.torvald.terrarum.itemproperties.ItemCodex.ITEM_TILES
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import java.io.BufferedOutputStream
@@ -573,8 +572,8 @@ object BlocksDrawerOLD {
var ret = 0
for (i in 0..3) {
try {
if (!BlockCodex[nearbyTiles[i]].isSolid &&
!BlockCodex[nearbyTiles[i]].isFluid) {
if (!BlockCodex[nearbyTiles[i]].isSolid) {
//&& !BlockCodex[nearbyTiles[i]].isFluid) {
ret += (1 shl i) // add 1, 2, 4, 8 for i = 0, 1, 2, 3
}
} catch (e: ArrayIndexOutOfBoundsException) {