From ad9a14992cde8ad6759263da37e723b2b1825981 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 8 May 2015 16:15:07 +0200 Subject: Replaced checkre() calls with constants Signed-off-by: Haru --- npc/other/arena/arena_aco.txt | 6 +++--- npc/other/arena/arena_lvl80.txt | 2 +- npc/other/arena/arena_room.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'npc/other/arena') 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; -- cgit v1.2.3-70-g09d2