From f7390b98e9b1d4f23d522bfeb2575201ee85f467 Mon Sep 17 00:00:00 2001 From: Lupus Date: Mon, 13 Aug 2007 09:13:21 +0000 Subject: replaced some item names with item IDs, also fixed a bug in skill quest (some items weren't deleted) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10992 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 +++ npc/events/custom/uneasy_cemetery.txt | 6 +++--- npc/quests/quests_geffen.txt | 11 +++++----- npc/quests/quests_morocc.txt | 18 ++++++++-------- npc/quests/quests_payon.txt | 10 ++++----- npc/quests/quests_prontera.txt | 17 ++++++++------- npc/quests/skills/alchemist_skills.txt | 37 +++++++++++++++++---------------- npc/quests/skills/blacksmith_skills.txt | 26 ++++++++++++----------- npc/quests/skills/knight_skills.txt | 9 ++++---- npc/quests/skills/monk_skills.txt | 9 ++++---- 10 files changed, 78 insertions(+), 68 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index f78d1e2f2..64248d0b8 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2007/08/13 + * Changed "item names" into item ID constants, added missing [] and fixed a bug in bs skill quest [Lupus] 2007/08/12 * Rev. 10989 Merchant job quest bug fixes. Thanks to Barron-Monster. [L0ne_W0lf] * Rev. 10987 More bug fixes to the 2-1 quests. Priest and Blacksmith specifically. [L0ne_w0lf] @@ -25,6 +27,7 @@ Date Added - Removed Priest quest specific text from acolyte quest file. * Bard Pang Voice quest was checking for the wrong variable. * Fixed a small bug with the Sign Quest XP rewards. [SinSloth] +>>>>>>> .r10991 2007/08/07 * Removed a duplicate related to the Sign Quest. [SinSloth] 2007/08/05 diff --git a/npc/events/custom/uneasy_cemetery.txt b/npc/events/custom/uneasy_cemetery.txt index 068480504..0c219b6d0 100644 --- a/npc/events/custom/uneasy_cemetery.txt +++ b/npc/events/custom/uneasy_cemetery.txt @@ -84,9 +84,9 @@ L_Undead_Walk: next; menu "Yes, have all my Holy Water!",-, "Nope, I need it.",M_NO, "I don't have any.",M_DONT_HAVE; - if ( countitem("Holy_Water")<1 ) goto M_DONT_HAVE; - set $UNEASY_BL,$UNEASY_BL-countitem("Holy_Water"); - delitem "Holy_Water",countitem("Holy_Water"); + if ( countitem(523)<1 ) goto M_DONT_HAVE; + set $UNEASY_BL,$UNEASY_BL-countitem(523); + delitem 523,countitem(523); if ( $UNEASY_BL > 0 ) goto L_NEED_MORE; //set quiet days!!! no more undead for this period! diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt index 34edd26f2..76fadab8c 100644 --- a/npc/quests/quests_geffen.txt +++ b/npc/quests/quests_geffen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 & Samuray22 //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.1 Fixed exploits [Lupus] //= 1.2 Removed Duplicates [Silent] //= 1.3 Updated "Welding Mask" Quest to the Official one. [Samuray22] +//= 1.3a replaced item "names" with item id. Added missing [] [Lupus] //============================================================ @@ -39,13 +40,13 @@ geffen_in,144,166,5 script Blacksmith 63,{ next; switch( select( "Not bad! I will take one.", "It doesn't seem useful.")) { case 1: - if (countitem("Steel") > 49 && Zeny > 1999) { - mes "Blacksmith"; + if (countitem(999) > 49 && Zeny > 1999) { + mes "[Blacksmith]"; mes "Great! I will do it right now!!"; next; - delitem "Steel", 50; + delitem 999, 50; set Zeny, Zeny-2000; - getitem "Welding_Mask", 1; + getitem 2292, 1; mes "[Blacksmith]"; mes "Now you can enjoy the heat!"; mes "Good bye..."; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 09d7af125..fb217a15b 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -15,8 +15,8 @@ //= 1.3a added GM lvl check as in other invansion quests [Lupus] //= 1.4 Fixed a small bug in Dandelion's Request. [SinSloth] //= 1.5 Fixed a little bug with "Job_Alchemist" changed to "Job_Alchem". [Samuray22] -// -Thanks to Nobuo //= 1.6 Fixed a nasty bug in last part of the quest. [SinSloth] +//= 1.6a replaced item "names" with item id. [Lupus] //= 1.7 Fixed a bug with XP rewards. [SinSloth] //============================================================ @@ -45,14 +45,14 @@ morocc_in,142,100,4 script Pierce 89,{ mes "For producing ^3355FF'Stop Post'^000000, we need ^3355FF' 91100 Zeny '^000000"; mes "And 50 ^3355FF' Trunk '^000000 and one ^3355FF' Black Dyestuffs'^000000."; next; - if(countitem("Wooden_Block") > 49 && countitem("Black_Dyestuffs") > 0 && Zeny > 91099) { - delitem "Wooden_Block",50; - delitem "Black_Dyestuffs",1; + if(countitem(1019) > 49 && countitem(983) > 0 && Zeny > 91099) { + delitem 1019,50; + delitem 983,1; set Zeny,Zeny-91100; mes "[Pierce]"; mes "Alright! This is the famous ^3355FF'Stop Post '^000000 of 250 years history!"; mes "Thank you for shopping here! See you soon!"; - getitem "Stop_Post",1; + getitem 2272,1; close; } mes "[Pierce]"; @@ -100,19 +100,19 @@ morocc_in,76,163,4 script Marius 64,5,5{ mes "One ^3355FFGeek Glasses^000000! 100 ^3355FFSteel^000000! And ^3355FF50.000 Zeny^000000!"; close; case 2: - if (countitem("Spinning_Eyes") > 0 && countitem("Steel") > 99 && Zeny > 49999) { + if (countitem(2243) > 0 && countitem(999) > 99 && Zeny > 49999) { mes "[Marius]"; mes "Great! It is great!"; mes "I made one Binoculars!"; mes "And I found the right owner for it!"; next; - delitem "Spinning_Eyes",1; - delitem "Steel", 100; + delitem 2243,1; + delitem 999, 100; set Zeny,Zeny-50000; next; mes "[Marius]"; mes "Here you are... Binoculars!"; - getitem "Binoculars",1; + getitem 2296,1; next; mes "[Marius]"; mes "I hope you won't need to use this Binoculars..."; diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt index 842ae922a..afc71acf0 100644 --- a/npc/quests/quests_payon.txt +++ b/npc/quests/quests_payon.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.4 +//= 1.5a //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 1.3 Fixed exploits [Lupus] //= 1.4 Removed Duplicates [Silent] //= 1.5 Updated Dialogs from "Pretend Murdered Quest" [Samuray22] +//= 1.5a replaced item "names" with item id. [Lupus] //============================================================ @@ -23,7 +24,7 @@ // Pretend Murdered quest //==========================================================================================// payon,154,170,4 script Granny 78,{ - if(countitem("Skirt_Of_Virgin") > 3 ) { + if(countitem(1049) > 3 ) { mes "[Granny in Payon]"; mes "Hey... Is this the item for Skirt of Virgin tHat my children will wear for the coming festival..."; mes "Could you give me some ^3355FF' Skirt of Virgin '^000000 for young girl... I need four of it... please ?"; @@ -31,7 +32,7 @@ payon,154,170,4 script Granny 78,{ next; switch(select( "Give it to her.","No way!")) { case 1: - delitem "Skirt_Of_Virgin",4; + delitem 1049,4; mes "[Granny in Payon]"; mes "Uh-uh... Thank you very much! Now I can make Skirt of Virgin for my children."; mes "Hey... Oh! Yeah! I was in a stage play when I was young..."; @@ -40,7 +41,7 @@ payon,154,170,4 script Granny 78,{ mes "[Granny in Payon]"; mes "Take it if you like it... please!"; mes "Good bye! Nice meeting you..."; - getitem "Pretend_Murdered",1; + getitem 2293,1; close; case 2: mes "[Granny in Payon]"; @@ -279,5 +280,4 @@ payon_in01,56,12,4 script Young Man#12 89,{ mes "[Young Man]"; mes "Fine then....."; close; - } diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index 8cee78a3e..2aa06a979 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.7b +//= 1.7c //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -30,6 +30,7 @@ //= 1.6a Fixed a couple spelling mistakes. [L0ne_W0lf] //= 1.7 Updated "Ph.D Quest" Dialogs. [Samuray22] //= 1.7b Fixed some minor typos. [SinSloth] +//= 1.7c replaced item "names" with item id. [Lupus] //============================================================ // Prontera Culvert @@ -150,7 +151,7 @@ prt_fild05,270,212,5 script Culvert Guardian 105,{ // Ph.D Hat Quest //============================================================ prt_in,38,108,3 script Teacher 53,{ - if(countitem("Illusion_Flower") > 0 && countitem("Hinalle") > 0 && countitem("Aloe") > 0 && countitem("Ment") > 0) { + if(countitem(710) > 0 && countitem(703) > 0 && countitem(704) > 0 && countitem(708) > 0) { mes "[Teacher]"; mes "My God! The Flower you are holding..."; next; @@ -164,12 +165,12 @@ prt_in,38,108,3 script Teacher 53,{ mes "If you give them to me... I... I will give my precious item..."; close; case 2: - if(countitem("Illusion_Flower") > 0 && countitem("Hinalle") > 0 && countitem("Aloe") > 0 && countitem("Ment") > 0) { - delitem "Illusion_Flower",1; - delitem "Hinalle",1; - delitem "Aloe",1; - delitem "Ment",1; - getitem "Ph.D_Hat",1; + if(countitem(710) > 0 && countitem(703) > 0 && countitem(704) > 0 && countitem(708) > 0) { + delitem 710,1; + delitem 703,1; + delitem 704,1; + delitem 708,1; + getitem 5012,1; mes "[Teacher]"; mes "Thank you so much! First time in my life someone is nice to me!"; mes "I will give you my precious item like I promised you."; diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt index caa1cc315..a19f66f71 100644 --- a/npc/quests/skills/alchemist_skills.txt +++ b/npc/quests/skills/alchemist_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Lupus, Reddozen, Samuray22 //===== Current Version: ===================================== -//= 1.8 +//= 1.8a //===== Compatible With: ===================================== //= eAthena Revision 3800+ //===== Description: ========================================= @@ -24,6 +24,7 @@ //= 1.6 Moved some NPCs related to Lighthalzen quests. [SinSloth] //= 1.7 Updated "Elemental Potion Creation Quest" to the official one. [Samuray22] //= 1.8 Added some missing NPCs from the Laboratory. [Samuray22] +//= 1.8a replaced item "names" with item id [Lupus] //============================================================ @@ -176,11 +177,11 @@ yuno_in04,33,108,6 script Pisruik Quv 883,{ mes "[Pisruik]"; mes "Let's see..."; next; - if (countitem("Yellow_Gemstone") > 4 && countitem("Empty_Potion") > 3 && countitem("Heart_Of_Mermaid") > 9 && countitem("Powder_Of_Butterfly") > 9) { - delitem "Yellow_Gemstone", 5; - delitem "Empty_Potion", 4; - delitem "Heart_Of_Mermaid", 10; - delitem "Powder_Of_Butterfly",10; + if (countitem(715) > 4 && countitem(1093) > 3 && countitem(950) > 9 && countitem(924) > 9) { + delitem 715, 5; + delitem 1093, 4; + delitem 950, 10; + delitem 924,10; set ALCHE_SK, 3; mes "[Pisruik]"; mes "Good."; @@ -382,8 +383,8 @@ yuno_in04,33,108,6 script Pisruik Quv 883,{ close; } } else if(ALCHE_SK == 6) { //Second Item - if (countitem("Blossom_Of_Maneater") > 19) { - delitem "Blossom_Of_Maneater", 20; + if (countitem(1032) > 19) { + delitem 1032, 20; set ALCHE_SK, 7; mes "[Pisruij]"; mes "...Thanks a lot."; @@ -468,8 +469,8 @@ yuno_in04,33,108,6 script Pisruik Quv 883,{ mes "Please..?"; close; } else if(ALCHE_SK == 8) { - if (countitem("Blossom_Of_Maneater") > 0) { - delitem "Blossom_Of_Maneater", 1; + if (countitem(1032) > 0) { + delitem 1032, 1; set ALCHE_SK, 7; mes "[Pisruik]"; mes "...Thanks."; @@ -554,10 +555,10 @@ yuno_in04,33,108,6 script Pisruik Quv 883,{ mes " == he looks much, much better =="; mes " == without his glasses. =="; next; - switch( select( "Give'Something'.", "Don't give him anything.")) { + switch( select( "Give 'Something'.", "Don't give him anything.")) { case 1: - if (countitem("Glasses") > 0) { - delitem "Glasses", 1; + if (countitem(2203) > 0) { + delitem 2203, 1; set ALCHE_SK, 10; mes " == I gave him the set of glasses =="; next; @@ -610,7 +611,7 @@ yuno_in04,33,108,6 script Pisruik Quv 883,{ mes " == of the medicine =="; next; set ALCHE_SK, 11; - getitem "Elemental_Create_Book", 1; + getitem 7434, 1; mes "[Pisruik]"; mes "...I think that"; mes "You can put this to a good use."; @@ -676,7 +677,7 @@ yuno_in04,33,108,6 script Pisruik Quv 883,{ mes " == of the medicine =="; next; set ALCHE_SK, 11; - getitem "Elemental_Create_Book", 1; + getitem 7434, 1; mes "[Pisruik]"; mes "...I think that"; mes "You can put this to a good use."; @@ -708,16 +709,16 @@ yuno_in04,33,108,6 script Pisruik Quv 883,{ close; } } else if(ALCHE_SK == 11) { - if (countitem("Elemental_Create_Book") == 0) { + if (countitem(7434) == 0) { mes "[Pisruik]"; mes "....I guess,"; mes "You haven't found much use for that item."; close; - } else if(countitem("Elemental_Create_Book") == 1) { + } else if(countitem(7434) == 1) { mes "[Pisruik]"; mes "Has the item been very helpful to you?"; close; - } else if(countitem("Elemental_Create_Book") > 1) { + } else if(countitem(7434) > 1) { mes "[Pisruik]"; mes "...."; mes "Well....I'm selling these but"; diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index 00409444c..caaabf74b 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Lupus, Reddozen, Samuray22 //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena Revision 3800+ //===== Description: ========================================= @@ -20,6 +20,8 @@ //= 1.3b Splitted into different files [DracoRPG] //= 1.3c Inverted the weight check for Greed [DracoRPG] //= 1.4 Updated to the official One [Samuray22] +//= 1.5 replaced item "names" with item id. Fixed a bug with +//= item deletion [Lupus] //============================================================ //============================================================ @@ -229,7 +231,7 @@ geffen,178,72,5 script Akki 726,{ close; } } else if(BLACK_SK == 1) { - if(countitem("Steel") > 0 && countitem("Coal") > 4 && countitem("Detrimindexta") > 0 && countitem("Iron_Hammer") > 0) { + if(countitem(999) > 0 && countitem(1003) > 4 && countitem(971) > 0 && countitem(613) > 0) { if (Zeny >= 500) { mes "[Akki]"; mes "Oh yay~ you got all the materials?"; @@ -246,10 +248,10 @@ geffen,178,72,5 script Akki 726,{ mes "the materials, so"; mes "wait a few"; mes "moments~"; - delitem "Coal", 5; - delitem "Steel", 1; - delitem "Detrimindexta", 1; - delitem "Iron_Hammer", 1; + delitem 1003, 5; + delitem 999, 1; + delitem 971, 1; + delitem 613, 1; set Zeny, Zeny-500; set BLACK_SK, 2; close; @@ -321,14 +323,14 @@ geffen,178,72,5 script Akki 726,{ set BLACK_SK, 3; close; } else if(BLACK_SK == 3) { - if (countitem("Steel") > 0 && countitem("Coal") > 2) { + if (countitem(999) > 0 && countitem(1003) > 2) { mes "[Akki]"; mes "Oh~ You brought them~!"; mes "Yay~ Really, thanks~"; mes "I'll do better this time."; mes "Wait a few moments."; - delitem "Steel", 1; - delitem "Coal", 3; + delitem 999, 1; + delitem 1003, 3; set BLACK_SK, 4; close; } @@ -372,7 +374,7 @@ geffen,178,72,5 script Akki 726,{ set BLACK_SK, 5; close; } else if(BLACK_SK == 5) { - if (countitem("Iron_Hammer") > 0) { + if (countitem(613) > 0) { mes "[Akki]"; mes "Oh~!!"; mes "You brought it~!"; @@ -382,7 +384,7 @@ geffen,178,72,5 script Akki 726,{ mes "Then I will really really"; mes "teach you, so just"; mes "wait a little~"; - delitem Iron_Hammer, 1; + delitem 613, 1; set BLACK_SK, 6; close; } @@ -606,7 +608,7 @@ geffen,172,52,7 script Goodday 826,{ } } else if(BLACK_SK2 == 1) { // Check if you can carry 25 golds (Gold weight 20 = 20*25 = 500), - if(checkweight("Gold",25) == 1) { + if(checkweight(969,25) == 1) { mes "[Goodday]"; mes "Mm~ back already."; mes "Well, without checking, I can tell"; diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt index 41feec727..f26ef6c57 100644 --- a/npc/quests/skills/knight_skills.txt +++ b/npc/quests/skills/knight_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Lupus, Reddozen, Samuray22 //===== Current Version: ===================================== -//= 1.4 +//= 1.4a //===== Compatible With: ===================================== //= eAthena Revision 3800+ //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] //= 1.4 Updated to the Official One. [Samuray22] +//= 1.4a replaced item "names" with item id [Lupus] //============================================================ //============================================================ @@ -54,7 +55,7 @@ prt_in,85,99,6 script Aesop 734,{ } else if(KNGT_SK == 8) { set KNGT_SK, 9; goto K_Learn; - } else if(KNGT_SK == 7 && countitem("Candy_Striper") > 4 && countitem("Witherless_Rose") > 2) { + } else if(KNGT_SK == 7 && countitem(530) > 4 && countitem(748) > 2) { mes "[Aesop]"; mes "...The Candy cane and Witherless Rose"; mes "you brought, can you please"; @@ -93,8 +94,8 @@ prt_in,85,99,6 script Aesop 734,{ mes "In return, I present you"; mes "a skill I discovered in my days."; next; - delitem "Candy_Striper", 5; - delitem "Witherless_Rose", 3; + delitem 530, 5; + delitem 748, 3; set KNGT_SK, 8; mes "[Aesop]"; mes "It's not much, but"; diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt index 93051253a..456e64d63 100644 --- a/npc/quests/skills/monk_skills.txt +++ b/npc/quests/skills/monk_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Lupus, Reddozen, Samuray22 //===== Current Version: ===================================== -//= 1.4 +//= 1.4a //===== Compatible With: ===================================== //= eAthena Revision 3800+ //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] //= 1.4 Updated to the official one. [Samuray22] +//= 1.4a replaced item "names" with item id. [Lupus] //============================================================ //============================================================ @@ -348,7 +349,7 @@ prt_monk,129,263,3 script Monk 823,{ mes "while travelling, feel free to"; mes "return and tell me."; close; - } else if(MONK_SK == 4 && countitem("Stem") > 19 && countitem("Shoot") > 2) { + } else if(MONK_SK == 4 && countitem(905) > 19 && countitem(711) > 2) { mes "[Monk]"; mes "...Stubborn fool."; mes "Over 20 stems and 3 Shoots."; @@ -371,8 +372,8 @@ prt_monk,129,263,3 script Monk 823,{ mes "used properly and the"; mes "knowledge goes to waste."; next; - delitem "Stem",20; - delitem "Shoot", 3; + delitem 905,20; + delitem 711, 3; set MONK_SK, 5; mes "[Monk]"; mes "Hmm... you still want to learn?"; -- cgit v1.2.3-60-g2f50