Replaced checkre() calls with constants

Signed-off-by: Haru <haru@dotalux.com>

5 files changed, 32 insertions, 42 deletions

diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index e0de2c97b..1cee70de4 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -501,16 +501,15 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	4_M_JOB_HUNTER,{
 		mes "[Demon Hunter]";
 		mes "You see, we're having some financial problems. Let's see, we're short on these items...";
 		next;
-		if(checkre(0)) .@i = 1;
 		switch(rand(1,7)) {
 		//Insect_Feeler/Claw_Of_Desert_Wolf, Wooden_Block, White_Herb
-		case 1: setarray .@items[0], (.@i?928:7030),5, 1019,5, 509,3, 3; changequest 4001,4002; break;
+		case 1: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 3; changequest 4001,4002; break;
 		//Bill_Of_Birds, Skel_Bone, Green_Herb
 		case 2: setarray .@items[0], 925,3, 932,5, 511,3, 4; changequest 4001,4003; break;
 		//Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
-		case 3: setarray .@items[0], (.@i?1013:937),3, 919,3, 507,5, 5; changequest 4001,4004; break;
+		case 3: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 5; changequest 4001,4004; break;
 		//Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff
-		case 4: setarray .@items[0], (.@i?947:1021),3, (.@i?7033:7032),3, 914,10, 6; changequest 4001,4005; break;
+		case 4: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 6; changequest 4001,4005; break;
 		//Shell, Worm_Peelings, Yellow_Herb
 		case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break;
 		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
@@ -532,16 +531,15 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	4_M_JOB_HUNTER,{
 		close;
 	}
 	else if (HNTR_Q >= 3 && HNTR_Q <= 9) {
-		if(checkre(0)) .@i = 1;
 		switch(HNTR_Q) {
 		//Insect_Feeler/Claw_Of_Desert_Wolf, Wooden_Block, White_Herb
-		case 3: setarray .@items[0], (.@i?928:7030),5, 1019,5, 509,3, 10; break;
+		case 3: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 10; break;
 		//Bill_Of_Birds, Skel_Bone, Green_Herb
 		case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break;
 		//Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
-		case 5: setarray .@items[0], (.@i?1013:937),3, 919,3, 507,5, 10; break;
+		case 5: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 10; break;
 		//Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff
-		case 6: setarray .@items[0], (.@i?947:1021),3, (.@i?7033:7032),3, 914,10, 10; break;
+		case 6: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 10; break;
 		//Shell, Worm_Peelings, Yellow_Herb
 		case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break;
 		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 5b146d66d..5abf3c3c3 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1252,15 +1252,14 @@ OnInit:
 
 OnEnable:
 	enablenpc "Knight1";
-	if (!checkre(0)) {
-		.MyMobs = 12;
+	.MyMobs = 8;
+	if (!RENEWAL) {
+		.MyMobs += 4;
 		monster "job_knt",39,150,"Dustiness",1114,1,"Knight1::OnMyMobDead";
 		monster "job_knt",47,150,"Dustiness",1114,1,"Knight1::OnMyMobDead";
 		monster "job_knt",39,142,"Dustiness",1114,1,"Knight1::OnMyMobDead";
 		monster "job_knt",47,142,"Dustiness",1114,1,"Knight1::OnMyMobDead";
 	}
-	else
-		.MyMobs = 8;
 	monster "job_knt",43,137,"Piere",1160,1,"Knight1::OnMyMobDead";
 	monster "job_knt",43,137,"Andre",1095,1,"Knight1::OnMyMobDead";
 	monster "job_knt",43,137,"Deniro",1105,1,"Knight1::OnMyMobDead";
@@ -1318,8 +1317,9 @@ OnInit:
 
 OnEnable:
 	enablenpc "Knight2";
-	if (!checkre(0)) {
-		.MyMobs = 12;
+	.MyMobs = 6;
+	if (!RENEWAL) {
+		.MyMobs += 6;
 		monster "job_knt",43,42,"Desert Wolf",1106,1,"Knight2::OnMyMobDead";
 		monster "job_knt",43,62,"Desert Wolf",1106,1,"Knight2::OnMyMobDead";
 		monster "job_knt",60,68,"Anacondaq",1030,1,"Knight2::OnMyMobDead";
@@ -1327,8 +1327,6 @@ OnEnable:
 		monster "job_knt",60,35,"Anacondaq",1030,1,"Knight2::OnMyMobDead";
 		monster "job_knt",27,35,"Anacondaq",1030,1,"Knight2::OnMyMobDead";
 	}
-	else
-		.MyMobs = 6;
 	monster "job_knt",53,52,"Frilldora",1119,1,"Knight2::OnMyMobDead";
 	monster "job_knt",34,52,"Frilldora",1119,1,"Knight2::OnMyMobDead";
 	monster "job_knt",58,52,"Drainliar",1111,1,"Knight2::OnMyMobDead";
@@ -1383,13 +1381,12 @@ OnInit:
 
 OnEnable:
 	enablenpc "Knight3";
-	if (!checkre(0)) {
-		.MyMobs = 7;
+	.MyMobs = 5;
+	if (!RENEWAL) {
+		.MyMobs += 2;
 		monster "job_knt",147,167,"Goblin Archer",1258,1,"Knight3::OnMyMobDead";
 		monster "job_knt",136,158,"Steam Goblin",1280,1,"Knight3::OnMyMobDead";
 	}
-	else
-		.MyMobs = 5;
 	monster "job_knt",136,152,"Goblin",1122,1,"Knight3::OnMyMobDead";
 	monster "job_knt",150,152,"Goblin",1123,1,"Knight3::OnMyMobDead";
 	monster "job_knt",143,145,"Goblin",1124,1,"Knight3::OnMyMobDead";
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index bce3603eb..053934522 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -1093,12 +1093,11 @@ OnInit:
 
 OnEnable:
 	enablenpc "Room of Water";
-	if (!checkre(0)) {
-		.MyMobs = 8;
+	.MyMobs = 7;
+	if (!RENEWAL) {
+		.MyMobs += 1;
 		monster "job_wiz",129,170,"Obeaune",1044,1,"Room of Water::OnMyMobDead";
 	}
-	else
-		.MyMobs = 7;
 	monster "job_wiz",109,174,"Phen",1158,1,"Room of Water::OnMyMobDead";
 	monster "job_wiz",118,174,"Shellfish",1074,1,"Room of Water::OnMyMobDead";
 	monster "job_wiz",109,165,"Vadon",1066,1,"Room of Water::OnMyMobDead";
@@ -1266,14 +1265,13 @@ OnInit:
 
 OnEnable:
 	enablenpc "Room of Earth";
-	if (!checkre(0)) {
-		.MyMobs = 10;
+	.MyMobs = 7;
+	if (!RENEWAL) {
+		.MyMobs += 3;
 		monster "job_wiz",120,102,"Hode",1127,1,"Room of Earth::OnMyMobDead";
 		monster "job_wiz",111,93,"Savage",1166,1,"Room of Earth::OnMyMobDead";
 		monster "job_wiz",127,86,"Mantis",1139,1,"Room of Earth::OnMyMobDead";
 	}
-	else
-		.MyMobs = 7;
 	monster "job_wiz",111,102,"Yoyo",1057,1,"Room of Earth::OnMyMobDead";
 	monster "job_wiz",120,102,"Deniro",1105,1,"Room of Earth::OnMyMobDead";
 	monster "job_wiz",111,102,"Caramel",1103,1,"Room of Earth::OnMyMobDead";
@@ -1362,12 +1360,11 @@ OnInit:
 OnEnable:
 	enablenpc "Room of Earth#Door";
 	donpcevent "Room of Earth::OnDisable";
-	if (!checkre(0)) {
-		.MyMobs = 7;
+	.MyMobs = 6;
+	if (!RENEWAL) {
+		.MyMobs += 1;
 		monster "job_wiz",116,97,"Flora",1118,1,"Room of Earth#Door::OnMyMobDead";
 	}
-	else
-		.MyMobs = 6;
 	monster "job_wiz",114,95,"Mandragora",1020,1,"Room of Earth#Door::OnMyMobDead";
 	monster "job_wiz",118,95,"Mandragora",1020,1,"Room of Earth#Door::OnMyMobDead";
 	monster "job_wiz",114,99,"Mandragora",1020,1,"Room of Earth#Door::OnMyMobDead";
@@ -1446,13 +1443,12 @@ OnInit:
 
 OnEnable:
 	enablenpc "Room of Fire";
-	if (!checkre(0)) {
-		.MyMobs = 8;
+	.MyMobs = 6;
+	if (!RENEWAL) {
+		.MyMobs += 2;
 		monster "job_wiz",58,110,"Zerom",1178,1,"Room of Fire::OnMyMobDead";
 		monster "job_wiz",54,89,"Desert Wolf",1106,1,"Room of Fire::OnMyMobDead";
 	}
-	else
-		.MyMobs = 6;
 	monster "job_wiz",33,110,"Goblin",1123,1,"Room of Fire::OnMyMobDead";
 	monster "job_wiz",40,103,"Scorpion",1001,1,"Room of Fire::OnMyMobDead";
 	monster "job_wiz",51,103,"Frilldora",1119,1,"Room of Fire::OnMyMobDead";
@@ -1542,11 +1538,10 @@ OnEnable:
 	donpcevent "Room of Fire::OnDisable";
 	.MyMobs = 3;
 	monster "job_wiz",44,99,"Greatest General",1277,1,"Room of Fire#Door::OnMyMobDead";
-	if (checkre(0)) {
+	if (RENEWAL) {
 		monster "job_wiz",43,99,"Greatest General",1277,1,"Room of Fire#Door::OnMyMobDead";
 		monster "job_wiz",45,99,"Greatest General",1277,1,"Room of Fire#Door::OnMyMobDead";
-	}
-	else {
+	} else {
 		monster "job_wiz",43,99,"Horong",1129,1,"Room of Fire#Door::OnMyMobDead";
 		monster "job_wiz",45,99,"Horong",1129,1,"Room of Fire#Door::OnMyMobDead";
 	}
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 7411e3533..a4cf754fd 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -334,7 +334,7 @@ aldeba_in,216,169,5	script	Esseray#sn	4_M_04,{
 		close;
 	}
 	if (BaseJob == Job_SuperNovice) {
-		if (checkre(0))
+		if (RENEWAL)
 			callfunc "Esseray_Ex";
 		mes "[Esseray]";
 		mes "Hm? Hey, you're a member";
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 0439033b9..c7cef8107 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -171,7 +171,7 @@ valkyrie,48,86,4	script	Valkyrie#	4_F_VALKYRIE,{
 			switch (ADVJOB) {
 			case 4008:
 			case 4015:
-				if (checkre(0)) warp "izlude",129,97;
+				if (RENEWAL) warp "izlude",129,97;
 				else warp "izlude",94,103;
 				break;
 			case 4009:
@@ -378,7 +378,7 @@ valkyrie,44,33,5	script	Teleporter	4_F_TELEPORTER,{
 		case 4: callsub S_Warpchar,"geffen",120,39;
 		case 5: callsub S_Warpchar,"alberta",117,56;
 		case 6:
-			if (checkre(0)) callsub S_Warpchar,"izlude",129,97;
+			if (RENEWAL) callsub S_Warpchar,"izlude",129,97;
 			else callsub S_Warpchar,"izlude",94,103;
 		case 7: callsub S_Warpchar,"aldebaran",91,105;
 		case 8: callsub S_Warpchar,"comodo",209,143;