ItemID to Constant: re Folder

1 files changed, 34 insertions, 34 deletions

diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index c9943f541..35a2683ed 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -209,9 +209,9 @@ tur_dun01,156,36,5	script	Survival Instructor#jr01	1_M_ORIENT01,{
 				mes "Do your best.";
 				job_ranger01 = 3;
 				changequest 8255,8256;
-				getitem 1703,1; //Bow__
-				getitem 12323,10; //N_Fly_Wing
-				getitem 1750,500; //Arrow
+				getitem Bow__,1;
+				getitem N_Fly_Wing,10;
+				getitem Arrow,500;
 				close;
 			}
 			mes "I knew it.";
@@ -399,7 +399,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 			close;
 		} else if (job_ranger01 == 4) {
 			if (questprogress(8257,HUNTING) == 2) {
-				if (countitem(7064) > 0) {
+				if (countitem(Dragon_Fly_Wing) > 0) {
 					mes "Oh! Oh! Woooooow!";
 					mes "You've brought it! Let me see...";
 					next;
@@ -413,7 +413,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 					mes "[Test Instructor, Teardrop]";
 					mes "Well, before I explain, could you please give me that Dragonfly wing?";
 					mes "You've heard the saying, 'in any situation, eating comes first'?";
-					delitem 7064,1; //Dragon_Fly_Wing
+					delitem Dragon_Fly_Wing,1;
 					job_ranger01 = 5;
 					changequest 8257,8258;
 					close;
@@ -558,11 +558,11 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 					mes "You don't have as many guts as I thought.";
 					nude;
 					next;
-					if (countitem(1703) > 0) {
+					if (countitem(Bow__) > 0) {
 						mes "[Test Instructor, Teardrop]";
 						mes "Okay. I'll respect your opinion.";
 						mes "I'll cancel the job change request from "+strcharinfo(0)+".";
-						delitem 1703,1; //Bow__
+						delitem Bow__,1;
 						job_ranger01 = 0;
 						for(.@i = 8254; .@i <= 8262; ++.@i)
 							if (questprogress(.@i))
@@ -625,28 +625,28 @@ L_Start:
 		close;
 	}
 	if (getarg(0) == 1) {
-		if (countitem(12380)) {
+		if (countitem(Desert_Wolf_Babe_Scroll)) {
 			mes "[Test Instructor, Teardrop]";
 			mes "What, what is this?";
 			mes "You shouldn't keep this around!";
-			delitem 12380,countitem(12380); //Desert_Wolf_Babe_Scroll
+			delitem Desert_Wolf_Babe_Scroll,countitem(Desert_Wolf_Babe_Scroll);
 			next;
 		}
-		if (countitem(12258)) {
+		if (countitem(Bombring_Box)) {
 			mes "[Test Instructor, Teardrop]";
 			mes "What, what is this, a Bombring Capsule.";
 			mes "You shouldn't keep such a dangerous thing!";
-			delitem 12258,countitem(12258); //Bombring_Box
+			delitem Bombring_Box,countitem(Bombring_Box);
 			next;
 		}
-		if (countitem(6156)) {
+		if (countitem(Approval_Report)) {
 			mes "[Test Instructor, Teardrop]";
 			mes "What, what are all these Documents?";
 			mes "I think I know. You were going to send this to Caution, right?";
 			next;
 			mes "[Test Instructor, Teardrop]";
 			mes "If you hold such thing it would disturb your practical test so I'll take this.";
-			delitem 6156,countitem(6156); //Approval_Report
+			delitem Approval_Report,countitem(Approval_Report);
 			next;
 		}
 	}
@@ -665,7 +665,7 @@ L_Start:
 	mes "[Test Instructor, Teardrop]";
 	mes "See, for the last time, I warn you that cheating is strictly banned.";
 	next;
-	if (countitem(1750) < 100) {
+	if (countitem(Arrow) < 100) {
 		mes "[Test Instructor, Teardrop]";
 		mes "Okay, once again I'll provide you with arrows, then I'll let you in.";
 		.@arrow = 1;
@@ -681,7 +681,7 @@ L_Start:
 		erasequest 8260;
 		erasequest 8261;
 	}
-	if (.@arrow) getitem 1750,100; //Arrow
+	if (.@arrow) getitem Arrow,100;
 	close2;
 	warp "job3_rang01",30,36;
 	end;
@@ -720,11 +720,11 @@ job3_rang01,30,44,3	script	Test Waiting Room#jr_03	4_M_ORIENT01,{
 			mes "You don't have as many guts as I thought.";
 			nude;
 			next;
-			if (countitem(1703) > 0) {
+			if (countitem(Bow__) > 0) {
 				mes "[Staff DTS]";
 				mes "Okay. I'll respect your opinion.";
 				mes "I'll cancel the job change request from "+strcharinfo(0)+".";
-				delitem 1703,1; //Bow__
+				delitem Bow__,1;
 				job_ranger01 = 0;
 				for(.@i = 8254; .@i <= 8262; ++.@i)
 					if (questprogress(.@i))
@@ -1184,14 +1184,14 @@ OnTimer223000:
 
 job3_rang02,111,56,3	script	Staff Rust#jr_09	4_M_ORIENT02,{
 	if (job_ranger01 == 6) {
-		if (countitem(12258) < 1) {
+		if (countitem(Bombring_Box) < 1) {
 			percentheal 100,0;
 			specialeffect2 EF_ABSORBSPIRITS;
 			mes "[Staff Rust]";
 			mes "I'll give you the 'Bombring Capsules.";
 			mes "The 'Bombring Capsules' can be given again only for the one who used it all, so please keep that in mind.";
-			if (countitem(6156)) {
-				getitem 12258,5; //Bombring_Box
+			if (countitem(Approval_Report)) {
+				getitem Bombring_Box,5;
 				close;
 			}
 			next;
@@ -1199,9 +1199,9 @@ job3_rang02,111,56,3	script	Staff Rust#jr_09	4_M_ORIENT02,{
 			mes "[Staff Rust]";
 			mes "And the mission is.... to deliver these documents to the supervisor, Caution. He won't take what I give...";
 			setquest 8260;
-			getitem 6156, (MaxWeight-Weight-2000)/10; //Approval_Report
-			getitem 12258,10; //Bombring_Box
-			getitem 569,100; //Novice_Potion
+			getitem Approval_Report, (MaxWeight-Weight-2000)/10;
+			getitem Bombring_Box,10;
+			getitem Novice_Potion,100;
 			close;
 		}
 		mes "[Staff Rust]";
@@ -1292,7 +1292,7 @@ OnDisable:
 	end;
 OnTouch:
 	if (job_ranger01 == 6) {
-		if (countitem(12258)) {
+		if (countitem(Bombring_Box)) {
 			mes "[Test Supervisor, Caution]";
 			mes "No, no!";
 			mes "You need to use all the 'Bombring Capsules'?!";
@@ -1302,7 +1302,7 @@ OnTouch:
 			mes "Time is ticking so you'd better hurry.";
 			close;
 		}
-		if (countitem(6156) > 0) {
+		if (countitem(Approval_Report) > 0) {
 			mes "[Test Supervisor, Caution]";
 			mes "You've arrived safely!!!";
 			donpcevent "Second Test Timer#jr_08::OnDisable";
@@ -1318,7 +1318,7 @@ OnTouch:
 			mes "[Test Supervisor, Caution]";
 			mes "Haaaaaaaah!!";
 			mes "I've been avoiding him so much!!";
-			delitem 6156,countitem(6156); //Approval_Report
+			delitem Approval_Report,countitem(Approval_Report);
 			erasequest 8260;
 			next;
 			mes "[Test Supervisor, Caution]";
@@ -1487,7 +1487,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 			next;
 			mes "[Test Supervisor, Freeze]";
 			mes "Well, then first get this Wolf' flutes and after summoning the wolf, talk to me!";
-			getitem 12380,1; //Desert_Wolf_Babe_Scroll
+			getitem Desert_Wolf_Babe_Scroll,1;
 			setquest 8261;
 			close;
 		}
@@ -1506,7 +1506,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 			donpcevent "Third Test Timer#jr_12::OnEnable";
 			end;
 		}
-		if (countitem(12380) < 1) {
+		if (countitem(Desert_Wolf_Babe_Scroll) < 1) {
 			mes "Huh?! There's no wolf, no Test Flute, where did you get rid of them?!";
 			next;
 			mes "[Test Supervisor, Freeze]";
@@ -1514,7 +1514,7 @@ job3_rang02,251,49,3	script	Test Supervisor#jr_13	4_M_JOB_HUNTER,{
 			next;
 			mes "[Test Supervisor, Freeze]";
 			mes "Summon the wolf quickly, and talk to me again!";
-			getitem 12380,1; //Desert_Wolf_Babe_Scroll
+			getitem Desert_Wolf_Babe_Scroll,1;
 			close;
 		}
 		mes "Ha? What are you doing?";
@@ -1732,7 +1732,7 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	4_M_REIDIN_KURS,{
 		mes "Your firm answer seems very trustworthy!";
 		next;
 		nude;
-		if (countitem(1703) < 1) {
+		if (countitem(Bow__) < 1) {
 			mes "[Ranger Master, Neveragain]";
 			mes "Umm?";
 			mes "You need to return the borrowed stuff.";
@@ -1742,13 +1742,13 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	4_M_REIDIN_KURS,{
 		mes "[Ranger Master, Neveragain]";
 		mes "From now on be active as a splendid Ranger!";
 		mes "I wish you luck in your future!";
-		delitem 1703,1; //Bow__
+		delitem Bow__,1;
 		job_ranger01 = 8;
 		completequest 8262;
 		jobchange roclass(eaclass()|EAJL_THIRD);
-		getitem 5748,1; //Sniper_Goggle
-		getitem 2795,1; //Green_Apple_Ring
-		getitem 6124,1; //Wolf's_Flute
+		getitem Sniper_Goggle,1;
+		getitem Green_Apple_Ring,1;
+		getitem Wolf's_Flute,1;
 		close;
 	}
 	mes "Hey, you look great.";