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

fix: bomb's item drop not obeying 'drop' itemproperty

Browse Source
This commit is contained in:
minjaesong
2024-02-15 23:36:56 +09:00
parent ae0a2e2564
commit 76586baba5
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package net.torvald.terrarum.modulebasegame
import net.torvald.terrarum.BlockCodex
import net.torvald.terrarum.ItemCodex
import net.torvald.terrarum.OreCodex
import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.ceilToInt
import net.torvald.terrarum.gameworld.BlockLayerI16
@@ -239,18 +240,16 @@ object ExplosionManager {
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) ->
if (ore != null) {
// drop ore
if (Math.random() < dropProbOre) {
PickaxeCore.dropItem(ore, wx, wy)
if (ore != null || tile != null) {
// drop item
val prob = if (ore != null) dropProbOre else dropProbNonOre
if (Math.random() < prob) {
val drop = if (ore != null) OreCodex[ore].item else BlockCodex[tile].drop
PickaxeCore.dropItem(drop, wx, wy)
}
}
else if (tile != null) {
// drop tile
if (Math.random() < dropProbNonOre) {
PickaxeCore.dropItem(tile, wx, wy)
}
if (tile != null) {
PickaxeCore.makeDust(tile, wx, wy, 8 + (5 * Math.random()).toInt())
// drop random disc