Merge branch 'dastgir-ScriptCleanup2' into hercules

Closes #920 as merged

1 files changed, 16 insertions, 16 deletions

diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt
index af13e01ab..21be15563 100644
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -74,7 +74,7 @@ alberta_in,133,55,3	script	Louitz#cm	4_M_02,{
 	mes "Heya.";
 	mes "What's up?";
 	next;
-	if (countitem(971) > 0 && countitem(972) > 0) {
+	if (countitem(Detrimindexta) > 0 && countitem(Karvodailnirol) > 0) {
 		switch(select("Talk:Talk about the solutions.:Cancel")) {
 		case 1:
 			mes "[Merchant Louitz]";
@@ -144,7 +144,7 @@ alberta_in,133,55,3	script	Louitz#cm	4_M_02,{
 			close;
 		}
 	}
-	if (countitem(972) > 0) {
+	if (countitem(Karvodailnirol) > 0) {
 		switch(select("Talk:Talk about Karvodailnirol:Cancel")) {
 		case 1:
 			mes "[Merchant Louitz]";
@@ -214,7 +214,7 @@ alberta_in,133,55,3	script	Louitz#cm	4_M_02,{
 			close;
 		}
 	}
-	if (countitem(971) > 0) {
+	if (countitem(Detrimindexta) > 0) {
 		switch(select("Talk:Talk about Detrimindexta:Cancel")) {
 		case 1:
 			mes "[Merchant Louitz]";
@@ -416,7 +416,7 @@ geffen,181,114,3	script	Aure Dupon#cm	4_KID01,{
 }
 
 geffen_in,141,140,3	script	Molgenstein#cm	2_M_MOLGENSTEIN,{
-	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. -";
@@ -474,7 +474,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	2_M_MOLGENSTEIN,{
 				mes "Oh, I just can't wait to make this! Are you ready to begin?";
 				next;
 				if (select("Make:Cancel") == 1) {
-					if (countitem(970) == 0 || countitem(971) == 0 || countitem(713) == 0 || Zeny < 3000) {
+					if (countitem(Alchol) == 0 || countitem(Detrimindexta) == 0 || countitem(Empty_Bottle) == 0 || Zeny < 3000) {
 						mes "[Chemist Molgenstein]";
 						mes "Heuheuheuheuh.... not enough... not enough.. Haah...Haah... Go..... get the rest of the materials!";
 						mes "We'll postpone the fun until then... Heuheuheuheuheuh.";
@@ -484,16 +484,16 @@ geffen_in,141,140,3	script	Molgenstein#cm	2_M_MOLGENSTEIN,{
 					mes "Ooooooooh...... heeheeheeheehee...... yes... like that...... yes... more... more........ heeheeheehee.";
 					mes ".... Aaah.... ahah... ha....ahahooooooooohoh!";
 					next;
-					if (countitem(970) < 1 || countitem(971) < 1 || countitem(713) < 1) {
+					if (countitem(Alchol) < 1 || countitem(Detrimindexta) < 1 || countitem(Empty_Bottle) < 1) {
 						mes "[Chemist Molgenstein]";
 						mes "Hohohoho.... not enough... not enough... haah...haah... go..... go get the rest of the materials!!";
 						close;
 					}
-					delitem 970,1; //Alchol
-					delitem 971,1; //Detrimindexta
-					delitem 713,1; //Empty_Bottle
+					delitem Alchol,1;
+					delitem Detrimindexta,1;
+					delitem Empty_Bottle,1;
 					Zeny -= 3000;
-					getitem 973,1; //Counteragent
+					getitem Counteragent,1;
 					mes "[Chemist Molgenstein]";
 					mes "Hee hee hee...";
 					mes "Haaaaah......";
@@ -518,7 +518,7 @@ geffen_in,141,140,3	script	Molgenstein#cm	2_M_MOLGENSTEIN,{
 				mes "Oh, I just can't wait to make this! Are you ready to begin?";
 				next;
 				if (select("Make:Cancel") == 1) {
-					if (countitem(970) == 0 || countitem(972) == 0 || countitem(713) == 0 || Zeny < 4000) {
+					if (countitem(Alchol) == 0 || countitem(Karvodailnirol) == 0 || countitem(Empty_Bottle) == 0 || Zeny < 4000) {
 						mes "[Chemist Molgenstein]";
 						mes "Hohohoho.... not enough... not enough... haah...haah... go..... go get the rest of the materials!!";
 						mes "We'll have to postpone the fun for later... Hehehehe";
@@ -528,16 +528,16 @@ geffen_in,141,140,3	script	Molgenstein#cm	2_M_MOLGENSTEIN,{
 					mes "Ooooooooh... heehee...... yes... like that...... yes... more... more........ heeheeheehee";
 					mes ".... Aaah.... ahah... ha....ahah...oooooooooooooooooh!!!...!!!!!!";
 					next;
-					if (countitem(970) < 1 || countitem(972) < 1 || countitem(713) < 1) {
+					if (countitem(Alchol) < 1 || countitem(Karvodailnirol) < 1 || countitem(Empty_Bottle) < 1) {
 						mes "[Chemist Molgenstein]";
 						mes "Hohohoho.... not enough... not enough... haah...haah... go..... go get the rest of the materials!!";
 						close;
 					}
-					delitem 970,1; //Alchol
-					delitem 972,1; //Karvodailnirol
-					delitem 713,1; //Empty_Bottle
+					delitem Alchol,1;
+					delitem Karvodailnirol,1;
+					delitem Empty_Bottle,1;
 					Zeny -= 4000;
-					getitem 974,1; //Mixture
+					getitem Mixture,1;
 					mes "[Chemist Molgenstein]";
 					mes "Hee hee hee...";
 					mes "Haaaaah......";