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

wood blocks update

Browse Source
This commit is contained in:
minjaesong
2024-08-25 20:20:46 +09:00
parent 23cae8ed73
commit 472fcfc05b
8 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
View File

@@ -403,7 +403,7 @@ internal object BlocksDrawer {
var hash = if ((mode == WALL || mode == TERRAIN) && !BlockCodex[world.tileNumberToNameMap[rawTileNum.toLong()]].hasTag("NORANDTILE"))
getHashCoord(x, y, 8, mode.modeToString())
else 0
else 0 // this zero is completely ignored if the block uses Subtiling
// draw a tile
val nearbyTilesInfo = if (mode == OCCLUSION) {
@@ -538,8 +538,8 @@ internal object BlocksDrawer {
else 1
val breakingStage =
if (mode == TERRAIN || mode == WALL || mode == ORES) (breakage / maxHealth).coerceIn(0f, 1f)
.times(BREAKAGE_STEPS).roundToInt()
if (mode == TERRAIN || mode == WALL || mode == ORES)
(breakage / maxHealth).coerceIn(0f, 1f).times(BREAKAGE_STEPS).roundToInt()
else 0
if (renderTag.maskType >= CreateTileAtlas.RenderTag.MASK_SUBTILE_GENERIC) {

2
src/net/torvald/terrarum/worlddrawer/CreateTileAtlas.kt
View File

@@ -464,6 +464,7 @@ class CreateTileAtlas {
// 0000 (0): INVALID
// 1000 (1): connect-mutual
// 0100 (2): connect-self
// NOTE: For this system, the "NORANDTILE" tag is ignored
val maskType = if (tilesPixmap.width >= 3*W_SUBTILE_GENERIC) MASK_SUBTILE_GRASS else MASK_SUBTILE_GENERIC
var connectionType0 = 0
var tilingMode = 0
@@ -498,6 +499,7 @@ class CreateTileAtlas {
// 0000 (0): INVALID
// 0001 (1): 16-tiles tiling [Deprecated]
// 0010 (2): 47-tiles tiling
// NOTE: For this system ONLY, the FlipRot can be disabled by adding "NORANDTILE" tag on the blocks.csv
var connectionType = 0
var maskType = 0
for (bit in 0 until TILE_SIZE) {