summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-05-08 16:15:07 +0200
committerHaru <haru@dotalux.com>2015-05-08 16:21:05 +0200
commitad9a14992cde8ad6759263da37e723b2b1825981 (patch)
treef6c168973bb2d2c5f243ad1c5688ae15439dcc5c /npc
parent513059cad7510c20f44e1a19f731efbe2f28dbec (diff)
downloadhercules-ad9a14992cde8ad6759263da37e723b2b1825981.tar.gz
hercules-ad9a14992cde8ad6759263da37e723b2b1825981.tar.bz2
hercules-ad9a14992cde8ad6759263da37e723b2b1825981.tar.xz
hercules-ad9a14992cde8ad6759263da37e723b2b1825981.zip
Replaced checkre() calls with constants
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc')
-rw-r--r--npc/airports/airships.txt2
-rw-r--r--npc/cities/alberta.txt2
-rw-r--r--npc/cities/amatsu.txt2
-rw-r--r--npc/cities/ayothaya.txt2
-rw-r--r--npc/cities/comodo.txt2
-rw-r--r--npc/cities/gonryun.txt2
-rw-r--r--npc/cities/izlude.txt4
-rw-r--r--npc/cities/jawaii.txt2
-rw-r--r--npc/cities/louyang.txt2
-rw-r--r--npc/cities/moscovia.txt2
-rw-r--r--npc/cities/yuno.txt4
-rw-r--r--npc/custom/events/disguise.txt2
-rw-r--r--npc/custom/warper.txt6
-rw-r--r--npc/jobs/2-1/hunter.txt14
-rw-r--r--npc/jobs/2-1/knight.txt21
-rw-r--r--npc/jobs/2-1/wizard.txt33
-rw-r--r--npc/jobs/novice/supernovice.txt2
-rw-r--r--npc/jobs/valkyrie.txt4
-rw-r--r--npc/kafras/functions_kafras.txt2
-rw-r--r--npc/kafras/kafras.txt4
-rw-r--r--npc/merchants/shops.txt4
-rw-r--r--npc/merchants/socket_enchant2.txt3
-rw-r--r--npc/other/CashShop_Functions.txt6
-rw-r--r--npc/other/acolyte_warp.txt2
-rw-r--r--npc/other/arena/arena_aco.txt6
-rw-r--r--npc/other/arena/arena_lvl80.txt2
-rw-r--r--npc/other/arena/arena_room.txt6
-rw-r--r--npc/other/monster_race.txt4
-rw-r--r--npc/other/pvp.txt2
-rw-r--r--npc/other/turbo_track.txt2
-rw-r--r--npc/quests/bard_quest.txt2
-rw-r--r--npc/quests/eye_of_hellion.txt4
-rw-r--r--npc/quests/first_class/tu_acolyte.txt14
-rw-r--r--npc/quests/first_class/tu_archer.txt32
-rw-r--r--npc/quests/first_class/tu_magician01.txt2
-rw-r--r--npc/quests/first_class/tu_sword.txt52
-rw-r--r--npc/quests/kiel_hyre_quest.txt4
-rw-r--r--npc/quests/partyrelay.txt2
-rw-r--r--npc/quests/quests_13_1.txt40
-rw-r--r--npc/quests/quests_13_2.txt13
-rw-r--r--npc/quests/quests_airship.txt4
-rw-r--r--npc/quests/quests_alberta.txt12
-rw-r--r--npc/quests/quests_ayothaya.txt2
-rw-r--r--npc/quests/quests_ein.txt8
-rw-r--r--npc/quests/quests_hugel.txt18
-rw-r--r--npc/quests/quests_juperos.txt8
-rw-r--r--npc/quests/quests_lighthalzen.txt16
-rw-r--r--npc/quests/quests_louyang.txt10
-rw-r--r--npc/quests/quests_morocc.txt6
-rw-r--r--npc/quests/quests_moscovia.txt14
-rw-r--r--npc/quests/quests_nameless.txt12
-rw-r--r--npc/quests/quests_prontera.txt6
-rw-r--r--npc/quests/quests_rachel.txt14
-rw-r--r--npc/quests/quests_veins.txt8
-rw-r--r--npc/quests/seals/brisingamen_seal.txt2
-rw-r--r--npc/quests/seals/god_global.txt2
-rw-r--r--npc/quests/seals/megingard_seal.txt6
-rw-r--r--npc/quests/seals/sleipnir_seal.txt2
-rw-r--r--npc/quests/the_sign_quest.txt36
-rw-r--r--npc/re/cities/brasilis.txt2
60 files changed, 246 insertions, 258 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 3eb84f867..115072b3f 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -655,7 +655,7 @@ OnTouch:
switch ($@airplanelocation2) {
case 0: warp "ra_fild12",292,204; end;
case 1:
- if(checkre(0))
+ if (RENEWAL)
warp "izlude",200,73;
else
warp "izlude",200,56;
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 92e249135..40d865b2f 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -215,7 +215,7 @@ alberta,189,151,5 script Fisk 4W_SAILOR,{
close;
}
Zeny -= 500;
- if(checkre(0))
+ if (RENEWAL)
warp "izlude",195,212;
else
warp "izlude",176,182;
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index a79c30993..54f23c853 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -135,7 +135,7 @@ amatsu,194,79,5 script Sea Captain#ama2 4_M_SEAMAN,{
mes "so many things to talk about,";
mes "right? All aboard now.";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "alberta",244,72;
else
warp "alberta",243,91;
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index a8a114d2d..db1a47a31 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -91,7 +91,7 @@ ayothaya,152,68,1 script Aibakthing#ayo2 4_M_THAIONGBAK,{
mes "[Aibakthing]";
mes "You will be welcome to come back whenever you please. I hope that we will see each other again sometime soon. Thank you~";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "alberta",235,45;
else
warp "alberta",238,22;
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 248af4e50..7342d2e08 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -355,7 +355,7 @@ cmd_fild07,299,83,4 script Zain#cmd 4W_SAILOR,{
case 2:
if (Zeny < 800) break;
Zeny -= 800;
- if(checkre(0))
+ if (RENEWAL)
warp "izlude",195,212;
else
warp "izlude",176,182;
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 919d23e20..86493f1d9 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -142,7 +142,7 @@ gon_fild01,255,79,7 script Kunlun Envoy#gon2 4_M_TWMIDMAN,{
mes "back. Now, let me guide you";
mes "back to Alberta.";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "alberta",244,60;
else
warp "alberta",243,67;
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 5aaceb709..7c43ae5ae 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -221,7 +221,7 @@
}
- script ::Kylick_izlude -1,{
- if (!checkre(0) && rand(2)) {
+ if (!RENEWAL && rand(2)) {
mes "[Kylick]";
mes "I was thinking, even though the people of Izlude live so close to the ocean...";
next;
@@ -506,7 +506,7 @@ izlu2dun,108,27,0 script Sailor#2izlude 4W_SAILOR,{
mes "head back?";
next;
if (select("Yeah, I'm tired to death.:Nope, I love this place!") == 1) {
- if(checkre(0))
+ if (RENEWAL)
warp "izlude",197,210;
else
warp "izlude",176,182;
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 1cbd51fd5..85a993c89 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -57,7 +57,7 @@ jawaii,239,112,7 script Mariner#toizu 4W_SAILOR,{
mes "guide you to";
mes "Izlude.";
close2;
- if(checkre(0))
+ if (RENEWAL)
warp "izlude",195,212;
else
warp "izlude",176,182;
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index b0aa53dbc..67d6ec87d 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -107,7 +107,7 @@ lou_fild01,190,100,7 script Girl#1lou 4_F_CHNDRESS1,{
mes "see you again!";
mes "Bye bye!";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "alberta",236,40;
else
warp "alberta",235,45;
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index ac6ef0bb4..74c121836 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -107,7 +107,7 @@ moscovia,166,53,4 script Moscovia P.R. Officer#2 4_F_RUSWOMAN2,{
mes "Please come and visit soon.";
mes "Ok then, Let's get going.";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "alberta",244,52;
else
warp "alberta",243,67;
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index 8ecc4910b..cda19d322 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -367,10 +367,10 @@ yuno,142,183,5 script Airship Representative 4W_SAILOR,{
next;
switch(select("Prontera:Izlude:Geffen:Morroc:Payon:Alberta:Comodo:Cancel")) {
case 1: callsub S_Warp,"prontera",116,72;
- case 2: if (checkre(0)) callsub S_Warp,"izlude",128,98; else callsub S_Warp,"izlude",94,103;
+ case 2: if (RENEWAL) callsub S_Warp,"izlude",128,98; else callsub S_Warp,"izlude",94,103;
case 3: callsub S_Warp,"geffen",120,39;
case 4: callsub S_Warp,"morocc",156,46;
- case 5: if (checkre(0)) callsub S_Warp,"payon",162,59; else callsub S_Warp,"payon",69,100;
+ case 5: if (RENEWAL) callsub S_Warp,"payon",162,59; else callsub S_Warp,"payon",69,100;
case 6: callsub S_Warp,"alberta",117,56;
case 7: callsub S_Warp,"comodo",209,143;
case 8: close;
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index b3215ccb7..ac218a2c2 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -133,7 +133,7 @@ OnInit:
B_MAGALETA, B_SHECIL, B_KATRINN, B_YGNIZEM, APOCALIPS_H, LADY_TANEE, THANATOS, DETALE, KIEL_, RANDGRIS,
GLOOMUNDERNIGHT, KTULLANUX, ATROCE, G_MAGALETA_, IFRIT, FALLINGBISHOP, BEELZEBUB_, GOPINICH, MOROCC_, KUBLIN,
S_NYDHOG, BOITATA;
- if(checkre(0)){
+ if (RENEWAL){
setarray .MVP[getarraysize(.MVP)], QUEEN_SCARABA, LOST_DRAGON, LEAK, I_QUEEN_SCARABA;
}
set .Blacklist$, "1003,1006,1017,1021,1022,1027,1043,1075,1136,1137,1168," +
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 311274997..4e85119dd 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -85,7 +85,7 @@ function Pick {
set .@map$, getarg(0)+((.@i<10)?"0":"")+.@i;
}
if (.@warp_block & (1<<.@select)) {
- message strcharinfo(0),"This map is not enabled in "+((checkre(0))?"":"Pre-")+"Renewal.";
+ message strcharinfo(0),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal.";
close;
}
warp .@map$,@c[.@i*2],@c[.@i*2+1];
@@ -94,13 +94,13 @@ function Pick {
end;
}
function Restrict {
- if ((getarg(0) == "RE" && !checkre(0)) || (getarg(0) == "Pre-RE" && checkre(0))) {
+ if ((getarg(0) == "RE" && !RENEWAL) || (getarg(0) == "Pre-RE" && RENEWAL)) {
if (getarg(1,0)) {
set @warp_block,0;
for(set .@i,1; .@i<getargcount(); set .@i,.@i+1)
set @warp_block, @warp_block | (1<<getarg(.@i));
} else {
- message strcharinfo(0),"This map is not enabled in "+((checkre(0))?"":"Pre-")+"Renewal.";
+ message strcharinfo(0),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal.";
close;
}
}
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;
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 329d0fee4..483e9b72a 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -345,7 +345,7 @@ function script F_KafTele {
else if (@wrpD$[.@j] == "Comodo") warp "comodo", 209, 143;
else if (@wrpD$[.@j] == "Comodo Pharos Beacon") warp "cmd_fild07", 127, 134;
else if (@wrpD$[.@j] == "Geffen") warp "geffen", 120, 39;
- else if (@wrpD$[.@j] == "Izlude") { if (checkre(0)) warp "izlude", 128, 98; else warp "izlude", 91, 105; }
+ else if (@wrpD$[.@j] == "Izlude") { if (RENEWAL) warp "izlude", 128, 98; else warp "izlude", 91, 105; }
else if (@wrpD$[.@j] == "Juno") warp "yuno", 158, 125;
else if (@wrpD$[.@j] == "Mjolnir Dead Pit") warp "mjolnir_02", 99, 351;
else if (@wrpD$[.@j] == "Morroc") warp "morocc", 156, 46;
diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
index 235a0da0f..0df94899d 100644
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@@ -412,7 +412,7 @@ cmd_fild07,136,134,4 script Kafra Employee::kaf_cmd_fild07 4_F_KAFRA7,{
mes "are always on your side.";
mes "How may I assist you?";
callfunc "F_Kafra",5,0,1,40,820;
- if (checkre(0))
+ if (RENEWAL)
savepoint strnpcinfo(4),129,97;
else
savepoint "izlude",94,103;
@@ -598,7 +598,7 @@ niflheim,202,180,3 script Kafra Employee::kaf_niflheim 4_F_NFDEADKAFRA,{
// - Byalan Island
izlu2dun,106,58,8 script Kafra Employee::kaf_izlu2dun 4_F_KAFRA3,{
cutin "kafra_03",2;
- if (!checkre(0) && BaseJob == Job_Novice && job_merchant_q2 > 0) {
+ if (!RENEWAL && BaseJob == Job_Novice && job_merchant_q2 > 0) {
// Merchant Job Change Quest
// function F_MercKafra is found in /pre-re/jobs/1-1/merchant.txt
callfunc "F_MercKafra";
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index a45ec6adb..33f72a1fb 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -269,7 +269,7 @@ OnInit:
sellitem Flash_Shuriken;
sellitem Sharp_Leaf_Shuriken;
sellitem Thorn_Needle_Shuriken;
- if (checkre(0)){
+ if (RENEWAL) {
sellitem Explosive_Kunai;
sellitem Makibishi;
}
@@ -286,7 +286,7 @@ OnInit:
sellitem Charm_Ice;
sellitem Charm_Wind;
sellitem Charm_Earth;
- if (checkre(0)){
+ if (RENEWAL) {
sellitem Fox_Armguard;
sellitem Special_Ninja_Suit;
}
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index afd19eba6..a93c87a03 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -169,8 +169,7 @@
mes "A class? You seem to want little too much. But, no problem.";
mes "So, what kind of armor do you have?";
next;
- switch(select("Pirate Bandana:Black Leather Boots"+(checkre(0)?":Special Ninja Suit":"")))
- {
+ switch (select("Pirate Bandana:Black Leather Boots"+(RENEWAL?":Special Ninja Suit":""))) {
case 1: callfunc "Func_Socket2",2287,5350,50,61,500,985,1; // 50,61 - it's not a typo
case 2: callfunc "Func_Socket2",2425,2434,40,51,500,985,1;
case 3: callfunc "Func_Socket2",15053,15056,50,61,500,985,1;
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.";
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 477bc9c3e..09ddf6505 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -124,7 +124,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
specialeffect2 EF_RESURRECTION;
mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
gef_bard_q += 16; //30,31
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 450,0;
else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 550,0;
else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 968,0;
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index 505db5edd..bd1cb8818 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -547,7 +547,7 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 4_M_JOB_WIZARD,3,3,{
HELLIONQ = 69;
getitem 2658,1; //Nile_Rose_
getitem 603,1; //Old_Blue_Box
- getexp (checkre(3))?120000:1200000,0;
+ getexp RENEWAL_EXP?120000:1200000,0;
next;
mes "[Sir Chilias'Tyus]";
mes "Thank you, kind";
@@ -614,7 +614,7 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 4_M_JOB_WIZARD,3,3,{
delitem 7332,1; //Slate
HELLIONQ = 70;
getitem 2658,1; //Nile_Rose_
- getexp (checkre(3))?100000:1000000,0;
+ getexp RENEWAL_EXP?100000:1000000,0;
next;
mes "[Sir Chilias'Tyus]";
mes "Thank you, kind";
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index 6a60f40c9..3a1a5f748 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -455,7 +455,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{
mes "building nearby.";
close;
case 9:
- mes "You went to "+(checkre(0)?"Prontera":"Payon")+" on behalf of the convent for Priest Gardron? That must have been tough...";
+ mes "You went to "+(RENEWAL?"Prontera":"Payon")+" on behalf of the convent for Priest Gardron? That must have been tough...";
next;
mes "[Asthe]";
mes "Blessing!";
@@ -776,7 +776,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{
mes "[Asthe]";
mes "Well, please don't forget what I've taught you. I hope you look back with fondness at our time together amongst these beautiful flowers. May God bless you~";
tu_acolyte01 = 25;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 1000,1000;
else
getexp 5000,3000;
@@ -833,7 +833,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
close;
}
} else if(tu_acolyte01 == 8){
- if(countitem((checkre(0)?939:957)) > 4){
+ if(countitem(RENEWAL?939:957) > 4){
mes "Oh...!";
mes "You've returned!";
mes "Let's see... One...";
@@ -845,7 +845,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
mes "on behalf of the convent,";
mes "not to mention the fact that";
mes "you've protected the citizens";
- mes "of "+(checkre(0)?"Prontera":"Payon")+" from danger.";
+ mes "of "+(RENEWAL?"Prontera":"Payon")+" from danger.";
next;
mes "[Priest Gardron]";
mes "May you always";
@@ -855,7 +855,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
mes "Acolyte training.";
tu_acolyte01 = 9;
percentheal 100,100;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 1000,1000;
else
getexp 2000,2000;
@@ -863,7 +863,7 @@ monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
//getitem 505,1; //Blue_Potion
close;
} else {
- if (checkre(0)) {
+ if (RENEWAL) {
mes "A few days ago, a sister in Prontera";
mes "sent me a telegram that citizens had been harmed";
mes "by Hornets in the western field,";
@@ -1130,7 +1130,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{
mes "It seemed that this good";
mes "deed has improved your skills.^000000";
tu_acolyte01 = 13;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 0,500;
else
getexp 0,1000;
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index cedf21a6f..e80dbe01d 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -306,7 +306,7 @@ payon_in02,54,13,3 script Master Kavaruk 1_M_JOBTESTER,{
mes "for bringing me the news. As Arthail has said, I shall wait until he has more news for me.";
mes "You should also train and prepare for the future as well.";
tu_archer02 = 10;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 1000,1000;
else
getexp 2000,1000;
@@ -547,7 +547,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
tu_archer01 = 6;
mes "Now, your first assignment";
mes "is to learn ^3131FFLevel 3 Owl's Eye^000000!";
- if (checkre(0))
+ if (RENEWAL)
mes "From Morroc, if you travel south, you can fight Condors for your training.";
else
mes "From Prontera, if you travel south, south and then west, you can fight Condors for your training.";
@@ -560,7 +560,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
switch(select("I'll follow your advice, Chief!:I'll hunt somewhere else...")) {
case 1:
mes "[Reidin Corse]";
- if (checkre(0)) {
+ if (RENEWAL) {
mes "I'll send you to";
mes "Morroc for now,";
mes "so don't forget the";
@@ -589,7 +589,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "[Reidin Corse]";
mes "Okay...!";
mes "Off you go!";
- if (checkre(0)) {
+ if (RENEWAL) {
mes "To Morroc!";
close2;
warp "morocc",156,46;
@@ -731,7 +731,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
.@eagle = getskilllv("AC_VULTURE");
if(.@eagle < 3){
- if (checkre(0))
+ if (RENEWAL)
mes "Alright, Mandagora usually live around Geffen. I can send you to Geffen, so just travel north from there to find";
else
mes "Alright, Mandagora usually live around Mt. Mjolnir. I can send you to Prontera, so just travel north, then east from there to find";
@@ -763,7 +763,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "Alright...!";
mes "Get a move on!";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "geffen",120,39;
else
warp "prontera",116,72;
@@ -791,7 +791,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
} else if(tu_archer01 == 8){
.@eagle = getskilllv("AC_VULTURE");
if(.@eagle < 3){
- if (checkre(0))
+ if (RENEWAL)
mes "Mandagora lives in the area north of Geffen. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
else
mes "Mandagora lives in the area north and east of Prontera. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
@@ -807,7 +807,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "Alright...!";
mes "Get a move on!";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "geffen",120,39;
else
warp "prontera",116,72;
@@ -891,7 +891,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
close;
}
} else if(tu_archer01 == 10){
- if (checkre(0)) {
+ if (RENEWAL) {
mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Rockers^000000!";
emotion e_no1;
next;
@@ -929,12 +929,12 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
tu_archer01 = 11;
close;
} else if(tu_archer01 == 11){
- if (checkre(0) && countitem(940) < 10) {
+ if (RENEWAL && countitem(940) < 10) {
mes "Hey...";
mes "You gotta bring";
mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!";
close;
- } else if (!checkre(0) && (countitem(962) < 10 || countitem(991) == 0)) {
+ } else if (!RENEWAL && (countitem(962) < 10 || countitem(991) == 0)) {
mes "Hey...";
mes "You gotta bring";
mes "^3131FF10 Tentacles^000000 and";
@@ -955,7 +955,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
specialeffect2 EF_WIND;
tu_archer01 = 12;
- if (checkre(0))
+ if (RENEWAL)
delitem 940,10; //Grasshopper's_Leg
getexp 1000,1000;
getitem 1707,1; //Great_Bow
@@ -1001,7 +1001,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "no need for you to fret.";
next;
mes "[Reidin Corse]";
- if (checkre(0)) {
+ if (RENEWAL) {
mes "Now, go into the forest east of Payon and hunt Spores and Wormtails. Your test will be to bring back ^3131FF10 Mushroom Spores^000000 and";
mes "^3131FF10 Pointed Scales^000000.";
} else {
@@ -1034,14 +1034,14 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
close;
}
} else if((tu_archer01 == 14) || (tu_archer01 == 15)){
- if (checkre(0) && (countitem(906) < 10 || countitem(921) < 10)) {
+ if (RENEWAL && (countitem(906) < 10 || countitem(921) < 10)) {
mes "Remember, you";
mes "need to head into";
mes "the forest east of Payon and get me";
mes "^3131FF10 Mushroom Spores^000000";
mes "and ^3131FF10 Pointed Scales^000000.";
close;
- } else if (!checkre(0) && (countitem(1032) < 5 || countitem(905) < 20)) {
+ } else if (!RENEWAL && (countitem(1032) < 5 || countitem(905) < 20)) {
mes "Remember, you";
mes "need to head over to";
mes "Mt. Mjolnir and get me";
@@ -1088,7 +1088,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "this little reward!";
specialeffect2 EF_WIND;
tu_archer01 = 16;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 1000,1000;
else
getexp 3000,3000;
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index a3ef46322..01dd61b54 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -132,7 +132,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{
mes "time for a break. But we'll";
mes "continue this later, okay?";
tu_magician01 = 1;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp BaseLevel*3,BaseLevel*2;
else
getexp BaseLevel*30,BaseLevel*15;
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 33cfd9fa6..dc2b4109c 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -108,7 +108,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "your great efforts. But do not let your talents allow you to grow arrogant!";
tu_swordman = 23;
completequest 8228;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 186,0;
else
getexp 1860,0;
@@ -199,7 +199,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "your accomplishment.";
tu_swordman = 22;
changequest 8227,8228;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 186,0;
else
getexp 1860,0;
@@ -229,7 +229,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
tu_swordman = 13;
erasequest 8221;
setquest 8222;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 126,0;
else
getexp 1260,0;
@@ -294,7 +294,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
tu_swordman = 13;
erasequest 8221;
setquest 8222;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 126,0;
else
getexp 1260,0;
@@ -374,7 +374,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
tu_swordman = 13;
erasequest 8221;
setquest 8222;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 126,0;
else
getexp 1260,0;
@@ -398,7 +398,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "[Shurank]";
mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
tu_swordman = 10;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 112,0;
else
getexp 1120,0;
@@ -415,7 +415,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "an outstanding Swordman.";
mes "Here is a small reward...";
tu_swordman = 10;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 126,0;
else
getexp 1260,0;
@@ -467,7 +467,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "[Shurank]";
mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
tu_swordman = 10;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 112,0;
else
getexp 1120,0;
@@ -484,7 +484,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "an outstanding Swordman.";
mes "Here is a small reward...";
tu_swordman = 10;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 126,0;
else
getexp 1260,0;
@@ -569,7 +569,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
tu_swordman = 10;
changequest 8219,8220;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 112,0;
else
getexp 1120,0;
@@ -590,7 +590,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
completequest 8219;
completequest 8220;
setquest 8221;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 126,0;
else
getexp 1260,0;
@@ -682,7 +682,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "Ah! That healthy glow!";
mes "I see that you've mastered this skill already. Let me give you a little reward for your hard training!";
tu_swordman = 5;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 112,0;
else
getexp 1120,0;
@@ -725,7 +725,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
mes "all of the basics.";
tu_swordman = 4;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 97,0;
else
getexp 970,0;
@@ -763,7 +763,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as";
mes "you grow stronger.";
tu_swordman = 3;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 83,0;
else
getexp 830,0;
@@ -777,7 +777,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
mes "all of the basics.";
tu_swordman = 4;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 97,0;
else
getexp 970,0;
@@ -815,7 +815,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
mes "of the fundamentals to cover!";
tu_swordman = 2;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 58,0;
else
getexp 580,0;
@@ -848,7 +848,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
tu_swordman = 3;
setquest 8211;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 83,0;
else
getexp 830,0;
@@ -865,7 +865,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
mes "all of the basics.";
tu_swordman = 4;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 97,0;
else
getexp 970,0;
@@ -901,7 +901,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "[Shurank]";
mes "Now, if you wish to become a true Swordman, you must learn the Bash skill. There's no question about it: You've got to know these basics! Take this, and learn to Bash!";
tu_swordman = 1;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 49,0;
else
getexp 490,0;
@@ -929,7 +929,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "of the fundamentals to cover!";
tu_swordman = 2;
changequest 8211,8212;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 58,0;
else
getexp 580,0;
@@ -955,7 +955,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "of the fundamentals to cover!";
tu_swordman = 3;
changequest 8212,8213;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 83,0;
else
getexp 830,0;
@@ -976,7 +976,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
completequest 8212;
completequest 8213;
setquest 8214;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 97,0;
else
getexp 970,0;
@@ -1072,7 +1072,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{
tu_swordman = 21;
changequest 8226,8227;
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "izlude",127,100;
else
warp "izlude",35,78;
@@ -1132,7 +1132,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{
mes "Hurry over to Morroc and monitor Bankley in case he does anything desperate. If something happens, report to me right away!";
tu_swordman = 19;
changequest 8224,8225;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 162,0;
else
getexp 1620,0;
@@ -2177,7 +2177,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{
mes "Thank you for taking the trouble to come this far. Let me reward you with some experience points.";
tu_swordman = 7;
changequest 8216,8217;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 112,0;
else
getexp 1120,0;
@@ -2187,7 +2187,7 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{
mes "of yourself,";
mes "brave Swordman.";
next;
- if (checkre(0))
+ if (RENEWAL)
warp "izlude",127,100;
else
warp "izlude",35,78;
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 34a605649..f9c08779d 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -4039,7 +4039,7 @@ kh_mansion,22,28,4 script Kiel Hyre#kh 4_M_KHKYEL,{
mes "a little reward for";
mes "saving my life.";
getitem 12105,1; //Taming_Gift_Set
- getexp (checkre(3))?70000:700000,0;
+ getexp RENEWAL_EXP?70000:700000,0;
KielHyreQuest = 50;
}
else if ((KielHyreQuest >= 50) && (KielHyreQuest < 64)) {
@@ -4666,7 +4666,7 @@ kh_mansion,22,28,4 script Kiel Hyre#kh 4_M_KHKYEL,{
mes "your help, "+.@KHTitle$+" "+strcharinfo(0)+".";
getitem 616,1; //Old Card Album
delitem 7508,1; //Elysia_Ring
- getexp (checkre(3))?100000:1000000,0;
+ getexp RENEWAL_EXP?100000:1000000,0;
}
else if (KielHyreQuest >= 108) {
mes "[Kiel Hyre]";
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index f7482ec65..314984b9b 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -3077,7 +3077,7 @@ payon,168,314,3 script Lospii#payon::RelayLospii 4_M_KID1,{
// EXP Rewards
function script F_PartyRelay_Exp {
- if (checkre(3)) { //unconfirmed
+ if (RENEWAL_EXP) { //unconfirmed
if (BaseLevel > 94) getexp 104760,0;
else if (BaseLevel > 89) getexp 85920,0;
else if (BaseLevel > 79) getexp 38520,0;
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 9b2a27ca2..fc051b383 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -268,7 +268,7 @@ prt_castle,83,67,5 script Recruiter for the Brave 4_M_MANAGER,{
next;
changequest 10064,10065;
ep13_ryu = 9;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 66000,21000;
else
getexp 660000,210000;
@@ -1783,7 +1783,7 @@ moc_fild22b,230,197,5 script Munkenro#2 4_M_RUSMAN1,{
next;
completequest 10078;
ep13_ryu = 100;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 66000,21000;
else
getexp 660000,210000;
@@ -2675,7 +2675,7 @@ mid_camp,261,284,4 script Instructor#ep13bs 4_M_YOUNGKNIGHT,{
ep13_newbs = 100;
getitem 617,1; //Old_Violet_Box
getitem 12322,5; //Chocolate_Pie
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 100000,10000;
else
getexp 1000000,100000;
@@ -4208,7 +4208,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 4_M_ALCHE_D,{
mes "I hope you'll make yourself known in Ash Vacuum with your great accomplishments.";
ep13_animal = 15;
completequest 2157;
- getexp (checkre(3))?100000:1500000,0;
+ getexp RENEWAL_EXP?100000:1500000,0;
close;
}
else {
@@ -4305,7 +4305,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 4_M_ALCHE_D,{
mes "- You really hope that Rumis will be able to go back home. -";
ep13_animal = 100;
delitem 6033,1; //Horn_Of_Tendrilion
- getexp (checkre(3))?50000:1000000,0;
+ getexp RENEWAL_EXP?50000:1000000,0;
close;
}
else {
@@ -4941,7 +4941,7 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 4_M_EIN_SOLDIER,{
mes "I'll discuss this more with the expedition management.";
mes "Thank you for your valuable information.";
completequest 2158;
- getexp (checkre(3))?90000:900000,0;
+ getexp RENEWAL_EXP?90000:900000,0;
close;
}
else if (!questprogress(2158)) {
@@ -4962,7 +4962,7 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 4_M_EIN_SOLDIER,{
mes "I'll discuss this more with the expedition management.";
mes "Thank you for your valuable information.";
completequest 2159;
- getexp (checkre(3))?90000:900000,0;
+ getexp RENEWAL_EXP?90000:900000,0;
close;
}
else {
@@ -5387,7 +5387,7 @@ OnTouch:
mes "- You feel so refreshed and light, as you drink the tea that the Official offered. -";
specialeffect2 EF_ABSORBSPIRITS;
ep13_1_rhea = 100;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 80000,3000;
else
getexp 300000,10000;
@@ -7210,7 +7210,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
next;
delitem 579,50; //Delicious_Fish
ep13_alba = 6;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
getexp 8000,3000;
mes "^4d4dff You have received 8,000 EXP";
mes "and 3,000 JEXP.^000000.";
@@ -7249,7 +7249,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
delitem 7198,30; //Great_Leaf
delitem 7188,30; //Browny_Root
ep13_alba = 6;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
getexp 9000,4000;
mes "^4d4dff You have received 9,000 EXP";
mes "and 4,000 JEXP.^000000.";
@@ -7293,7 +7293,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
delitem 528,20; //Monster's_Feed
delitem 537,30; //Pet_Food
ep13_alba = 6;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
getexp 8000,3000;
mes "^4d4dff You have received 8,000 EXP";
mes "and 3,000 JEXP.^000000.";
@@ -7334,7 +7334,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
delitem 517,50; //Meat
delitem 537,30; //Pet_Food
ep13_alba = 6;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
getexp 8000,3000;
mes "^4d4dff You have received 8,000 EXP";
mes "and 3,000 JEXP.^000000.";
@@ -7372,7 +7372,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
next;
delitem 6020,30; //Fur
ep13_alba = 6;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
getexp 8000,3000;
mes "^4d4dff You have received 8,000 EXP";
mes "and 3,000 JEXP.^000000.";
@@ -7947,7 +7947,7 @@ function Catwarp {
switch(getarg(1)) {
case 1: warp "alberta",117,56; end;
case 2: warp "prontera",116,72; end;
- case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
+ case 3: if (RENEWAL) warp "izlude",128,98; else warp "izlude",91,105; end;
case 4: warp "geffen",120,39; end;
case 5: warp "payon",161,58; end;
case 6: warp "morocc",156,46; end;
@@ -8129,11 +8129,11 @@ mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{
mes "You've brough Pieces of Fish!";
mes "GOOD JOB!";
delitem 6039,10; //Piece_Of_Fish
- getexp (checkre(3))?20000:30000,0;
+ getexp RENEWAL_EXP?20000:30000,0;
ep13_yong1 = 10;
setquest 12060;
next;
- mes "^0000ffYou gain EXP "+(checkre(3)?"20,000":"30,000")+"^000000";
+ mes "^0000ffYou gain EXP "+(RENEWAL_EXP?"20,000":"30,000")+"^000000";
close;
}
else {
@@ -8375,7 +8375,7 @@ mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{
mes "Thank you for collecting minerals for me.";
next;
delitem 6048,3; //Unidentified_Mineral
- getexp (checkre(3))?20000:30000,0;
+ getexp RENEWAL_EXP?20000:30000,0;
setquest 12062;
++ep13_yong1;
select("I'm freezing! Take them quickly.");
@@ -8886,7 +8886,7 @@ mid_campin,90,121,5 script Hibba Agip 4_M_REDSWORD,{
mes "And please take this small reward.";
mes "Thank you for your help so far.";
next;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 300000,0;
else
getexp 2500000,0;
@@ -10671,7 +10671,7 @@ mid_campin,68,185,3 script Pursuit Party Leader#1 1_F_SIGNZISK,{
mes "[Echinacea]";
mes "Keep up the good work assisting the explorers in this camp.";
mao_morocc2 = 100;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 120000,20000;
else
getexp 1200000,200000;
@@ -11051,7 +11051,7 @@ mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 4_M_ACROSS,{
delitem 6029,1; //Morocc_Tracing_Log
delitem 6027,1; //Crystal_Of_Feardoom
mao_morocc2 = 10;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 20000,1000;
else
getexp 200000,10000;
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 9c11d7fb2..3faaacd62 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -399,7 +399,7 @@ function Catwarp {
switch(getarg(1)) {
case 1: warp "alberta",117,56; end;
case 2: warp "prontera",116,72; end;
- case 3: if (checkre(0)) warp "izlude",128,98; else warp "izlude",91,105; end;
+ case 3: if (RENEWAL) warp "izlude",128,98; else warp "izlude",91,105; end;
case 4: warp "geffen",120,39; end;
case 5: warp "payon",161,58; end;
case 6: warp "morocc",156,46; end;
@@ -2458,7 +2458,7 @@ spl_in02,236,92,5 script Arc#ep13md_l02 4_M_FAIRYSOLDIER,{
mes "I'm sorry this is all I can give you for now.";
ep13_mdrama = 27;
getitem 6081,25; //Splendide_Coin
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 120000,10000;
else
getexp 1200000,100000;
@@ -2778,7 +2778,7 @@ manuk,252,116,3 script Manuk Galtun#ep13_2day 4_MAN_GALTUN,{
completequest 7074;
completequest 7075;
ep13_2_days01 = 2;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 50000,30000;
else
getexp 500000,300000;
@@ -3695,7 +3695,7 @@ mid_camp,197,237,3 script Schwartzvalt Mechanic#1 4_M_LGTMAN,{
mes "I hope this ring would be a big help for your journey through the other world.";
completequest 8253;
ep13_2_rhea = 100;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 200000,5000;
else
getexp 1000000,300000;
@@ -4776,7 +4776,7 @@ man_in01,372,221,5 script Scientist#lifeguard 4_MAN_BENKUNI,{
delitem 6078,.@stoneelse_chk; //Stone_Fragments
delitem 6076,1; //Portable_Toolbox
getitem 6080,3; //Manuk_Coin
- getexp 0,(checkre(3))?50000:700000; //unconfirmed (RE)
+ getexp 0,RENEWAL_EXP?50000:700000; //unconfirmed (RE)
changequest 2179+(ep13_2_tre-2),2182;
ep13_2_tre = 100;
close;
@@ -5643,8 +5643,7 @@ spl_in01,30,324,3 script High Laphine#grenouille 4_M_FAIRYKID5,{
ep13_2_tre1 = 6;
changequest 2185,2186;
getitem 6081,3; //Splendide_Coin
- if (checkre(3) == 0)
- getexp 0,(checkre(3))?50000:700000; //unconfirmed (RE)
+ getexp 0,RENEWAL_EXP?50000:700000; //unconfirmed (RE)
close;
}
else {
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 2a3b5103d..3ba20ff7a 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -1836,7 +1836,7 @@ airplane_01,238,154,3 script Airship Captain#01 4_M_REINDEER,{
mes "letters.";
completequest 8035;
lght_air = 7;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 20000,1000;
else
getexp 200000,10000;
@@ -2155,7 +2155,7 @@ airplane,236,163,5 script Airship Captain#03 4_M_REINDEER,{
specialeffect2 EF_ABSORBSPIRITS;
completequest 8043;
lhz_heart = 13;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 70000,40000;
else
getexp 700000,400000;
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 0dbea9c6a..698229040 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -1235,7 +1235,7 @@ tur_dun01,165,29,4 script Sailor#tur2 4_M_SEAMAN,{
mes "I certainly hope you've found what you were looking for. Alright, I guess there's always a time for an adventurer to return home...";
next;
mes "^3355FF* Choo Choo *^000000";
- if (checkre(0))
+ if (RENEWAL)
warp "alberta",238,112;
else
warp "alberta",241,115;
@@ -2378,7 +2378,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
next;
ep13_2_hiki = 13;
completequest 10089;
- getexp (checkre(3))?8000:80000,0;
+ getexp RENEWAL_EXP?8000:80000,0;
mes "[Iromo]";
mes "The world is big, there are many things...";
mes "I have not seen yet. Yes... I want to...";
@@ -2506,7 +2506,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
next;
ep13_2_hiki = 11;
changequest 10087,10088;
- getexp (checkre(3))?6700:67000,0;
+ getexp RENEWAL_EXP?6700:67000,0;
mes "[Iromo]";
mes "Nevermind... it's not unexpected...";
mes "To go on an adventure with my friends,";
@@ -2574,7 +2574,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
next;
ep13_2_hiki = 10;
changequest 10086,10087;
- getexp (checkre(3))?5700:57000,0;
+ getexp RENEWAL_EXP?5700:57000,0;
mes "[Iromo]";
mes "...I'm not in a good mood, get out...";
close;
@@ -2631,7 +2631,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
next;
ep13_2_hiki = 8;
changequest 10084,10085;
- getexp (checkre(3))?4700:47000,0;
+ getexp RENEWAL_EXP?4700:47000,0;
mes "[Iromo]";
mes "Thank you for being helpful.";
mes "But, no thanks.";
@@ -2687,7 +2687,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
delitem 501,1; //Red_Potion
ep13_2_hiki = 7;
changequest 10083,10084;
- getexp (checkre(3))?3750:37500,0;
+ getexp RENEWAL_EXP?3750:37500,0;
mes "[Iromo]";
mes "I don't want to see the cat again.";
mes "If I go out, I will see him. It is scary.";
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 4135e8f98..e4fb2fb75 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -712,7 +712,7 @@ ayo_dun02,91,264,3 script Haggard Man 4_M_THAIAYO,{
mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
thai_find = 14;
completequest 12034;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 900,0;
else if (BaseLevel > 55 && BaseLevel < 61) getexp 1050,0;
else if (BaseLevel > 60 && BaseLevel < 66) getexp 1868,0;
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index 75391e529..706e6d1b7 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -3555,7 +3555,7 @@ ein_in01,67,242,3 script Zelmeto 4_M_REPAIR,{
++$EinPolution;
completequest 8031;
EinFactory = 16;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 41) getexp 61,0;
else if (BaseLevel < 51) getexp 307,0;
else if (BaseLevel < 61) getexp 660,0;
@@ -4665,7 +4665,7 @@ einbech,165,105,7 script Buender Hikeman#ein 4_M_EINOLD,{
cutin "ein_hicman",255;
completequest 2078;
Shinokas_Quest = 11;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 70) getexp 30000,30000;
else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 40000,40000;
else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 70000,70000;
@@ -5937,7 +5937,7 @@ ein_in01,31,138,3 script Calla#ein 4_F_01,{
mes "feel goooood~";
percentheal 100,0;
EIN_LOVERQ = 17;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 41) getexp 61,0;
else if (BaseLevel < 61) getexp 600,0;
else if (BaseLevel < 81) getexp 3000,0;
@@ -6413,7 +6413,7 @@ ein_in01,200,101,5 script Klitzer#ein 4_M_EINMAN2,{
delitem 1901,1; //Violin
EIN_LOVERQ = 5;
changequest 8077,8079;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 41) getexp 61,0;
else if (BaseLevel < 61) getexp 600,0;
else if (BaseLevel < 81) getexp 3000,0;
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index a9505a624..5d38f1433 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -635,7 +635,7 @@ OnTouch:
specialeffect EF_CONE;
hg_herb = 13;
getitem 603,1; //Old Blue Box
- getexp (checkre(3))?5000:50000,0;
+ getexp RENEWAL_EXP?5000:50000,0;
completequest 8056;
} else {
if (.@rand > 3) {
@@ -1216,7 +1216,7 @@ ein_in01,16,36,3 script Morriphen 4_M_04,{
mes "I won't have to worry";
mes "about you. Take care~";
hg_bio = 9;
- getexp (checkre(3))?70000:700000,0;
+ getexp RENEWAL_EXP?70000:700000,0;
completequest 11016;
close;
} else if (hg_bio == 9) {
@@ -1411,7 +1411,7 @@ hu_in01,326,307,3 script Siria 4_F_01,{
mes "I just... I just need to relax.";
mes "Thank you for everything...";
hg_bio = 8;
- getexp (checkre(3))?30000:500000,0;
+ getexp RENEWAL_EXP?30000:500000,0;
changequest 11015,11016;
close;
} else if (hg_bio == 8) {
@@ -4855,7 +4855,7 @@ hugel,196,164,3 script El Schatt 1_M_04,{
next;
specialeffect2 EF_CONE;
hg_memory = 12;
- getexp (checkre(3))?8000:50000,0;
+ getexp RENEWAL_EXP?8000:50000,0;
completequest 8063;
getitem 603,1; //Old Blue Box
mes "[El Schatt]";
@@ -5153,7 +5153,7 @@ hu_fild06,190,367,3 script Torpy's Mom 4_F_GODEMOM,{
hg_ubu01 = 8;
completequest 12048;
getitem 12065,3; //Green Salad
- getexp (checkre(3))?5000:50000,0;
+ getexp RENEWAL_EXP?5000:50000,0;
close;
} else if (hg_ubu01 == 8) {
mes "[Torpy's Mom]";
@@ -5785,7 +5785,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{
erasequest .@i;
}
getitem 584,3; //Fish_Ball_Soup
- getexp (checkre(3))?100:1000,0;
+ getexp RENEWAL_EXP?100:1000,0;
next;
mes "[Cellette]";
mes "It was really nice working";
@@ -6462,7 +6462,7 @@ yuno,111,156,3 script Euslan 4_F_01,{
hg_ma1 = 13;
completequest 8052;
specialeffect EF_ABSORBSPIRITS;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 90000,60000;
else
getexp 900000,600000;
@@ -6982,7 +6982,7 @@ hugel,56,104,3 script Kurupe 4_M_SEAMAN,3,3,{
}
hg_milk = 9;
specialeffect2 EF_CONE;
- getexp (checkre(3))?10000:100000,0;
+ getexp RENEWAL_EXP?10000:100000,0;
getitem 12063,3;
erasequest 12043;
mes "[Kurupe]";
@@ -9457,7 +9457,7 @@ OnTouch:
mes "used... Like that one lady,";
mes "that archaeologist, Laura.";
next;
- getexp (checkre(3))?100000:700000,0;
+ getexp RENEWAL_EXP?100000:700000,0;
hg_odin = 60;
completequest 11008;
mes "[???]";
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index e2a28024c..ffac8b6a7 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -578,7 +578,7 @@ function script Func_JupHist {
delitem getarg(0),1;
yuno_hist = 5;
jupe_hist = getarg(1);
- getexp (checkre(3))?10000:100000,0;
+ getexp RENEWAL_EXP?10000:100000,0;
next;
mes "[Fayruz]";
mes "Everyone can relate";
@@ -654,7 +654,7 @@ function script Func_JupHist {
else jupe_hist += 8;
}
yuno_hist = 6;
- getexp (checkre(3))?10000:100000,0;
+ getexp RENEWAL_EXP?10000:100000,0;
next;
mes "[Fayruz]";
mes "By now I'm sure you've";
@@ -778,7 +778,7 @@ function script Func_JupHist {
else jupe_hist += 8;
}
yuno_hist = 8;
- getexp (checkre(3))?10000:100000,0;
+ getexp RENEWAL_EXP?10000:100000,0;
next;
mes "[Fayruz]";
mes "Well... That's just my";
@@ -875,7 +875,7 @@ function script Func_JupHist {
else jupe_hist += 8;
yuno_hist = 10;
delitem getarg(0),1;
- getexp (checkre(3))?10000:100000,0;
+ getexp RENEWAL_EXP?10000:100000,0;
next;
mes "[Fayruz]";
mes "Well, that is the";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 9d236e831..78419758b 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -2695,7 +2695,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{
next;
delitem 7351,1; //Friend's_Diary
friendship = 14;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel > 90) getexp 70000,0;
else if (BaseLevel > 75) getexp 40000,0;
else getexp 20000,0;
@@ -3148,7 +3148,7 @@ yuno_in04,96,106,5 script Passionate Student 4_M_SAGE_A,{
next;
friendship = 16;
completequest 12006;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel > 90) getexp 70000,0;
else if (BaseLevel > 75) getexp 40000,0;
else getexp 20000,0;
@@ -5228,7 +5228,7 @@ OnTouch_:
mes "^FF0000Regenschirm Laboratory^000000.";
lhz_curse = 26;
changequest 2093,2094;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 70) getexp 30000,30000;
else if ((BaseLevel > 69) && (BaseLevel < 80)) getexp 40000,70000;
else if ((BaseLevel > 79) && (BaseLevel < 90)) getexp 70000,90000;
@@ -7002,7 +7002,7 @@ lighthalzen,179,170,4 script Ordinary Man 4W_M_02,{
mes "what we set out to do. Still...";
lhz_boss = 44;
getitem 617,1; //Old_Violet_Box
- getexp (checkre(3))?180000:1800000,0;
+ getexp RENEWAL_EXP?180000:1800000,0;
completequest 12028;
next;
mes "[Ghalstein]";
@@ -8571,7 +8571,7 @@ L_Mission:
mes "You can count on me to right what was wrong.";
hg_tre = 57;
delitem 7342,1; //File01
- getexp (checkre(3))?200000:2000000,0;
+ getexp RENEWAL_EXP?200000:2000000,0;
getitem 617,1;
close2;
cutin "",255;
@@ -10497,7 +10497,7 @@ lhz_in01,174,258,3 script Young Man#reken 4_M_LGTGUARD,{
mes "back. I can't work like this...";
next;
lhz_rekenber = 22;
- getexp (checkre(3))?55000:550000,0;
+ getexp RENEWAL_EXP?55000:550000,0;
completequest 12013;
cutin "lhz_kaz01",2;
mes "[Kazien]";
@@ -10582,7 +10582,7 @@ lhz_in01,174,258,3 script Young Man#reken 4_M_LGTGUARD,{
mes "can handle those thugs, right?";
next;
lhz_rekenber = 17;
- getexp (checkre(3))?45000:450000,0;
+ getexp RENEWAL_EXP?45000:450000,0;
cutin "lhz_kaz10",2;
mes "[Kazien]";
mes "Right. Now get back to";
@@ -10675,7 +10675,7 @@ lhz_in01,174,258,3 script Young Man#reken 4_M_LGTGUARD,{
next;
lhz_rekenber = 12;
changequest 5005,5006;
- getexp (checkre(3))?40000:400000,0;
+ getexp RENEWAL_EXP?40000:400000,0;
cutin "lhz_kaz03",2;
mes "[Kazien]";
mes "Alright, I'll see you";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 789c3b447..9611c46b1 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -1286,7 +1286,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{
ch_par = 10;
completequest 11056;
getitem 679,2; //Gold_Pill
- getexp (checkre(3))?1000:10000,0;
+ getexp RENEWAL_EXP?1000:10000,0;
next;
mes "[Hua Tuo]";
mes "Well then,";
@@ -1405,7 +1405,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{
ch_par = 10;
completequest 11056;
getitem 679,2; //Gold_Pill
- getexp (checkre(3))?1000:10000,0;
+ getexp RENEWAL_EXP?1000:10000,0;
next;
mes "[Hua Tuo]";
mes "Well then, I will see you around. Once again, I'd like to thank you for your help.";
@@ -1460,7 +1460,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{
ch_par = 18;
completequest 11057;
getitem 679,5; //Gold_Pill
- getexp (checkre(3))?10000:30000,0;
+ getexp RENEWAL_EXP?10000:30000,0;
next;
mes "[Hua Tuo]";
mes "However, please remember not to take more than the recommended dosage for the pills I have given you. Even medicine, in the wrong doses, can become poison to the body.";
@@ -3359,7 +3359,7 @@ lou_in02,123,39,4 script Poison King#lou 4_M_CHNOLD,{
next;
ch_poison = 20;
changequest 11082,11083;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 1050,0;
else if (BaseLevel > 55 && BaseLevel < 61) getexp 1230,0;
else if (BaseLevel > 60 && BaseLevel < 66) getexp 1570,0;
@@ -4011,7 +4011,7 @@ lou_in02,253,45,0 script Employee#poison 4_M_CHNMAN,{
next;
mes "^3355FFThe nasty taste lingers in your mouth, but then you feel a great warmth flowing throughout your body. Eventually, you pass out.^000000";
next;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 500,0;
else if (BaseLevel > 55 && BaseLevel < 61) getexp 700,0;
else if (BaseLevel > 60 && BaseLevel < 66) getexp 850,0;
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 77708ab31..174a859d6 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1616,7 +1616,7 @@ morocc,159,113,3 script Chief Balrog 4_M_CRU_OLD,{
mes "Once again, I thank you for your distinguished service on behalf of the Continental Guard and the Rune-Midgarts Kingdom. I'll report your great achievement to His Majesty right away.";
next;
delitem 7820,1; //Morroc_Skin
- getexp (checkre(3))?200000:2000000,0;
+ getexp RENEWAL_EXP?200000:2000000,0;
rebirth_moc_edq = 7;
changequest 3055,3056;
mes "[Chief Balrog]";
@@ -2396,7 +2396,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 1_M_02,{
delitem 7797,1; //Author_Memo
delitem 7796,1; //Author_Autograph
barmunt_crow = 16;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 90000,90000;
else
getexp 900000,900000;
@@ -5268,7 +5268,7 @@ prt_castle,117,163,5 script Inspector#prince 4_M_SAGE_C,{
mes "[Inspector]";
mes "So, keep up the good work.";
mes "For the Kingdom of Rune Midgarts!";
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 40000,0;
else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 45000,0;
else if ((BaseLevel > 90) && (BaseLevel < 96)) getexp 50000,0;
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index eeaa34276..22226158e 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -2190,7 +2190,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{
mes "[Prime Minister Dmitree]";
mes "Even though I regard as your effort for the time so, award you. Take it and go out.";
getitem 12702,1; //Old_Bleu_Box
- getexp (checkre(3))?50000:500000,0;
+ getexp RENEWAL_EXP?50000:500000,0;
mos_whale_edq = 39;
close;
}
@@ -2218,7 +2218,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{
mes "[Prime Minister Dmitree]";
mes "Even though I regard as your effort for the time so, award you. Take it.";
getitem 12702,1; //Old_Bleu_Box
- getexp (checkre(3))?70000:700000,0;
+ getexp RENEWAL_EXP?70000:700000,0;
mos_whale_edq = 40;
close;
}
@@ -2300,7 +2300,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{
mes "in his palace. I will reward your";
mes "efforts, in the name of the Csar.";
getitem 617,1; //Old_Violet_Box
- getexp (checkre(3))?100000:1200000,0;
+ getexp RENEWAL_EXP?100000:1200000,0;
mos_whale_edq = 41;
close;
}
@@ -2756,7 +2756,7 @@ mosk_in,144,279,5 script Gallina#mos 4_F_RUSWOMAN1,{
mes "Well, now I have to get to work!";
mes "I'll make you my hotcakes someday. Please visit me later";
mos_swan = 100;
- getexp (checkre(3))?90000:1000000,0;
+ getexp RENEWAL_EXP?90000:1000000,0;
close;
}
mes "[Gallina]";
@@ -7309,7 +7309,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
case 5: getitem 12083,1; break;
case 6: getitem 12098,1; break;
}
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 5700,500;
else if (BaseLevel < 61) getexp 6700,800;
else if (BaseLevel < 66) getexp 8000,1000;
@@ -7930,7 +7930,7 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{
delitem 7883,1; //Pointed_Wooden_Flute
rhea_rus_ring = 10;
getitem 7877,1; //Red_Ring
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 470,0;
else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
else if (BaseLevel > 60 && BaseLevel < 66) getexp 750,0;
@@ -8248,7 +8248,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
delitem 7883,1; //Pointed_Wooden_Flute
rhea_rus_ring = 9;
getitem 7877,1; //Red_Ring
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 470,0;
else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
else if (BaseLevel > 60 && BaseLevel < 66) getexp 750,0;
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 55d689ec5..93330c722 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -1296,7 +1296,7 @@ nameless_n,259,218,3 script Larjes#Boat1 4W_M_01,{
delitem 7726,1; //Token_Of_King
aru_monas = 25;
changequest 17016,17017;
- getexp (checkre(3))?100000:1000000,0;
+ getexp RENEWAL_EXP?100000:1000000,0;
close;
}
}
@@ -1711,7 +1711,7 @@ ra_temple,165,57,5 script Niren#ss 4_F_MADAME,{
delitem 7755,1; //Research_Note
aru_monas = 26;
completequest 17017;
- getexp (checkre(3))?50000:500000,0;
+ getexp RENEWAL_EXP?50000:500000,0;
close2;
}
}
@@ -2184,7 +2184,7 @@ ra_temple,165,57,5 script Niren#ss 4_F_MADAME,{
mes "that you've seen that";
mes "expression on her face.^000000";
aru_em = 23;
- getexp (checkre(3))?100000:1000000,0;
+ getexp RENEWAL_EXP?100000:1000000,0;
changequest 2141,2142;
close2;
}
@@ -6687,7 +6687,7 @@ prontera,148,326,3 script Chief Officer#edq 4_M_JOB_KNIGHT2,{
mes "Congratulations! ";
completequest 3134;
zdan_edq = 19;
- getexp (checkre(3))?100000:1000000,0;
+ getexp RENEWAL_EXP?100000:1000000,0;
close;
}
mes "[Chief Officer]";
@@ -11198,7 +11198,7 @@ prontera,140,304,5 script Old Soldier 4_M_HUOLDARMY,{
delitem 7725,1; //Unlucky_Emerald
jewel_nd = 31;
getitem 603,1; //Old_Blue_Box
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 5000,0;
else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 18000,0;
@@ -11253,7 +11253,7 @@ prontera,140,304,5 script Old Soldier 4_M_HUOLDARMY,{
delitem 7725,1; //Unlucky_Emerald
jewel_nd = 31;
getitem 603,1; //Old_Blue_Box
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 66) getitem 607,1; //Yggdrasilberry
else if ((BaseLevel > 65) && (BaseLevel < 75)) getexp 5000,0;
else if ((BaseLevel > 74) && (BaseLevel < 81)) getexp 8000,0;
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 1258b2876..770ee2934 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -2686,7 +2686,7 @@ prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{
else
prt_curse = 54;
changequest 18047,18049;
- getexp (checkre(3))?90000:1600000,0;
+ getexp RENEWAL_EXP?90000:1600000,0;
close;
}
else if (prt_curse > 43 && prt_curse < 50 && !aru_monas) {
@@ -2894,7 +2894,7 @@ prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{
mes "to cover your Airship fee.";
mes "Thank you, and good luck.";
aru_monas = 6;
- Zeny += (checkre(0)?5000:1500);
+ Zeny += (RENEWAL?5000:1500);
changequest 17002,17003;
close;
}
@@ -3012,7 +3012,7 @@ prt_church,184,110,3 script Father Biscuss 1_M_PASTOR,{
mes "you for all of your help.";
prt_curse = 36;
completequest 18048;
- getexp (checkre(3))?90000:1600000,0;
+ getexp RENEWAL_EXP?90000:1600000,0;
close;
}
else if (prt_curse == 36) {
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 935568c28..f4d3cfdad 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -2528,7 +2528,7 @@ OnTouch:
next;
rach_vice = 24;
completequest 8122;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel > 90) getexp 130000,0;
else if (BaseLevel > 75) getexp 85000,0;
else getexp 45000,0;
@@ -2833,7 +2833,7 @@ rachel,157,183,3 script Sincere Follower Urstia 4_F_MASK1,{
mes "token of my appreication for";
mes " what you have done for me.";
delitem 7573,1; //Magic_Necklace_
- getexp (checkre(3))?90000:700000,0;
+ getexp RENEWAL_EXP?90000:700000,0;
ice_necklace_q = 6;
completequest 2113;
next;
@@ -4098,7 +4098,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
if (countitem(12018) >= 20) {
cutin "ra_nemma04",2;
delitem 12018,20; //Fire_Cracker
- getexp (checkre(3))?50000:200000,0;
+ getexp RENEWAL_EXP?50000:200000,0;
ra_tem_q = 14;
mes "[Priestess Nemma]";
mes "Yay!";
@@ -4841,7 +4841,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 4_M_RACHOLD1,{
lost_boy = 13;
completequest 8099;
specialeffect2 EF_ABSORBSPIRITS;
- getexp (checkre(3))?90000:900000,0;
+ getexp RENEWAL_EXP?90000:900000,0;
end;
}
else if ((lost_boy == 13) && (ra_tem_q < 14)) {
@@ -5266,7 +5266,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 4_M_RACHOLD1,{
cutin "",255;
completequest 8105;
specialeffect2 EF_ABSORBSPIRITS;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 90000,60000;
else
getexp 900000,600000;
@@ -5826,7 +5826,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 4_M_RACHOLD1,{
mes "peace between our nations.";
aru_vol = 27;
completequest 60213;
- getexp (checkre(3))?20000:200000,0;
+ getexp RENEWAL_EXP?20000:200000,0;
close2;
cutin "",255;
end;
@@ -6266,7 +6266,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 4_M_RACHOLD1,{
mes "Your place in Valhalla is";
mes "already assured, I'm sure.";
aru_em = 24;
- getexp (checkre(3))?150000:1500000,0;
+ getexp RENEWAL_EXP?150000:1500000,0;
}
else {
mes "[High Priest Zhed]";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index b4416da15..a9b7abed6 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -291,7 +291,7 @@
mes "find these useful. Anyway,";
mes "I hope you like these rocks...";
veins_stone = 8;
- getexp (checkre(3))?30000:300000,0;
+ getexp RENEWAL_EXP?30000:300000,0;
getitem 985,3; //Elunium
close;
}
@@ -975,7 +975,7 @@ prt_church,89,108,6 script Bard#sch 2_M_BARD_ORIENT,{
mes "reward with our sincere thanks.";
que_sch = 26;
getitem 12106,1; //Accessory_Box
- getexp (checkre(3))?60000:600000,0;
+ getexp RENEWAL_EXP?60000:600000,0;
close;
}
else {
@@ -3058,7 +3058,7 @@ veins,327,185,3 script Kid#camelcamel 4_M_DST_CHILD,{
completequest 3083;
rachel_camel = 25;
specialeffect2 EF_ABSORBSPIRITS;
- if (checkre(3))
+ if (RENEWAL_EXP)
getexp 100000,50000;
else
getexp 1000000,700000;
@@ -6100,7 +6100,7 @@ ve_in,281,214,3 script Bookshelf#vol HIDDEN_NPC,{
else {
getitem 12103,1; //Bloody_Dead_Branch
}
- getexp (checkre(3))?100000:800000,0;
+ getexp RENEWAL_EXP?100000:800000,0;
mes "^3355FFWell, you've done all";
mes "that you could here.";
mes "Now would be a good time";
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 34e1a76b0..13e30ddab 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -890,7 +890,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 4_M_ALCHE_B,{
mes "Take this.";
god_brising = 50;
getitem 616,1; // Old_Card_Album
- getexp (checkre(3))?60000:600000,0;
+ getexp RENEWAL_EXP?60000:600000,0;
next;
mes "[Enrico Kaili]";
mes "Please accept this as my way of thanking you for assisting in my";
diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt
index daeb6ddae..9db44a140 100644
--- a/npc/quests/seals/god_global.txt
+++ b/npc/quests/seals/god_global.txt
@@ -100,7 +100,7 @@ L_Var:
OnInit:
// Seals roll at 25/50 in Renewal and 50/100 in Pre-Renewal.
- if (checkre(0)) {
+ if (RENEWAL) {
$@god_check1 = 25;
$@god_check2 = 50;
} else {
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index bb0d35f6c..bde57eb6c 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -2652,7 +2652,7 @@ aldebaran,66,213,0 script Lady#megin 1_F_04,{
mes "I really appreciate you coming here to talk to me about the old days. I, I want you to have this.";
god_eremes = 28;
getitem 603,1; // Old_Blue_Box
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 2700,0;
else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
@@ -3191,7 +3191,7 @@ niflheim,109,254,0 script Egnigem 4_M_NFDEADSWDMAN,{
specialeffect EF_LOCKON;
specialeffect2 EF_HOLYCROSS;
god_eremes = 27;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 2700,0;
else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
@@ -3249,7 +3249,7 @@ niflheim,109,254,0 script Egnigem 4_M_NFDEADSWDMAN,{
specialeffect EF_LOCKON;
specialeffect2 EF_HOLYCROSS;
god_eremes = 27;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 2700,0;
else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 3000,0;
else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 5605,0;
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index 54587ae94..81f231852 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -208,7 +208,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{
god_sl_1 = 51;
.@god_treasure = rand(1,900);
.@god_treasure1 = rand(1,1000);
- if (checkre(0)) {
+ if (RENEWAL) {
if (.@god_treasure < 101) {
if (.@god_treasure1 < 210) getitem 2102,1; //Guard_
else if (.@god_treasure1 < 420) getitem 2104,1; //Buckler_
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index be630c202..23f543546 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -694,7 +694,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
mes "You may have had your doubts,";
mes "but I'm happy enough to confirm that the Sign really exists. Thanks again, and I hope you stop by and chat from time to time.";
sign_q = 142;
- getexp (checkre(3))?200000:2000000,0;
+ getexp RENEWAL_EXP?200000:2000000,0;
}
else {
mes "Have you visited";
@@ -727,7 +727,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
}
delitem 7178,1; //Star's_Sob
sign_q = 202;
- getexp (checkre(3))?10000:100000,0;
+ getexp RENEWAL_EXP?10000:100000,0;
getitem 617,1; //Old_Violet_Box
}
else if (sign_q > 201) {
@@ -1495,7 +1495,7 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{
mes "you gave Ganaan tell me";
mes "you're not a total dumbass.";
mes "Now you're supposed to go see Daewoon in Payon. And don't forget to show him this Star thingee.";
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 750,0;
else if (BaseLevel < 80) getexp 1000,0;
@@ -2365,7 +2365,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
if (.@pay_point > 29) {
sign_q = 15;
getitem 7177,1; //Part_Of_Star's_Sob
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 750,0;
else if (BaseLevel < 80) getexp 1000,0;
@@ -2409,7 +2409,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
else if ((.@pay_point > 26) && (.@pay_point < 30)) {
sign_q = 15;
getitem 7177,1; //Part_Of_Star's_Sob
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 750,0;
else if (BaseLevel < 80) getexp 1000,0;
@@ -4639,7 +4639,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{
if (countitem(750)) delitem 750,1; //Baphomet_Doll
if (countitem(751)) delitem 751,1; //Osiris_Doll
sign_q = 30;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 500,0;
else if (BaseLevel < 80) getexp 800,0;
@@ -4730,7 +4730,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{
mes "um, ''Bakerlan'' in Alberta.";
sign_q = 35;
getitem 7177,1; //Part_Of_Star's_Sob
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 700,0;
else if (BaseLevel < 80) getexp 1900,0;
@@ -4768,7 +4768,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{
sign_q = 35;
getitem 7177,1; //Part_Of_Star's_Sob
Zeny += 20000;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 700,0;
else if (BaseLevel < 80) getexp 1000,0;
@@ -5639,7 +5639,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{
mes "He will tell you what you need to do next.";
sign_q = 53;
getitem 7177,1; //Part_Of_Star's_Sob
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 500,0;
else if (BaseLevel < 70) getexp 800,0;
else if (BaseLevel < 80) getexp 1100,0;
@@ -6853,7 +6853,7 @@ yuno,330,100,4 script Knight#ss 4_M_JOB_KNIGHT2,{
delitem2 7049,1,1,0,0,.@sign1,.@sign2,.@sign3,.@sign4;
sign_q = 39;
getitem 7181,1; //Receipt_01
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 100,0;
else if (BaseLevel < 70) getexp 200,0;
else if (BaseLevel < 80) getexp 400,0;
@@ -8244,7 +8244,7 @@ himinn,48,86,5 script Valkyrie#sign 4_F_VALKYRIE,{
mes "one of the hearts there...";
sign_q = 82;
percentheal 100,100;
- if (checkre(3)) {
+ if (RENEWAL_EXP) {
if (BaseLevel < 56) getexp 900,0;
else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 1200,0;
else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 2000,0;
@@ -8534,7 +8534,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{
mes "ask the Dark Lord to spare";
mes "you. Thank you so much...";
sign_q = 200;
- getexp (checkre(3))?20000:200000,0;
+ getexp RENEWAL_EXP?20000:200000,0;
$@sign_w2 = 0;
donpcevent "Dark Lord#serin::OnDisable";
close2;
@@ -8805,7 +8805,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
mes "ask the Dark Lord to spare";
mes "you. Thank you so much...";
sign_q = 200;
- getexp (checkre(3))?20000:200000,0;
+ getexp RENEWAL_EXP?20000:200000,0;
$@sign_w1 = 0;
close2;
warp "umbala,",132,203;
@@ -9551,7 +9551,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
mes "the faint smile on her lips tell you that her memories of you";
mes "will always remain in her heart.^000000";
delitem 2643,1; //Serin's_Gold_Ring_
- getexp (checkre(3))?50000:500000,0;
+ getexp RENEWAL_EXP?50000:500000,0;
close;
case 2:
emotion e_sob;
@@ -10313,7 +10313,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason, "+strcharinfo(0)+"...";
delitem 7313,5; //Seal_Of_Witch
sign_q = 129;
- getexp (checkre(3))?50000:500000,0;
+ getexp RENEWAL_EXP?50000:500000,0;
close;
}
}
@@ -10342,7 +10342,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
delitem 7313,5; //Seal_Of_Witch
sign_q = 130;
- getexp (checkre(3))?30000:300000,0;
+ getexp RENEWAL_EXP?30000:300000,0;
close;
}
}
@@ -10368,7 +10368,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
if (countitem(2643) == 1) sign_q = 129;
else sign_q = 130;
- getexp (checkre(3))?30000:300000,0;
+ getexp RENEWAL_EXP?30000:300000,0;
close;
}
else if (sign_q == 200) {
@@ -10398,7 +10398,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
if (countitem(2642) > 0) delitem 2642,1; //Serin's_Gold_Ring
if (countitem(7308) > 0) delitem 7308,1; //Witch's_Potion
sign_q = 201;
- getexp (checkre(3))?20000:200000,0;
+ getexp RENEWAL_EXP?20000:200000,0;
close;
}
else if (sign_q > 200) {
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt
index 417dc87b8..696354199 100644
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@@ -57,7 +57,7 @@ brasilis,316,57,3 script Crewman#bra1 4W_SAILOR,{
mes "[Crewman]";
mes "I sure do miss home.";
close2;
- if (checkre(0))
+ if (RENEWAL)
warp "alberta",243,82;
else
warp "alberta",244,115;