summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-07-07 22:56:15 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-07-07 22:57:46 -0700
commit387a7313139f7fa7492b226dcdfd3c642c81d83e (patch)
treecdbd990e608da7e9e9269281b837f6a57ac15dd1 /world/map/npc
parent4bc5fc0a3b0a8c9ebb986b83acd5312f6aa69581 (diff)
downloadserverdata-387a7313139f7fa7492b226dcdfd3c642c81d83e.tar.gz
serverdata-387a7313139f7fa7492b226dcdfd3c642c81d83e.tar.bz2
serverdata-387a7313139f7fa7492b226dcdfd3c642c81d83e.tar.xz
serverdata-387a7313139f7fa7492b226dcdfd3c642c81d83e.zip
Canonicalize case of items, which will soon be strict
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/009-2/olana.txt6
-rw-r--r--world/map/npc/009-2/selim.txt4
-rw-r--r--world/map/npc/010-2/dimonds.txt2
-rw-r--r--world/map/npc/021-1/hetchel.txt2
-rw-r--r--world/map/npc/025-1/rossy.txt12
-rw-r--r--world/map/npc/027-2/headless_man.txt2
-rw-r--r--world/map/npc/easter/2010/Doctor.txt10
7 files changed, 19 insertions, 19 deletions
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index d528cc41..3e7be881 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -82,9 +82,9 @@ L_Worried:
L_See:
if (gotcherry == 1)
goto L_Task;
- if (countitem("cherry") < @Cherry_Amount)
+ if (countitem("Cherry") < @Cherry_Amount)
goto L_Worried;
- delitem "cherry", @Cherry_Amount;
+ delitem "Cherry", @Cherry_Amount;
menu
"Hi, Rossy asked me to give you this. She says it is a gift from both her and Julia.", -;
mes "[Olana]";
@@ -147,7 +147,7 @@ L_RG:
close;
L_RC:
- if(countitem("redrose") < @RedRose_Amount)
+ if(countitem("RedRose") < @RedRose_Amount)
goto L_RG;
mes "[Olana]";
set Rossy_Quest, 10;
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index 055e54eb..dee87a8e 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -90,13 +90,13 @@ L_miniskirt:
L_tanktop:
set @del, 688;
set @new, 2090;
- set @name$, "tanktop";
+ set @name$, "tank top";
goto L_picked_item;
L_tanktop_short:
set @del, 689;
set @new, 2120;
- set @name$, "short tanktop";
+ set @name$, "short tank top";
goto L_picked_item;
L_robe:
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 8fe8cbc5..3bc1f75d 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -216,7 +216,7 @@
getinventorylist;
if (@inventorylist_count == 100)
goto L_Full_Inv;
- getitem "bowlerhat", 1;
+ getitem "BowlerHat", 1;
set FLAGS, FLAGS | FLAG_HAS_BOWLER_BURNSDAY;
close;
diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt
index d2ed7012..c0179d22 100644
--- a/world/map/npc/021-1/hetchel.txt
+++ b/world/map/npc/021-1/hetchel.txt
@@ -79,7 +79,7 @@ L_sheet_menu:
goto L_TooMany;
set Zeny, Zeny - @SheetCount * @SHEET_ZENY;
delitem "SilkCocoon", @SheetCount * @SHEET_COCOONS_NR;
- getitem "Silksheet", @SheetCount;
+ getitem "SilkSheet", @SheetCount;
mes "[Hetchel]";
mes "\"Thank you, I hope the sheets will fit your needs.";
mes "Please greet Lora for me when you see her.\"";
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index de3ce386..e6b5e8d4 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -170,7 +170,7 @@ close;
L_Donet:
if (Rossy_Quest == 10
- && countitem("redrose") >= @RedRose_Amount)
+ && countitem("RedRose") >= @RedRose_Amount)
goto L_RG;
menu
"David took your potion and he tested it in front of me. It worked perfectly!", -;
@@ -179,9 +179,9 @@ L_Donet:
close;
L_RG:
- if (countitem("redrose") < @RedRose_Amount)
+ if (countitem("RedRose") < @RedRose_Amount)
goto L_No;
- delitem "redrose", @RedRose_Amount;
+ delitem "RedRose", @RedRose_Amount;
menu
"Your mother was so happy that she asked me to bring you these flowers.", -;
mes "[Rossy]";
@@ -198,7 +198,7 @@ close;
L_Allergic:
mes "Rossy sneezes a lot.";
if (Rossy_Quest == 12
- && countitem("redtulip") >= @RedTulip_Amount)
+ && countitem("RedTulip") >= @RedTulip_Amount)
goto L_Sorry;
close;
@@ -208,9 +208,9 @@ L_Sorry:
L_See:
mes "[Rossy]";
- if (countitem("redtulip") < @RedTulip_Amount)
+ if (countitem("RedTulip") < @RedTulip_Amount)
goto L_No;
- delitem "redtulip", @RedTulip_Amount;
+ delitem "RedTulip", @RedTulip_Amount;
set Rossy_Quest, 13;
mes "\"That's better! Go and tell my mother that she is the nicest mother in the world.\"";
next;
diff --git a/world/map/npc/027-2/headless_man.txt b/world/map/npc/027-2/headless_man.txt
index e22b6442..386ee773 100644
--- a/world/map/npc/027-2/headless_man.txt
+++ b/world/map/npc/027-2/headless_man.txt
@@ -172,7 +172,7 @@ L_Quest_finished:
goto L_Full_Inv;
mes "[Thurstan]";
mes "\"Please take this for your efforts. I got it in payment of some work I did protecting the pinkie population from a terrible scourge some time ago.\"";
- getitem "pinkiehelmet", 1;
+ getitem "PinkieHelmet", 1;
set @state, 3;
callsub S_Update_Mask;
goto L_Close;
diff --git a/world/map/npc/easter/2010/Doctor.txt b/world/map/npc/easter/2010/Doctor.txt
index c6d20bfa..fefd9814 100644
--- a/world/map/npc/easter/2010/Doctor.txt
+++ b/world/map/npc/easter/2010/Doctor.txt
@@ -26,7 +26,7 @@ L_At_Tree:
setarray @responses$, "\"This tree, I'm sure it's - \"The man looks up distractedly.\" Oh, hello. Can't talk now, I'm afraid, this world needs my help...\"", "He looks up, confused. \"Withering... why is this world dying? Perhaps--er, who are you? You'll have to excuse me, I'm a little preoccupied with this tree...\"", "\"What-what? I mean, sorry, hello! Can't quite talk, a bit busy trying to save this world.\" He seems to be deep in thought, brandishing what looks to be a small tool near the tree.", "\"You there! Do you realise what's happening here? This world is dying, much like a human would, perhaps. Nevertheless...\""; // Not many responses are needed here, since init only happens one per player.
callsub S_Update_Knows;
next;
- if (countitem("LifeStone") > 0)
+ if (countitem("Lifestone") > 0)
goto L_has_lifestone;
close;
@@ -36,7 +36,7 @@ L_At_Tree_Knows_Doctor:
callsub S_Dialogue_Knows;
next;
- if (countitem("LifeStone") > 0)
+ if (countitem("Lifestone") > 0)
goto L_has_lifestone;
mes "[Doctor]";
mes "";
@@ -235,13 +235,13 @@ L_only_lifestone:
close;
L_offer_lifestone:
- if (countitem("LifeStone") < 1)
+ if (countitem("Lifestone") < 1)
goto L_lost_lifestone;
- delitem "LifeStone", 1;
+ delitem "Lifestone", 1;
callsub S_Update_Helped;
- if (countitem("LifeStone") == 0)
+ if (countitem("Lifestone") == 0)
goto L_one_lifestone;
mes "[Doctor]";