From 5d1d55adc1b889b8a670c9db2459c06e70c916e7 Mon Sep 17 00:00:00 2001 From: Lupus Date: Tue, 7 Dec 2004 13:51:38 +0000 Subject: fixed 16 newgear quests (each contained 1-4 bugs: missing labels, wrong labels, wrong items amount, missing checks, missing delitem wrong item ID ,etc ) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@488 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 6 +- npc/quests/newgears/arjen.txt | 139 +++++++++++++----------- npc/quests/newgears/back_ribbon.txt | 51 ++++----- npc/quests/newgears/bear_hat.txt | 55 +++++----- npc/quests/newgears/burning_blood_bandana.txt | 51 +++++---- npc/quests/newgears/cat_hairband.txt | 59 +++++----- npc/quests/newgears/fox_mask.txt | 37 +++---- npc/quests/newgears/hat_seller.txt | 149 ++++++++++++++------------ npc/quests/newgears/indian_headband.txt | 44 +++++--- npc/quests/newgears/mask_of_alarm.txt | 46 ++++---- npc/quests/newgears/mushroom_hairband.txt | 44 ++++---- npc/quests/newgears/neris.txt | 115 ++++++++++++-------- npc/quests/newgears/old_blacksmith.txt | 111 ++++++++++--------- npc/quests/newgears/posture_fix_hat.txt | 65 ++++++----- npc/quests/newgears/sea_otter_hat.txt | 43 ++++---- npc/quests/newgears/traveler.txt | 126 ++++++++++++---------- npc/quests/newgears/tulip_hairpin.txt | 48 ++++++--- 17 files changed, 669 insertions(+), 520 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index afde897ce..f0b29e380 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -30,7 +30,11 @@ Other Ppl Date Added ====== -12/07 * Added Fox Mask quest. [Mass Zero] +12/07 Fixed all Newgear quests: arjen.txt,back_ribbon.txt,bear_hat.txt,burning_blood_bandana.txt,cat_hairband.txt + fox_mask.txt,hat_seller.txt,indian_headband.txt,mask_of_alarm.txt,mushroom_hairband.txt,neris.txt + old_blacksmith.txt,posture_fix_hat.txt,sea_otter_hat.txt,traveler.txt,tulip_hairpin.txt + Fixed missing labels, missing delitem, wrong zeny amount, wrong items id, spelling [Lupus] + * Added Fox Mask quest. [Mass Zero] 12/06 * Added seperate quests for the new headgears, missing Fox Mask and Orc Hero Helm. (I'll so 'em ASAP.) [Mass Zero] diff --git a/npc/quests/newgears/arjen.txt b/npc/quests/newgears/arjen.txt index a0a543432..f2b19cb17 100644 --- a/npc/quests/newgears/arjen.txt +++ b/npc/quests/newgears/arjen.txt @@ -4,135 +4,144 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= //= Seperate quests for these items. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, wrong items ID. [Lupus] //============================================================ gef_tower.gat,128,148,6 script Arjen 807,{ mes "[Arjen]"; mes "What item information do you require?"; - next; - menu "X-Shaped Hairpin.",M1,"Bandage",M2,"Flower Hairpin.",M3; -M1: + next; + menu "X-Shaped Hairpin.",M_1,"Bandage",M_2,"Flower Hairpin.",M_3; +M_1: mes "[Arjen]"; mes "Hyaaaaaaaa!"; - next; + next; mes "[Arjen]"; mes "Ooops, sorry. I was practicing my balance."; mes "Good that I have my hairpin to stop my hair getting in my eyes."; - next; + next; mes "[Arjen]"; mes "Im not much of a craftsman, but If you bring me some items I can make you"; mes "my ^660000X-Shaped Hairpin^000000."; - next; - menu "Make me the hairpin.",-,"What are the requirements?",X_REQ,"No, thanks.",EXT; - If ((countitem(10011) < 1) || (countitem(7219) < 400)) GOTO X_NM; + next; + menu "Make me the hairpin.",-,"What are the requirements?",M_REQ1,"No, thanks.",M_EXIT; + + If ((countitem(10011) < 1) || (countitem(7220) < 400)) GOTO L_NOITEM1;//Items: Stellar Hairpin, Ectoplasm, mes "[Arjen]"; mes "Yes, that's just what I require!"; mes "Nayayayaaaaaa!"; - next; - delitem 10011,1; - delitem 7219,400; + next; + delitem 10011,1;//Items: Stellar Hairpin, + delitem 7220,400;//Items: Ectoplasm, mes "[Arjen]"; mes "Hmm... okay, thanks for the items."; mes "Let me make it for you."; - next; - getitem 5079,1; + next; + getitem 5079,1;//Items: X Hairpin, mes "[Arjen]"; mes "Thanks very much, you look cool now."; - close; -X_NM: + close; + +L_NOITEM1: mes "[Arjen]"; mes "Come on man, gimme a break."; mes "This is hot property!"; - next; - GOTO X_REQ; -X_REQ: - next; + next; + +M_REQ1: mes "[Arjen]"; mes "Hmm, it's a very rare Item."; mes "I need 1 Stellar Hairpin for its spacial properties."; mes "And I need 400 Ectoiplasm to give it its special powers."; - next; + next; mes "[Arjen]"; mes "You need to have travelled well to get these items..."; - close; -M2: + close; + +M_2: mes "[Arjen]"; mes "Ouch, have you ever gotten an injury after doing too much exercise?"; mes "It sucks, especially when you excercise so much."; - next; + next; mes "[Arjen]"; mes "What is that you say? you have just the problem?"; mes "Well, I can make you a ^660000Bandage^000000 to heal your wounds!"; - next; - menu "Yes, please make me one!",-,"What are the requirements?",B_REQ,"No, thanks.",EXT; - If ((countitem(930) < 500) || (countitem(970) < 1)) GOTO B_NM; + next; + menu "Yes, please make me one!",-,"What are the requirements?",M_REQ2,"No, thanks.",M_EXIT; + + If ((countitem(930) < 500) || (countitem(970) < 1)) GOTO L_NOITEM2;//Items: Rotten Bandage, Alcohol, 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; - delitem 970,1; - getitem 5070,1; + next; + delitem 930,500;//Items: Rotten Bandage, + delitem 970,1;//Items: Alcohol, + getitem 5070,1;//Items: Bandage, mes "[Arjen]"; mes "Thanks! Hope that cures your aches!"; - close; -B_NM: + close; + +L_NOITEM2: mes "[Arjen]"; mes "Argh, please, If you want the item, bring me what I asked for."; - next; - GOTO B_REQ; -B_REQ: + next; + +M_REQ2: mes "[Arjen]"; mes "I need 500 Rotten Bandages to make the actual cast."; mes "Then I need 1 Alcohol so I can get the stains out of the bandages."; - close; -EXT: - mes "[Arjen]"; - mes "Okay, have a nice day!"; - close; -M3: + close; + +M_3: mes "[Arjen]"; mes "Ahh, don't you love the romance in the air?"; mes "Isn't it great to look good, and also, keep your girl or boy pretty?"; - next; - menu "Yes, of course!",-,"No, not quite.",EXT; + next; + menu "Yes, of course!",-,"No, not quite.",M_EXIT; + mes "[Arjen]"; mes "Well, I'm sure you would like me to make you a ^660000Flower Hairpin^000000."; - next; - menu "Yes, please.",RL,"No, thanks.",EXT; -RL: + next; + menu "Yes, please.",M_REQ3,"No, thanks.",M_EXIT; + +L_NOITEM3: + mes "[Arjen]"; + mes "Sorry, but you don't have the correct items."; + next; + +M_REQ3: mes "[Arjen]"; mes "Well, I need..."; - mes "1 Romantic Leaf, for the element of love,"; + mes "1 Romantic Flower, for the element of love,"; mes "10 Steels for the pin part,"; mes "And 20,000 Zeny for the forging costs."; - next; + next; mes "[Arjen]"; mes "Would you like to make this item?"; - next; - menu "Yes.",-,"No.",EXT; - If ((countitem(2269) < 1) || (countitem(999) < 10) || (Zeny < 20000)) GOTO FH_NM; + next; + menu "Yes.",-,"No.",M_EXIT; + + If ((countitem(2269) < 1) || (countitem(999) < 10) || (Zeny < 20000)) GOTO L_NOITEM3;//Items: Romantic Flower, Steel, mes "[Arjen]"; mes "Thanks!"; - next; - delitem 2269,1; - delitem 999,10; - set Zeny,Zeny-20000; - getitem 5061,1; + next; + delitem 2269,1;//Items: Romantic Flower, + delitem 999,10;//Items: Steel, + set Zeny,Zeny-20000; + getitem 5061,1;//Items: Flower Hairpin, mes "[Arjen]"; mes "Enjoy!"; - close; -FH_NM: + close; + +M_EXIT: mes "[Arjen]"; - mes "Sorry, but you don't have the correct items."; - next; - GOTO RL; -End; -} \ No newline at end of file + mes "Okay, have a nice day!"; + close; + +} diff --git a/npc/quests/newgears/back_ribbon.txt b/npc/quests/newgears/back_ribbon.txt index 13dceb938..11a9bd457 100644 --- a/npc/quests/newgears/back_ribbon.txt +++ b/npc/quests/newgears/back_ribbon.txt @@ -4,55 +4,58 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= //= Seperate Back Ribbon quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text [Lupus] //============================================================ prontera.gat,164,232,5 script Netpia 815,{ mes "[Netpia]"; mes "Wheee! Don't you just love making youself look pretty!?"; mes "I love glamourising myself with all the best accessories!"; - next; + next; mes "[Netpia]"; mes "Ever heard of a ^560000Back Ribbon^000000?"; mes "I can make you one, and you too can be fashionable!"; - next; - menu "Please make me a ^670000Back ribbon^000000.",-,"What are the requirements?",BR_REQ,"No, I dont want one.",EXT; - If ((countitem(2244) < 1) || (countitem(2209) < 1) || (countitem(10007) < 1)) GOTO BR_NM; + next; + menu "Make me a ^670000Back ribbon^000000.",-,"What are the requirements?",M_REQ,"No, I dont want one.",M_EXIT; + + 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; - delitem 2209,1; - delitem 10007,1; - getitem 5083,1; + next; + delitem 2244,1;//Items: Big Ribbon, + delitem 2209,1;//Items: Ribbon, + delitem 10007,1;//Items: Silk Ribbon, + getitem 5083,1;//Items: Back Ribbon, mes "[Netpia]"; mes "Okay, now here is your item."; - next; + next; mes "[Netpia]"; mes "Enjoy being pretty!"; - close; -BR_NM: + close; + +L_NOITEM: mes "[Netpia]"; mes "Aww... sorry, but I cant make it If you don't bring me the materials."; - next; - GOTO BR_REQ; -BR_REQ: + next; + +M_REQ: mes "[Netpia]"; mes "Well, for me to make you my BEAUTIFUL Back Ribbon..."; mes "I require these materials:"; - mes "1 big ribbon."; - mes "1 ribbon (Slotted)."; - mes "1 silk ribbon."; - close; -EXT: + mes "1 Big Ribbon."; + mes "1 Ribbon (Slotted)."; + mes "1 Silk Ribbon."; + close; + +M_EXIT: mes "[Netpia]"; mes "Aww, well, okay then!"; mes "Be pretty some other time"; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/bear_hat.txt b/npc/quests/newgears/bear_hat.txt index 5ad988887..1f1b6b819 100644 --- a/npc/quests/newgears/bear_hat.txt +++ b/npc/quests/newgears/bear_hat.txt @@ -4,59 +4,64 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= //= Seperate Bear hat quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text, added missing +//= items check [Lupus] //============================================================ xmas.gat,156,152,3 script Bora 826,{ mes "[Bora]"; mes "Don't bears have such a cute expression on their faces?"; mes "And I bet you wouldn't mind one of those vute expressions yourself!"; - next; + next; mes "[Bora]"; mes "Well, I can make you one!"; - next; - menu "Yes, make me one now!",NN,"What are the requirements?",REQ,"No, thanks.",EXT; -MN: + next; + menu "Yes, make me one now!",-,"What are the requirements?",M_REQ,"No, thanks.",M_EXIT; + + If ((countitem(5030) < 1) || (countitem(7213) < 100) || (countitem(7217) < 100) || (countitem(7167) < 300)) GOTO L_NOITEM;//Items: Panda Hat, Pin Cusion, Spool of Thread, Strange Piece of Iron, mes "[Bora]"; mes "Yay! now I can make my famous Bear Hat!"; mes "Now, give me your items!"; - next; - delitem 5030,1; - delitem 7213,100; - delitem 7217,100; - delitem 7167,300; + 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, mes "[Bora]"; mes "Now I will give you the hat!"; - next; - getitem 5059,1; + next; + getitem 5059,1;//Items: Bear Hat, mes "[Bora]"; mes "Thanks, and bye!"; - close; -REQ: + close; + +M_REQ: mes "[Bora]"; mes "Bring me..."; mes "1 Panda Hat,"; - mes "100 Stabbing Needles,"; + mes "100 Pin Cusion,"; mes "100 Spool of Thread"; - mes "300 Zippers."; - next; + mes "300 Strange Pieces of Iron."; + next; mes "[Bora]"; - mes "For the Stabbing Needles and Spool of Thread,"; + mes "For the Pin Cusion (Stabbing Needles) and Spool of Thread,"; mes "Hyzoloists in Niflheim drop those, I believe."; - close; -EX_NI: + close; + +L_NOITEM: mes "[Bora]"; mes "Sorry, I want all the items I asked."; mes "Please dont try to cheat me."; - close; -EXT: + close; + +M_EXIT: mes "[Bora]"; mes "Okay, well, byebye!"; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/burning_blood_bandana.txt b/npc/quests/newgears/burning_blood_bandana.txt index 0cb861c30..923977765 100644 --- a/npc/quests/newgears/burning_blood_bandana.txt +++ b/npc/quests/newgears/burning_blood_bandana.txt @@ -4,52 +4,61 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= -//= Seperate Burning Blood Bandana quest. +//= Seperate Red Bandana (Burning Blood Bandana?) quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text, wrong ID [Lupus] //============================================================ + yuno.gat,301,188,6 Genbolt 826,{ mes "[Genbolt]"; mes "Why, don't you think looking badass is most important?"; mes "After all, we all have to fend for ourselves in this world!"; - next; + next; mes "[Genbolt]"; mes "I am the only one who can make you look the coolest,"; - mes "as I can craft a ^000090Burning Blood Bandana^000000."; + mes "as I can craft a ^000090Red Bandana^000000."; mes "You can wear this, and you clench your fist without knowing"; mes "because of the raw power you feel!"; - next; - menu "Wow! make me one!",-,"What do I need?",REQ,"Naw, bye",EXT; - if ((countitem(7216) < 300) || (countitem(7097) < 300) || (countitem(982) < 1) || (countitem(2211) < 1)) GOTO EX_NI; + next; + menu "Wow! Make me one!",-,"What do I need?",M_REQ,"Naw, bye",M_EXIT; + + 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; - delitem 7097,300; - delitem 982,1; - delitem 2211,1; + next; + delitem 7216,300;//Items: Red Scarf, + delitem 7097,300;//Items: Burning Heart, + delitem 982,1;//Items: White Dyestuff, + delitem 2211,1;//Items: Bandana, mes "[Genbolt]"; mes "Now I can make it..."; - next; - getitem 5071,1; + next; + getitem 2275,1;//Items: Red Bandana, mes "[Genbolt]"; mes "Enjoy."; - close; -REQ: + close; + +L_NOITEM: + mes "[Genbolt]"; + mes "Where are the items? Ok, I list them for you again..."; + next; + +M_REQ: mes "[Genbolt]"; mes "Bring me:"; mes "300 Red Scarfs,"; mes "300 Burning Hearts,"; mes "1 White Dyestuff,"; mes "and 1 Bandana."; - close; -EXT: + close; + +M_EXIT: mes "[Genbolt]"; mes "Bye then."; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/cat_hairband.txt b/npc/quests/newgears/cat_hairband.txt index 283b4f492..5aa2b5097 100644 --- a/npc/quests/newgears/cat_hairband.txt +++ b/npc/quests/newgears/cat_hairband.txt @@ -4,63 +4,68 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= -//= Seperate Cat Hairband quest. +//= Seperate Black Cat Ears (Cat Hairband) quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text, +//= fixed zeny amount [Lupus] //============================================================ pay_cast01.gat,110,160,4 KoneKone 819,{ mes "[KoneKone]"; mes "Don't you just love cats? the way they have the pointy,"; mes "sticky ears and stuff, they're just so cute!"; - next; + next; mes "[KoneKone]"; - mes "Hehe... well, I decided, I would make a Cat Hairband!"; + mes "Hehe... well, I decided, I would make a Black Cat Ears!"; mes "It is modeled on my most favourite of cat... BLACK!"; mes "Of course, I got the idea from Hwikebain!"; - next; + next; mes "[KoneKone]"; mes "I can make it for you, but it requires the correct materials."; - next; - menu "Please make me this item.",-,"What are the materials needed?",BCM,"Bye.",EXT; - If ((countitem(2213) < 1) || (countitem(7063) < 200) || (countitem(983) < 1) || (Zeny < 10000)) GOTO CAT_NM; + next; + menu "Please make me this item.",-,"What are the materials needed?",M_REQ,"Bye.",M_EXIT; + + 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; - delitem 7063,200; - delitem 983,1; - set Zeny,Zeny-1000; + next; + delitem 2213,1;//Items: Kitty Band, + delitem 7063,200;//Items: Soft Feather, + delitem 983,1;//Items: Black Dyestuff, + set Zeny,Zeny-10000; mes "[KoneKone]"; mes "Mew mew! thanks! Now for your ears!"; - next; - getitem 5057,1; + next; + getitem 5057,1;//Items: Black Cat Ears, mes "[KoneKone]"; mes "Mew! thanks! It was a pleasure to make them for you!"; - close; -CAT_NM: + close; + +L_NOITEM: mes "[KoneKone]"; mes "Sorry, but you dont have what I asked for..."; - close; -BCM: + close; + +M_REQ: mes "[KoneKone]"; - mes "For the ^670000Cat Hairband^000000, the following items are needed:"; - next; + mes "For the ^670000Black Cat Ears^000000, the following items are needed:"; + next; mes "[KoneKone]"; mes "1 Kitty Band,"; mes "200 Soft Feathers,"; mes "Some Black Dye,"; mes "And of course 10,000z for labour costs."; - next; + next; mes "[KoneKone]"; mes "Bring me these items and the money and I will make it for you."; - close; -EXT: + close; + +M_EXIT: mes "[KoneKone]"; mes "Okay, *meow* have a nice day!"; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/fox_mask.txt b/npc/quests/newgears/fox_mask.txt index f39bfd177..0186ee69e 100644 --- a/npc/quests/newgears/fox_mask.txt +++ b/npc/quests/newgears/fox_mask.txt @@ -4,13 +4,13 @@ //= KitsuneStarWind (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena version. //===== Description: ========================================= // Seperate quest for the Fox Mask. //===== Additional Comments: ================================= -// +// 1.2 optimized [Lupus] //============================================================ pay_dun04.gat,204,152,2 script Nine Tail 1180,{ @@ -20,36 +20,37 @@ pay_dun04.gat,204,152,2 script Nine Tail 1180,{ mes "[Nine Tail]"; mes "Have you come here for a ^FF3300 Fox Mask^000000?"; next; - menu "Yeah, Sure.",L_1,"No",L_2; -L_1: + menu "Yeah, Sure.",-,"No",M_EXIT; + mes "[Nine Tail]"; mes "Fine then. If I make one for you, will you go away?"; mes "You realize that it requires 999 Nine Tails to make, do you?"; - menu "Sure.",L_1_1,"Nah.",L_1_2; -L_1_1: + menu "Sure.",M_MAKE,"Nah.",-; + mes "[Nine Tail]"; - mes "Ok then, I shall make one for you."; + mes "Grrrr... I'll make one anyway but I hope my master gets you."; next; - goto L_1_SUB; -L_1_2: +M_MAKE: mes "[Nine Tail]"; - mes "Grrrr... I'll make one anyway but I hope my master gets you."; + mes "Ok then, I shall make one for you."; next; -L_1_SUB: - if (countitem(1022) < 999) goto L_1_SUB2; - delitem 1022,999; - getitem 5069,1; + + if (countitem(1022) < 999) goto L_NOITEM;//Items: Nine Tails, + delitem 1022,999;//Items: Nine Tails, + getitem 5069,1;//Items: Fox Mask, next; mes "[Nine Tails]"; mes "Have fun."; close; -L_1_SUB2: + +L_NOITEM: mes "[Nine Tail]"; mes "You do not have have enough Nine Tails."; mes "You need 999 of them."; close; -L_2: + +M_EXIT: mes "[Nine Tail]"; - mes "Then leave me alone... for I am waiting for my master."; + mes "Then leave me alone... I am waiting for my master."; close; -} \ No newline at end of file +} diff --git a/npc/quests/newgears/hat_seller.txt b/npc/quests/newgears/hat_seller.txt index 3039e50c5..ef791e117 100644 --- a/npc/quests/newgears/hat_seller.txt +++ b/npc/quests/newgears/hat_seller.txt @@ -4,125 +4,140 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= -//= Seperate New Hat quests. +//= New Hat quests: +//= Pointy Cap,Straw Hat,Cowboy Hat,Sombrero,Furry Hat //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text +//= added missing delitem, fixed names, item amount [Lupus] //============================================================ xmas_in.gat,123,131,4 script Hat Seller 806,{ mes "[Hat Seller]"; mes "What hat would you like information on?"; mes "I can make all the hats I mention here"; - next; - menu "Pointy Cap",M1,"Straw Hat",M2,"Cowboy Hat",M3,"Sombrero",M4,"Furry Hat",M5; -M1: + next; + menu "Pointy Cap",M_1,"Straw Hat",M_2,"Cowboy Hat",M_3,"Sombrero",M_4,"Furry Hat",M_5,"Quit",M_EXIT; + +M_1: mes "[Hat Seller]"; mes "Okay well, for this item I require:"; - mes "1 Santa Hat,"; - mes "100 Waxed/Slick paper,"; - mes "100 Oily Paper."; - next; + mes "1 Santa's Hat,"; + mes "100 String Paper,"; + mes "100 Oiled Paper."; + next; mes "[Hat Seller]"; mes "You got these items?"; - next; - menu "Yes.",-,"No.",EXT; - if ((Countitem(2236) < 1) || (countitem(7111) < 100) || (countitem(7151) < 100)) GOTO EXT_NI; - delitem 2236,1; - delitem 7111,100; - delitem 7151,100; - getitem 5060,1; + next; + menu "Yes.",-,"No.",M_EXIT; + + if ((countitem(2236) < 1) || (countitem(7111) < 100) || (countitem(7151) < 100)) GOTO L_NOITEM;//Items: Santa's Hat, String Paper, Oiled Paper, + delitem 2236,1;//Items: Santa's Hat, + delitem 7111,100;//Items: String Paper, + delitem 7151,100;//Items: Oiled Paper, + getitem 5060,1;//Items: Pointy Cap, mes "[Hat Seller]"; mes "Thanks! Bye."; - close; -EX_NI: + close; + +L_NOITEM: mes "[Hat Seller]"; mes "Not enough items, bye."; - close; -EXT: + close; + +M_EXIT: mes "[Hat Seller]"; mes "Bye!"; - close; -M2: + close; + +M_2: mes "[Hat Seller]"; mes "For this item I require:"; mes "1 Sakkat,"; - mes "300 Tough Branches,"; - mes "300 Bamboo Pieces."; - next; + mes "300 Healthy Branch,"; + mes "300 Bamboo Trunk."; + next; mes "[Hat Seller]"; mes "Bring those, and we got a deal."; mes "You got them?"; - next; - menu "Yes.",-,"No.",EXT; - if ((countitem(2280) < 1) || (countitem(7203) < 300) || (countitem(7150) < 300)) GOTO EX_NI; - delitem 2280,1; - delitem 7203,300; - delitem 7150,300; - getitem 5062,1; + next; + menu "Yes.",-,"No.",M_EXIT; + + if ((countitem(2280) < 1) || (countitem(7203) < 300) || (countitem(7150) < 300)) GOTO L_NOITEM;//Items: Sakkat, Healthy Branch, Bamboo Trunk, + delitem 2280,1;//Items: Sakkat, + delitem 7203,300;//Items: Healthy Branch, + delitem 7150,300;//Items: Bamboo Trunk, + getitem 5062,1;//Items: Straw Hat, mes "[Hat Seller]"; mes "There you go... bye."; - close; -M3: + close; + +M_3: mes "[Hat Seller]"; mes "For this item I require:"; mes "1 Western Grace,"; - mes "108 Desert Wolf Claws,"; - mes "108 Soft Grass,"; + mes "108 Claw of Desert Wolf,"; + mes "108 Soft Grass Leaf,"; mes "and 4 Burning Horseshoes."; - next; + next; mes "[Hat Seller]"; mes "Bring those, and we got a deal."; mes "You got them?"; - next; - menu "Yes.",-,"No.",EXT; - if ((countitem(2248) < 1) || (countitem(7030) < 108) || (countitem(7194) < 108) || (countitem(7120) < 4)) GOTO EX_NI; - delitem 2248,1; - delitem 7030,108; - delitem 7194,108; - getitem 5075,1; + next; + menu "Yes.",-,"No.",M_EXIT; + + if ((countitem(2248) < 1) || (countitem(7030) < 108) || (countitem(7194) < 108) || (countitem(7120) < 4)) GOTO L_NOITEM;//Items: Western Grace, Claw of Desert Wolf, Soft Grass Leaf, Burning Horseshoe, + delitem 2248,1;//Items: Western Grace, + delitem 7030,108;//Items: Claw of Desert Wolf, + delitem 7194,108;//Items: Soft Grass Leaf, + delitem 7120,4;//Items: Burning Horseshoe, + getitem 5075,1;//Items: Cowboy Hat, mes "[Hat Seller]"; mes "There you go... bye."; - close; -M4: + close; + +M_4: mes "[Hat Seller]"; mes "For this item I require:"; mes "1 Straw Hat,"; mes "1 Guitar,"; mes "50 Cactus Needle."; - next; + next; mes "[Hat Seller]"; mes "Bring those, and we got a deal."; mes "You got them?"; - next; - menu "Yes.",-,"No.",EXT; - if ((countitem(5062) < 1) || (countitem(1907) < 1) || (countitem(952) < 50)) GOTO EX_NI; - delitem 5062,1; - delitem 1907,1; - delitem 952,300; - getitem 5067,1; + next; + menu "Yes.",-,"No.",M_EXIT; + + if ((countitem(5062) < 1) || (countitem(1907) < 1) || (countitem(952) < 50)) GOTO L_NOITEM;//Items: Straw Hat, Guitar, Cactus Needle, + delitem 5062,1;//Items: Straw Hat, + delitem 1907,1;//Items: Guitar, + delitem 952,50;//Items: Cactus Needle, + getitem 5067,1;//Items: Sombrero, mes "[Hat Seller]"; mes "There you go... bye."; - close; -M5: + close; + +M_5: mes "[Hat Seller]"; mes "For this item I require:"; mes "1 Cap,"; - mes "500 Bear Fur."; - next; + mes "300 Skin of the Black Bear."; + next; mes "[Hat Seller]"; mes "Bring those, and we got a deal."; mes "You got them?"; - next; - menu "Yes.",-,"No.",EXT; - if ((countitem(2227) < 1) || (countitem(7161) < 300)) GOTO EX_NI; - delitem 2227,1; - delitem 7161,300; - getitem 5076,1; + next; + menu "Yes.",-,"No.",M_EXIT; + + if ((countitem(2227) < 1) || (countitem(7161) < 300)) GOTO L_NOITEM;//Items: Cap, Skin of the Black Bear, + delitem 2227,1;//Items: Cap, + delitem 7161,300;//Items: Skin of the Black Bear, + getitem 5076,1;//Items: Furry Hat, mes "[Hat Seller]"; mes "There you go... bye."; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/indian_headband.txt b/npc/quests/newgears/indian_headband.txt index 2b7fe68e6..e5a945170 100644 --- a/npc/quests/newgears/indian_headband.txt +++ b/npc/quests/newgears/indian_headband.txt @@ -1,8 +1,8 @@ -//===== eAthena Script ======================================= +//===== eAthena Script ======================================= //= Indian Headband Quest //===== By: ================================================== -//= Halca (1.0) -//= Mass Zero (1.1) +//= Halca (1.0), Mass Zero (1.1) +//= Lupus (1.2) //===== Current Version: ===================================== //= 1.1 //===== Compatible With: ===================================== @@ -10,7 +10,8 @@ //===== Description: ========================================= //= Seperate Indian Headband quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text, fixed +//= items count [Lupus] //============================================================ comodo.gat,238,217,5 script Merunte 832,{ @@ -18,25 +19,34 @@ comodo.gat,238,217,5 script Merunte 832,{ mes "Well, umbaga umbumbaga."; mes "I like to do stuff like that!"; mes "And I love Indian Headbands too!"; - next; + next; + menu "Make me an Indian Headband!",-,"Bye!",M_EXIT; + mes "[Merunte]"; - mes "Give me:"; + mes "Ok. Gimme:"; mes "100 Bill of Birds,"; mes "and 10,000 Zeny."; - next; + next; mes "[Merunte]"; mes "Got these items?"; - next; - menu "Yep!",-,"Nope!",EXT; - if ((countitem(925) < 1) || (Zeny < 10000)) GOTO EXT; - delitem 925,1; - set Zeny,Zeny-10000; - getitem 5071,1; + 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, + set Zeny,Zeny-10000; + getitem 5071,1;//Items: Indian Headband, mes "[Merunte]"; mes "Thanks! Bye."; - close; -EXT: + close; + +L_NOITEM: + mes "[Merunte]"; + mes "Ya miss some items or zeny."; + close; + +M_EXIT: mes "[Merunte]"; mes "Kay bye."; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/mask_of_alarm.txt b/npc/quests/newgears/mask_of_alarm.txt index 4e54a6b6a..f53564767 100644 --- a/npc/quests/newgears/mask_of_alarm.txt +++ b/npc/quests/newgears/mask_of_alarm.txt @@ -4,41 +4,49 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= -//= Seperate Mask of Alarm quest. +//= Seperate Expressionless Mask (Mask of Alarm) quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text and labels, +//= changed Zeny amount, fixed wrong item ID [Lupus] //============================================================ aldebaran.gat,87,181,3 script Muslam 819,{ mes "[Muslam]"; mes "I love Alarms, so evil, just like me."; mes "Touch me and I will rip your arm off!"; - next; + next; mes "[Muslam]"; - mes "Anyways... If you want a Mask of an Alarm,"; - mes "bring me 3000 Zeny,"; + mes "Anyways... If you want a Expressionless Mask (Mask of an Alarm),"; + mes "bring me 300,000 Zeny,"; mes "and 1 Monster Oxygen Mask."; - next; + next; mes "[Muslam]"; mes "Got these?"; - next; - menu "Yep!",-,"Nope!",EXT; - if ((countitem(10002) < 1) || (Zeny < 300000)) GOTO EX_NR; + next; + menu "Yep!",-,"Nope!",M_EXIT; + + if ((countitem(10002) < 1) || (Zeny < 300000)) GOTO L_NOITEM;//Items: Monster Oxygen Mask, mes "[Muslam]"; mes "Great!"; - next; - delitem 1002,1; - set Zeny,Zeny-300000; - getitem 5087,1; + next; + delitem 10002,1;//Items: Monster Oxygen Mask, + set Zeny,Zeny-300000; + getitem 5087,1;//Items: Expressionless Mask, mes "[Muslam]"; mes "Enjoy your item!"; - close; -EX_NR: + close; + +L_NOITEM: + mes "[Muslam]"; + mes "Where is 1 Monster Oxygen Mask and 300,000 Zeny?"; + close; + +M_EXIT: mes "[Muslam]"; - mes "Kay! byeee."; - close; -} \ No newline at end of file + mes "Mkay! byeee."; + close; +} diff --git a/npc/quests/newgears/mushroom_hairband.txt b/npc/quests/newgears/mushroom_hairband.txt index ba417c647..87f6c4baf 100644 --- a/npc/quests/newgears/mushroom_hairband.txt +++ b/npc/quests/newgears/mushroom_hairband.txt @@ -1,50 +1,58 @@ -//===== eAthena Script ======================================= +//===== eAthena Script ======================================= //= Mushroom Hairband Quest //===== By: ================================================== //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= //= Seperate Mushroom Hairband quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text [Lupus] //============================================================ prontera.gat,66,87,6 script Aipo 819,{ mes "[Aipo]"; + If (Class == 0) GOTO L_NOVICE; mes "Heeeeee."; - next; + next; mes "[Aipo]"; mes "Have you ever wondered what you would look like with a ^000080Mushroom Hairband^000000?"; mes "Well, I can make you one If you like, just give me 300 Mushroom Spores!"; - next; + next; mes "[Aipo]"; mes "This wondrous item grew in the depths of a gave and needs the spores for the final"; mes "materials neededm"; mes "Want me to make it for you?"; - next; - menu "Yes! Now make me the item!",-,"No, thanks!",EXT; - if (countitem(921) < 300) GOTO NM_EXT; + next; + menu "Yes! Now make me the item!",-,"No, thanks!",M_EXIT; + + if (countitem(921) < 300) GOTO L_NOITEM;//Items: Mushroom Spore, mes "[Aipo]"; mes "Wow! Thanks! Lemme make the item then."; - next; - delitem 921,300; + next; + delitem 921,300;//Items: Mushroom Spore, mes "[Aipo]"; mes "Okay, thanks for the items, now yours in return!"; - next; - getitem 5082,1; + next; + getitem 5082,1;//Items: Mushroom Hairband, mes "[Aipo]"; mes "Thanks again! Bye!"; - close; -NM_EXT: + close; + +L_NOITEM: mes "[Aipo]"; mes "You don't have enough Mushroom Spores... sorry!"; - close; -EXT: + close; + +L_NOVICE: + mes "I love musrooms. I wanna be their master one day..."; + close; + +M_EXIT: mes "[Aipo]"; mes "Well, I'm always here If you change your mind!"; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/neris.txt b/npc/quests/newgears/neris.txt index b94298de2..b1c46bd35 100644 --- a/npc/quests/newgears/neris.txt +++ b/npc/quests/newgears/neris.txt @@ -10,92 +10,117 @@ //===== Description: ========================================= //= Seperate New Hat quests. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text [Lupus] //============================================================ yuno.gat,21,17,7 script Neris 806,{ mes "[Neris]"; mes "So, whatcha want then?"; - next; - menu "Large Golden Bell.",LGB,"Crown of Mistress.",COM,"Crown of Ancient Queen.",COAQ; -LGB: + next; + menu "Big Golden Bell.",M_LGB,"Crown of Mistress.",M_COM,"Crown of Ancient Queen.",M_COAQ,"Nothing, thanks.",M_EXIT; + +M_LGB: mes "[Neris]"; mes "Hehe, so you are a fan of Sohee's eh?"; mes "Yeah, I guess I like the bell they carry too!"; - next; + next; mes "[Neris]"; mes "Looks pretty cute when you wear it."; mes "So... what can I do for you?"; - menu "Make me the golden bell!",-,"What do I need to make it?",REQL,"Nothing, thanks.",EXT; - if ((countitem(10016) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR; + menu "Make me the golden bell!",-,"What do I need to make it?",M_REQL,"Nothing, thanks.",M_EXIT; + + 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; - delitem 714,1; - delitem 969,3; - set Zeny,Zeny-1000; - getitem 5091,1; + next; + delitem 10016,1;//Items: Golden Bell, + delitem 714,1;//Items: Emperium, + delitem 969,3;//Items: Gold, + set Zeny,Zeny-1000; + getitem 5091,1;//Items: Big Golden Bell, mes "[Neris]"; mes "Thanks, and bye!"; - close; -REQL: + close; + +M_REQL: mes "[Neris]"; mes "Okay all these are gold related:"; mes "1 Golden Bell,"; mes "1 Emperium,"; - mes "3 Golds,"; + mes "3 Gold,"; mes "1000 Zeny for the labor."; - close; -COM: + close; + +M_COM: mes "[Neris]"; mes "You like mistresses?"; - next; + next; mes "[Neris]"; mes "So... what can I do for you?"; - menu "Make me the item.",-,"What do I need to make it?",REQC,"Nothing, thanks.",EXT; - if ((countitem(2249) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR; + next; + menu "Make me the item.",-,"What do I need to make it?",M_REQC,"Nothing, thanks.",M_EXIT; + + 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; - delitem 714,1; - delitem 969,3; - set Zeny,Zeny-1000; - getitem 5081,1; + next; + delitem 2249,1;//Items: Coronet, + delitem 714,1;//Items: Emperium, + delitem 969,3;//Items: Gold, + set Zeny,Zeny-1000; + getitem 5081,1;//Items: Crown of Mistress, mes "[Neris]"; mes "Thanks, and bye!"; - close; -REQC: + close; + +M_REQC: mes "[Neris]"; mes "Okay all these are gold related:"; mes "1 Coronet,"; mes "1 Emperium,"; - mes "3 Golds,"; + mes "3 Gold,"; mes "1000 Zeny for the labor."; - close; -COAQ: + close; + +M_COAQ: mes "[Neris]"; mes "You like ancient queens?"; - next; + next; mes "[Neris]"; mes "So.. what can I do for you?"; - menu "Make me the item.",-,"What do I need to make it?",REQC,"Nothing, thanks.",EXT; - if ((countitem(10006) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR; + next; + menu "Make me the item.",-,"What do I need to make it?",M_REQC2,"Nothing, thanks.",M_EXIT; + + 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; - delitem 714,1; - delitem 969,3; - set Zeny,Zeny-1000; - getitem 5080,1; + next; + delitem 10006,1;//Items: Queen's Hair Ornament, + delitem 714,1;//Items: Emperium, + delitem 969,3;//Items: Gold, + set Zeny,Zeny-1000; + getitem 5080,1;//Items: Crown of The Ancient Queen, mes "[Neris]"; mes "Thanks, and bye!"; - close; -EX_NR: + close; + +M_REQC2: + mes "[Neris]"; + mes "Okay all these are gold related:"; + mes "1 Queen's Hair Ornament,"; + mes "1 Emperium,"; + mes "3 Gold,"; + mes "1000 Zeny for the labor."; + close; + +L_NOITEM: mes "[Neris]"; mes "Don't take me for a fool!"; mes "No items, no deal!"; - close; -} \ No newline at end of file + close; + +M_EXIT: + mes "[Neris]"; + mes "Bye! Come again."; + close; +} diff --git a/npc/quests/newgears/old_blacksmith.txt b/npc/quests/newgears/old_blacksmith.txt index 2ea20653b..dc1d9963e 100644 --- a/npc/quests/newgears/old_blacksmith.txt +++ b/npc/quests/newgears/old_blacksmith.txt @@ -4,88 +4,95 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= -//= Seperate Angel & Devil Ears quests. +//= Seperate Ears Of Angel & Ears Of Demon quests. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text, wrong ID! [Lupus] //============================================================ yuno.gat,246,51,4 script Old Blacksmith 813,{ mes "[Old Blacksmith]"; mes "Well then my good man!"; mes "What can I do for you?"; - next; - menu "Give me the ears of a devil!",EOD,"Give me the ears of an angel!",EOA; -EOD: + next; + menu "Give me the ears of a devil!",M_EOD,"Give me the ears of an angel!",M_EOA,"Nothing, thanks",M_EXIT; + +M_EOD: mes "[Old Blacksmith]"; mes "Well, this item sure makes you look like a evil bastard."; mes "It makes me crap in my pants when I see these."; - next; - menu "Dont care, make me the Item!",-,"What are the requirements?",EODREQ,"Nothing",EXT; - if ((countitem(5038) < 1) || (countitem(2286) < 1) || (Zeny < 20000)) GOTO EX_REQ; + next; + menu "Dont care, make me the Item!",-,"What are the requirements?",M_EODREQ,"Nothing",M_EXIT; + + if ((countitem(5038) < 1) || (countitem(2286) < 1) || (Zeny < 20000)) GOTO L_NOITEM_EOD;//Items: Deviruchi Hat, Elven Ears, mes "[Old Blacksmith]"; mes "Wow, never thought a little fella like you could get tha.t"; mes "Bwahaha, ok."; - next; - delitem 5038,1; - delitem 2286,1; - set Zeny,Zeny-20000; - getitem 5068,1; + next; + delitem 5038,1;//Items: Deviruchi Hat, + delitem 2286,1;//Items: Elven Ears, + set Zeny,Zeny-20000; + getitem 5068,1;//Items: Ears Of Demon, mes "[Old Blacksmith]"; mes "Well, enjoy your item!"; - close; -EOA: + close; + +L_NOITEM_EOD: + mes "[Old Blacksmith]"; + mes "Well sorry, but you dont have enough items!"; + next; + +M_EODREQ: + mes "[Old Blacksmith]"; + mes "Well, let's see..."; + mes "I need something for the evil, that be a Deviruchi Cap,"; + mes "I also need the ears for the base of it, Elven Ears would be OK,"; + mes "Last of all, I need 20,000 Zeny for me troubles."; + next; + mes "[Old Blacksmith]"; + mes "Hey, I have to make a living!"; + close; + +M_EOA: mes "[Old Blacksmith]"; mes "Well, this item sure makes you look like a holy bastard."; - next; - menu "Dont care, make me the Item!",-,"What are the requirements?",EOAREQ,"Nothing",EXT; - if ((countitem(2286) < 1) || (countitem(2254) < 1) || (Zeny < 20000)) GOTO EX_REQ_A; + next; + menu "Dont care, make me the Item!",-,"What are the requirements?",M_EOAREQ,"Nothing",M_EXIT; + + if ((countitem(2286) < 1) || (countitem(2254) < 1) || (Zeny < 20000)) GOTO L_NOITEM_EOA;//Items: Elven Ears, Angel Wing, mes "[Old Blacksmith]"; mes "Well well well! Someone who has the spirit!"; mes "Okay, gimme the items."; - next; - delitem 2286,1; - delitem 2254,1; - set Zeny,Zeny-20000; + next; + delitem 2286,1;//Items: Elven Ears, + delitem 2254,1;//Items: Angel Wing, + set Zeny,Zeny-20000; mes "[Old Blacksmith]"; mes "Okay, and here you go."; - next; - getitem 5066,1; + next; + getitem 5074,1;//Items: Horns of Succubus, mes "[Old Blacksmith]"; mes "Enjoy it!"; - close; -EAOREQ: + close; + +L_NOITEM_EOA: + mes "[Old Blacksmith]"; + mes "Well sorry, but you dont have enough items!"; + next; + +M_EOAREQ: mes "[Old Blacksmith]"; mes "Well, this item is very holy, so I will need:"; - mes "1 Angel Wing/Angel Hheadband,"; + mes "1 Angel Wing (Angel Headband),"; mes "1 Elven Ears for the ears,"; mes "and 20,000z for the labour costs!"; - close; -EODREQ: - mes "[Old Blacksmith]"; - mes "Well, let's see..."; - mes "I need something for the evil, that be a Deviruchi Cap,"; - mes "I also need the ears for the base of it, Elven Ears would be OK,"; - mes "Last of all, I need 20,000 Zeny for me troubles."; - next; - mes "[Old Blacksmith]"; - mes "Hey, I have to make a living!"; - close; -EX_REQ: - mes "[Old Blacksmith]"; - mes "Well sorry, but you dont have enough items!"; - next; - GOTO EODREQ; -EX_REQ_A: - mes "[Old Blacksmith]"; - mes "Well sorry, but you dont have enough items!"; - next; - GOTO EOAREQ; -EXT: + close; + +M_EXIT: mes "[Old Blacksmith]"; mes "Fair yee well!"; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/posture_fix_hat.txt b/npc/quests/newgears/posture_fix_hat.txt index 91d04f7f2..7c77edee6 100644 --- a/npc/quests/newgears/posture_fix_hat.txt +++ b/npc/quests/newgears/posture_fix_hat.txt @@ -4,58 +4,65 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= -//= Seperate Posture Fix Hat quest. +//= Campus Hat (Posture Fix Hat) quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text +//= fixed wrong items ID [Lupus] //============================================================ pay_in01.gat,171,142,5 script Nan Hyang 814,{ - If (getequipisequiped(5073)) GOTO GOOD; - If (Class == 0) GOTO EXT; + If (getequipisequiped(5073)) GOTO L_GOOD; + If (Class == 0) GOTO L_NOVICE; mes "[Nan Hyang]"; mes "Tut tut! you have terrible posture!"; mes "You need to correct it immediately!"; - next; + next; mes "[Nan Hyang]"; - mes "I could correct it for you If you brought me"; - mes "some materials to make you a posture aid."; - next; - menu "Can you please make me the aid.",-,"What do I need to bring?",AIT,"No thanks!",EXT; - If ((Countitem(1550) <1) || (Countitem(2285) < 1 )) GOTO A_NM; + mes "I could correct it for you If you brought me some materials to make you a Campus Hat."; + next; + menu "Make me a Campus Hat.",-,"What do I need to get?",M_REQ,"No thanks!",M_EXIT; + + 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; - delitem 2885,1; - getitem 5073,1; + next; + delitem 1550,1;//Items: Book, + delitem 2285,1;//Items: Apple o' Archer, + getitem 5073,1;//Items: Campus Hat, mes "[Nan Hyang]"; - mes "Hehe, well, maybe you will become more careful, or your sense will"; - mes "become balanced."; - close; -AIT: + mes "Hehe, well, maybe you will become more careful, or your sense will become balanced."; + close; + +M_REQ: mes "[Nan Hyang]"; mes "What I require is very simple..."; - next; + next; mes "[Nan Hyang]"; mes "1 Book."; mes "And 1 Apple o' Archer to balance on it."; - close; -A_NM: + close; + +L_NOITEM: mes "[Nan Hyang]"; mes "At least be serious, you dont have enough items!"; mes "Come back when you wish to learn posture."; - close; -GOOD: + close; + +L_GOOD: mes "[Nan Hyang]"; mes "Ah, that's it! good to see you are willing to learn!"; - close; -EXIT: - next; + close; + +L_NOVICE: + mes "Hi! Could you visit me next week?"; + next; + +M_EXIT: mes "[Nan Hyang]"; mes "Good day to you."; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/sea_otter_hat.txt b/npc/quests/newgears/sea_otter_hat.txt index 7ca272032..87e302192 100644 --- a/npc/quests/newgears/sea_otter_hat.txt +++ b/npc/quests/newgears/sea_otter_hat.txt @@ -4,47 +4,50 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= //= Seperate Seo Otter Hat quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text [Lupus] //============================================================ xmas.gat,184,267,4 script Pretty Rency 818,{ mes "[Pretty Rency]"; mes "Wow! you heard of a Sea Otter Hat?"; - next; + next; mes "[Pretty Rency]"; mes "The requirements for this item, are very simple:"; - mes "1 Raccoon Hat,"; - mes "1 Transform Leaf"; - next; + mes "1 Lazy Racoon Hat,"; + mes "1 Transformation Leaf"; + next; mes "[Pretty Rency]"; mes "Do you have these items?"; - next; - menu "Yes.",-,"No.",EXT; - if ((countitem(5084) < 1) || (countitem(5064) < 1)) GOTO NM_EXT; + next; + menu "Yes.",-,"No.",M_EXIT; + + 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; - delitem 5064,1; + next; + delitem 5084,1;//Items: Lazy Racoon Hat, + delitem 5064,1;//Items: Transformation Leaf, mes "[Pretty Rency]"; mes "Thanks for your items! Now I will make yours for you!"; - next; - getitem 5078,1; + next; + getitem 5078,1;//Items: Sea Otter Hat, mes "[Pretty Rency]"; mes "Thanks! Byeeeeeee!"; - close; -NM_EXT: + close; + +L_NOITEM: mes "[Pretty Rency]"; mes "Sorry, not enough items."; - close; -EXT: + close; + +M_EXIT: mes "[Pretty Rency]"; mes "Byebye! Have a nice time in the world of Ragnarok!"; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/traveler.txt b/npc/quests/newgears/traveler.txt index 384835274..c81734a68 100644 --- a/npc/quests/newgears/traveler.txt +++ b/npc/quests/newgears/traveler.txt @@ -4,111 +4,127 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= //= Seperate New Hat quests. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text +//= added missing delitem, fixed names, item amount [Lupus] //============================================================ morroc.gat,234,77,6 script Traveler 807,{ - if (Class == 0) GOTO EXT; mes "[Traveler]"; - mes "What item do you want from me?"; - next; - menu "Annoyed Raccoon Dog Hat.",MN1,"Fresh Bluish Fish Hat",MN2,"Drooping Cat",MN3,"Transformation Leaf",MN4; -MN1: + if (Class == 0) GOTO L_NOVICE; + mes "What kind of hat do you want from me?"; + next; + menu "Lazy Racoon Hat.",M_N1,"Fresh Bluish Fish",M_N2,"Drooping Cat",M_N3,"Transformation Leaf",M_N4,"Nothing.",M_EXIT; + +M_N1: mes "[Traveler]"; mes "Gimme 1000 Acorns,"; mes "100 Sea Otter Skins,"; - mes "and 10 Raccoon Dog's Leaf"; - next; + mes "and 10 Raccoon Leaf"; + next; mes "[Traveler]"; mes "Got these items?"; - next; -menu "Yep.",-,"No!",EXT; - if ((countitem(1026) < 1000) || (countitem(7065) < 100) || (countitem(945) < 10)) GOTO EX_NM; + next; + menu "Yep.",-,"No!",M_EXIT; + + 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; - delitem 7065,100; - delitem 945,10; - getitem 5084,1; + next; + delitem 1026,1000;//Items: Acorn, + delitem 7065,100;//Items: Sea Otter Fur, + delitem 945,10;//Items: Raccoon Leaf, + getitem 5084,1;//Items: Lazy Racoon Hat, mes "[Traveler]"; mes "Enjoy."; - close; -MN2: + close; + +M_N2: mes "[Traveler]"; mes "Gimme 1 Rotten Fish,"; mes "300 Rotten Scales,"; mes "50 Sashimi,"; mes "1 Tail of a Fish,"; mes "and 100 Sticky Mucus"; - next; + next; mes "[Traveler]"; mes "Got these items?"; - menu "Yes",-,"No.",EXT; - if ((countitem(624) < 1) || (countitem(959) < 300) || (countitem(1144) < 50) || (countitem(1023) < 1) || (countitem(938) < 100)) GOTO EX_NM; + menu "Yes",-,"No.",M_EXIT; + + 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; - delitem 959,300; - delitem 1144,50; - delitem 1023,1; - delitem 938,100; - getitem 5065,1 + 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, + getitem 5065,1//Items: Fresh Blueish Fish, mes "[Traveler]"; mes "Thanks. Bye."; - close; -MN3: + close; + +M_N3: mes "[Traveler]"; mes "Give me 1 Slotted Circlet,"; mes "1 Black Dyestuff,"; - mes "and 300 Cat Dolls."; + mes "and 300 Black Cat Dolls."; mes "Loli Ruri drops the last one."; - next; + next; mes "[Traveler]"; mes "Have you these items?"; - next; -menu "Yes",-,"No.",EXT; - if ((countitem(2233) < 1) || (countitem(7206) < 300)) GOTO EX_NM; + next; + menu "Yes",-,"No.",M_EXIT; + + 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; - delitem 7206,300; - getitem 5058,1; + next; + delitem 2233,1;//Items: Circlet, + delitem 983,1;//Items: Black Dyestuff, + delitem 7206,300;//Items: Black Cat Doll, + getitem 5058,1;//Items: Resting Cat, mes "[Traveler]"; mes "Good luck."; - close; -MN4: + close; + +M_N4: mes "[Traveler]"; mes "Bring me 600 Raccoon Dog's Leaf (Raccoon Leaf)"; - next; + next; mes "[Traveler]"; mes "You have these?"; - next; -menu "Yes!",-,"Nope.",EXT; - if (countitem(945) < 600) GOTO EX_NM; + next; + menu "Yes!",-,"Nope.",M_EXIT; + + if (countitem(945) < 600) GOTO L_NOITEM;//Items: Raccoon Leaf, mes "[Traveler]"; mes "Thanks. here's your leaf"; - next; - delitem 945,600; - getitem 5064,1; + next; + delitem 945,600;//Items: Raccoon Leaf, + getitem 5064,1;//Items: Transformation Leaf, mes "[Traveler]"; mes "Enjoy your Item"; - close; -EX_NM: + close; + +L_NOITEM: mes "[Traveler]"; mes "No stuff, no item!"; mes "When you have it, come back."; - close; -EXT: + close; + +L_NOVICE: + mes "It's hot today..."; + close; + +M_EXIT: mes "[Traveler]"; mes "Bye."; - close; -} \ No newline at end of file + close; +} diff --git a/npc/quests/newgears/tulip_hairpin.txt b/npc/quests/newgears/tulip_hairpin.txt index fc9c1cd5a..8c4dc327e 100644 --- a/npc/quests/newgears/tulip_hairpin.txt +++ b/npc/quests/newgears/tulip_hairpin.txt @@ -4,46 +4,60 @@ //= Halca (1.0) //= Mass Zero (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any eAthena Version. //===== Description: ========================================= //= Seperate Tulip Hairpin quest. //===== Additional Comments: ================================= -//= +//= 1.2 Fixed wrong labels, added missing text [Lupus] //============================================================ prontera.gat,84,189,6 script Ses 815,{ mes "[Ses]"; + If (Class == 0) GOTO L_NOVICE; mes "Woo, hello! Fruit fruit!"; mes "Sorry, I just love flowers, fruits and everything that makes me"; mes "look more FRUITY!"; - next; - menu "Shh, just make me the Tulip Hairpin!",-,"What do I need for the Tulip Hairpin?",TH_REQ,"Bye!",EXIT; + next; + menu "Make me a Tulip Hairpin!",-,"What do I need?",M_REQ,"Bye!",M_EXIT; + mes "[Ses]"; mes "You have the items?"; - next; - menu "Yes!",-,"No!",EXIT; - If ((countitem(2278) < 1) || (countitem(975) < 1)) GOTO EX_NM; + next; + menu "Yes!",-,"No!",M_EXIT; + + If ((countitem(2278) < 1) || (countitem(975) < 1)) GOTO L_NOITEM;//Items: Mr. Smile, Scarlet Dyestuffs, mes "[Ses]"; mes "Yay! thanks! Pineapple!"; mes "Here you go!"; - next; - delitem 2278,1; - delitem 975,1; - getitem 5077,1; + next; + delitem 2278,1;//Items: Mr. Smile, + delitem 975,1;//Items: Scarlet Dyestuffs, + getitem 5077,1;//Items: Tulip Hairpin, mes "[Ses]"; mes "Enjoy being pretty!"; - close; -TH_REQ: + close; + +L_NOITEM: + mes "[Ses]"; + mes "You don't have enough items for a Tulip Hairpin!"; + next; + +M_REQ: mes "[Ses]"; mes "Well, I need..."; mes "1 Mr. Smile for the substance"; - mes "and 1 scarlet dyestuff!"; + mes "and 1 scarlet Dyestuff!"; mes "Bring these to me for your item!"; - close; -EXIT: + close; + +L_NOVICE: + mes "I love flowers... Do you love flowers, too?"; + close; + +M_EXIT: mes "[Ses]"; mes "Okay!"; mes "Byeeeee!"; -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2