Replaced checkre() calls with constants

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

8 files changed, 15 insertions, 15 deletions

diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 39bfa3c97..f71245ad6 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -74,7 +74,7 @@ function	script	F_CashReset	{
 function	script	F_CashDungeon	{
 	switch(getarg(0)) {
 	case 1:
-		switch(select("Nogg Road:Mjolnir Dead Pit:"+((checkre(0))?"":"Umbala Dungeon")+":Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor")) {
+		switch(select("Nogg Road:Mjolnir Dead Pit:"+(RENEWAL?"":"Umbala Dungeon")+":Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower 3f:Glast Heim Culvert 2f:Sphinx Dungeon 4f:Inside Pyramid 4f:Prontera Culvert 3f:Amatsu Dungeon 1f (Tatami Maze):Somatology Laboratory 1st floor:Ayothya Ancient Shrine 2nd floor")) {
 		case 1: warp "mag_dun01",125,71; end;	// Nogg Road
 		case 2: warp "mjo_dun02",80,297; end;	// Mjolnir Dead Pit
 		case 3: warp "um_dun02",125,122; end;	// Umbala Dungeon (Pre-Renewal only)
@@ -133,7 +133,7 @@ function	script	F_CashCity	{
 	case 1: // Yellow - Rune-Midgart
 		switch(select("Prontera:Izlude:Geffen:Payon:Morroc:Alberta:Al de Baran")) {
 			case 1: warp "prontera",122,87; end;
-			case 2: if (checkre(0)) warp "izlude",130,90; else warp "izlude",91,105; end;
+			case 2: if (RENEWAL) warp "izlude",130,90; else warp "izlude",91,105; end;
 			case 3: warp "geffen",128,48; end;
 			case 4: warp "payon",164,123; end;
 			case 5: warp "morocc",160,100; end;
@@ -185,7 +185,7 @@ function	script	F_CashTele	{
 		case 1: warp "prontera",119,77; end;
 		case 2: warp "geffen",119,39; end;
 		case 3: warp "aldebaran",165,107; end;
-		case 4: if (checkre(0)) warp "izlude",128,105; else warp "izlude",91,105; end;
+		case 4: if (RENEWAL) warp "izlude",128,105; else warp "izlude",91,105; end;
 		case 5: warp "SavePoint",0,0; end;
 		}
 	case 2:
diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt
index 9760d4e67..c1b2a4b8d 100644
--- a/npc/other/acolyte_warp.txt
+++ b/npc/other/acolyte_warp.txt
@@ -61,7 +61,7 @@ prontera,98,121,4	script	Acolyte#Prtclear	4_F_01,{
 		next;
 		Zeny -= .@cost[.@i];
 		switch(.@i) {
-			case 0: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; break;
+			case 0: if (RENEWAL) warp "izlude",128,98; else warp "izlude",91,105; break;
 			case 1: warp "geffen",120,39; break;
 			case 2: warp "payon",161,58; break;
 			case 3: warp "morocc",156,46; break;
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 65ed3c6e3..d6c7943da 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -1568,7 +1568,7 @@ arena_room,94,82,7	script	Arena Record Staff#aco	1_F_PRIEST,{
 	mes "Class Arena Challenges?";
 	mes "Please choose from the menu.";
 	next;
-	switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ "+(checkre(0)?"160":"99"))) {
+	switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ "+(RENEWAL?"160":"99"))) {
 	case 1:
 		.@acotop_t = $arn_acotop;
 		.@acotop_n$ = $arn_acotopn$;
@@ -1644,7 +1644,7 @@ OnLineRec_pri80:
 	end;
 
 OnLineRec_pri90:
-	mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~"+(checkre(0)?"160":"99")+". Congratulations!",bc_map,"0xFFFF00";
+	mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~"+(RENEWAL?"160":"99")+". Congratulations!",bc_map,"0xFFFF00";
 	end;
 }
 
@@ -1722,7 +1722,7 @@ arena_room,195,5,3	script	log-on-aco#arena	4_NFWISP,{
 		mes "particular mode in the";
 		mes "Arena Acolyte Class Mode.^000000";
 		next;
-		switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level "+(checkre(0)?"160":"99"))) {
+		switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level "+(RENEWAL?"160":"99"))) {
 		case 1:
 			mes "^3355FFCommand has";
 			mes "been canceled.^000000";
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index f610619b7..8690d992b 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -17,7 +17,7 @@ arena_room,147,42,1	script	Lv80 Waiting Room	4_F_TELEPORTER,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 80 to "+(checkre(0)?"160":"99"),50,"Lv80 Waiting Room::OnStartArena",1,1000,80;
+	waitingroom "Individual; Level 80 to "+(RENEWAL?"160":"99"),50,"Lv80 Waiting Room::OnStartArena",1,1000,80;
 	enablewaitingroomevent;
 	end;
 
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index c06aef63d..2b6a33a27 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -264,7 +264,7 @@ arena_room,147,49,3	script	Helper Epin	4_F_JOB_HUNTER,{
 	next;
 	mes "[Epin]";
 	mes "This ^3131FFLv 80 arena stage^000000";
-	mes "is accessable to characters from ^FF0000level 80^000000 to ^FF0000level "+(checkre(0)?"160":"99")+"^000000.";
+	mes "is accessable to characters from ^FF0000level 80^000000 to ^FF0000level "+(RENEWAL?"160":"99")+"^000000.";
 	next;
 	mes "[Epin]";
 	mes "This level limitation is to prevent high level characters abusing low level arena stages. I hope you will understand.";
@@ -304,7 +304,7 @@ arena_room,158,93,5	script	Helper Lunic	4_M_ROGUE,{
 	next;
 	mes "[Lunic]";
 	mes "^3131FFParty Arena Stage^000000";
-	mes "is accessible to players from ^FF0000level 10^000000 to ^FF0000level "+(checkre(0)?"160":"99")+"^000000.";
+	mes "is accessible to players from ^FF0000level 10^000000 to ^FF0000level "+(RENEWAL?"160":"99")+"^000000.";
 	next;
 	mes "[Lunic]";
 	mes "Also, arena will be not be started until all of 5 party members enter the room. We accept an entrance fee 1,000 zeny.";
@@ -617,7 +617,7 @@ prt_are_in,98,14,3	script	Givu#arena	4_F_JOB_KNIGHT,{
 				close;
 			}
 			arena_point -= 40;
-			if (checkre(3)) {
+			if (RENEWAL_EXP) {
 				if (BaseLevel < 70) getexp 300,0;
 				else if (BaseLevel < 80) getexp 900,0;
 				else if (BaseLevel < 90) getexp 1000,0;
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 30dd66bab..2dc89052e 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -2395,7 +2395,7 @@ S_Reward:
 			mes "Now do you see the";
 			mes "power of hope?";
 			delitem 7515,1; //Marvelous_Medal
-			if (checkre(3)) {
+			if (RENEWAL_EXP) {
 				if (BaseLevel < 21) getexp 110,0;
 				else if ((BaseLevel > 20) && (BaseLevel < 31)) getexp 280,0;
 				else if ((BaseLevel > 30) && (BaseLevel < 41)) getexp 1000,0;
@@ -2457,7 +2457,7 @@ S_Reward:
 			mes "whatever you feed it.";
 			mes "Placebos and psychosomatic symptoms-- it all ties together.";
 			delitem 7515,1; //Marvelous_Medal
-			if (checkre(3)) {
+			if (RENEWAL_EXP) {
 				if (Class == Job_Novice) {
 					getexp 0,15;
 				} else if (Class == Job_Novice_High) {
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 383c67d22..b8d104ce2 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -254,7 +254,7 @@ geffen_in,67,63,4	duplicate(pvpe)	PVP Narrator#pe6	4_M_02
 
 L_Warp:
 	.@map$ = getarg(0);
-	if (checkre(0)) {
+	if (RENEWAL) {
 		switch(rand(1,10)) {
 			case 1: warp .@map$,34,38; break;
 			case 2: warp .@map$,46,38; break;
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index fdbf58b82..e2dd1d661 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -4670,7 +4670,7 @@ alde_gld,186,199,3	script	Turbo Track Guide#Entran	4_F_RACING,{
 	mes "Turbo Track~";
 	next;
 	mes "[Guide]";
-	if (checkre(0))
+	if (RENEWAL)
 		mes "Peco Pecos, Grand Pecos, Dragons, Gryphons, Wargs and Magic Gears are prohibited inside the Turbo Track Arena.";
 	else
 		mes "Peco Pecos are prohibited inside the Turbo Track Arena.";