From 4c683dd397834b183e15ea4eec94ac6ef20a56b7 Mon Sep 17 00:00:00 2001 From: Michael Townsend Date: Mon, 12 Jun 2023 10:20:28 -0400 Subject: [PATCH] bugs --- script/events.js | 7 ++++--- script/events/executioner.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/script/events.js b/script/events.js index 5eba0c2..d7e1639 100644 --- a/script/events.js +++ b/script/events.js @@ -639,6 +639,7 @@ var Events = { } if (venomous && !shielded) { + clearInterval(Events._dotTimer); Events._dotTimer = setInterval(() => { Events.dotDamage(enemy, Math.floor(dmg / 2)); }, Events.DOT_TICK); @@ -763,9 +764,9 @@ var Events = { }, clearTimeouts: () => { - clearTimeout(Events._enemyAttackTimer); - Events._specialTimers.forEach(clearTimeout); - clearTimeout(Events._dotTimer); + clearInterval(Events._enemyAttackTimer); + Events._specialTimers.forEach(clearInterval); + clearInterval(Events._dotTimer); }, endFight: function() { diff --git a/script/events/executioner.js b/script/events/executioner.js index 92da8a3..ccffcfe 100644 --- a/script/events/executioner.js +++ b/script/events/executioner.js @@ -1745,7 +1745,7 @@ Events.Executioner = { buttons: { 'continue': { text: _('continue'), - nextScene: { 1: '7-1' } + nextScene: { 1: '8' } }, 'leave': { text: _('leave'),