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

4 files changed, 43 insertions, 38 deletions

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?";