summaryrefslogtreecommitdiff
path: root/npc/011-1_Woodland
diff options
context:
space:
mode:
authorJarrett Thomas-Huxley <fotherjarrett@gmail.com>2010-05-02 00:59:46 -0400
committerJarrett Thomas-Huxley <fotherjarrett@gmail.com>2010-05-02 00:59:46 -0400
commitf0a5ca4865f1600934b509812799ccd17147d413 (patch)
treecfccc0b903cf73caeed044af9a360b8c58e85017 /npc/011-1_Woodland
parentc55b3a1f385249f274aa4af59dcd81f1a6e1c5b4 (diff)
downloadserverdata-f0a5ca4865f1600934b509812799ccd17147d413.tar.gz
serverdata-f0a5ca4865f1600934b509812799ccd17147d413.tar.bz2
serverdata-f0a5ca4865f1600934b509812799ccd17147d413.tar.xz
serverdata-f0a5ca4865f1600934b509812799ccd17147d413.zip
Add naming prefix "Pink" to flower mob & petal item
Diffstat (limited to 'npc/011-1_Woodland')
-rw-r--r--npc/011-1_Woodland/_mobs.txt2
-rw-r--r--npc/011-1_Woodland/alchemist.txt22
-rw-r--r--npc/011-1_Woodland/auldsbel.txt2
3 files changed, 13 insertions, 13 deletions
diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt
index 353f8f2d..846b565d 100644
--- a/npc/011-1_Woodland/_mobs.txt
+++ b/npc/011-1_Woodland/_mobs.txt
@@ -1,7 +1,7 @@
// 011-1 Woodland mobs
011-1.gat,0,0,0,0 monster EvilMushroom 1013,30,0,0,Mob011-1::On1013
-011-1.gat,0,0,0,0 monster Flower 1014,20,0,0,Mob011-1::On1014
+011-1.gat,0,0,0,0 monster PinkFlower 1014,20,0,0,Mob011-1::On1014
011-1.gat,0,0,0,0 monster Spiky Mushroom 1019,5,0,0,Mob011-1::On1019
011-1.gat,0,0,0,0 monster Fluffy 1020,1,0,0,Mob011-1::On1020
011-1.gat,0,0,0,0 monster Mouboo 1028,5,0,10,Mob011-1::On1028
diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index 8c9e39ff..de07be70 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
@@ -296,13 +296,13 @@ L_iron:
close;
L_concentration:
- if(countitem("Petal") < 20) goto L_no_concentration;
+ if(countitem("PinkPetal") < 20) goto L_no_concentration;
getinventorylist;
- if (@inventorylist_count == 100 && countitem("Petal") > 20) goto L_TooMany;
+ if (@inventorylist_count == 100 && countitem("PinkPetal") > 20) goto L_TooMany;
mes "[Rauk the Alchemist]";
mes "\"Great! You brought me exactly what I need!";
mes "Here is your Concentration potion.\"";
- delitem "Petal", 20;
+ delitem "PinkPetal", 20;
getitem "ConcentrationPotion", 1;
close;
@@ -311,7 +311,7 @@ L_no_iron:
close;
L_no_concentration:
- mes "\"You have to bring me 20 [petals].\"";
+ mes "\"You have to bring me 20 [pink petals].\"";
close;
L_dyeing_intro:
@@ -389,7 +389,7 @@ L_description_quick:
menu "Can you make some dye for me, please?", L_pick_colour,
"Where can I get the herbs?", L_d_herbs,
- "Where can I find petals?", L_d_petals,
+ "Where can I find pink petals?", L_d_pink_petals,
"Where can I find iron ore?", L_d_ore,
"Where can I find a pearl?", L_d_pearl,
"Where can I find maggot slime?", L_d_maggot_slime,
@@ -402,9 +402,9 @@ L_d_herbs:
next;
goto L_description_quick;
-L_d_petals:
+L_d_pink_petals:
mes "[Rauk the Alchemist]";
- mes "\"Just take some from the flowers around here. But be careful, they seem to be a bit fond of them.\"";
+ mes "\"Just take some from the pink flowers around here. But be careful, they seem to be a bit fond of them.\"";
next;
goto L_description_quick;
@@ -556,19 +556,19 @@ L_d_orange:
L_pink:
if (countitem("AlizarinHerb") < 10) goto L_pink_fail;
- if (countitem("Petal") < 6) goto L_pink_fail;
+ if (countitem("PinkPetal") < 6) goto L_pink_fail;
if (zeny < 1000) goto L_pink_fail;
getinventorylist;
- if (@inventorylist_count == 100 && countitem("AlizarinHerb") > 10 && countitem("Petal") > 6) goto L_TooMany;
+ if (@inventorylist_count == 100 && countitem("AlizarinHerb") > 10 && countitem("PinkPetal") > 6) goto L_TooMany;
delitem "AlizarinHerb", 10;
- delitem "Petal", 6;
+ delitem "PinkPetal", 6;
set zeny, zeny - 1000;
getitem "PinkDye", 1;
goto L_ok;
L_pink_fail:
mes "[Rauk the Alchemist]";
- mes "\"No, you don't have all I need, and that would be ten alizarin leaves, six flower petals, and 1000 GP.\"";
+ mes "\"No, you don't have all I need, and that would be ten alizarin leaves, six pink flower petals, and 1000 GP.\"";
next;
goto L_intermediate;
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index f31b26c1..595c1a9f 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -1196,7 +1196,7 @@ LL_student_3:
LL_student_3_repeat:
mes "[Auldsbel the Wizard]";
- mes "\"This one has the invocation `" + getspellinvocation("make-concentration-potion") + "'. Put two cobalt leaves and two flower petals into a bottle of water, hold it up, and speak that phrase.\"";
+ mes "\"This one has the invocation `" + getspellinvocation("make-concentration-potion") + "'. Put two cobalt leaves and two pink flower petals into a bottle of water, hold it up, and speak that phrase.\"";
next;
mes "[Auldsbel the Wizard]";