bugs

sagrd · Jun 12, 2023 · 4c683dd · 4c683dd
1 parent 7ee96fd
commit 4c683dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -1745,7 +1745,7 @@ Events.Executioner = {
         buttons: {
           'continue': {
             text: _('continue'),
-            nextScene: { 1: '7-1' }
+            nextScene: { 1: '8' }
           },
           'leave': {
             text: _('leave'),