ItemID to Constant: re Folder

14 files changed, 99 insertions, 99 deletions

diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt
index c9737cdb5..83c73ad5b 100644
--- a/npc/re/merchants/3rd_trader.txt
+++ b/npc/re/merchants/3rd_trader.txt
@@ -37,7 +37,7 @@
 
 //== Poison Herb Merchants (Guillotine Cross) ==============
 -	script	::phs	-1,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+	if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -102,7 +102,7 @@ lhz_in02,16,205,4	duplicate(phs)	Poison Herb Merchant#lhz	4_F_YUNYANG
 
 //== Rune Stone Merchants (Rune Knight) ====================
 -	script	::runesale	-1,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+	if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -169,7 +169,7 @@ prontera,168,228,3	duplicate(runesale)	Rune Merchant#prt	4_M_YURI
 
 //== Rare Herb Merchants (Guillotine Cross) ================
 job3_guil01,91,93,3	script	Rare Herb Collector	1_M_03,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+	if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
@@ -220,7 +220,7 @@ job3_guil01,91,93,3	script	Rare Herb Collector	1_M_03,{
 			mes "Good. I've received the money and the special item.";
 			delitem .@item, .@amount;
 			Zeny -= .@total;
-			getitem 709, .@amount; //Izidor
+			getitem Izidor, .@amount;
 			close;
 		}
 	}
@@ -231,7 +231,7 @@ job3_guil01,91,93,3	script	Rare Herb Collector	1_M_03,{
 
 //== Point Merchants (Sorcerer) ============================
 -	script	::pss	-1,{
-	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
+	if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt
index 6dc267a78..fe67e6eb2 100644
--- a/npc/re/merchants/alchemist.txt
+++ b/npc/re/merchants/alchemist.txt
@@ -62,7 +62,7 @@ alde_alche,31,186,3	script	Craft Book Merchant#alde	4_M_ALCHE_D,{
 		mes "Please be safe on your travels.";
 		close;
 	}
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "[Craft Book Merchant]";
 		mes "I'm sorry, but your inventory is almost full.";
 		mes "Please empty your inventory first.";
diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt
index 53430f7f2..ecd4f1fdd 100644
--- a/npc/re/merchants/card_separation.txt
+++ b/npc/re/merchants/card_separation.txt
@@ -35,7 +35,7 @@
 
 -	script	::CardSeparation_mal	-1,{
 	disable_items;
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
 		close;
 	}
@@ -205,8 +205,8 @@
 		next;
 		.@menu$ = "Next time...:"+
 			((Zeny >= 1000000)?"Use 1,000,000z (Do not use special item):":"^999999Use 1,000,000z (Insufficient)^000000:")+
-			((countitem(6441))?"Use Premium Lubricant:":"^999999Premium Lubricant (Insufficient)^000000:")+
-			((countitem(6440))?"Use Ordinary Lubricant":"^999999Ordinary Lubricant (Insufficient)^000000");
+			((countitem(High_RankLubricant))?"Use Premium Lubricant:":"^999999Premium Lubricant (Insufficient)^000000:")+
+			((countitem(General_Lubricant))?"Use Ordinary Lubricant":"^999999Ordinary Lubricant (Insufficient)^000000");
 		switch(select(.@menu$)) {
 		case 1:
 			mes .@n$;
@@ -232,7 +232,7 @@
 			Zeny -= 1000000;
 			break;
 		case 3:
-			if (countitem(6441) == 0) {
+			if (countitem(High_RankLubricant) == 0) {
 				mes .@n$;
 				mes "You don't have Premium Lubricant.";
 				close;
@@ -248,10 +248,10 @@
 			.@sf_c_num = 75;
 			.@sf_r_num = 75;
 			.@sf_w_num = 75;
-			delitem 6441,1; //High_RankLubricant
+			delitem High_RankLubricant,1;
 			break;
 		case 4:
-			if (countitem(6440) == 0) {
+			if (countitem(General_Lubricant) == 0) {
 				mes .@n$;
 				mes "You don't have Ordinary Lubricant.";
 				close;
@@ -267,7 +267,7 @@
 			.@sf_c_num = 75;
 			.@sf_r_num = 150;
 			.@sf_w_num = 150;
-			delitem 6440,1; //General_Lubricant
+			delitem General_Lubricant,1;
 			break;
 		}
 	} else {
@@ -280,7 +280,7 @@
 			mes "Whenever you need the work, visit me here.";
 			close;
 		case 2:
-			if (countitem(6443) == 0) {
+			if (countitem(Sillit_Pong_Bottle) == 0) {
 				mes .@n$;
 				mes "You don't have Sillit Pong.";
 				close;
@@ -305,7 +305,7 @@
 			.@sf_c_num = 60;
 			.@sf_r_num = 60;
 			.@sf_w_num = 60;
-			delitem 6443,1; //Sillit_Pong_Bottle
+			delitem Sillit_Pong_Bottle,1;
 			break;
 		}
 	}
diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt
index 8f3178531..5267a20b5 100644
--- a/npc/re/merchants/catalog.txt
+++ b/npc/re/merchants/catalog.txt
@@ -36,7 +36,7 @@
 //=========================================================================
 
 moc_para01,22,16,5	script	Catalog Magician#catal01	4_M_BIBI,{
-	if (!checkweight(1301,3)) {
+	if (!checkweight(Axe,3)) {
 		mes "- You have too many items. Please make space. -";
 		close;
 	}
@@ -97,7 +97,7 @@ moc_para01,22,16,5	script	Catalog Magician#catal01	4_M_BIBI,{
 		}
 		mes "Ok, here you go.";
 		Zeny -= .@sell;
-		getitem 12580,.@input; //Vending_Search_Scroll
+		getitem Vending_Search_Scroll,.@input;
 		close;
 	case 2:
 		mes "[Catalog Magician]";
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index acb879174..2e09a9a9d 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -37,7 +37,7 @@
 
 //== Malangdo ==============================================
 malangdo,220,167,5	script	Coin Exchanger CX-1	2_VENDING_MACHINE1,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
 		close;
 	}
@@ -128,7 +128,7 @@ malangdo,220,167,5	script	Coin Exchanger CX-1	2_VENDING_MACHINE1,{
 }
 
 malangdo,218,165,5	script	Special Vending Machine	2_DROP_MACHINE,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
 		close;
 	}
@@ -172,17 +172,17 @@ L_AddItem:
 	mes "[Special Vending Machine]";
 	mes "You choose ^005500"+getarg(.@i*3)+"^000000. For purchasing, you need ^005500"+.@cost+"^000000 unit(s) of Silvervine Fruit.";
 	next;
-	if (countitem(6417) < .@cost)
-		.@ven_menu$ = "^999999Silvervine Fruit (missing "+(.@cost - countitem(6417))+")^000000";
+	if (countitem(Silvervine) < .@cost)
+		.@ven_menu$ = "^999999Silvervine Fruit (missing "+(.@cost - countitem(Silvervine))+")^000000";
 	else
-		.@ven_menu$ = "Purchase - Silvervine Fruit (have "+countitem(6417)+")";
+		.@ven_menu$ = "Purchase - Silvervine Fruit (have "+countitem(Silvervine)+")";
 	switch(select("Stop:"+.@ven_menu$)) {
 	case 1:
 		mes "[Special Vending Machine]";
 		mes "Thank you for coming.";
 		close;
 	case 2:
-		if (countitem(6417) < .@cost) {
+		if (countitem(Silvervine) < .@cost) {
 			mes "[Special Vending Machine]";
 			mes "Not enough Silvervine Fruit.";
 			mes "Closing the transaction.";
@@ -191,14 +191,14 @@ L_AddItem:
 		}
 		mes "[Special Vending Machine]";
 		mes "The transaction is completed. Thank you for coming.";
-		delitem 6417,.@cost; //Silvervine
+		delitem Silvervine,.@cost;
 		getitem getarg(.@i*3+1),1;
 		close;
 	}
 }
 
 malangdo,236,179,5	script	Dark Merchant K	4_CAT_REST,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
 		close;
 	}
@@ -214,7 +214,7 @@ malangdo,236,179,5	script	Dark Merchant K	4_CAT_REST,{
 	while(1) {
 		.@menu$ = "";
 		for(.@i = 0; .@i<getarraysize(.@coin_amount); ++.@i) {
-			if (countitem(6420) >= .@coin_amount[.@i])
+			if (countitem(Cgrade_Coin) >= .@coin_amount[.@i])
 				.@menu$ += "Exchange "+(.@coin_amount[.@i]/10)+" Mora Coin:";
 			else
 				.@menu$ += "^aaaaaaExchange "+(.@coin_amount[.@i]/10)+" Mora Coin (Not Enough)^000000:";
@@ -225,13 +225,13 @@ malangdo,236,179,5	script	Dark Merchant K	4_CAT_REST,{
 			mes "Let's exchange some other time.";
 			close;
 		}
-		if (countitem(6420) < .@coin_amount[.@i]) {
+		if (countitem(Cgrade_Coin) < .@coin_amount[.@i]) {
 			mes "[Merchant K]";
 			mes "You need ^ff0000"+.@coin_amount[.@i]+"^000000 C Grade Coin to perform the exchange. But you don't seem to have enough now.";
 			close;
 		}
-		delitem 6420,.@coin_amount[.@i]; //Cgrade_Coin
-		getitem 6380,.@coin_amount[.@i]/10; //Mora_Coin
+		delitem Cgrade_Coin,.@coin_amount[.@i];
+		getitem Mora_Coin,.@coin_amount[.@i]/10;
 		mes "[Merchant K]";
 		mes "C Grade Coin ^003399"+.@coin_amount[.@i]+"^000000 well received."; //FIXME: Dialogue.
 		mes "Exchanged to ^003399"+(.@coin_amount[.@i]/10)+"^000000 Mora Coin.";
@@ -243,7 +243,7 @@ malangdo,236,179,5	script	Dark Merchant K	4_CAT_REST,{
 }
 
 malangdo,233,180,3	script	Dark MachineTX100	2_VENDING_MACHINE1,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
 		close;
 	}
@@ -364,7 +364,7 @@ malangdo,233,180,3	script	Dark MachineTX100	2_VENDING_MACHINE1,{
 }
 
 malangdo,175,145,4	script	Can Agency Guard	4_CAT_MERMASTER,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You seem to have too many items. Give it a try after sorting out the item kinds.";
 		close;
 	}
@@ -437,8 +437,8 @@ malangdo,175,145,4	script	Can Agency Guard	4_CAT_MERMASTER,{
 			close;
 		}
 	}
-	delitem 12633,.@count; //Malang_Cat_Can
-	getitem 6422,.@count*3; //Egrade_Coin
+	delitem 12633,.@count;
+	getitem Egrade_Coin,.@count*3;
 	mes "[Can Agency Guard]";
 	mes "Exchanged "+.@count+" Malangdo Cat Can to "+(.@count*3)+" E Class Coin. Check it out.";
 	close;
@@ -491,7 +491,7 @@ function	script	F_mal_coin	{
 		next;
 		switch(select("Yes:No")) {
 		case 1:
-			if (checkweight(1201,1) == 0) {
+			if (checkweight(Knife,1) == 0) {
 				mes getarg(1);
 				mes "It seems that there are too many items in your inventory.";
 				mes "Please make space and come back again~";
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index 0ea3b0488..95f8d7774 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -64,7 +64,7 @@
 	next;
 
 	.@menu$ = "^FF82FF'17 Carat Diamond'^000000?";
-	if (countitem(6024))
+	if (countitem(17Carat_Dia))
 		.@menu$ += ":Exchange my 17 Carat Diamond for zeny...";
 
 	switch(select(.@menu$)) {
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 272e4ed75..3007c9ee4 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -36,7 +36,7 @@
 
 malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 	disable_items;
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
 		close;
 	}
@@ -627,7 +627,7 @@ L_Socket:
 			mes "If you change your mind, come back anytime.";
 			close;
 		}
-		if (countitem(6417) == 0) {
+		if (countitem(Silvervine) == 0) {
 			mes "[Mayomayo]";
 			mes "I'm sorry. You don't have Silvervine Fruit. Please check your inventory again?";
 			close;
@@ -645,7 +645,7 @@ L_Socket:
 		specialeffect2 EF_REPAIRWEAPON;
 		mes "[Mayomayo]";
 		mes "Initialize the enchant effect from the equipment.";
-		delitem 6417,1; //Silvervine
+		delitem Silvervine,1;
 		delequip EQI_HAND_R;
 
 		// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index 6ffdb2ca5..e27446594 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -36,7 +36,7 @@
 
 //== Arch Bishop Enchants :: coin_arc ======================
 mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
 	}
@@ -45,7 +45,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 		close;
 	}
 	disable_items;
-	if (countitem(6380) < 10) {
+	if (countitem(Mora_Coin) < 10) {
 		mes "[Artifice]";
 		mes "Relics for Archbishops are meant for defense and support!";
 		next;
@@ -86,7 +86,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 			mes "Go with the light.";
 			close;
 		case 2:
-			if (countitem(2864) || countitem(2865) || countitem(2866)) {
+			if (countitem(Light_Of_Cure) || countitem(Seal_Of_Cathedral) || countitem(Ring_Of_Archbishop)) {
 				mes "[Artifice]";
 				mes "You are already allowed access to our relics by your possession of a Ring!";
 				close;
@@ -116,7 +116,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 			break;
 		}
 		.@item = .@items[rand(getarraysize(.@items))];
-		delitem 6380,10; //Mora_Coin
+		delitem Mora_Coin,10;
 		getitem .@item,1;
 		mes "[Artifice]";
 		mes "You have obtained ^aa00aa"+getitemname(.@item)+"^000000. May the Blessing of the Light be with you.";
@@ -130,9 +130,9 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 			mes "It seems that you have power to control the ring so I cannot exchange it into coins.";
 			close;
 		}
-		     if (countitem(2864)) .@item = 2864; //Light_Of_Cure
-		else if (countitem(2865)) .@item = 2865; //Seal_Of_Cathedral
-		else if (countitem(2866)) .@item = 2866; //Ring_Of_Archbishop
+		     if (countitem(Light_Of_Cure)) .@item = 2864; //Light_Of_Cure
+		else if (countitem(Seal_Of_Cathedral)) .@item = 2865; //Seal_Of_Cathedral
+		else if (countitem(Ring_Of_Archbishop)) .@item = 2866; //Ring_Of_Archbishop
 		else {
 			mes "[Artifice]";
 			mes "Did you change something?";
@@ -148,7 +148,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 			close;
 		case 2:
 			delitem .@item,1;
-			getitem 6380,10; //Mora_Coin
+			getitem Mora_Coin,10;
 			mes "[Artifice]";
 			mes "I think that was an even trade.";
 			close;
@@ -157,7 +157,7 @@ mora,88,89,5	script	Keeper of Secrets#pa082	4_M_MERCAT1,{
 }
 
 mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
 	}
@@ -225,13 +225,13 @@ mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
 			.@enchant_type = 4;
 			break;
 		}
-		if (countitem(6380) < 2 || countitem(.@item) == 0) {
+		if (countitem(Mora_Coin) < 2 || countitem(.@item) == 0) {
 			mes "[Relice]";
 			mes "For 2 Mora Coins I can strengthen the relic you have in many ways!";
 			close;
 		}
 		specialeffect2 EF_REPAIRWEAPON;
-		delitem 6380,2; //Mora_Coin
+		delitem Mora_Coin,2;
 		delitem .@item,1;
 		switch(.@enchant_type) {
 		case 1:
@@ -335,7 +335,7 @@ mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
 
 //== Warlock Enchants :: coin_warrock ======================
 mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
 	}
@@ -343,7 +343,7 @@ mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
 		mes "You are carrying too much weight to do that. Reduce the weight and try again.";
 		close;
 	}
-	if (countitem(6380) < 10) {
+	if (countitem(Mora_Coin) < 10) {
 		mes "[Guardian of Artifacts]";
 		mes "My job is to guard the Warlock's ancient artifacts.";
 		next;
@@ -394,13 +394,13 @@ mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
 		setarray .@items[0],2007,2008,2009,2010; //Golden_Rod_Staff,Aqua_Staff,Crimson_Staff,Forest_Staff
 		break;
 	}
-	if (countitem(6380) < 10) {
+	if (countitem(Mora_Coin) < 10) {
 		mes "[Guardian of Artifacts]";
 		mes "Would you please come back when you have enough Coins?";
 		close;
 	}
 	.@item = .@items[rand(getarraysize(.@items))];
-	delitem 6380,10; //Mora_Coin
+	delitem Mora_Coin,10;
 	getitem .@item,1;
 	mes "[Guardian of Artifacts]";
 	mes "I have ^aa00aa"+getitemname(.@item)+"^000000 available today. I hope "+((.@plural)?"they":"it")+" will come in handy...";
@@ -408,7 +408,7 @@ mora,104,76,4	script	Guardian of Artifacts#p	4_M_MERCAT1,{
 }
 
 mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
 	}
@@ -473,13 +473,13 @@ mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
 		break;
 	}
 	.@item = .@items[(.@select-2)%4];
-	if (countitem(6380) < 2 || countitem(.@item) == 0) {
+	if (countitem(Mora_Coin) < 2 || countitem(.@item) == 0) {
 		mes "[Artifact Crafter]";
 		mes "You have to have 2 Mora Coins and an item to be reinforced before I can do my work.";
 		close;
 	}
 	specialeffect2 EF_REPAIRWEAPON;
-	delitem 6380,2; //Mora_Coin
+	delitem Mora_Coin,2;
 	delitem .@item,1;
 	switch(.@enchant_type) {
 	case 1:
@@ -539,7 +539,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
 
 //== Rune Knight, Guillotine Cross, & Ranger Enchants :: new_artifact =
 mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
 	}
@@ -547,7 +547,7 @@ mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
 		mes "You are carrying too much in your inventory.";
 		close;
 	}
-	if (countitem(6380) < 10) {
+	if (countitem(Mora_Coin) < 10) {
 		mes "[Guardian of Power]";
 		mes "I give Rune Knights, Guillotine Crosses, and Rangers ancient artifacts to help them carry out their missions.";
 		next;
@@ -597,12 +597,12 @@ mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
 		mes "Talk to me later then.";
 		close;
 	}
-	if (countitem(6380) < 10) {
+	if (countitem(Mora_Coin) < 10) {
 		mes "[Guardian of Power]";
 		mes "Didn't I tell you to bring the correct amount of Mora Coins?";
 		close;
 	}
-	delitem 6380,10; //Mora_Coin
+	delitem Mora_Coin,10;
 	getitem .@items[.@i],1;
 	mes "[Guardian of Power]";
 	mes "Thank you for the 10 Mora Coins. Here is your artifact for the "+.@jobs$[.@job]+" job. Come back whenever you get more Mora Coins.";
@@ -610,7 +610,7 @@ mora,152,97,5	script	Guardian of Power#pa082	4_F_DOGTRAVELER,{
 }
 
 mora,148,98,3	script	Artifact Researcher#new	4_F_MORAFINE2,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
 	}
@@ -647,7 +647,7 @@ mora,148,98,3	script	Artifact Researcher#new	4_F_MORAFINE2,{
 		@mora_enchant_select = 2;
 		break;
 	}
-	if (Zeny < 100000 || countitem(6380) == 0) {
+	if (Zeny < 100000 || countitem(Mora_Coin) == 0) {
 		mes "[Artifact Researcher]";
 		mes "I'm not giving these services out for free pal. 100,000 zeny and 1 Mora Coin. Is that too much to ask?";
 		close;
@@ -1110,12 +1110,12 @@ L_Socket:
 			mes "I think there was an enhancing limit to the artifacts.";
 			close;
 		}
-		if (Zeny < 100000 || countitem(6380) == 0) {
+		if (Zeny < 100000 || countitem(Mora_Coin) == 0) {
 			mes "[Artifact Researcher]";
 			mes "I'm not going to do the work unless you pay the fee.";
 			close;
 		}
-		delitem 6380,1; //Mora_Coin
+		delitem Mora_Coin,1;
 		Zeny -= 100000;
 		delequip .@part;
 		if (.@enchant == 9) {
@@ -1142,7 +1142,7 @@ L_Socket:
 
 		close;
 	} else if (.@select == 2) {
-		if (Zeny < 100000 || countitem(6380) == 0) {
+		if (Zeny < 100000 || countitem(Mora_Coin) == 0) {
 			mes "[Artifact Researcher]";
 			mes "You've got to pay if you want the services.";
 			close;
@@ -1150,7 +1150,7 @@ L_Socket:
 		specialeffect2 EF_REPAIRWEAPON;
 		mes "[Artifact Researcher]";
 		mes "The ability to enhance remains.";
-		delitem 6380,1; //Mora_Coin
+		delitem Mora_Coin,1;
 		Zeny -= 100000;
 		delequip .@part;
 
@@ -1167,7 +1167,7 @@ L_Socket:
 
 //== Arch Bishop & Warlock Empowering :: relic_change ======
 mora,124,82,4	script	Artifact Collector#blan	4_M_RAFLE_OR,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "Reduce the amount of items that you have in your inventory before continuing.";
 		close;
 	}
@@ -1489,7 +1489,7 @@ L_ShowInfo:
 function	script	F_Mora_Enchant	{
 	specialeffect2 EF_REPAIRWEAPON;
 	progressbar "ffff00",3;
-	delitem 6380,5; //Mora_Coin
+	delitem Mora_Coin,5;
 	delitem getarg(0),1;
 	.@i = rand(1,4568);
 	if (.@i <= 3168) {
@@ -1519,7 +1519,7 @@ function	script	F_Mora_Enchant	{
 	return 1;
 }
 mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
 	}
@@ -1527,13 +1527,13 @@ mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 		mes "You are carrying too much weight to do that. Reduce the weight and try again.";
 		close;
 	}
-	if (countitem(6380) < 5 || countitem(15024) < 1) {
+	if (countitem(Mora_Coin) < 5 || countitem(Army_Padding) < 1) {
 		mes "[Master Tailor]";
 		mes "With my touch, I can turn a typical army padding into a piece of art. I'm Kay the Master Tailor, creating art with army paddings.";
 		next;
 		mes "[Master Tailor]";
 		mes "Well, what's in a name? I can turn your army padding into a piece of art if you bring ^ff00005 Mora Coins and an Army Padding^000000.";
-		if (countitem(6380)) {
+		if (countitem(Mora_Coin)) {
 			next;
 			mes "[Master Tailor]";
 			mes "I happen to have a few army paddings in stock. Would you like to buy one? The price is 1 Mora Coin. So cheap.";
@@ -1545,8 +1545,8 @@ mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 				mes "Come back for one if you change your mind.";
 				close;
 			case 2:
-				delitem 6380,1; //Mora_Coin
-				getitem 15024,1; //Army_Padding
+				delitem Mora_Coin,1;
+				getitem Army_Padding,1;
 				mes "[Master Tailor]";
 				mes "Here it is.";
 				mes "It's very nice and fluffy. Please come back.";
@@ -1586,7 +1586,7 @@ mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 			mes "The villagers keep me busy enough.";
 			close;
 		case 2:
-			if (countitem(6380) < 5 || countitem(15024) == 0) {
+			if (countitem(Mora_Coin) < 5 || countitem(Army_Padding) == 0) {
 				mes "[Master Tailor]";
 				mes "It looks like you don't have everything you need.";
 				next;
@@ -1611,7 +1611,7 @@ mora,105,176,4	script	Master Tailor#pa0829	4_ELEPHANT,{
 }
 
 mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
 	}
@@ -1619,7 +1619,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 		mes "You are carrying too much weight to do that. Reduce the weight and try again.";
 		close;
 	}
-	if (countitem(6380) < 5 || countitem(2858) == 0) {
+	if (countitem(Mora_Coin) < 5 || countitem(Pendant_Of_Guardian) == 0) {
 		mes "[Pendant Crafter]";
 		mes "My job is to polish the stone in a Guardian's Pendant, and then carve a symbol with special power on it.";
 		next;
@@ -1658,7 +1658,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 			mes "Come back when you're not in a hurry. I always have a lot of time on my hands.";
 			close;
 		case 2:
-			if (countitem(6380) < 5 || countitem(2858) == 0) {
+			if (countitem(Mora_Coin) < 5 || countitem(Pendant_Of_Guardian) == 0) {
 				mes "[Pendant Crafter]";
 				mes "It looks like you don't have everything you need.";
 				next;
@@ -1667,7 +1667,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 				close;
 			}
 			if (callfunc("F_Mora_Enchant",2858) == 0) {
-				getitem 2858,1; //Pendant_Of_Guardian
+				getitem Pendant_Of_Guardian,1;
 				mes "[Pendant Crafter]";
 				mes "What~!!";
 				mes "What on earth is wrong with it!!";
@@ -1681,7 +1681,7 @@ mora,123,177,6	script	Pendant Crafter#pa0829	4_ELEPHANT,{
 }
 
 mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
 		close;
 	}
@@ -1689,7 +1689,7 @@ mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
 		mes "You are carrying too much weight to do that. Reduce the weight and try again.";
 		close;
 	}
-	if (countitem(6380) < 5 || countitem(2568) == 0) {
+	if (countitem(Mora_Coin) < 5 || countitem(Muffler_Of_Roki) == 0) {
 		mes "[Bulberry Westhood]";
 		mes "I'm Bulberry Westhood, keeping the tradition of quality hoods alive.";
 		next;
@@ -1739,7 +1739,7 @@ mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
 			mes "You say 'later' when you can have the best quality item right away? Well, have it your own way.";
 			close;
 		case 2:
-			if (countitem(6380) < 5 || countitem(2568) == 0) {
+			if (countitem(Mora_Coin) < 5 || countitem(Muffler_Of_Roki) == 0) {
 				mes "[Bulberry Westhood]";
 				mes "It looks like you don't everything you need.";
 				next;
@@ -1748,7 +1748,7 @@ mora,134,166,4	script	Bulberry Westhood#pa0829	4_ELEPHANT,{
 				close;
 			}
 			if (callfunc("F_Mora_Enchant",2568) == 0) {
-				getitem 2568,1; //Muffler_Of_Roki
+				getitem Muffler_Of_Roki,1;
 				mes "[Bulberry Westhood]";
 				mes "Aaarrgghh, this is impossible!";
 				mes "My! My Loki's Scarf!....";
diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt
index e8ba1c274..67ad2c773 100644
--- a/npc/re/merchants/enchan_upg.txt
+++ b/npc/re/merchants/enchan_upg.txt
@@ -35,7 +35,7 @@
 
 prt_in,28,73,3	script	Devil Enchant Master#prq	1_M_SMITH,{
 	disable_items;
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "You are carrying too many items, please reduce it and come back again!";
 		close;
 	}
@@ -65,7 +65,7 @@ prt_in,28,73,3	script	Devil Enchant Master#prq	1_M_SMITH,{
 		mes "Else, I will not enchant for you....";
 		close;
 	case 2:
-		if (!countitem(6484)) {
+		if (!countitem(Enchant_Book)) {
 			mes "[Devil Enchant Master]";
 			mes "Are you listening to me? I will only do for you if you bring the Enchant Book!";
 			close;
@@ -109,7 +109,7 @@ prt_in,28,73,3	script	Devil Enchant Master#prq	1_M_SMITH,{
 	.@equip_refine = getequiprefinerycnt(.@part);
 
 	if (.@select == 1) {
-		if (!countitem(6484)) {
+		if (!countitem(Enchant_Book)) {
 			mes "Are you listening to me? I will only do for you if you bring the Enchant Book!";
 			close;
 		}
@@ -231,7 +231,7 @@ prt_in,28,73,3	script	Devil Enchant Master#prq	1_M_SMITH,{
 			mes "This item has been enchanted!";
 			close;
 		}
-		if (!countitem(6484)) {
+		if (!countitem(Enchant_Book)) {
 			mes "Are you listening to me? I will only do for you if you bring the Enchant Book!";
 			close;
 		}
@@ -244,7 +244,7 @@ prt_in,28,73,3	script	Devil Enchant Master#prq	1_M_SMITH,{
 			specialeffect EF_REPAIRWEAPON;
 			mes "The slot ^9900004^000000 has been enchanted!";
 		}
-		delitem 6484,1; //Enchant_Book
+		delitem Enchant_Book,1;
 		delequip .@part;
 
 		// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@enchant
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index 254c10bd9..9a2736fb1 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -74,7 +74,7 @@
 			close;
 		}
 		if (Zeny >= .@price) {
-			if (countitem(12848) >= 1) {
+			if (countitem(Falcon_Flute) >= 1) {
 				mes "[Falcon Flute Trader]";
 				mes "As I can see you already have a Falcon Flute!";
 				mes "Don't worry, my young friend, once you've purchased the Falcon Flute you won't need to do so again";
@@ -85,7 +85,7 @@
 			mes "Here, take this flute.";
 			mes "With it you can whistle for your Falcon from anywhere.";
 		  	Zeny -= .@price;
-			getitem 12848,1; //Falcon_Flute
+			getitem Falcon_Flute,1;
 			next;
 			mes "[Falcon Flute Trader]";
 			mes "Just a reminder.";
@@ -110,7 +110,7 @@ pay_arche,91,134,3	duplicate(fflute)	Falcon Flute Trader#fft2	1_M_BARD
 
 tur_dun01,89,170,5	script	Expert Flute Crafter	1_M_ORIENT01,{
 	if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
-		if (countitem(6124)) {
+		if (countitem(Wolf's_Flute)) {
 			mes "[Expert Flute Crafter]";
 			mes "The Wolf Flute you have is crafted by myself, with wood.";
 			mes "You can come back here and find me if you lose your Wolf flute!";
@@ -126,7 +126,7 @@ tur_dun01,89,170,5	script	Expert Flute Crafter	1_M_ORIENT01,{
 		next;
 		switch(select("Please give me a new Wolf Flute.:No.")) {
 		case 1:
-			if (countitem(7150) && Zeny >= 100000) {
+			if (countitem(Bamboo_Cut) && Zeny >= 100000) {
 				mes "[Expert Flute Crafter]";
 				mes "Have you brought all the materials?";
 				mes "Wow! All your materials are not bad!";
@@ -135,9 +135,9 @@ tur_dun01,89,170,5	script	Expert Flute Crafter	1_M_ORIENT01,{
 				mes "[Expert Flute Crafter]";
 				mes "Here's the new Wolf Flute.";
 				mes "Hope you are ready to use it.";
-				delitem 7150,1; //Bamboo_Cut
+				delitem Bamboo_Cut,1;
 				Zeny -= 100000;
-				getitem 6124,1; //Wolf's_Flute
+				getitem Wolf's_Flute,1;
 				close;
 			}
 			mes "[Expert Flute Crafter]";
diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt
index d49ea7256..79f4be69e 100644
--- a/npc/re/merchants/ninja_craftsman.txt
+++ b/npc/re/merchants/ninja_craftsman.txt
@@ -128,7 +128,7 @@ L_Menu:
 					mes "Looks like you need more time to decide.";
 					close;
 				}
-                if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
+                if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
 					mes "- Hold on!! -";
 					mes "- You cannot receive items -";
 					mes "- because you carry too much. -";
@@ -298,7 +298,7 @@ L_Menu:
 					mes "Think carefully~~";
 					close;
 				}
-                if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
+                if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
 					mes "- Hold on!! -";
 					mes "- You cannot receive items -";
 					mes "- because you carry too much. -";
diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt
index 51bea1092..03957962b 100644
--- a/npc/re/merchants/quivers.txt
+++ b/npc/re/merchants/quivers.txt
@@ -35,7 +35,7 @@
 //=========================================================================
 
 mora,106,117,3	script	Quiver Maker#mora	4_M_RAFLE_GR,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "[Quiver Maker]";
 		mes "You have too many things with you.";
 		mes "Make some space in your inventory and come back. I'll tell you something interesting.";
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index ce64063b7..db42f01cf 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -349,7 +349,7 @@ function	script	refinenew	{
 
 //== Ori/Elu to Carnium/Bradium Refiners ===================
 -	script	Austri#ref	-1,{
-	if (checkweight(1201,1) == 0) {
+	if (checkweight(Knife,1) == 0) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt
index 3242c0405..bfa983b98 100644
--- a/npc/re/merchants/ticket_refiner.txt
+++ b/npc/re/merchants/ticket_refiner.txt
@@ -37,9 +37,9 @@
 
 prontera,184,177,6	script	Refine Master	4_M_REPAIR,{
 	disable_items;
-	if (countitem(6238) || countitem(6228) || countitem(6229) || countitem(6230) || countitem(6231) || countitem(6456))
+	if (countitem(Guarantee_Weapon_11Up) || countitem(Guarantee_Weapon_9Up) || countitem(Guarantee_Weapon_8Up) || countitem(Guarantee_Weapon_7Up) || countitem(Guarantee_Weapon_6Up) || countitem(Guarantee_Weapon_5Up))
 		.@bWeaponUp = 1;
-	if (countitem(6239) || countitem(6232) || countitem(6233) || countitem(6234) || countitem(6235) || countitem(6457))
+	if (countitem(Guarantee_Armor_11Up) || countitem(Guarantee_Armor_9Up) || countitem(Guarantee_Armor_8Up) || countitem(Guarantee_Armor_7Up) || countitem(Guarantee_Armor_6Up) || countitem(Guarantee_Armor_5Up))
 		.@bArmorUp = 1;
 	if (!.@bWeaponUp && !.@bArmorUp) {
 		mes "[Refine Master]";