ItemID to Constant: quests/woe Folder

7 files changed, 96 insertions, 96 deletions

diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index 96b6e628e..a819942d1 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -108,7 +108,7 @@ prt_church,179,15,1	script	Priest Praupin	4_M_MINISTER,{
 		mes "Ah, he's away at the convent right now. If you want to meet Bishop Maugins in the Saint Capitolina Convent, travel ^3131FFnorth^000000, ^3131FFeast^000000, ^3131FFeast^000000 and then ^3131FFeast^000000 from Prontera.";
 		close;
 	case 22:
-		if(countitem(7181) > 0){	// Receipt_01
+		if(countitem(Receipt_01) > 0){	// Receipt_01
 			emotion e_gasp;
 			mes "Oh my, you seem";
 			mes "to be growing quickly";
@@ -135,14 +135,14 @@ prt_church,179,15,1	script	Priest Praupin	4_M_MINISTER,{
 			next;
 			switch(select("Wand:Flail")) {
 			case 1:
-				delitem 7181,1; //Receipt_01
+				delitem Receipt_01,1;
 				tu_acolyte01 = 23;
-				getitem 1604,1; //Wand
+				getitem Wand,1;
 				break;
 			case 2:
-				delitem 7181,1; //Receipt_01
+				delitem Receipt_01,1;
 				tu_acolyte01 = 23;
-				getitem 1510,1; //Flail
+				getitem Flail,1;
 				break;
 			}
 			close;
@@ -346,8 +346,8 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			mes "I hope you";
 			mes "have a safe trip.";
 			tu_acolyte01 = 4;
-			getitem 1504,1; //Mace
-			getitem 602,1; //Wing_Of_Butterfly
+			getitem Mace,1;
+			getitem Wing_Of_Butterfly,1;
 			savepoint "prt_monk",30,250;
 			close;
 		} else {
@@ -369,7 +369,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		break;
 	case 4:
 		if(getskilllv("AL_HEAL") > 2){
-			if(countitem(1504) > 0){
+			if(countitem(Mace) > 0){
 				mes "Oh my!";
 				mes "Welcome back~";
 				mes "I see that you've";
@@ -396,7 +396,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 				mes "You have returned the Mace.";
 				emotion e_heh;
 				tu_acolyte01 = 5;
-				delitem 1504, 1; //Mace
+				delitem Mace, 1;
 				if(Class == Job_Acolyte_High) {
 					getexp 2000,1000;
 					specialeffect2 EF_CONE;
@@ -460,7 +460,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "However, I'm a little busy with";
 		mes "my work right now, so would you deliver this to Priest Gardron in the next building for me?";
 		tu_acolyte01 = 7;
-		getitem 7148,1; //Mother_Letter
+		getitem Mother_Letter,1;
 		close;
 	case 7:
 		mes "Would you please";
@@ -707,10 +707,10 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			mes "Why don't you put some of your things in Kafra Storage first?";
 		} else {
 			tu_acolyte01 = 18;
-			getitem 7183,1; //Sister_Letter
-			getitem 7181,1; //Receipt_01
-			getitem 1081,2; //Merchant_Box_1
-			getitem 7148,1; //Mother_Letter
+			getitem Sister_Letter,1;
+			getitem Receipt_01,1;
+			getitem Merchant_Box_1,2;
+			getitem Mother_Letter,1;
 		}
 		close;
 	case 18:
@@ -817,7 +817,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 	mes "[Priest Gardron]";
 	if(tu_acolyte01 == 7){
-		if(countitem(7148) >= 1){
+		if(countitem(Mother_Letter) >= 1){
 			mes "Hmm...?";
 			mes "What's that?";
 			mes "You have something for me?";
@@ -831,7 +831,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 			mes "her, especially since";
 			mes "she is getting old now, but I'm relieved to hear that her health";
 			mes "is good. We are truly blessed...";
-			delitem 7148,1; //Mother_Letter
+			delitem Mother_Letter,1;
 			tu_acolyte01 = 8;
 			close;
 		} else {
@@ -874,7 +874,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 			else
 				getexp 2000,2000;
 			specialeffect2 EF_CONE;
-			//getitem 505,1; //Blue_Potion
+			//getitem Blue_Potion,1;
 			close;
 		} else {
 			if (RENEWAL) {
@@ -1224,7 +1224,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	4_F_04,{
 //== Veiner ================================================
 prt_monk,197,228,3	script	Veiner	4_M_ORIENT02,{
 	mes "[Veiner]";
-	if(countitem(1081) && tu_acolyte01 == 18){
+	if(countitem(Merchant_Box_1) && tu_acolyte01 == 18){
 		mes "So very exhausted...";
 		mes "Should I just go back home?";
 		next;
@@ -1247,7 +1247,7 @@ prt_monk,197,228,3	script	Veiner	4_M_ORIENT02,{
 		mes "Thank you very much for delivering this to me. Sorry, but I'm always excited to hear from my cutie pie~";
 		emotion e_thx;
 		tu_acolyte01 = 19;
-		delitem 1081,1; //Merchant_Box_1
+		delitem Merchant_Box_1,1;
 		close;
 	} else if(tu_acolyte01 > 18){
 		mes "I can't wait";
@@ -1272,7 +1272,7 @@ prt_monk,28,260,5	script	Hedrick	1_M_04,{
 	mes "And so efficiently too!";
 	mes "Awesome job as usual,";
 	mes "Hedrick. You're number one!";
-	if(countitem(7148)==0 || tu_acolyte01 != 19) close;
+	if(countitem(Mother_Letter)==0 || tu_acolyte01 != 19) close;
 	next;
 	mes "[Hedrick]";
 	mes "Oh...?";
@@ -1293,16 +1293,16 @@ prt_monk,28,260,5	script	Hedrick	1_M_04,{
 	mes "Here, why don't";
 	mes "you have one of the";
 	mes "cookies she sent me?";
-	delitem 7148,1; //Mother_Letter
+	delitem Mother_Letter,1;
 	tu_acolyte01 = 20;
-	getitem 538,1; //Well_Baked_Cookie
+	getitem Well_Baked_Cookie,1;
 	close;
 }
 
 //== Weapon Merchant =======================================
 prt_monk,136,261,0	script	Weapon Merchant#tu	HIDDEN_WARP_NPC,9,9,{
 OnTouch:
-	if(tu_acolyte01 != 20 || countitem(1081)==0) end;
+	if(tu_acolyte01 != 20 || countitem(Merchant_Box_1)==0) end;
 	mes "[Weapon Merchant]";
 	mes "The stuff I requested from the guild is finally here!";
 	mes "It's pretty tough to keep everything in stock since this is such a remote place.";
@@ -1311,7 +1311,7 @@ OnTouch:
 	mes "Hey, thanks so much!";
 	mes "Oh, and come here if";
 	mes "you need anything, okay?";
-	delitem 1081,1; //Merchant_Box_1
+	delitem Merchant_Box_1,1;
 	tu_acolyte01 = 21;
 	close;
 }
@@ -1320,7 +1320,7 @@ OnTouch:
 monk_in,103,176,7	script	Karven	1_M_PASTOR,{
 	mes "[Karven]";
 	mes "May you rest";
-	if(tu_acolyte01 == 21 && countitem(7183)){
+	if(tu_acolyte01 == 21 && countitem(Sister_Letter)){
 		delitem 7183, 1;
 		tu_acolyte01 = 22;
 		mes "in peace forever...";
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 1f3506428..064f3fd9f 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -759,7 +759,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 					mes "[Reidin Corse]";
 					mes "Here's a little something to encourage you. Since Mandagora are Earth property monsters, these Fire Arrows will work really well.";
 					tu_archer01 = 8;
-					getitem 1752,300; //Fire_Arrow
+					getitem Fire_Arrow,300;
 					next;
 				}
 				mes "[Reidin Corse]";
@@ -794,7 +794,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "learned Vulture's Eye!";
 				mes "Why did I spend so much time explaining about it? Well, I guess we're ready to move on to the next lesson...";
 				tu_archer01 = 9;
-				getitem 1752,500; //Fire_Arrow
+				getitem Fire_Arrow,500;
 				close;
 			}
 		} else if(tu_archer01 == 8){
@@ -832,7 +832,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "Ah, so you've learned";
 				mes "a little something about Vulture's Eye! What do you think about it now? Ah, and here's a little reward for you before I start the next lesson~";
 				tu_archer01 = 9;
-				getitem 1752,500; //Fire_Arrow
+				getitem Fire_Arrow,500;
 				close;
 			}
 		} else if(tu_archer01 == 9){
@@ -938,12 +938,12 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			tu_archer01 = 11;
 			close;
 		} else if(tu_archer01 == 11){
-			if (RENEWAL && countitem(940) < 10) {
+			if (RENEWAL && countitem(Grasshopper's_Leg) < 10) {
 				mes "Hey...";
 				mes "You gotta bring";
 				mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!";
 				close;
-			} else if (!RENEWAL && (countitem(962) < 10 || countitem(991) == 0)) {
+			} else if (!RENEWAL && (countitem(Tentacle) < 10 || countitem(Crystal_Blue) == 0)) {
 				mes "Hey...";
 				mes "You gotta bring";
 				mes "^3131FF10 Tentacles^000000 and";
@@ -965,9 +965,9 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				specialeffect2 EF_WIND;
 				tu_archer01 = 12;
 				if (RENEWAL)
-					delitem 940,10; //Grasshopper's_Leg
+					delitem Grasshopper's_Leg,10;
 				getexp 1000,1000;
-				getitem 1707,1; //Great_Bow
+				getitem Great_Bow,1;
 				close;
 			}
 		} else if(tu_archer01 == 12){
@@ -1037,20 +1037,20 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "This stuff is just a little something to encourage you, so don't take it the wrong way! Now hurry up, get what I asked for,";
 				mes "and come back!";
 				tu_archer01 = 14;
-				getitem 601,10; //Wing_Of_Fly
-				getitem 501,10; //Red_Potion
-				getitem 602,1; //Wing_Of_Butterfly
+				getitem Wing_Of_Fly,10;
+				getitem Red_Potion,10;
+				getitem Wing_Of_Butterfly,1;
 				close;
 			}
 		} else if((tu_archer01 == 14) || (tu_archer01 == 15)){
-			if (RENEWAL && (countitem(906) < 10 || countitem(921) < 10)) {
+			if (RENEWAL && (countitem(Pointed_Scale) < 10 || countitem(Mushroom_Spore) < 10)) {
 				mes "Remember, you";
 				mes "need to head into";
 				mes "the forest east of Payon and get me";
 				mes "^3131FF10 Mushroom Spores^000000";
 				mes "and ^3131FF10 Pointed Scales^000000.";
 				close;
-			} else if (!RENEWAL && (countitem(1032) < 5 || countitem(905) < 20)) {
+			} else if (!RENEWAL && (countitem(Blossom_Of_Maneater) < 5 || countitem(Stem) < 20)) {
 				mes "Remember, you";
 				mes "need to head over to";
 				mes "Mt. Mjolnir and get me";
@@ -1101,7 +1101,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				getexp 1000,1000;
 			else
 				getexp 3000,3000;
-			getitem 1770,500; //Iron_Arrow
+			getitem Iron_Arrow,500;
 			next;
 			mes "[Reidin Corse]";
 			mes "Well, it's like you're a full fledged Archer now. Honestly,";
@@ -1559,7 +1559,7 @@ pay_arche,76,135,3	script	#Target	HIDDEN_NPC,{ end; }
 pay_arche,130,113,3	script	Alchemist Guildmember#tu	2_M_ALCHE,{
 	mes "[Alchemist Guildmember]";
 	if(tu_archer02 > 0){
-		if((countitem(1032) > 0) || (countitem(905) > 0 )){	// Blossom_Of_Maneater & Stem
+		if((countitem(Blossom_Of_Maneater) > 0) || (countitem(Stem) > 0 )){	// Blossom_Of_Maneater & Stem
 			mes "Great...!";
 			mes "I've been waiting";
 			mes "for the Icarus Guild";
@@ -1583,18 +1583,18 @@ pay_arche,130,113,3	script	Alchemist Guildmember#tu	2_M_ALCHE,{
 				mes "Flora field! I really";
 				mes "appreciate your help~";
 
-				.@alche_f = countitem(1032); // Blossom_Of_Maneater
-				.@alche_s = countitem(905); // Stem
+				.@alche_f = countitem(Blossom_Of_Maneater); // Blossom_Of_Maneater
+				.@alche_s = countitem(Stem); // Stem
 				.@f_zeny = .@alche_f * 130;
 				.@s_zeny = .@alche_s * 30;
 				.@total_zeny = .@f_zeny + .@s_zeny;
-				if(countitem(1032) == 0){
-					delitem 905, .@alche_s; //Stem
-				} else if(countitem(905) == 0){
-					delitem 1032, .@alche_f; //Blossom_Of_Maneater
+				if(countitem(Blossom_Of_Maneater) == 0){
+					delitem Stem, .@alche_s;
+				} else if(countitem(Stem) == 0){
+					delitem Blossom_Of_Maneater, .@alche_f;
 				} else {
-					delitem 1032, .@alche_f; //Blossom_Of_Maneater
-					delitem 905, .@alche_s; //Stem
+					delitem Blossom_Of_Maneater, .@alche_f;
+					delitem Stem, .@alche_s;
 				}
 				Zeny += .@total_zeny;
 				close;
diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt
index 282ad6a50..787d64498 100644
--- a/npc/quests/first_class/tu_ma_th01.txt
+++ b/npc/quests/first_class/tu_ma_th01.txt
@@ -297,7 +297,7 @@ moc_fild11,205,52,0	script	Trace of Battle#5	CLEAR_NPC,{
 			mes "^3355FFThe traces of the battle";
 			mes "now split and head towards";
 			mes "the north and south. However,^000000";
-			if(countitem(506) == 0){
+			if(countitem(Green_Potion) == 0){
 				mes "^3355FFthere is a puddle of strong poison that you must neutralize before you can investigate this scene.^000000";
 				close;
 			} else {
@@ -366,7 +366,7 @@ moc_fild11,205,52,0	script	Trace of Battle#5	CLEAR_NPC,{
 			mes "^3355FFThe traces of the battle";
 			mes "now split and head towards";
 			mes "the north and south. However,^000000";
-			if(countitem(506) == 0){
+			if(countitem(Green_Potion) == 0){
 				mes "^3355FFthere is a puddle of strong poison that you must neutralize before you can investigate this scene.^000000";
 				close;
 			} else {
@@ -979,7 +979,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 				next;
 				switch(select("Pour Green Potion.:Don't use Green Potion.")){
 				case 1:
-					if(countitem(506) < 1){
+					if(countitem(Green_Potion) < 1){
 						mes "^3355FFUnfortunately, you";
 						mes "don't have a Green";
 						mes "Potion that you can";
@@ -991,7 +991,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 						mes "really make anything";
 						mes "happen. Perhaps you";
 						mes "should try something else.^000000";
-						delitem 506,1; //Green_Potion
+						delitem Green_Potion,1;
 						tu_thief01 = 23;
 						close;
 					}
@@ -1012,8 +1012,8 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 				close;
 			}
 		} else if(tu_thief01 == 23){
-			if(countitem(511) > 0 || countitem(716) > 0){
-				if(countitem(511) > 0 && countitem(716) > 0){
+			if(countitem(Green_Herb) > 0 || countitem(Red_Gemstone) > 0){
+				if(countitem(Green_Herb) > 0 && countitem(Red_Gemstone) > 0){
 					mes "^3355FFYou try grinding";
 					mes "a Green Herb and";
 					mes "sprinkling it on the";
@@ -1029,11 +1029,11 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 					mes "to successfully dismantle";
 					mes "the trap. Now you can safely";
 					mes "check what might be inside.^000000";
-					delitem 511,1; //Green_Herb
-					delitem 716,1; //Red_Gemstone
+					delitem Green_Herb,1;
+					delitem Red_Gemstone,1;
 					tu_thief01 = 24;
 					close;
-				} else if(countitem(511) > 0){
+				} else if(countitem(Green_Herb) > 0){
 					mes "^3355FFYou should try to";
 					mes "dismantle this trap";
 					mes "by using other catalysts";
@@ -1133,7 +1133,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 				next;
 				switch(select("Pour Green Potion.:Don't use Green Potion.")){
 				case 1:
-					if(countitem(506) < 1){
+					if(countitem(Green_Potion) < 1){
 						mes "^3355FFUnfortunately, you";
 						mes "don't have a Green";
 						mes "Potion that you can";
@@ -1145,7 +1145,7 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 						mes "really make anything";
 						mes "happen. Perhaps you";
 						mes "should try something else.^000000";
-						delitem 506,1; //Green_Potion
+						delitem Green_Potion,1;
 						tu_magician01 = 23;
 						close;
 					}
@@ -1166,8 +1166,8 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 				close;
 			}
 		} else if(tu_magician01 == 23){
-			if(countitem(511) > 0 || countitem(716) > 0){
-				if(countitem(511) > 0 && countitem(716) > 0){
+			if(countitem(Green_Herb) > 0 || countitem(Red_Gemstone) > 0){
+				if(countitem(Green_Herb) > 0 && countitem(Red_Gemstone) > 0){
 					mes "^3355FFYou try grinding";
 					mes "a Green Herb and";
 					mes "sprinkling it on the";
@@ -1183,11 +1183,11 @@ moc_fild18,109,197,0	script	Trace of Battle#15	CLEAR_NPC,{
 					mes "to successfully dismantle";
 					mes "the trap. Now you can safely";
 					mes "check what might be inside.^000000";
-					delitem 511,1; //Green_Herb
-					delitem 716,1; //Red_Gemstone
+					delitem Green_Herb,1;
+					delitem Red_Gemstone,1;
 					tu_magician01 = 24;
 					close;
-				} else if(countitem(511) > 0){
+				} else if(countitem(Green_Herb) > 0){
 					mes "^3355FFYou should try to";
 					mes "dismantle this trap";
 					mes "by using other catalysts";
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index 1998ccb89..22c1c4b43 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -485,7 +485,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "all 10 Chrysalis from hunting";
 		mes "all of those Pupa. Hmmmm...";
 		next;
-		if (countitem(915) < 10) {
+		if (countitem(Chrysalis) < 10) {
 			mes "[Mana]";
 			mes "Aw, you don't";
 			mes "have enough of";
@@ -516,7 +516,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "like I asked? I hope so...";
 		mes "Because I'm going to check~";
 		next;
-		if(countitem(915) < 10){
+		if(countitem(Chrysalis) < 10){
 			mes "[Mana]";
 			mes "Whoa, you need";
 			mes "more than just this.";
@@ -710,7 +710,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "training. I hope it comes";
 				mes "in handy when fighting...";
 				tu_magician01 = 6;
-				getitem 1604,1; //Wand
+				getitem Wand,1;
 				specialeffect2 EF_HIT5;
 				if(.@skill_e1) getexp 300,100;
 				if(.@skill_e2) getexp 300,100;
@@ -804,7 +804,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "out both of our guilds. Once";
 		mes "again, thanks very much~";
 		tu_magician01 = 28;
-		getitem 2321,1; //Silk_Robe
+		getitem Silk_Robe,1;
 		Zeny += 3000;
 		getexp 3000,1000;
 		close;
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index 9b863bf7f..ecb900535 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -575,7 +575,7 @@ alberta_in,70,51,5	script	Guarnien	4W_M_02,{
 				tu_merchant = 2;
 				changequest 8229, 8230;
 				getexp 58,11;
-				getitem 1351,1; //Battle_Axe
+				getitem Battle_Axe,1;
 				next;
 				mes "[Guarnien]";
 				mes "Alright, next time";
@@ -642,7 +642,7 @@ alberta_in,70,51,5	script	Guarnien	4W_M_02,{
 				tu_merchant = 2;
 				setquest 8230;
 				getexp 58,11;
-				getitem 1351,1; //Battle_Axe
+				getitem Battle_Axe,1;
 				next;
 				mes "[Guarnien]";
 				mes "Alright, next time";
@@ -711,7 +711,7 @@ prontera,66,111,3	script	Sagle	4_KID01,{
 			} else {
 				Zeny -= 420;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -759,7 +759,7 @@ prontera,66,111,3	script	Sagle	4_KID01,{
 			} else {
 				Zeny -= 410;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -806,7 +806,7 @@ prontera,66,111,3	script	Sagle	4_KID01,{
 			} else {
 				Zeny -= 390;
 				tu_merchant = 9;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -862,7 +862,7 @@ prontera,93,330,3	script	Kellion	4W_M_01,{
 			} else {
 				Zeny -= 340;
 				tu_merchant = 10;
-				getitem 569,10; //Novice_Potion
+				getitem Novice_Potion,10;
 				close;
 			}
 		case 2:
@@ -901,7 +901,7 @@ prontera,93,330,3	script	Kellion	4W_M_01,{
 			} else {
 				Zeny -= 390;
 				tu_merchant = 9;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -940,7 +940,7 @@ prontera,93,330,3	script	Kellion	4W_M_01,{
 			} else {
 				Zeny -= 400;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -999,7 +999,7 @@ prt_in,169,11,3	script	Aigie	4_F_03,{
 			} else {
 				Zeny -= 390;
 				tu_merchant = 9;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -1044,7 +1044,7 @@ prt_in,169,11,3	script	Aigie	4_F_03,{
 			} else {
 				Zeny -= 420;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -1089,7 +1089,7 @@ prt_in,169,11,3	script	Aigie	4_F_03,{
 			} else {
 				Zeny -= 340;
 				tu_merchant = 10;
-				getitem 569,10; //Novice_Potion
+				getitem Novice_Potion,10;
 				close;
 			}
 		case 2:
@@ -1143,7 +1143,7 @@ prontera,247,129,3	script	Jayon	4_M_03,{
 			} else {
 				Zeny -= 410;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -1189,7 +1189,7 @@ prontera,247,129,3	script	Jayon	4_M_03,{
 			} else {
 				Zeny -= 400;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -1236,7 +1236,7 @@ prontera,247,129,3	script	Jayon	4_M_03,{
 			} else {
 				Zeny -= 410;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -1290,7 +1290,7 @@ prt_in,251,129,3	script	Maos	4_M_SEAMAN,{
 			} else {
 				Zeny -= 420;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -1325,7 +1325,7 @@ prt_in,251,129,3	script	Maos	4_M_SEAMAN,{
 			} else {
 				Zeny -= 340;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
@@ -1360,7 +1360,7 @@ prt_in,251,129,3	script	Maos	4_M_SEAMAN,{
 			} else {
 				Zeny -= 400;
 				tu_merchant = 10;
-				getitem 501,10; //Red_Potion
+				getitem Red_Potion,10;
 				close;
 			}
 		case 2:
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 6dfb3f33a..a735ae219 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -131,7 +131,7 @@ izlude_in,82,163,3	script	Shurank	4_M_JOB_KNIGHT1,{
 				getexp 186,0;
 			else
 				getexp 1860,0;
-			getitem 1113,1; //Scimiter
+			getitem Scimiter,1;
 			next;
 			mes "[Shurank]";
 			mes "That is all I have to teach you about Swordman skills. Hopefully, I've been able to clear up anything you haven't understood about your job and skills.";
@@ -186,7 +186,7 @@ izlude_in,82,163,3	script	Shurank	4_M_JOB_KNIGHT1,{
 		mes "I hope that you make good use of it as you train to become stronger and stronger. Good luck out there.";
 		tu_swordman = 23;
 		completequest 8228;
-		getitem 1113,1; //Scimiter
+		getitem Scimiter,1;
 		close;
 	case 21:
 		mes "Ah, you've returned. I've just received a communique from";
@@ -748,7 +748,7 @@ izlude_in,82,163,3	script	Shurank	4_M_JOB_KNIGHT1,{
 				getexp 97,0;
 			else
 				getexp 970,0;
-			getitem 2503,1; //Muffler
+			getitem Muffler,1;
 			close;
 		} else {
 			mes "[Shurank]";
@@ -802,7 +802,7 @@ izlude_in,82,163,3	script	Shurank	4_M_JOB_KNIGHT1,{
 				getexp 97,0;
 			else
 				getexp 970,0;
-			getitem 2503,1; //Muffler
+			getitem Muffler,1;
 			close;
 		} else {
 			mes "[Shurank]";
@@ -892,7 +892,7 @@ izlude_in,82,163,3	script	Shurank	4_M_JOB_KNIGHT1,{
 				getexp 97,0;
 			else
 				getexp 970,0;
-			getitem 2503,1; //Muffler
+			getitem Muffler,1;
 			close;
 		} else {
 			mes "[Shurank]";
@@ -1000,7 +1000,7 @@ izlude_in,82,163,3	script	Shurank	4_M_JOB_KNIGHT1,{
 				getexp 97,0;
 			else
 				getexp 970,0;
-			getitem 2503,1; //Muffler
+			getitem Muffler,1;
 			close;
 		}
 	}
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index c593d8b93..b446458b8 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -368,14 +368,14 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 			mes "You can go ahead and kill Pickies to get those. It really shouldn't be that hard. Oh, and use this Wing thingee to come back.";
 			tu_thief01 = 5;
 			savepoint "moc_ruins",80,164;
-			getitem 602,1; //Wing_Of_Butterfly
+			getitem Wing_Of_Butterfly,1;
 			getexp 100,50;
 			specialeffect2 EF_HIT5;
 			close2;
 			warp "moc_fild12",158,373;
 			end;
 		} else if(tu_thief01 == 5 || tu_thief01 == 6){
-			if(countitem(916) < 10){
+			if(countitem(Feather_Of_Birds) < 10){
 				mes "'Ey, you don't have the 10 ^ff0000Feather of Birds^000000 I asked you for! You gotta apply what you know, you know.";
 				mes "Now hurry up and do it!";
 				close2;
@@ -426,7 +426,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 						mes "to the poison! That stuff";
 						mes "is pretty strong!";
 						tu_thief01 = 8;
-						getitem 1207,1; //Main_Gauche
+						getitem Main_Gauche,1;
 						getexp 1000,500;
 						specialeffect2 EF_HIT5;
 						close;
@@ -436,7 +436,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 						mes "Less work for me!";
 						mes "Alright, you better get stronger the next time I see you. Oh, and you can have this stuff. You know, since you're so gangster and all.";
 						tu_thief01 = 7;
-						getitem 1207,1; //Main_Gauche
+						getitem Main_Gauche,1;
 						getexp 500,200;
 						specialeffect2 EF_HIT5;
 						close;
@@ -463,7 +463,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 						break;
 					}
 					tu_thief01 = 7;
-					getitem 1207,1; //Main_Gauche
+					getitem Main_Gauche,1;
 					getexp 500,200;
 					specialeffect2 EF_HIT5;
 					close;
@@ -589,7 +589,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 				mes "[Yierhan]";
 				mes "Hey, this stuff is yours. Think of it as a reward for helping us out. Take care of yourself now~";
 				tu_thief01 = 27;
-				getitem 2307,1; //Mantle
+				getitem Mantle,1;
 				Zeny += 5000;
 				getexp 8000,3000;
 				close;