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

fix: damaging terrain would not queue the modified chunk for the autosave

Browse Source
This commit is contained in:
minjaesong
2024-02-16 14:29:47 +09:00
parent 902341bd78
commit b11bbf0130
7 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/torvald/terrarum/IngameInstance.kt
View File

@@ -295,6 +295,7 @@ open class IngameInstance(val batch: FlippingSpriteBatch, val isMultiplayer: Boo
open fun modified(layer: Int, x: Int, y: Int) {
// printdbg(this, "Chunk modified: layer $layer ($x, $y)")
modifiedChunks[layer].add(LandUtil.toChunkNum(world, x, y))
}

2
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -588,7 +588,7 @@ open class ActorWithBody : Actor {
// printdbg(this, it)
val dmgPerTile = terrainDamage / it.size
it.forEach { (x, y) ->
world?.inflictTerrainDamage(x, y, dmgPerTile)
world?.inflictTerrainDamage(x, y, dmgPerTile, false)
}
}
}

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

@@ -644,7 +644,7 @@ open class GameWorld(
/**
* @return ItemID of the broken block AND ore if the block is broken, `null` otherwise
*/
fun inflictTerrainDamage(x: Int, y: Int, damage: Double): Pair<ItemID?, ItemID?> {
fun inflictTerrainDamage(x: Int, y: Int, damage: Double, bypassEvent: Boolean): Pair<ItemID?, ItemID?> {
if (damage.isNaN()) throw IllegalArgumentException("Cannot inflict NaN amount of damage at($x, $y)")
val damage = damage.toFloat()
@@ -662,6 +662,10 @@ open class GameWorld(
terrainDamages[addr] = terrainDamages[addr]!! + damage
}
if (!bypassEvent) {
Terrarum.ingame?.modified(LandUtil.LAYER_TERR, x, y)
}
//println("[GameWorld] accumulated damage: ${terrainDamages[addr]}")
// remove tile from the world
@@ -681,7 +685,7 @@ open class GameWorld(
/**
* @return true if block is broken
*/
fun inflictWallDamage(x: Int, y: Int, damage: Double): ItemID? {
fun inflictWallDamage(x: Int, y: Int, damage: Double, bypassEvent: Boolean): ItemID? {
if (damage.isNaN()) throw IllegalArgumentException("Cannot inflict NaN amount of damage at($x, $y)")
val damage = damage.toFloat()
@@ -697,6 +701,10 @@ open class GameWorld(
wallDamages[addr] = wallDamages[addr]!! + damage
}
if (!bypassEvent) {
Terrarum.ingame?.modified(LandUtil.LAYER_TERR, x, y)
}
// remove tile from the world
if (wallDamages[addr]!! >= BlockCodex[getTileFromWall(x, y)].strength) {
val tileBroke = getTileFromWall(x, y)

4
src/net/torvald/terrarum/modulebasegame/ExplosionManager.kt
View File

@@ -140,7 +140,7 @@ object ExplosionManager {
private fun memcpyToWorldBreakage(CALC_WIDTH: Int, world: GameWorld, xStart: Int, yStart: Int, yOff: Int, out: UnsafeFloatArray) {
for (x in xStart until xStart + CALC_WIDTH) {
world.inflictTerrainDamage(x, yStart + yOff, out[x - xStart, yOff].toDouble())
world.inflictTerrainDamage(x, yStart + yOff, out[x - xStart, yOff].toDouble(), false)
}
}
@@ -273,7 +273,7 @@ object ExplosionManager {
for (wx in worldXstart until worldXstart + CALC_WIDTH) {
val lx = wx - (tx - CALC_RADIUS - 1)
val ly = wy - (ty - CALC_RADIUS - 1)
world.inflictTerrainDamage(wx, wy, mapBoomPow[lx, ly].blastToDmg().toDouble()).let { (tile, ore) ->
world.inflictTerrainDamage(wx, wy, mapBoomPow[lx, ly].blastToDmg().toDouble(), false).let { (tile, ore) ->
if (ore != null || tile != null) {
// drop item
val prob = if (ore != null) dropProbOre else dropProbNonOre

9
src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt
View File

@@ -79,7 +79,8 @@ object AxeCore {
INGAME.world.inflictTerrainDamage(
x, y,
Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg
Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg,
false
).let { tileBroken ->
// tile busted
if (tileBroken != null) {
@@ -100,7 +101,8 @@ object AxeCore {
INGAME.world.inflictTerrainDamage(
x, y,
Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg
Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg,
false
).let { (tileBroken, _) ->
// tile busted
if (tileBroken != null) {
@@ -125,7 +127,8 @@ object AxeCore {
INGAME.world.inflictTerrainDamage(
x, y,
Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg
Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg,
false
).let { (tileBroken, _) ->
// tile busted
if (tileBroken != null) {

3
src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
View File

@@ -93,7 +93,8 @@ object PickaxeCore {
INGAME.world.inflictTerrainDamage(
x, y,
Calculate.pickaxePower(actor, item?.material) * swingDmgToFrameDmg
Calculate.pickaxePower(actor, item?.material) * swingDmgToFrameDmg,
false
).let { (tileBroken, oreBroken) ->
// drop ore

3
src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt
View File

@@ -94,7 +94,8 @@ object SledgehammerCore {
INGAME.world.inflictWallDamage(
x, y,
Calculate.pickaxePower(actor, item?.material) * swingDmgToFrameDmg
Calculate.pickaxePower(actor, item?.material) * swingDmgToFrameDmg,
false
).let { tileBroken ->
// tile busted
if (tileBroken != null) {