summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-10 08:41:26 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-10 08:41:26 +0000
commitf5a7fa8adb4e259a956fe82f41639f528bd70ada (patch)
tree7f6475b3a04379b51d684fb7da59f6ec42b822f6 /npc
parente1a851c0e4ab1676df9ca9b5e5e06b7cf6e80e03 (diff)
downloadhercules-f5a7fa8adb4e259a956fe82f41639f528bd70ada.tar.gz
hercules-f5a7fa8adb4e259a956fe82f41639f528bd70ada.tar.bz2
hercules-f5a7fa8adb4e259a956fe82f41639f528bd70ada.tar.xz
hercules-f5a7fa8adb4e259a956fe82f41639f528bd70ada.zip
fixed some exploits,
changed ingredients added missing close; git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@534 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/quests/newgears/arjen.txt9
-rw-r--r--npc/quests/newgears/back_ribbon.txt5
-rw-r--r--npc/quests/newgears/bear_hat.txt5
-rw-r--r--npc/quests/newgears/burning_blood_bandana.txt5
-rw-r--r--npc/quests/newgears/cat_hairband.txt5
-rw-r--r--npc/quests/newgears/indian_headband.txt13
-rw-r--r--npc/quests/newgears/mask_of_alarm.txt5
-rw-r--r--npc/quests/newgears/mushroom_hairband.txt5
-rw-r--r--npc/quests/newgears/neris.txt10
-rw-r--r--npc/quests/newgears/old_blacksmith.txt7
-rw-r--r--npc/quests/newgears/posture_fix_hat.txt5
-rw-r--r--npc/quests/newgears/sea_otter_hat.txt5
-rw-r--r--npc/quests/newgears/traveler.txt19
-rw-r--r--npc/quests/newgears/tulip_hairpin.txt6
15 files changed, 64 insertions, 43 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index c3b26ee5a..2a3c1ae79 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -30,6 +30,9 @@ Other Ppl
Date Added
======
+12/10
+ * Newgearquests (14 files of 16) fixed possible exploits, added a missing close;
+ According to kro, changed ingredients of Indead Hairband quest [Lupus]
12/08
* Changed ingredients of Ears of Demon Quest: Deviruchi Hat -> Evil Wing [Lupus]
* Added translated shop names for the Extended Shop, I'unno who made it. o.O; [Mass Zero]
diff --git a/npc/quests/newgears/arjen.txt b/npc/quests/newgears/arjen.txt
index 8eb51f9be..96d854b22 100644
--- a/npc/quests/newgears/arjen.txt
+++ b/npc/quests/newgears/arjen.txt
@@ -4,13 +4,14 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate quests for these items.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, wrong items ID. [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
//86
@@ -37,9 +38,9 @@ M_1:
mes "[Arjen]";
mes "Yes, that's just what I require!";
mes "Nayayayaaaaaa!";
- next;
delitem 10011,1;//Items: Stellar Hairpin,
delitem 7220,400;//Items: Ectoplasm,
+ next;
mes "[Arjen]";
mes "Hmm... okay, thanks for the items.";
mes "Let me make it for you.";
@@ -80,9 +81,9 @@ M_2:
mes "[Arjen]";
mes "Wow! You have the stuff I need! Thanks!";
mes "Lemme do a swap, your stuff for the bandage";
- next;
delitem 930,500;//Items: Rotten Bandage,
delitem 970,1;//Items: Alcohol,
+ next;
getitem 5063,1;//Items: Bandage,
mes "[Arjen]";
mes "Thanks! Hope that cures your aches!";
@@ -131,10 +132,10 @@ M_REQ3:
If ((countitem(2269) < 1) || (countitem(999) < 10) || (Zeny < 20000)) GOTO L_NOITEM3;//Items: Romantic Flower, Steel,
mes "[Arjen]";
mes "Thanks!";
- next;
delitem 2269,1;//Items: Romantic Flower,
delitem 999,10;//Items: Steel,
set Zeny,Zeny-20000;
+ next;
getitem 5061,1;//Items: Flower Hairpin,
mes "[Arjen]";
mes "Enjoy!";
diff --git a/npc/quests/newgears/back_ribbon.txt b/npc/quests/newgears/back_ribbon.txt
index 11a9bd457..ae61a0560 100644
--- a/npc/quests/newgears/back_ribbon.txt
+++ b/npc/quests/newgears/back_ribbon.txt
@@ -4,13 +4,14 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate Back Ribbon quest.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
prontera.gat,164,232,5 script Netpia 815,{
@@ -27,10 +28,10 @@ prontera.gat,164,232,5 script Netpia 815,{
If ((countitem(2244) < 1) || (countitem(2209) < 1) || (countitem(10007) < 1)) GOTO L_NOITEM;//Items: Big Ribbon, Ribbon, Silk Ribbon,
mes "[Netpia]";
mes "Wow, thank you! Let me just take your items.";
- next;
delitem 2244,1;//Items: Big Ribbon,
delitem 2209,1;//Items: Ribbon,
delitem 10007,1;//Items: Silk Ribbon,
+ next;
getitem 5083,1;//Items: Back Ribbon,
mes "[Netpia]";
mes "Okay, now here is your item.";
diff --git a/npc/quests/newgears/bear_hat.txt b/npc/quests/newgears/bear_hat.txt
index bba82eaea..674ba9956 100644
--- a/npc/quests/newgears/bear_hat.txt
+++ b/npc/quests/newgears/bear_hat.txt
@@ -4,7 +4,7 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text, added missing
//= items check [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
xmas.gat,152,176,3 script Bora 826,{
@@ -28,11 +29,11 @@ xmas.gat,152,176,3 script Bora 826,{
mes "[Bora]";
mes "Yay! now I can make my famous Bear Hat!";
mes "Now, give me your items!";
- next;
delitem 5030,1;//Items: Panda Hat,
delitem 7213,100;//Items: Pin Cusion,
delitem 7217,100;//Items: Spool of Thread,
delitem 7167,300;//Items: Strange Piece of Iron,
+ next;
mes "[Bora]";
mes "Now I will give you the hat!";
next;
diff --git a/npc/quests/newgears/burning_blood_bandana.txt b/npc/quests/newgears/burning_blood_bandana.txt
index f8d94f4fb..2d2b89a77 100644
--- a/npc/quests/newgears/burning_blood_bandana.txt
+++ b/npc/quests/newgears/burning_blood_bandana.txt
@@ -4,13 +4,14 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate Burning Blood Bandana quest.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text, wrong ID [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
@@ -30,11 +31,11 @@ yuno.gat,301,188,6 script Genbolt 826,{
if ((countitem(7216) < 300) || (countitem(7097) < 300) || (countitem(982) < 1) || (countitem(2211) < 1)) GOTO L_NOITEM;//Items: Red Scarf, Burning Heart, White Dyestuff, Bandana,
mes "[Genbolt]";
mes "Very well, here you go.";
- next;
delitem 7216,300;//Items: Red Scarf,
delitem 7097,300;//Items: Burning Heart,
delitem 982,1;//Items: White Dyestuff,
delitem 2211,1;//Items: Bandana,
+ next;
mes "[Genbolt]";
mes "Now I can make it...";
next;
diff --git a/npc/quests/newgears/cat_hairband.txt b/npc/quests/newgears/cat_hairband.txt
index 6f38e464d..f74c2f860 100644
--- a/npc/quests/newgears/cat_hairband.txt
+++ b/npc/quests/newgears/cat_hairband.txt
@@ -4,7 +4,7 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text,
//= fixed zeny amount [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
@@ -33,11 +34,11 @@ payon_in01.gat,62,10,4 script KoneKone 819,{
If ((countitem(2213) < 1) || (countitem(7063) < 200) || (countitem(983) < 1) || (Zeny < 10000)) GOTO L_NOITEM;//Items: Kitty Band, Soft Feather, Black Dyestuff,
mes "[KoneKone]";
mes "Wow! thankies! I will now take your items!";
- next;
delitem 2213,1;//Items: Kitty Band,
delitem 7063,200;//Items: Soft Feather,
delitem 983,1;//Items: Black Dyestuff,
set Zeny,Zeny-10000;
+ next;
mes "[KoneKone]";
mes "Mew mew! thanks! Now for your ears!";
next;
diff --git a/npc/quests/newgears/indian_headband.txt b/npc/quests/newgears/indian_headband.txt
index e5a945170..a98eb8dd4 100644
--- a/npc/quests/newgears/indian_headband.txt
+++ b/npc/quests/newgears/indian_headband.txt
@@ -4,7 +4,7 @@
//= Halca (1.0), Mass Zero (1.1)
//= Lupus (1.2)
//===== Current Version: =====================================
-//= 1.1
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text, fixed
//= items count [Lupus]
+//= 1.3 Fixed ingredients according to kRO [Lupus]
//============================================================
comodo.gat,238,217,5 script Merunte 832,{
@@ -24,7 +25,9 @@ comodo.gat,238,217,5 script Merunte 832,{
mes "[Merunte]";
mes "Ok. Gimme:";
- mes "100 Bill of Birds,";
+ mes "1 Hair Band,";
+ mes "1 Striped Bandana,";
+ mes "10 Peco Feathers,";
mes "and 10,000 Zeny.";
next;
mes "[Merunte]";
@@ -32,8 +35,10 @@ comodo.gat,238,217,5 script Merunte 832,{
next;
menu "Yep!",-,"Nope!",M_EXIT;
- if ((countitem(925) < 100) || (Zeny < 10000)) GOTO L_NOITEM;//Items: Bill of Birds,
- delitem 925,100;//Items: Bill of Birds,
+ if ((countitem(7101) < 10) || (countitem(5049) < 1) || (countitem(2210) < 1) || (Zeny < 10000)) GOTO L_NOITEM;//Items: Peco Feather, Striped Bandana, Hair Band,
+ delitem 2210,1;//Items: Hair Band,
+ delitem 5049,1;//Items: Striped Bandana,
+ delitem 7101,10;//Items: Peco Feather,
set Zeny,Zeny-10000;
getitem 5071,1;//Items: Indian Headband,
mes "[Merunte]";
diff --git a/npc/quests/newgears/mask_of_alarm.txt b/npc/quests/newgears/mask_of_alarm.txt
index e75b34212..ede29d3be 100644
--- a/npc/quests/newgears/mask_of_alarm.txt
+++ b/npc/quests/newgears/mask_of_alarm.txt
@@ -4,7 +4,7 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text and labels,
//= changed Zeny amount, fixed wrong item ID [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
aldebaran.gat,236,235,3 script Muslam 819,{
@@ -32,9 +33,9 @@ aldebaran.gat,236,235,3 script Muslam 819,{
if ((countitem(10002) < 1) || (Zeny < 300000)) GOTO L_NOITEM;//Items: Monster Oxygen Mask,
mes "[Muslam]";
mes "Great!";
- next;
delitem 10002,1;//Items: Monster Oxygen Mask,
set Zeny,Zeny-300000;
+ next;
getitem 5086,1;//Items: Alarm Mask,
mes "[Muslam]";
mes "Enjoy your item!";
diff --git a/npc/quests/newgears/mushroom_hairband.txt b/npc/quests/newgears/mushroom_hairband.txt
index de777ce6f..71e07a244 100644
--- a/npc/quests/newgears/mushroom_hairband.txt
+++ b/npc/quests/newgears/mushroom_hairband.txt
@@ -4,13 +4,14 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate Mushroom Hairband quest.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
geffen.gat,66,87,6 script Aipo 819,{
@@ -32,8 +33,8 @@ geffen.gat,66,87,6 script Aipo 819,{
if (countitem(921) < 300) GOTO L_NOITEM;//Items: Mushroom Spore,
mes "[Aipo]";
mes "Wow! Thanks! Lemme make the item then.";
- next;
delitem 921,300;//Items: Mushroom Spore,
+ next;
mes "[Aipo]";
mes "Okay, thanks for the items, now yours in return!";
next;
diff --git a/npc/quests/newgears/neris.txt b/npc/quests/newgears/neris.txt
index d0771e449..5809141ef 100644
--- a/npc/quests/newgears/neris.txt
+++ b/npc/quests/newgears/neris.txt
@@ -4,16 +4,16 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.1
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate New Hat quests.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
-
yuno.gat,353,282,7 script Neris 806,{
mes "[Neris]";
mes "So, whatcha want then?";
@@ -34,11 +34,11 @@ M_LGB:
if ((countitem(10016) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO L_NOITEM;//Items: Golden Bell, Emperium, Gold,
mes "[Neris]";
mes "Now, lets swap your items.";
- next;
delitem 10016,1;//Items: Golden Bell,
delitem 714,1;//Items: Emperium,
delitem 969,3;//Items: Gold,
set Zeny,Zeny-1000;
+ next;
getitem 5091,1;//Items: Golden Bells,
mes "[Neris]";
mes "Thanks, and bye!";
@@ -65,11 +65,11 @@ M_COM:
if ((countitem(2249) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO L_NOITEM;//Items: Coronet, Emperium, Gold,
mes "[Neris]";
mes "Now, lets swap your items.";
- next;
delitem 2249,1;//Items: Coronet,
delitem 714,1;//Items: Emperium,
delitem 969,3;//Items: Gold,
set Zeny,Zeny-1000;
+ next;
getitem 5081,1;//Items: Crown of Mistress,
mes "[Neris]";
mes "Thanks, and bye!";
@@ -96,11 +96,11 @@ M_COAQ:
if ((countitem(10006) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO L_NOITEM;//Items: Queen's Hair Ornament, Emperium, Gold,
mes "[Neris]";
mes "Now, lets swap your items";
- next;
delitem 10006,1;//Items: Queen's Hair Ornament,
delitem 714,1;//Items: Emperium,
delitem 969,3;//Items: Gold,
set Zeny,Zeny-1000;
+ next;
getitem 5080,1;//Items: Crown of The Ancient Queen,
mes "[Neris]";
mes "Thanks, and bye!";
diff --git a/npc/quests/newgears/old_blacksmith.txt b/npc/quests/newgears/old_blacksmith.txt
index 12ad6e4a7..d2fbde87a 100644
--- a/npc/quests/newgears/old_blacksmith.txt
+++ b/npc/quests/newgears/old_blacksmith.txt
@@ -4,13 +4,14 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate Ears Of Angel & Ears Of Demon quests.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text, wrong ID! [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
yuno.gat,246,51,4 script Old Blacksmith 813,{
@@ -31,10 +32,10 @@ M_EOD:
mes "[Old Blacksmith]";
mes "Wow, never thought a little fella like you could get tha.t";
mes "Bwahaha, ok.";
- next;
delitem 2255,1;//Items: Evil Wing,
delitem 2286,1;//Items: Elven Ears,
set Zeny,Zeny-20000;
+ next;
getitem 5068,1;//Items: Ears Of Demon,
mes "[Old Blacksmith]";
mes "Well, enjoy your item!";
@@ -66,10 +67,10 @@ M_EOA:
mes "[Old Blacksmith]";
mes "Well well well! Someone who has the spirit!";
mes "Okay, gimme the items.";
- next;
delitem 2286,1;//Items: Elven Ears,
delitem 2254,1;//Items: Angel Wing,
set Zeny,Zeny-20000;
+ next;
mes "[Old Blacksmith]";
mes "Okay, and here you go.";
next;
diff --git a/npc/quests/newgears/posture_fix_hat.txt b/npc/quests/newgears/posture_fix_hat.txt
index 9060866b6..ee58239e7 100644
--- a/npc/quests/newgears/posture_fix_hat.txt
+++ b/npc/quests/newgears/posture_fix_hat.txt
@@ -4,7 +4,7 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text
//= fixed wrong items ID [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
payon.gat,155,115,5 script Nan Hyang 814,{
@@ -29,9 +30,9 @@ payon.gat,155,115,5 script Nan Hyang 814,{
If ((countitem(1550) <1) || (countitem(2285) < 1 )) GOTO L_NOITEM;//Items: Book, Apple o' Archer,
mes "[Nan Hyang]";
mes "Ahh at last, someone who is serious!";
- next;
delitem 1550,1;//Items: Book,
delitem 2285,1;//Items: Apple o' Archer,
+ next;
getitem 5073,1;//Items: Posture Fix Hat,
mes "[Nan Hyang]";
mes "Hehe, well, maybe you will become more careful, or your sense will become balanced.";
diff --git a/npc/quests/newgears/sea_otter_hat.txt b/npc/quests/newgears/sea_otter_hat.txt
index 977ba8ab5..4e31273d7 100644
--- a/npc/quests/newgears/sea_otter_hat.txt
+++ b/npc/quests/newgears/sea_otter_hat.txt
@@ -4,13 +4,14 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate Sea Otter Hat quest.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
xmas.gat,184,267,4 script Pretty Rency 818,{
@@ -30,9 +31,9 @@ xmas.gat,184,267,4 script Pretty Rency 818,{
if ((countitem(5084) < 1) || (countitem(5064) < 1)) GOTO L_NOITEM;//Items: Lazy Racoon Hat, Transformation Leaf,
mes "[Pretty Rency]";
mes "Congratulations!";
- next;
delitem 5084,1;//Items: Lazy Racoon Hat,
delitem 5064,1;//Items: Transformation Leaf,
+ next;
mes "[Pretty Rency]";
mes "Thanks for your items! Now I will make yours for you!";
next;
diff --git a/npc/quests/newgears/traveler.txt b/npc/quests/newgears/traveler.txt
index 291d9825f..68e9bb886 100644
--- a/npc/quests/newgears/traveler.txt
+++ b/npc/quests/newgears/traveler.txt
@@ -4,7 +4,7 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
@@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text
//= added missing delitem, fixed names, item amount [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
//============================================================
morocc.gat,274,79,6 script Traveler 807,{
@@ -35,10 +36,10 @@ M_N1:
if ((countitem(1026) < 1000) || (countitem(7065) < 100) || (countitem(945) < 10)) GOTO L_NOITEM;//Items: Acorn, Sea Otter Fur, Raccoon Leaf,
mes "[Traveler]";
mes "Well, then here is your item";
- next;
delitem 1026,1000;//Items: Acorn,
delitem 7065,100;//Items: Sea Otter Fur,
delitem 945,10;//Items: Raccoon Leaf,
+ next;
getitem 5084,1;//Items: Lazy Racoon Hat,
mes "[Traveler]";
mes "Enjoy.";
@@ -59,12 +60,12 @@ M_N2:
if ((countitem(624) < 1) || (countitem(959) < 300) || (countitem(1144) < 50) || (countitem(1023) < 1) || (countitem(938) < 100)) GOTO L_NOITEM; //Items: Rotten Fish, Stinky Scale, Sashimi, Fish Tail, Sticky Mucus,
mes "[Traveler]";
mes "Okay, thanks.";
- next;
delitem 624,1;//Items: Rotten Fish,
delitem 959,300;//Items: Stinky Scale,
delitem 1144,50;//Items: Sashimi,
delitem 1023,1;//Items: Fish Tail,
delitem 938,100;//Items: Sticky Mucus,
+ next;
getitem 5065,1;//Items: Fresh Blueish Fish,
mes "[Traveler]";
mes "Thanks. Bye.";
@@ -85,10 +86,10 @@ M_N3:
if ((countitem(2233) < 1) || (countitem(983) < 1) || (countitem(7206) < 300)) GOTO L_NOITEM;//Items: Circlet, Black Dyestuff, Black Cat Doll,
mes "[Traveler]";
mes "Okay, here you are.";
- next;
delitem 2233,1;//Items: Circlet,
delitem 983,1;//Items: Black Dyestuff,
delitem 7206,300;//Items: Black Cat Doll,
+ next;
getitem 5058,1;//Items: Resting Cat,
mes "[Traveler]";
mes "Good luck.";
@@ -96,7 +97,7 @@ M_N3:
M_N4:
mes "[Traveler]";
- mes "Bring me 600 Raccoon Dog's Leaf (Raccoon Leaf)";
+ mes "Bring me 600 Raccoon Dog's Leaves (Raccoon Leaf).";
next;
mes "[Traveler]";
mes "You have these?";
@@ -105,12 +106,12 @@ M_N4:
if (countitem(945) < 600) GOTO L_NOITEM;//Items: Raccoon Leaf,
mes "[Traveler]";
- mes "Thanks. here's your leaf";
- next;
+ mes "Thanks. here's your leaf.";
delitem 945,600;//Items: Raccoon Leaf,
+ next;
getitem 5064,1;//Items: Transformation Leaf,
mes "[Traveler]";
- mes "Enjoy your Item";
+ mes "Enjoy your Item.";
close;
L_NOITEM:
@@ -120,7 +121,7 @@ L_NOITEM:
close;
L_NOVICE:
- mes "It's hot today...";
+ mes "It's damn hot today...";
close;
M_EXIT:
diff --git a/npc/quests/newgears/tulip_hairpin.txt b/npc/quests/newgears/tulip_hairpin.txt
index 257cb47c6..8f6b2ebfa 100644
--- a/npc/quests/newgears/tulip_hairpin.txt
+++ b/npc/quests/newgears/tulip_hairpin.txt
@@ -4,13 +4,14 @@
//= Halca (1.0)
//= Mass Zero (1.1)
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena Version.
//===== Description: =========================================
//= Seperate Tulip Hairpin quest.
//===== Additional Comments: =================================
//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit and added missing close; [Lupus]
//============================================================
geffen.gat,84,189,6 script Ses 815,{
@@ -31,9 +32,9 @@ geffen.gat,84,189,6 script Ses 815,{
mes "[Ses]";
mes "Yay! thanks! Pineapple!";
mes "Here you go!";
- next;
delitem 2278,1;//Items: Mr. Smile,
delitem 975,1;//Items: Scarlet Dyestuffs,
+ next;
getitem 5077,1;//Items: Tulip Hairpin,
mes "[Ses]";
mes "Enjoy being pretty!";
@@ -60,4 +61,5 @@ M_EXIT:
mes "[Ses]";
mes "Okay!";
mes "Byeeeee!";
+ close;
}