diff options
Diffstat (limited to 'npc/custom/quests')
-rw-r--r-- | npc/custom/quests/bandit_beard.txt | 2 | ||||
-rw-r--r-- | npc/custom/quests/elvenear.txt | 2 | ||||
-rw-r--r-- | npc/custom/quests/event_6_new_hats.txt | 4 | ||||
-rw-r--r-- | npc/custom/quests/hunting_missions.txt | 14 | ||||
-rw-r--r-- | npc/custom/quests/may_hats.txt | 8 | ||||
-rw-r--r-- | npc/custom/quests/quest_shop.txt | 6 | ||||
-rw-r--r-- | npc/custom/quests/thq/THQS_ChatingNPC.txt | 8 | ||||
-rw-r--r-- | npc/custom/quests/thq/THQS_GuildNPC.txt | 8 | ||||
-rw-r--r-- | npc/custom/quests/thq/THQS_QuestNPC.txt | 4 | ||||
-rw-r--r-- | npc/custom/quests/thq/THQS_Quests.txt | 24 | ||||
-rw-r--r-- | npc/custom/quests/thq/THQS_TTShop.txt | 2 |
11 files changed, 41 insertions, 41 deletions
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index fa1e61eac..9f9e509f4 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -70,7 +70,7 @@ L_MAKE: mes "[Bearded Man]"; mes "Let's make you your beard!"; next; - if(countitem(Flexible_String) < 1 || countitem(Animal's_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 || + if(countitem(Flexible_String) < 1 || countitem(Animals_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 || countitem(Sticky_Mucus) < 100 || countitem(Counteragent) < 1 || countitem(Crystal_Jewel_) < 1) goto L_NOITEMS; delitem 7200, 1; delitem 919, 1; diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt index dca4fdfd8..02e650e78 100644 --- a/npc/custom/quests/elvenear.txt +++ b/npc/custom/quests/elvenear.txt @@ -36,7 +36,7 @@ geffen,127,49,5 script Elven Ears Quest 4_M_02,{ mes "[Elven Ears quest]"; mes "Good good, let me just check"; next; - if (countitem(Cat_Hairband)<1 || countitem(Elder_Pixie's_Beard)<20 || countitem(Animal's_Skin)<20) { + if (countitem(Cat_Hairband) < 1 || countitem(Elder_Pixies_Beard) < 20 || countitem(Animals_Skin) < 20) { mes "[Elven Ears Quest]"; mes "You don't have the requirements."; mes "Please come back another time..."; diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt index 593293a69..50110ff52 100644 --- a/npc/custom/quests/event_6_new_hats.txt +++ b/npc/custom/quests/event_6_new_hats.txt @@ -194,13 +194,13 @@ prt_in,53,56,5 script Jac 1_M_PAY_ELDER,{ mes "Oh, dear. You need 10 Steels..."; close; } - if (countitem(Bear's_Foot) < 200) { + if (countitem(Bears_Foot) < 200) { mes "[Jac]"; mes "Oh, dear. You need 200 Bear Footskins..."; close; } delitem Steel,10;//Items: Steel, - delitem Bear's_Foot,200; //Items: Bears Footskin, + delitem Bears_Foot,200; //Items: Bears Footskin, mes "[Jac]"; mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Panda Hat for you right away. Please Wait a Moment."; next; diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index ad18a73f5..611bdd480 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/npc/custom/quests/hunting_missions.txt @@ -24,7 +24,7 @@ prontera,152,187,6 script Hunting Missions 4_F_EDEN_MASTER,{ function Chk; function Cm; mes "[Hunting Missions]"; - mes "Hello, "+strcharinfo(0)+"!"; + mes "Hello, "+strcharinfo(PC_NAME)+"!"; if (!#Mission_Delay) { next; mes "[Hunting Missions]"; @@ -50,7 +50,7 @@ function Chk; function Cm; mes "You've started a mission"; mes "on another character."; if ( !@hm_char_del_check ) { - if ( !query_sql( "SELECT 1 FROM `char_reg_num_db` WHERE `key` = 'Mission0' AND `char_id` IN ( SELECT `char_id` FROM `char` WHERE `account_id` = "+ getcharid(3) +" )", .@dummy ) ) { + if ( !query_sql( "SELECT 1 FROM `char_reg_num_db` WHERE `key` = 'Mission0' AND `char_id` IN ( SELECT `char_id` FROM `char` WHERE `account_id` = "+ getcharid(CHAR_ID_ACCOUNT) +" )", .@dummy ) ) { next; mes "[Hunting Missions]"; mes "I can't seem to find any records"; @@ -198,8 +198,8 @@ Mission_Status: set #Mission_Count,0; if (.Delay) set #Mission_Delay, gettimetick(2)+(.Delay*3600); set Mission_Total, Mission_Total+1; - if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(0)+",'Mission_Total','0',1)"); - else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(0)+" AND `key` = 'Mission_Total'"); + if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(CHAR_ID_CHAR)+",'Mission_Total','0',1)"); + else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(CHAR_ID_CHAR)+" AND `key` = 'Mission_Total'"); close; Mission_Info: @@ -258,7 +258,7 @@ OnBuyItem: close; OnNPCKillEvent: - if (!getcharid(1) || !.Party) { + if (!getcharid(CHAR_ID_PARTY) || !.Party) { if (!#Mission_Count || !Mission0) end; for (set .@i, 0; .@i<.Quests; set .@i,.@i+1) { if (strmobinfo(1,killedrid) == strmobinfo(1,getd("Mission"+.@i))) { @@ -271,8 +271,8 @@ OnNPCKillEvent: } else if (.Party) { set .@mob, killedrid; getmapxy(.@map1$, .@x1, .@y1, UNITTYPE_PC); - getpartymember getcharid(1),1; - getpartymember getcharid(1),2; + getpartymember getcharid(CHAR_ID_PARTY),1; + getpartymember getcharid(CHAR_ID_PARTY),2; for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) { if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) { attachrid $@partymemberaid[.@i]; diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index beea787a1..a1864f96f 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -62,10 +62,10 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ next; if (select("Yeah.", "Nay." != 1)) break; - if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty, + if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tigers_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger_Footskin, Tiger_Panty, delitem Tiger_Mask,1;//Items: Tiger_Mask, - delitem Tiger_Footskin,10;//Items: Tiger's_Footskin, - delitem Tiger's_Skin,30;//Items: Tiger_Skin, + delitem Tiger_Footskin,10;//Items: Tiger_Footskin, + delitem Tigers_Skin,30;//Items: Tiger_Skin, delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty, getitem Lion_Mask,1;//Items: Lion_Mask, mes "[Yakima]"; @@ -95,7 +95,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ delitem Manteau_,2;//Items: Manteau_, delitem Skul_Ring,3;//Items: Skull_Ring, delitem Old_Manteau,10;//Items: Old_Manteau, - getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau, + getitem Skeletons_Cape,1;//Items: Skeleton_Manteau, mes "[Yakima]"; mes "Thank you very very much!"; mes callfunc("F_Bye"); diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt index 2db3b069a..f96b4cb75 100644 --- a/npc/custom/quests/quest_shop.txt +++ b/npc/custom/quests/quest_shop.txt @@ -96,7 +96,7 @@ OnMenu: } deletearray @i[0],getarraysize(@i); if (.Shops$[.@i] == "") { - message strcharinfo(0),"An error has occurred."; + message strcharinfo(PC_NAME),"An error has occurred."; end; } dispbottom "Select one item at a time."; @@ -110,7 +110,7 @@ OnBuyItem: copyarray .@q[3],getd(".q_"+.@q[0]+"[0]"),getarraysize(getd(".q_"+.@q[0])); set .@q[2],.@q[1]*.@q[3]; if (!.@q[2] || .@q[2] > 30000) { - message strcharinfo(0),"You can't purchase that many "+getitemname(.@q[0])+"."; + message strcharinfo(PC_NAME),"You can't purchase that many "+getitemname(.@q[0])+"."; end; } mes "[Quest Shop]"; @@ -143,7 +143,7 @@ OnBuyItem: if (.@q[6]) for(set .@i,6; .@i<getarraysize(.@q); set .@i,.@i+2) delitem .@q[.@i],.@q[.@i+1]*.@q[1]; getitem .@q[0],.@q[2]; - if (.Announce) announce strcharinfo(0)+" has created "+((.@q[2] > 1)?.@q[2]+"x "+getitemname(.@q[0]):A_An(getitemname(.@q[0])))+"!",0; + if (.Announce) announce strcharinfo(PC_NAME)+" has created "+((.@q[2] > 1)?.@q[2]+"x "+getitemname(.@q[0]):A_An(getitemname(.@q[0])))+"!",0; specialeffect2 EF_FLOWERLEAF; close; case 2: diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt index 24e3f7410..2ea65e3c9 100644 --- a/npc/custom/quests/thq/THQS_ChatingNPC.txt +++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt @@ -66,11 +66,11 @@ N_Member: mes "Well unless you are reading the code :)"; close; N_Chat1: - mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+"."; + mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(PC_NAME)+"."; mes "Did you hear about that brave man that went into Glast Heim alone?! He must be crazy."; close; N_Chat2: - mes ""+strcharinfo(0)+" don't you have something better you could be doing? Like a quest."; + mes ""+strcharinfo(PC_NAME)+" don't you have something better you could be doing? Like a quest."; close; } //another usless member @@ -82,12 +82,12 @@ yuno_in01,25,162,6 script Female Wizard 2_F_MAGICMASTER,{ N_Member: set @temp,rand(2); if (@temp == 1) goto N_Chat; - mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+"."; + mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(PC_NAME)+"."; mes "Did you hear about that goat man running around in the trees?"; mes " "; mes "Aperently his name is Baphomet and he has been runing around the Forest Maze out side of prontera for quite some time now."; close; N_Chat: - mes ""+strcharinfo(0)+" don't you have something better you could be doing? Like a quest."; + mes ""+strcharinfo(PC_NAME)+" don't you have something better you could be doing? Like a quest."; close; } diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt index 05379e345..5a7c4883b 100644 --- a/npc/custom/quests/thq/THQS_GuildNPC.txt +++ b/npc/custom/quests/thq/THQS_GuildNPC.txt @@ -20,7 +20,7 @@ yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{ if (Event_THQS==1) goto N_AlreadyReg; mes "[Keegan]"; - mes "Well "+strcharinfo(0)+" if you want to be a Treasure Hunter first you must."; + mes "Well "+strcharinfo(PC_NAME)+" if you want to be a Treasure Hunter first you must."; mes " "; mes "^FF00001.^000000 You well be changed ^FF000025,000z^000000 for basic training and your proof of being a member."; mes " "; @@ -49,13 +49,13 @@ yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{ if (Event_THQS!=1) goto A_NeedReg; mes "[Keegan]"; - mes "Well "+strcharinfo(0)+" if you wish to take a quest go talk to the fellow Treasure Hunter in the other room there."; + mes "Well "+strcharinfo(PC_NAME)+" if you wish to take a quest go talk to the fellow Treasure Hunter in the other room there."; close; case 3: if (Event_THQS!=1) goto N_NeedMem; mes "[Keegan]"; - mes "Yes "+strcharinfo(0)+" I will take you to our shop right away!"; + mes "Yes "+strcharinfo(PC_NAME)+" I will take you to our shop right away!"; next; warp "prt_in",166,171; close; @@ -66,7 +66,7 @@ yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{ } N_NoZeny: mes "[Keegan]"; - mes "Hmmm you don't seem to have ^FF000025,000z^000000 "+strcharinfo(0)+". Please come back when you do."; + mes "Hmmm you don't seem to have ^FF000025,000z^000000 "+strcharinfo(PC_NAME)+". Please come back when you do."; close; N_AlreadyReg: mes "[Keegan]"; diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt index 606559e74..1bbe8fd7a 100644 --- a/npc/custom/quests/thq/THQS_QuestNPC.txt +++ b/npc/custom/quests/thq/THQS_QuestNPC.txt @@ -18,11 +18,11 @@ yuno_in01,112,151,6 script Quest Manager 1_M_SIZ,{ mes "[Guy]"; - mes "Welcome to the Treasure Hunters Guild "+strcharinfo(0)+"."; + mes "Welcome to the Treasure Hunters Guild "+strcharinfo(PC_NAME)+"."; next; if (On_Quest == 0) goto N_NewQuest; mes "[Guy]"; - mes "Look " +strcharinfo(0)+ ", you can only 1 quest at a time, you should finish the quest unless you have given up."; + mes "Look " +strcharinfo(PC_NAME)+ ", you can only 1 quest at a time, you should finish the quest unless you have given up."; mes "Giving up will cost you ^FF00002500z^000000."; next; if (select("No, never would I leave a quest!", "Yah I'm pathetic... Pay 2500z") == 1) { diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index 55037eb5c..c0eb1427a 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -228,7 +228,7 @@ N_QuestStart: ///////Job list 3/////// //3-1; moc_fild04,208,322,6 script Clark 1_M_YOUNGKNIGHT,{ - if (three_qset == 1 && countitem(Elder_Pixie's_Beard) > 29) goto N_QuestComp; + if (three_qset == 1 && countitem(Elder_Pixies_Beard) > 29) goto N_QuestComp; if (three_qset == 1) goto N_QuestStart; mes "[Clark]"; mes "Love to chat, but I'm waiting for someone."; @@ -433,7 +433,7 @@ N_QuestComp: mes "[Czhore]"; mes "Thank god!"; mes " "; - mes "I'm so happy to see one of these Emperiums! Thank you "+strcharinfo(0)+"."; + mes "I'm so happy to see one of these Emperiums! Thank you "+strcharinfo(PC_NAME)+"."; next; mes "[Czhore]"; mes "Here have these 2 Treasure Tokens."; @@ -456,7 +456,7 @@ N_QuestStart: ///////Job list 5/////// //5-1; prt_maze01,18,184,6 script Lithin#01 4_M_CRU_OLD,{ - if (five_qset == 1 && countitem(Wild_Boar's_Mane) > 14) goto N_QuestComp; + if (five_qset == 1 && countitem(Wild_Boars_Mane) > 14) goto N_QuestComp; if (five_qset == 1) goto N_QuestStart; mes "[Lithin]"; mes "Well hello."; @@ -668,7 +668,7 @@ prontera,123,208,6 script Little Girl#thq 4_F_KID3,{ if (seven_qset == 1) goto N_QuestStart; if (eight_qset == 1) goto N_QuestStart2; mes "[Girl]"; - mes "Hello mister "+strcharinfo(0)+"."; + mes "Hello mister "+strcharinfo(PC_NAME)+"."; close; N_QuestComp: mes "[Girl]"; @@ -694,7 +694,7 @@ alberta,101,84,6 script Charles 1_M_02,{ if (seven_qset == 2 && countitem(Merchant_Box_2) > 0) goto N_QuestComp; if (seven_qset == 2) goto N_QuestStart; mes "[Charles]"; - mes "Hello "+strcharinfo(0)+" welcome to Alberta."; + mes "Hello "+strcharinfo(PC_NAME)+" welcome to Alberta."; close; N_QuestComp: mes "[Charles]"; @@ -782,7 +782,7 @@ morocc,165,55,6 script Klye 1_M_02,{ if (eight_qset == 2 && countitem(Merchant_Box_1) > 0) goto N_QuestComp; if (eight_qset == 2) goto N_QuestStart; mes "[Klye]"; - mes "Hello "+strcharinfo(0)+"."; + mes "Hello "+strcharinfo(PC_NAME)+"."; close; N_QuestComp: mes "[Klye]"; @@ -858,7 +858,7 @@ geffen_in,168,124,6 script Mage 1_M_02,{ if (nine_qset == 1 && countitem(Merchant_Box_2) > 0) goto N_QuestComp; if (nine_qset == 1) goto N_QuestStart; mes "[Mage]"; - mes "Hello "+strcharinfo(0)+" welcome to the Mage Guild."; + mes "Hello "+strcharinfo(PC_NAME)+" welcome to the Mage Guild."; close; N_QuestComp: mes "[Mage]"; @@ -873,7 +873,7 @@ N_QuestComp: close; N_QuestStart: mes "[Mage]"; - mes "Hello "+strcharinfo(0)+", Where is my box of Toad Tounges?."; + mes "Hello "+strcharinfo(PC_NAME)+", Where is my box of Toad Tounges?."; close; } //9-2; @@ -955,7 +955,7 @@ morocc,193,51,6 script Kreg 1_M_02,{ if (ten_qset == 1 && countitem(Merchant_Box_2) > 0) goto N_QuestComp; if (ten_qset == 1) goto N_QuestStart; mes "[Kreg]"; - mes "Hello "+strcharinfo(0)+" welcome to Morroc."; + mes "Hello "+strcharinfo(PC_NAME)+" welcome to Morroc."; close; N_QuestComp: mes "[Kreg]"; @@ -975,7 +975,7 @@ N_QuestStart: } //10-2; pay_fild10,145,252,6 script Man#02 2_M_DYEINGER,{ - if (ten_qset == 2 && countitem(Tiger's_Skin) > 0) goto N_QuestComp; + if (ten_qset == 2 && countitem(Tigers_Skin) > 0) goto N_QuestComp; if (ten_qset == 2) goto N_QuestStart; mes "[Man]"; mes "Sorry I'm waiting for someone, you will have to come back later"; @@ -995,12 +995,12 @@ N_QuestStart: mes "[Man]"; mes "Tony the Tiger is on Crack! He must be stoped, KILL HIM!"; mes " "; - mes "Bring me back 1 Tiger's_Skin!"; + mes "Bring me back 1 Tiger's Skin!"; close; } //10-3; cmd_fild08,328,349,4 script Caral 2_M_SWORDMASTER,{ - if (ten_qset == 3 && countitem(Thin_N'_Long_Tongue) > 0) goto N_QuestComp; + if (ten_qset == 3 && countitem(Thin_N_Long_Tongue) > 0) goto N_QuestComp; if (ten_qset == 3) goto N_QuestStart; mes "[Caral]"; mes "Sorry I'm waiting for someone, you will have to come back later."; diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt index 9883950a1..c85a9c9fe 100644 --- a/npc/custom/quests/thq/THQS_TTShop.txt +++ b/npc/custom/quests/thq/THQS_TTShop.txt @@ -154,7 +154,7 @@ function script ths_menu_weapons { // Main script prt_in,164,174,1 script Treasure Hunter's Shop 1_M_YOUNGKNIGHT,{ mes "[Ash]"; - mes "Ahh, "+strcharinfo(0)+"! Welcome to the Offical Treasure Hunter's Guild Shop."; + mes "Ahh, "+strcharinfo(PC_NAME)+"! Welcome to the Offical Treasure Hunter's Guild Shop."; mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!"; next; switch( select("How does this place work?","What do you have in stock?","Nevermind") ) { |