From ff116359f3fdcf72fdb8d4a8c6f4a23656f2c9d5 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 10 Aug 2019 17:57:57 -0300 Subject: Keep @val1 in memory for Mouboo Healing (as it is created on-the-fly). Fix a typo on Transmigration Menu --- npc/014-2/mouboo.txt | 2 +- npc/items/legacy_heal.txt | 3 ++- npc/items/rand_sc_heal.txt | 10 +++++----- npc/magic/transmigration.txt | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/npc/014-2/mouboo.txt b/npc/014-2/mouboo.txt index b861465c8..038f0aec0 100644 --- a/npc/014-2/mouboo.txt +++ b/npc/014-2/mouboo.txt @@ -96,7 +96,7 @@ L_Begin: if (.@id == ElixirOfLife) setq2 HurnscaldQuest_InjuriedMouboo, 9999; else - setq2 HurnscaldQuest_InjuriedMouboo, .@q2+((@min+@max)/10); + setq2 HurnscaldQuest_InjuriedMouboo, .@q2+((@val1)/10); .@q2=getq2(HurnscaldQuest_InjuriedMouboo); if (.@q2 > 1000) { diff --git a/npc/items/legacy_heal.txt b/npc/items/legacy_heal.txt index 7664c4be9..106b92b8d 100644 --- a/npc/items/legacy_heal.txt +++ b/npc/items/legacy_heal.txt @@ -51,9 +51,10 @@ OnUse: sc_end .@skill; sc_start2 .@skill, @delay, @val1, 1; + // @val1 must be preserved for cross-reading @delay=0; @min=0; @max=0; - @val1=0; + // @val1=0; end; } diff --git a/npc/items/rand_sc_heal.txt b/npc/items/rand_sc_heal.txt index c0610b223..c14f33a97 100644 --- a/npc/items/rand_sc_heal.txt +++ b/npc/items/rand_sc_heal.txt @@ -85,7 +85,7 @@ OnUse: @max=max(3, MaxHp*@max/100); // Calculate how much you'll heal - @val1 = rand(@min, @max); + @val1 = rand2(@min, @max); // Calculate delay if it was not given if (!@delay || @delay > 60) { @@ -123,12 +123,12 @@ OnUse: sc_start2 .@skill, @delay, @val1, 1; // Clear stuff - // @min and @max must be preserved for cross-reading + // @val1 must be preserved for cross-reading @delay=0; @type=0; @rarity=0; - // @min=0; - // @max=0; - @val1=0; + @min=0; + @max=0; + // @val1=0; end; } diff --git a/npc/magic/transmigration.txt b/npc/magic/transmigration.txt index 6ac962fef..439333d77 100644 --- a/npc/magic/transmigration.txt +++ b/npc/magic/transmigration.txt @@ -25,7 +25,7 @@ OnCall: mesc l("What will you transmute today?"); mes ""; menuint - l("Haste Potion"), CrazyRum, + l("Crazy Rum"), CrazyRum, l("Mouboo Figurine"), MoubooFigurine; mes ""; -- cgit v1.2.3-70-g09d2