summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-01-24 13:17:14 +0000
committerJared Adams <jaxad0127@gmail.com>2009-01-24 13:17:14 +0000
commitb8e9095461ffd09ec7aec7cfcbcab502ea813bab (patch)
tree9f8670796ce5c5391e2a66a786e4098c22814c1e /npc
parentdb44fb4e6555a0f8dc615b9795d5240f3a6d6903 (diff)
downloadserverdata-b8e9095461ffd09ec7aec7cfcbcab502ea813bab.tar.gz
serverdata-b8e9095461ffd09ec7aec7cfcbcab502ea813bab.tar.bz2
serverdata-b8e9095461ffd09ec7aec7cfcbcab502ea813bab.tar.xz
serverdata-b8e9095461ffd09ec7aec7cfcbcab502ea813bab.zip
Finish conversion to "ItemName"
Some of the more complicated scripts (bleach/dye, for example) can't be converted so easily.
Diffstat (limited to 'npc')
-rw-r--r--npc/012-1_Woodland_Hills/injured-mouboo.txt20
-rw-r--r--npc/013-2_Magic_house/apprentice.txt8
-rw-r--r--npc/013-3_Cave/barrier.txt2
-rw-r--r--npc/013-3_Cave/mask_chest.txt129
-rw-r--r--npc/014-1_Woodland/wedding-officiator.txt4
-rw-r--r--npc/015-1_Woodland/sword.txt8
-rw-r--r--npc/015-3/katze.txt46
-rw-r--r--npc/015-3/pot.txt20
-rw-r--r--npc/018-2_Woodland_mining_camp/caul.txt65
-rw-r--r--npc/019-1_Snow_field/santa_helper.txt20
-rw-r--r--npc/019-1_Snow_field/snowman.txt21
-rw-r--r--npc/020-2_Nivalis/furquest.txt52
12 files changed, 192 insertions, 203 deletions
diff --git a/npc/012-1_Woodland_Hills/injured-mouboo.txt b/npc/012-1_Woodland_Hills/injured-mouboo.txt
index c248b8e6..0c32aaf3 100644
--- a/npc/012-1_Woodland_Hills/injured-mouboo.txt
+++ b/npc/012-1_Woodland_Hills/injured-mouboo.txt
@@ -99,7 +99,7 @@ L_pickup_alive:
L_give:
set @items_nr, 12;
- setarray @items, 501, 502, 509, 527, 534, 535, 539, 541, 684, 685, 686, 687;
+ setarray @items$, "CactusDrink", "CactusPotion", "ChocolateBar", "Milk", "OrangeCupcake", "Apple", "Beer", "BottleOfWater", "TinyHealingPotion", "SmallHealingPotion", "MediumHealingPotion", "LargeHealingPotion";
setarray @itemeat, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0;
setarray @choice$, "", "", "", "", "", "", "", "", "", "", "", "";
@@ -110,13 +110,13 @@ L_give:
set @n, 0;
set @ct, 0;
L_nloop:
- set @k, @items[@n];
- if (countitem(@k) == 0)
+ set @k$, @items$[@n];
+ if (countitem(@k$) == 0)
goto L_nloop_skip;
set @name$, getitemname(@k);
set @choice$[@ct], @name$;
- set @choice_idx[@ct], @k;
+ set @choice_idx$[@ct], @k$;
set @choice_eat[@ct], @itemeat[@n];
set @ct, @ct + 1;
@@ -140,13 +140,13 @@ L_nloop_skip:
@choice$[11], -;
set @menu, @menu - 1;
- set @choice, @choice_idx[@menu];
+ set @choice$, @choice_idx[@menu];
set @choice_e, @choice_eat[@menu];
set @verb$, "drinks";
if (@choice_e)
set @verb$, "eats";
- if (@choice && countitem(@choice))
+ if (@choice$ && countitem(@choice$))
goto L_consume;
goto L_menu;
@@ -154,11 +154,11 @@ L_nloop_skip:
L_consume:
mes "[Injured Mouboo]";
- mes "The mouboo " + @verb$ + " your " + getitemname(@choice) + ".";
- delitem @choice, 1;
+ mes "The mouboo " + @verb$ + " your " + getitemname(@choice$) + ".";
+ delitem @choice$, 1;
next;
- if (@choice == 687)
+ if (@choice$ == "LargeHealingPotion")
goto L_do_heal;
@@ -198,7 +198,7 @@ L_dead:
if (@inventorylist_count == 100)
goto L_nopickup;
- getitem 2076, 1;
+ getitem "BlackTNeckSweater", 1;
mes "You pull out the sweater and stuff it into your backpack.";
set @Q_status, @STATE_TOOK_KILL_REWARD;
diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt
index abb96e6b..89c0beb7 100644
--- a/npc/013-2_Magic_house/apprentice.txt
+++ b/npc/013-2_Magic_house/apprentice.txt
@@ -41,9 +41,9 @@ L_Beer:
L_Beer_yes:
if (zeny < 175) goto L_Low_money;
getinventorylist;
- if (@inventorylist_count == 100 && countitem(539) == 0) goto L_TooMany;
+ if (@inventorylist_count == 100 && countitem("Beer") == 0) goto L_TooMany;
- getitem 539, 1;
+ getitem "Beer", 1;
set zeny, zeny - 175;
goto L_Finish;
@@ -64,8 +64,8 @@ L_Milk:
L_Milk_yes:
if (zeny < 300) goto L_Low_money;
getinventorylist;
- if (@inventorylist_count == 100 && countitem(527) == 0) goto L_TooMany;
- getitem 527, 1;
+ if (@inventorylist_count == 100 && countitem("Milk") == 0) goto L_TooMany;
+ getitem "Milk", 1;
set zeny, zeny - 300;
goto L_Finish;
diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt
index 004452f9..85a7fc72 100644
--- a/npc/013-3_Cave/barrier.txt
+++ b/npc/013-3_Cave/barrier.txt
@@ -13,5 +13,5 @@
L_Has_Jack_O_Soul:
mes "The barrier around the opening allows you passage.";
set QUEST_demon_mines, 2;
- delitem 1198, 1;
+ delitem "JackOSoul", 1;
}
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
index 0da8bab9..2e292e50 100644
--- a/npc/013-3_Cave/mask_chest.txt
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -4,80 +4,81 @@
if (QUEST_demon_mines < 2) goto L_This_shouldn_t_happen;
if (QUEST_demon_mines == 3) goto L_Finished;
- if (countitem(505) == 0) goto L_No_maggot_slime;
- if (countitem(566) == 0) goto L_No_mushroom;
- if (countitem(565) == 0) goto L_No_petal;
+ if (countitem("MaggotSlime") == 0) goto L_No_maggot_slime;
+ if (countitem("SmallMushroom") == 0) goto L_No_mushroom;
+ if (countitem("Petal") == 0) goto L_No_petal;
- if (countitem(700) == 0) goto L_No_pearl;
- if (countitem(613) == 0) goto L_No_hard_spike;
- if (countitem(569) == 0) goto L_No_raw_log;
+ if (countitem("Pearl") == 0) goto L_No_pearl;
+ if (countitem("HardSpike") == 0) goto L_No_hard_spike;
+ if (countitem("RawLog") == 0) goto L_No_raw_log;
- if (countitem(614) == 0) goto L_No_pink_antenna;
- if (countitem(710) == 0 || countitem(711) == 0 || countitem(712) == 0 || countitem(713) == 0) goto L_No_tongues;
- if (countitem(537) == 0) goto L_No_treasure_key;
+ if (countitem("PinkAntenna") == 0) goto L_No_pink_antenna;
+ if (countitem("SnakeTongue") == 0 || countitem("MountainSnakeTongue") == 0 || countitem("GrassSnakeTongue") == 0 || countitem("CaveSnakeTongue") == 0) goto L_No_tongues;
+ if (countitem("TreasureKey") == 0) goto L_No_treasure_key;
- if (countitem(701) == 0) goto L_No_ash;
- if (countitem(680) == 0 || countitem(681) == 0 || countitem(682) == 0 || countitem(683) == 0) goto L_No_herbs;
- if (countitem(518) == 0) goto L_No_bug_leg;
+ if (countitem("PileOfAsh") == 0) goto L_No_ash;
+ if (countitem("MauveHerb") == 0 || countitem("CobaltHerb") == 0 || countitem("GambogeHerb") == 0 || countitem("AlizarinHerb") == 0) goto L_No_herbs;
+ if (countitem("BugLeg") == 0) goto L_No_bug_leg;
- if (countitem(612) == 0) goto L_No_lamp;
- if (countitem(640) == 0) goto L_No_iron_ore;
- if (countitem(507) == 0 || countitem(517) == 0 || countitem(709) == 0) goto L_No_stingers;
+ if (countitem("CaveSnakeLamp") == 0) goto L_No_lamp;
+ if (countitem("IronOre") == 0) goto L_No_iron_ore;
+ if (countitem("ScorpionStinger") == 0 || countitem("RedScorpionStinger") == 0 || countitem("BlackScorpionStinger") == 0) goto L_No_stingers;
- if (countitem(718) == 0) goto L_No_silk;
- if (countitem(611) == 0) goto L_No_fur;
- if (countitem(631) == 0) goto L_No_dark_crystal;
+ if (countitem("SilkCocoon") == 0) goto L_No_silk;
+ if (countitem("WhiteFur") == 0) goto L_No_fur;
+ if (countitem("DarkCrystal") == 0) goto L_No_dark_crystal;
- if (countitem(541) == 0) goto L_No_water;
+ if (countitem("BottleOfWater") == 0) goto L_No_water;
getinventorylist;
- if (@inventorylist_count == 100 && countitem(505) > 1 && countitem(518) > 1 && countitem(718) > 1
- && countitem(566) > 1 && countitem(565) > 1 && countitem(700) > 1
- && countitem(613) > 1 && countitem(569) > 1 && countitem(614) > 1
- && countitem(631) > 1 && countitem(640) > 1 && countitem(507) > 1
- && countitem(517) > 1 && countitem(709) > 1 && countitem(710) > 1
- && countitem(711) > 1 && countitem(712) > 1 && countitem(713) > 1
- && countitem(680) > 1 && countitem(681) > 1 && countitem(682) > 1
- && countitem(683) > 1 && countitem(537) > 1 && countitem(612) > 1
- && countitem(701) > 1 && countitem(541) > 1) goto L_TooMany;
-
- delitem 505, 1;
- delitem 518, 1;
- delitem 718, 1;
-
- delitem 566, 1;
- delitem 565, 1;
- delitem 700, 1;
-
- delitem 613, 1;
- delitem 569, 1;
- delitem 614, 1;
-
- delitem 631, 1;
- delitem 640, 1;
- delitem 507, 1;
-
- delitem 517, 1;
- delitem 709, 1;
- delitem 710, 1;
-
- delitem 711, 1;
- delitem 712, 1;
- delitem 713, 1;
-
- delitem 680, 1;
- delitem 681, 1;
- delitem 682, 1;
-
- delitem 683, 1;
- delitem 537, 1;
- delitem 612, 1;
-
- delitem 701, 1;
- delitem 541, 1;
+ if (@inventorylist_count == 100 && countitem("MaggotSlime") > 1 && countitem("BugLeg") > 1 && countitem("SilkCocoon") > 1
+ && countitem("SmallMushroom") > 1 && countitem("Petal") > 1 && countitem("Pearl") > 1
+ && countitem("HardSpike") > 1 && countitem("RawLog") > 1 && countitem("PinkAntenna") > 1
+ && countitem("DarkCrystal") > 1 && countitem("IronOre") > 1 && countitem("ScorpionStinger") > 1
+ && countitem("RedScorpionStinger") > 1 && countitem("BlackScorpionStinger") > 1 && countitem("SnakeTongue") > 1
+ && countitem("MountainSnakeTongue") > 1 && countitem("GrassSnakeTongue") > 1 && countitem("CaveSnakeTongue") > 1
+ && countitem("MauveHerb") > 1 && countitem("CobaltHerb") > 1 && countitem("GambogeHerb") > 1
+ && countitem("AlizarinHerb") > 1 && countitem("TreasureKey") > 1 && countitem("CaveSnakeLamp") > 1
+ && countitem("PileOfAsh") > 1 && countitem("WhiteFur") > 1 && countitem("BottleOfWater") > 1) goto L_TooMany;
+
+ delitem "MaggotSlime", 1;
+ delitem "BugLeg", 1;
+ delitem "SilkCocoon", 1;
+
+ delitem "SmallMushroom", 1;
+ delitem "Petal", 1;
+ delitem "Pearl", 1;
+
+ delitem "HardSpike", 1;
+ delitem "RawLog", 1;
+ delitem "PinkAntenna", 1;
+
+ delitem "DarkCrystal", 1;
+ delitem "IronOre", 1;
+ delitem "ScorpionStinger", 1;
+
+ delitem "RedScorpionStinger", 1;
+ delitem "BlackScorpionStinger", 1;
+ delitem "SnakeTongue", 1;
+
+ delitem "MountainSnakeTongue", 1;
+ delitem "GrassSnakeTongue", 1;
+ delitem "CaveSnakeTongue", 1;
+
+ delitem "MauveHerb", 1;
+ delitem "CobaltHerb", 1;
+ delitem "GambogeHerb", 1;
+
+ delitem "AlizarinHerb", 1;
+ delitem "TreasureKey", 1;
+ delitem "CaveSnakeLamp", 1;
+
+ delitem "WhiteFur", 1;
+ delitem "PileOfAsh", 1;
+ delitem "BottleOfWater", 1;
mes "You managed to preform the ritual and open the chest.";
- getitem 679, 1;
+ getitem "DemonMask", 1;
mes "You found a demon mask inside.";
set QUEST_demon_mines, 3;
close;
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 26f2fc56..8b25647e 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -99,8 +99,8 @@ L_get_married:
if (@inventorylist_count > 98) goto L_No_Room_For_Rings;
set zeny, zeny - @WEDDING_FEE;
- getitem 702, 1;
- getitem 702, 1;
+ getitem "WeddingRing", 1;
+ getitem "WeddingRing", 1;
mes "[Wedding Officiator]";
mes "Wendy collects the fee.";
diff --git a/npc/015-1_Woodland/sword.txt b/npc/015-1_Woodland/sword.txt
index 0128d819..75142de3 100644
--- a/npc/015-1_Woodland/sword.txt
+++ b/npc/015-1_Woodland/sword.txt
@@ -16,8 +16,6 @@ L_message:
set @STATUS_W12, 5;
set @STATUS_W11_12, 6;
set @STATUS_L2_ALLSPELLS, 7;
- set @ORE, 640;
- set @IRONPOWDER, 704;
if (@Q_status == @STATUS_INITIAL) goto L_Initial;
if (@Q_status == @STATUS_LEARNED_FLAREDART) goto L_FlareStage;
@@ -311,7 +309,7 @@ L_L2_W10:
"OK.", -,
"No way.", L_farewell;
- if (countitem(@ORE) < 1)
+ if (countitem("IronOre") < 1)
goto L_no_ore;
if (MPQUEST && (Mobpt < 10000)) goto L_lacking_mobpoints;
@@ -321,8 +319,8 @@ L_L2_W10:
mes "[1000 experience points]";
set Mobpt, Mobpt - 10000;
getexp 1000, 0;
- delitem @ORE, 1;
- getitem @IRONPOWDER, 5;
+ delitem "IronOre", 1;
+ getitem "IronPowder", 5;
set @Q_status, @STATUS_L2_ALLSPELLS;
callsub S_update_var;
next;
diff --git a/npc/015-3/katze.txt b/npc/015-3/katze.txt
index c24a9f80..a3cc0626 100644
--- a/npc/015-3/katze.txt
+++ b/npc/015-3/katze.txt
@@ -70,17 +70,17 @@ L_NeedsFur:
mes "\"Prrr. Meow, prrr...\"";
next;
- if (countitem(611) > 0) // White Fur
+ if (countitem("WhiteFur") > 0)
menu "Make funny movements with the fur near the ground", L_MoveFur,
"Throw a stone at the cat", L_ThrowStone,
"Leave the cat alone", -;
- if (countitem(611) == 0)
+ if (countitem("WhiteFur") == 0)
menu "Throw a stone at the cat", L_ThrowStone,
"Leave the cat alone", -;
close;
L_MoveFur:
- delitem 611, 1; // Cat takes the white fur
+ delitem "WhiteFur", 1;
set Katze, 3;
mes "The cat jumps at the fur! You quickly let go of it. The cat happily returns to its spot, carrying the fur in its mouth.";
next;
@@ -93,7 +93,7 @@ L_NeedsWood:
mes "\"Prrrr, now I'd like something to sharpen my claws on.\"";
next;
- if (countitem(569) > 0) // Raw log
+ if (countitem("RawLog") > 0)
menu "Want this piece of wood?", L_GiveWood,
"Ok, see you later", -;
close;
@@ -113,12 +113,12 @@ L_NeedsStuff:
set Katze, 5;
mes "[Katze]";
mes "\"You've been really kind to me. I can make you something nice, but I will need";
- mes "2 snake skins,";
- mes "2 snake tongues,";
- mes "2 maggot slimes,";
- mes "2 white furs,";
- mes "2 hard spikes and";
- mes "2 tiny healing potions.\"";
+ mes "2 [snake skin]s,";
+ mes "2 [snake tongue]s,";
+ mes "2 [maggot slime]s,";
+ mes "2 [white fur]s,";
+ mes "2 [hard spike]s and";
+ mes "2 [tiny healing potion]s.\"";
next;
close;
@@ -152,12 +152,12 @@ L_Please:
close;
L_CatChecksStuff:
- if (countitem(641) > 1 && // Snake skin
- countitem(710) > 1 && // Snake tongue
- countitem(505) > 1 && // Maggot slime
- countitem(611) > 1 && // White fur
- countitem(613) > 1 && // Hard spike
- countitem(684) > 1) // Tiny healing potion
+ if (countitem("SnakeSkin") > 1 &&
+ countitem("SnakeTongue") > 1 &&
+ countitem("MaggotSlime") > 1 &&
+ countitem("WhiteFur") > 1 &&
+ countitem("HardSpike") > 1 &&
+ countitem("TinyHealingPotion") > 1)
goto L_GiveStuff;
mes "[Katze]";
mes "\"You don't seem to have everything yet. Come back later when you do.\"";
@@ -165,12 +165,12 @@ L_CatChecksStuff:
close;
L_GiveStuff:
- delitem 641, 2;
- delitem 710, 2;
- delitem 505, 2;
- delitem 611, 2;
- delitem 613, 2;
- delitem 684, 2;
+ delitem "SnakeSkin", 2;
+ delitem "SnakeTongue", 2;
+ delitem "MaggotSlime", 2;
+ delitem "WhiteFur", 2;
+ delitem "HardSpike", 2;
+ delitem "TinyHealingPotion", 2;
set Katze, 6;
set KatzeBeenOutside, 0;
mes "[Katze]";
@@ -185,7 +185,7 @@ L_PreGainEars:
close;
L_GainEars:
- getitem 1217, 1; // Cat ears
+ getitem "CatEars", 1;
set @xpval, 5000;
getexp @xpval, 0;
set Katze, 7;
diff --git a/npc/015-3/pot.txt b/npc/015-3/pot.txt
index bf3bd945..434954c7 100644
--- a/npc/015-3/pot.txt
+++ b/npc/015-3/pot.txt
@@ -20,14 +20,14 @@
if (Katze >= 4) goto L_Finished;
L_NeedsMilk:
- if (countitem(527) > 0)
+ if (countitem("Milk") > 0)
menu
"Pour in some milk", L_GiveMilk,
"Leave it alone", -;
close;
L_GiveMilk:
- delitem 527, 1;
+ delitem "Milk", 1;
set Katze, 1;
set KatzeBeenOutside, 0;
close;
@@ -41,29 +41,29 @@ L_NeedsFood:
mes "The milk is gone!";
next;
- if (countitem(562) > 0 && countitem(676) > 0)
+ if (countitem("ChickenLeg") > 0 && countitem("Steak") > 0)
menu
"Put in a chicken leg", L_GiveChicken,
"Put in a steak", L_GiveSteak,
"Leave it alone", -;
- if (countitem(562) > 0 && countitem(676) == 0)
+ if (countitem("ChickenLeg") > 0 && countitem("Steak") == 0)
menu
"Put in a chicken leg", L_GiveChicken,
"Leave it alone", -;
- if (countitem(562) == 0 && countitem(676) > 0)
+ if (countitem("ChickenLeg") == 0 && countitem("Steak") > 0)
menu
"Put in a steak", L_GiveSteak,
"Leave it alone", -;
close;
L_GiveChicken:
- delitem 562, 1;
+ delitem "ChickenLeg", 1;
set Katze, 2;
set KatzeBeenOutside, 0;
close;
L_GiveSteak:
- delitem 676, 1;
+ delitem "Steak", 1;
set Katze, 2;
set KatzeBeenOutside, 0;
close;
@@ -77,7 +77,7 @@ L_NeedsFur:
mes "And it's empty!";
next;
- if (countitem(611) > 0) // White Fur
+ if (countitem("WhiteFur") > 0)
menu "Put a white fur next to the pot", L_GiveFur,
"Leave it alone", -;
close;
@@ -88,13 +88,13 @@ L_GiveFur:
close;
L_NeedsWood:
- if (countitem(569) > 0) // Raw log
+ if (countitem("RawLog") > 0)
menu "Put a wooden log next to the pot", L_GiveWood,
"Leave it alone", -;
close;
L_GiveWood:
- delitem 569, 1;
+ delitem "RawLog", 1;
set Katze, 4;
set KatzeBeenOutside, 0;
mes "You put the wooden log next to the pot. The cat eyes it suspiciously, but remains on her spot.";
diff --git a/npc/018-2_Woodland_mining_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt
index 1aeda920..ff20e69f 100644
--- a/npc/018-2_Woodland_mining_camp/caul.txt
+++ b/npc/018-2_Woodland_mining_camp/caul.txt
@@ -13,22 +13,11 @@
set @SETZER_KNOWS_STINGER, 2;
set @SETZER_FLAG_MADE_OIL, 4;
- set @PEARL, 700;
- set @SNAKE_SKIN, 641;
- set @BLACK_STINGER, 709;
- set @ASH_PILE, 701;
- set @GOLDEN_STINGER, 706;
- set @MONSTER_OIL, 707;
set @MONSTER_OIL_XP, 100000;
set @Q_MASK, NIBBLE_3_MASK;
set @Q_SHIFT, NIBBLE_3_SHIFT;
- set @MAUVE, 680;
- set @COBALT, 681;
- set @GAMBOGE, 682;
- set @ALIZARIN, 683;
-
set @Q_status, (QUEST_Forestbow_state & @Q_MASK) >> @Q_SHIFT;
mes "[Caul]";
@@ -92,10 +81,10 @@ L_brew:
mes "\"Now put " + @num + " herbs of each kind into the cauldron, stir, and concentrate all your mental energy on it.\"";
next;
- if (countitem(@MAUVE) < @num) goto L_NotEnough;
- if (countitem(@COBALT) < @num) goto L_NotEnough;
- if (countitem(@GAMBOGE) < @num) goto L_NotEnough;
- if (countitem(@ALIZARIN) < @num) goto L_NotEnough;
+ if (countitem("MauveHerb") < @num) goto L_NotEnough;
+ if (countitem("CobaltHerb") < @num) goto L_NotEnough;
+ if (countitem("GambogeHerb") < @num) goto L_NotEnough;
+ if (countitem("AlizarinHerb") < @num) goto L_NotEnough;
set @a, @num;
set @result1, 0;
@@ -118,10 +107,10 @@ L_CraftLoop:
set @a, @a - 1;
if (@a > 0) goto L_CraftLoop;
- delitem @MAUVE, @num;
- delitem @COBALT, @num;
- delitem @GAMBOGE, @num;
- delitem @ALIZARIN, @num;
+ delitem "MauveHerb", @num;
+ delitem "CobaltHerb", @num;
+ delitem "GambogeHerb", @num;
+ delitem "AlizarinHerb", @num;
getitem 684, @result1;
getitem 685, @result2;
@@ -221,16 +210,16 @@ L_monster_oil_where_gold:
L_monster_oil_start_brew:
set @main_menu, 0;
- if (countitem (@PEARL) < 1) goto L_monster_oil_missing;
- if (countitem (@SNAKE_SKIN) < 2) goto L_monster_oil_missing;
- if (countitem (@BLACK_STINGER) < 3) goto L_monster_oil_missing;
- if (countitem (@ASH_PILE) < 2) goto L_monster_oil_missing;
- if (countitem (@GOLDEN_STINGER) < 1) goto L_monster_oil_missing_gold;
+ if (countitem ("Pearl") < 1) goto L_monster_oil_missing;
+ if (countitem ("SnakeSkin") < 2) goto L_monster_oil_missing;
+ if (countitem ("BlackScorpionStinger") < 3) goto L_monster_oil_missing;
+ if (countitem ("PileOfAsh") < 2) goto L_monster_oil_missing;
+ if (countitem ("GoldenScorpionStinger") < 1) goto L_monster_oil_missing_gold;
- delitem @PEARL, 1;
- delitem @SNAKE_SKIN, 2;
- delitem @BLACK_STINGER, 3;
- delitem @ASH_PILE, 2;
+ delitem "Pearl", 1;
+ delitem "SnakeSkin", 2;
+ delitem "BlackScorpionStinger", 3;
+ delitem "PileOfAsh", 2;
set @bubble_mode, 0;
setarray @bubble_modes$,
@@ -301,35 +290,35 @@ L_monster_oil_out_of_leaves:
goto L_monster_oil_loop;
L_monster_oil_alizarin:
- set @use_leaf, @ALIZARIN;
+ set @use_leaf$, "AlizarinHerb";
set @use_color, 1;
goto L_monster_oil_leaf_color;
L_monster_oil_gamboge:
- set @use_leaf, @GAMBOGE;
+ set @use_leaf$, "GambogeHerb";
set @use_color, 2;
goto L_monster_oil_leaf_color;
L_monster_oil_cobalt:
- set @use_leaf, @COBALT;
+ set @use_leaf$, "CobaltHerb";
set @use_color, 4;
goto L_monster_oil_leaf_color;
L_monster_oil_leaf_color:
- if (countitem (@use_leaf) < 1) goto L_monster_oil_out_of_leaves;
+ if (countitem (@use_leaf$) < 1) goto L_monster_oil_out_of_leaves;
callsub S_monster_oil_random_move;
if (@color & @use_color) goto L_monster_oil_pc_bad;
set @color, @color | @use_color;
- delitem @use_leaf, 1;
+ delitem @use_leaf$, 1;
mes "The brew changes its hue as your leaf dissolves.";
next;
goto L_monster_oil_loop;
L_monster_oil_mauve:
- if (countitem(@MAUVE) < 1) goto L_monster_oil_out_of_leaves;
- delitem @MAUVE, 1;
+ if (countitem("MauveHerb") < 1) goto L_monster_oil_out_of_leaves;
+ delitem "MauveHerb", 1;
callsub S_monster_oil_random_move;
if (@intensity == 2 && @color == 7) goto L_monster_oil_done;
@@ -432,12 +421,12 @@ L_monster_oil_done:
mes "[Brewing monster oil]";
mes "As instructed, you toss in your golden scorpion stinger.";
- if (countitem (@GOLDEN_STINGER) < 1) goto L_monster_oil_no_gold_end;
+ if (countitem ("GoldenScorpionStinger") < 1) goto L_monster_oil_no_gold_end;
mes "The brew bubbles once more, then calms completely.";
- delitem @GOLDEN_STINGER, 1;
- getitem @MONSTER_OIL, 1;
+ delitem "GoldenScorpionStinger", 1;
+ getitem "MonsterOilPotion", 1;
if (!(@Q_status & @SETZER_FLAG_MADE_OIL))
getexp @MONSTER_OIL_XP, 0;
diff --git a/npc/019-1_Snow_field/santa_helper.txt b/npc/019-1_Snow_field/santa_helper.txt
index a8a86af6..e9c0772d 100644
--- a/npc/019-1_Snow_field/santa_helper.txt
+++ b/npc/019-1_Snow_field/santa_helper.txt
@@ -19,26 +19,26 @@ L_Y:
mes "[Santa's Helper]";
mes "\"Hmm, let me check what you have.\"";
next;
- if (countitem(515) < 25) goto L_NoItem;
- if (countitem(516) < 20) goto L_NoItem;
- if (countitem(538) < 5) goto L_NoItem;
+ if (countitem("PurplePresentBox") < 25) goto L_NoItem;
+ if (countitem("BluePresentBox") < 20) goto L_NoItem;
+ if (countitem("GreenPresentBox") < 5) goto L_NoItem;
getinventorylist;
if (@inventorylist_count > 99) goto L_TooMany;
mes "[Santa's Helper]";
mes "\"Great! Here is something for you\"";
- delitem 515, 25;
- delitem 516, 20;
- delitem 538, 5;
- getitem 564, 1;
+ delitem "PurplePresentBox", 25;
+ delitem "BluePresentBox", 20;
+ delitem "GreenPresentBox", 5;
+ getitem "TurtleneckSweater", 1;
set ChristmasQuest2,1;
close;
L_R:
mes "[Santa's Helper]";
mes "\"I need:";
- mes "25 purple present boxes";
- mes "20 blue present boxes";
- mes "5 green present boxes\"";
+ mes "25 [purple present box]es";
+ mes "20 [blue present box]es";
+ mes "5 [green present box]es\"";
next;
goto L_M;
diff --git a/npc/019-1_Snow_field/snowman.txt b/npc/019-1_Snow_field/snowman.txt
index ca8c1f09..72b40a13 100644
--- a/npc/019-1_Snow_field/snowman.txt
+++ b/npc/019-1_Snow_field/snowman.txt
@@ -21,16 +21,17 @@ L_Sure:
mes "[Snowman]";
mes "\"Hmm, let me see what you have.\"";
next;
- if(countitem(510) < 15) goto L_NoItem;
- if(countitem(509) < 10) goto L_NoItem;
- if(countitem(502) < 5) goto L_NoItem;
+ if(countitem("Candy") < 15) goto L_NoItem;
+ if(countitem("ChocolateBar") < 10) goto L_NoItem;
+ if(countitem("CactusPotion") < 5) goto L_NoItem;
getinventorylist;
if (@inventorylist_count > 99) goto L_TooMany;
- delitem 510, 15;
- delitem 509, 10;
- delitem 502, 5;
+ delitem "Candy", 15;
+ delitem "ChocolateBar", 10;
+ delitem "CactusPotion", 5;
+ mes "[Snowman]";
mes "\"Here you go, enjoy your new hat!\"";
- getitem 511, 1;
+ getitem "SantaHat", 1;
set ChristmasQuest, 1;
close;
@@ -38,9 +39,9 @@ L_Need:
mes "[Snowman]";
mes "\"For this special hat, I need a pint of magic and a little help.";
mes "Just kidding. I would like to get some food:";
- mes "15 Candies";
- mes "10 Chocolate bars";
- mes "5 Cactus potions\"";
+ mes "15 pieces of [Candy]";
+ mes "10 [Chocolate bar]s";
+ mes "5 [Cactus potion]s\"";
next;
goto L_Menu;
diff --git a/npc/020-2_Nivalis/furquest.txt b/npc/020-2_Nivalis/furquest.txt
index 67a6eb10..2e804be2 100644
--- a/npc/020-2_Nivalis/furquest.txt
+++ b/npc/020-2_Nivalis/furquest.txt
@@ -74,59 +74,59 @@ L_State_0_3:
L_State_0_4:
mes "[Agostine, The Legendary Tailor]";
mes "\"So, a Cactus Drink?\"";
- if (countitem(501) < 1) goto L_State_neg;
+ if (countitem("CactusDrink") < 1) goto L_State_neg;
next;
- delitem 501, 1;
+ delitem "CactusDrink", 1;
goto L_State_bad;
close;
L_State_0_5:
mes "[Agostine, The Legendary Tailor]";
mes "\"So, a Cactus Potion?\"";
- if (countitem(502) < 1) goto L_State_neg;
+ if (countitem("CactusPotion") < 1) goto L_State_neg;
next;
- delitem 502, 1;
+ delitem "CactusPotion", 1;
goto L_State_bad;
close;
L_State_0_6:
mes "[Agostine, The Legendary Tailor]";
mes "\"So, some milk for me?\"";
- if (countitem(527) < 1) goto L_State_neg;
- delitem 527, 1;
+ if (countitem("Milk') < 1) goto L_State_neg;
+ delitem "Milk", 1;
goto L_State_bad;
close;
L_State_0_7:
mes "[Agostine, The Legendary Tailor]";
mes "\"So, a beer?\"";
- if (countitem(539) < 1) goto L_State_neg;
+ if (countitem("Beer") < 1) goto L_State_neg;
next;
- delitem 539, 1;
+ delitem "Beer", 1;
goto L_State_bad;
close;
L_State_0_8:
mes "[Agostine, The Legendary Tailor]";
mes "\"So, a Concentration Potion?\"";
- if (countitem(568) < 1) goto L_State_neg;
+ if (countitem("ConcentrationPotion") < 1) goto L_State_neg;
next;
- delitem 568, 1;
+ delitem "ConcentrationPotion", 1;
goto L_State_bad;
close;
L_State_0_9:
mes "[Agostine, The Legendary Tailor]";
mes "\"So, an Iron Potion?\"";
- if (countitem(567) < 1) goto L_State_neg;
+ if (countitem("IronPotion") < 1) goto L_State_neg;
next;
- delitem 567, 1;
+ delitem "IronPotion", 1;
mes "Agostine looks pleased as he drinks the potion.";
next;
mes "[Agostine, The Legendary Tailor]";
mes "\"Oh! This is damn good! I feel a new man, my friend!\"";
next;
- set zeny, zeny+500;
+ set zeny, zeny + 500;
mes "[Agostine, The Legendary Tailor]";
mes "\"This is a little reward for your help. Take 500 GP, my friend!\"";
set QUEST_WG_state, 2;
@@ -176,7 +176,7 @@ L_State_3:
L_State_4:
mes "[Agostine, The Legendary Tailor]";
mes "\"Oh, my friend! Have you brought me some good furs?\"";
- if (countitem(611) < 1) close;
+ if (countitem("WhiteFur") < 1) close;
next;
menu
"Here, take a look!", L_State_4_try,
@@ -188,14 +188,14 @@ L_State_4_try:
mes "\"Let me see, my friend! It needs to be perfect for my gloves!\"";
mes "Agostine examines the patch of fur.";
next;
- delitem 611, 1;
+ delitem "WhiteFur", 1;
set @Temp1,rand(30);
if (@Temp1 == 0) goto L_State_4_success;
mes "Agostine throws away the white fur.";
next;
mes "[Agostine, The Legendary Tailor]";
mes "\"It was awfully cut! You should pay more attention when you kill fluffies!\"";
- if (countitem(611) < 1) close;
+ if (countitem("WhiteFur") < 1) close;
next;
menu
"Here I have another one!", L_State_4_try,
@@ -224,8 +224,8 @@ L_State_5_pay:
if (zeny < 15000) goto L_State_5_nocash;
getinventorylist;
if (@inventorylist_count == 100) goto L_TooMany;
- set zeny, zeny-15000;
- getitem 563, 1;
+ set zeny, zeny - 15000;
+ getitem "WinterGloves", 1;
set QUEST_WG_state, 6;
mes "[Agostine, The Legendary Tailor]";
mes "\"Here they are. You will have the more fashionable hands in the world!\"";
@@ -260,7 +260,7 @@ L_State_10:
L_State_11:
mes "[Agostine, The Legendary Tailor]";
mes "\"So, my friend, have you brought me the right Fur?\"";
- if (countitem(611) < 1) close;
+ if (countitem("WhiteFur") < 1) close;
next;
menu
"Sure, I'm a fluffy hunter!", L_State_11_try,
@@ -273,14 +273,14 @@ L_State_11_try:
next;
mes "Agostine examines the patch of fur.";
next;
- delitem 611, 1;
+ delitem "WhiteFur", 1;
set @Temp2,rand(30);
if (@Temp2 == 0) goto L_State_11_success;
mes "Agostine rips the white fur.";
next;
mes "[Agostine, The Legendary Tailor]";
mes "\"That fur was terrible. I won't work with it!\"";
- if (countitem(611) < 1) close;
+ if (countitem("WhiteFur") < 1) close;
next;
menu
"Well, maybe this is better!", L_State_11_try,
@@ -292,7 +292,7 @@ L_State_11_success:
next;
mes "[Agostine, The Legendary Tailor]";
mes "\"This one is good enough, my friend. Good job.\"";
- delitem 611, 1;
+ delitem "WhiteFur", 1;
set QUEST_WG_state, 8;
goto L_State_12;
@@ -308,11 +308,11 @@ L_State_12:
L_State_12_pay:
if (zeny < 15000) goto L_State_12_missing;
- if (countitem(528) < 1) goto L_State_12_missing;
+ if (countitem("Boots") < 1) goto L_State_12_missing;
// No inventory check needed, as boots are removed, opening a slot
- set zeny, zeny-15000;
- delitem 528, 1;
- getitem 655, 1;
+ set zeny, zeny - 15000;
+ delitem "Boots", 1;
+ getitem "FurBoots", 1;
set QUEST_WG_state, 9;
mes "[Agostine, The Legendary Tailor]";
mes "\"Enjoy your new boots, my friend!\"";