summaryrefslogtreecommitdiff
path: root/npc/009-2_Hurnscald/wyara.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/009-2_Hurnscald/wyara.txt')
-rw-r--r--npc/009-2_Hurnscald/wyara.txt50
1 files changed, 22 insertions, 28 deletions
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2_Hurnscald/wyara.txt
index d6ff9165..1cce5d90 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2_Hurnscald/wyara.txt
@@ -12,12 +12,6 @@
set @STATUS_PURIFY_TWICE, 3;
set @STATUS_PURIFY_OVER, 4;
- set @MAUVE, 680;
- set @MAGGOTSLIME, 505;
- set @BOTTLE_WATER, 541;
- set @MANAPOTION, 705;
- set @PURIFICATIONPOTION, 733;
-
set @has_magic, getskilllv(SKILL_MAGIC);
if (@Q_status == @STATUS_PURIFY_ONCE)
@@ -123,18 +117,18 @@ L_manapotion_toomany:
goto L_Main;
L_make_manapotion:
- if(countitem(@MAUVE) < 40) goto L_make_manapotion_lack;
- if(countitem(@BOTTLE_WATER) < 1) goto L_make_manapotion_lack;
+ if(countitem("MauveHerb") < 40) goto L_make_manapotion_lack;
+ if(countitem("BottleOfWater") < 1) goto L_make_manapotion_lack;
getinventorylist;
if ((@inventorylist_count == 100)
- && (countitem(@MAUVE) > 40)
- && (countitem(@BOTTLE_WATER) > 100)
- && (countitem(@MANAPOTION) < 1))
+ && (countitem("MauveHerb") > 40)
+ && (countitem("BottleOfWater") > 100)
+ && (countitem("ManaPotion") < 1))
goto L_manapotion_toomany;
- delitem @MAUVE, 40;
- delitem @BOTTLE_WATER, 1;
- getitem @MANAPOTION, 1;
+ delitem "MauveHerb", 40;
+ delitem "BottleOfWater", 1;
+ getitem "ManaPotion", 1;
mes "[Wyara the Witch]";
mes "Wyara takes your mauve leaves, grinds them, and pours some of the resultant paste into her cauldron. She then takes your bottle and sticks it into her brew, head-first.";
@@ -291,7 +285,7 @@ L_Magic_train:
set @Q_status, @STATUS_PURIFY_EXPLAINED;
callsub S_update_var;
L_Magic_purify_explained:
- if (countitem(@PURIFICATIONPOTION))
+ if (countitem("PurificationPotion"))
goto L_Magic_purify_doit;
mes "[Wyara the Witch]";
@@ -304,17 +298,17 @@ L_Magic_purify_explained:
"Here they are.", -;
getinventorylist;
- if ((@inventorylist_count == 100) && (countitem(@MAUVE) > 20) && (countitem(@MAGGOTSLIME) > 20))
+ if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
goto L_Magic_purify_nospace;
- if (countitem(@MAUVE) < 20)
+ if (countitem("MauveHerb") < 20)
goto L_Magic_purify_lacking;
- if (countitem(@MAGGOTSLIME) < 20)
+ if (countitem("MaggotSlime") < 20)
goto L_Magic_purify_lacking;
- delitem @MAUVE, 20;
- delitem @MAGGOTSLIME, 20;
- getitem @PURIFICATIONPOTION, 1;
+ delitem "MauveHerb", 20;
+ delitem "MaggotSlime", 20;
+ getitem "PurificationPotion", 1;
mes "[Wyara the Witch]";
mes "\"Wyara grinds the leaves and mixes them with the slime, boils them, then speaks a brief incantation over them and hands you the result.\"";
next;
@@ -343,7 +337,7 @@ L_Magic_purify_once:
mes "\"You have purified the pond a little, but not enough, I think. We'll need another potion.\"";
next;
- if (countitem(@PURIFICATIONPOTION))
+ if (countitem("PurificationPotion"))
goto L_Magic_purify_doit2;
mes "[Wyara the Witch]";
@@ -355,17 +349,17 @@ L_Magic_purify_once:
"No way.", L_Main,
"Here you are.", -;
getinventorylist;
- if ((@inventorylist_count == 100) && (countitem(@MAUVE) > 20) && (countitem(@MAGGOTSLIME) > 20))
+ if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
goto L_Magic_purify_nospace;
- if (countitem(@MAUVE) < 20)
+ if (countitem("MauveHerb") < 20)
goto L_Magic_purify_lacking;
- if (countitem(@MAGGOTSLIME) < 20)
+ if (countitem("MaggotSlime") < 20)
goto L_Magic_purify_lacking;
- delitem @MAUVE, 20;
- delitem @MAGGOTSLIME, 20;
- getitem @PURIFICATIONPOTION, 1;
+ delitem "MauveHerb", 20;
+ delitem "MaggotSlime", 20;
+ getitem "PurificationPotion", 1;
mes "[Wyara the Witch]";
mes "\"Wyara brews another purification potion.\"";
next;