diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/009-2/olana.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/009-2/olana.txt')
| -rw-r--r-- | world/map/npc/009-2/olana.txt | 6 |
1 files changed, 3 insertions, 3 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; |