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

overlaying tile breakage over ores

Browse Source
This commit is contained in:
minjaesong
2023-10-10 20:08:55 +09:00
parent 64d30728ff
commit 1e15719b9c
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
assets/mods/basegame/ores/ores.csv Normal file
View File

@@ -0,0 +1,14 @@
"id";"item";"tags"
"1";"item@basegame:128";"COPPER,MALACHITE"
# "2";"item@basegame:129";"IRON,HEMATITE"
# "3";"item@basegame:130";"GOLD,NATURAL_GOLD"
# "4";"item@basegame:131";"COAL,CARBON"
# "5";"item@basegame:132";"ZINC,SPHALERITE"
# "6";"item@basegame:133";"TITANIUM,RUTILE"
# "7";"item@basegame:134";"GEM,RUBY"
# "8";"item@basegame:135";"GEM,EMERALD"
# "9";"item@basegame:136";"GEM,SAPPHIRE"
#"10";"item@basegame:137";"GEM,TOPAZ"
#"11";"item@basegame:138";"GEM,DIAMOND"
#"12";"item@basegame:139";"GEM,SIO2,AMETHYST"
#"13";"item@basegame:140";"GEM,SIO2,QUARTZ"
Can't render this file because it contains an unexpected character in line 3 and column 3.

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

@@ -341,7 +341,6 @@ internal object BlocksDrawer {
else -> throw IllegalArgumentException()
}
// draw a tile
val nearbyTilesInfo = if (mode == OCCLUSION) {
getNearbyTilesInfoFakeOcc(x, y)
@@ -406,9 +405,9 @@ internal object BlocksDrawer {
//println("tileNumberBase = $tileNumberBase, tileNumber = $tileNumber, fluid = ${world.getFluid(x, y)}")
}
val breakage = if (mode == TERRAIN) world.getTerrainDamage(x, y) else if (mode == WALL) world.getWallDamage(x, y) else 0f
val maxHealth = if (mode == TERRAIN) BlockCodex[world.getTileFromTerrain(x, y)].strength else if (mode == WALL) BlockCodex[world.getTileFromWall(x, y)].strength else 1
val breakingStage = if (mode == TERRAIN || mode == WALL) (breakage / maxHealth).coerceIn(0f, 1f).times(BREAKAGE_STEPS).roundToInt() else 0
val breakage = if (mode == TERRAIN || mode == ORES) world.getTerrainDamage(x, y) else if (mode == WALL) world.getWallDamage(x, y) else 0f
val maxHealth = if (mode == TERRAIN || mode == ORES) BlockCodex[world.getTileFromTerrain(x, y)].strength else if (mode == WALL) BlockCodex[world.getTileFromWall(x, y)].strength else 1
val breakingStage = if (mode == TERRAIN || mode == WALL || mode == ORES) (breakage / maxHealth).coerceIn(0f, 1f).times(BREAKAGE_STEPS).roundToInt() else 0
// draw a tile
writeToBuffer(mode, bufferX, bufferY, thisTileX, thisTileY, breakingStage)