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

replacing water/lava tiles with one fluid marker

Browse Source 
actual fluid not implemented
This commit is contained in:
Minjae Song
2018-12-12 20:32:13 +09:00
parent 6e4cea28e7
commit 95245c8945
9 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,9 +228,9 @@ internal object BlocksDrawer {
Block.SANDSTONE_DESERT,
Block.SANDSTONE_RED,
Block.SANDSTONE_WHITE,
Block.SANDSTONE_GREEN,
Block.SANDSTONE_GREEN
Block.WATER,
/*lock.WATER,
Block.WATER_1,
Block.WATER_2,
Block.WATER_3,
@@ -261,7 +261,7 @@ internal object BlocksDrawer {
Block.LAVA_12,
Block.LAVA_13,
Block.LAVA_14,
Block.LAVA_15
Block.LAVA_15*/
)
/**
@@ -311,8 +311,8 @@ internal object BlocksDrawer {
* will blend colour using colour multiplication
* i.e. red hues get lost if you dive into the water
*/
private val TILES_BLEND_MUL = hashSetOf(
Block.WATER,
private val TILES_BLEND_MUL = hashSetOf(-1
/*Block.WATER,
Block.WATER_1,
Block.WATER_2,
Block.WATER_3,
@@ -343,7 +343,7 @@ internal object BlocksDrawer {
Block.LAVA_12,
Block.LAVA_13,
Block.LAVA_14,
Block.LAVA_15
Block.LAVA_15*/
)
/**

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

@@ -215,9 +215,9 @@ object BlocksDrawerOLD {
Block.SANDSTONE_DESERT,
Block.SANDSTONE_RED,
Block.SANDSTONE_WHITE,
Block.SANDSTONE_GREEN,
Block.SANDSTONE_GREEN
Block.WATER,
/*Block.WATER,
Block.WATER_1,
Block.WATER_2,
Block.WATER_3,
@@ -248,7 +248,7 @@ object BlocksDrawerOLD {
Block.LAVA_12,
Block.LAVA_13,
Block.LAVA_14,
Block.LAVA_15
Block.LAVA_15*/
)
/**
@@ -298,8 +298,8 @@ object BlocksDrawerOLD {
* will blend colour using colour multiplication
* i.e. red hues get lost if you dive into the water
*/
private val TILES_BLEND_MUL = hashSetOf(
Block.WATER,
private val TILES_BLEND_MUL = hashSetOf(-1
/*Block.WATER,
Block.WATER_1,
Block.WATER_2,
Block.WATER_3,
@@ -330,7 +330,7 @@ object BlocksDrawerOLD {
Block.LAVA_12,
Block.LAVA_13,
Block.LAVA_14,
Block.LAVA_15
Block.LAVA_15*/
)
/**