This commit is contained in:
33333-33333 2026-07-01 22:59:49 +09:00
commit acf93ec6df
22 changed files with 320 additions and 261 deletions

View file

@ -212,8 +212,9 @@ function updateFirecracker(item, dt, worldRef) {
for (const it of nearby) {
if (!it || it.dead || it === item) continue;
if (it.type === "grass" && distXY(item.x, item.y, it.x, it.y) <= spreadRadius + Math.max(it.r || 16, 12)) {
changed = tryGrassExtinguishFire(it, item, worldRef, dt) || changed;
if ((item.amount || 0) > 0) changed = igniteGrassByFire(it, item, worldRef, dt) || changed;
const extinguished = tryGrassExtinguishFire(it, item, worldRef, dt);
changed = extinguished || changed;
if (!extinguished && (item.amount || 0) > 0) changed = igniteGrassByFire(it, item, worldRef, dt) || changed;
}
if (it.type === "zunchi" && distXY(item.x, item.y, it.x, it.y) <= spreadRadius + Math.max(it.r || 15, 12)) changed = igniteZunchiByFire(it, item, worldRef, dt) || changed;
if (it.type === "water" && distXY(item.x, item.y, it.x, it.y) <= spreadRadius + Math.max(it.r || 10, 8)) {
@ -461,8 +462,6 @@ function updateFirecracker(item, dt, worldRef) {
panicTarinaiFromFire,
igniteAntByFire,
igniteGrassByFire,
igniteZunchiByFire,
tryGrassExtinguishFire,
spawnFireAt: (worldRef, x, y, opts = {}) => spawnFireAt(worldRef, x, y, opts),
scatterFireFrom,
compactWorldFires,