From 32169c383f2658192b6b8cb02d7f818a361dda03 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 20 Oct 2014 04:20:29 +0200 Subject: Removed use of 'checkquest' from scripts (common folder) Signed-off-by: Haru --- npc/battleground/flavius/flavius01.txt | 4 +- npc/battleground/flavius/flavius02.txt | 8 +- npc/battleground/flavius/flavius_enter.txt | 292 +++++++++++++---------------- npc/battleground/kvm/kvm_enter.txt | 16 +- npc/battleground/tierra/tierra01.txt | 10 +- npc/battleground/tierra/tierra02.txt | 10 +- npc/battleground/tierra/tierra_enter.txt | 292 +++++++++++++---------------- 7 files changed, 286 insertions(+), 346 deletions(-) (limited to 'npc/battleground') diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index 18f153d87..a02752d52 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -377,14 +377,14 @@ OnTouch: bat_b01,87,76,0 script A_CODE#bat_b01 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) + if (!questprogress(2070)) setquest 2070; end; } bat_b01,312,224,0 script B_CODE#bat_b01 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) + if (!questprogress(2070)) setquest 2070; end; } diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt index 0a88b9919..79b7b5168 100644 --- a/npc/battleground/flavius/flavius02.txt +++ b/npc/battleground/flavius/flavius02.txt @@ -378,15 +378,15 @@ OnTouch: bat_b02,87,76,0 script A_CODE#bat_b02 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) - //setquest 2070; + //if (!questprogress(2070)) + // setquest 2070; end; } bat_b02,312,224,0 script B_CODE#bat_b02 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) - //setquest 2070; + //if (!questprogress(2070)) + // setquest 2070; end; } diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt index d63130007..315eff2cb 100644 --- a/npc/battleground/flavius/flavius_enter.txt +++ b/npc/battleground/flavius/flavius_enter.txt @@ -30,48 +30,41 @@ bat_room,133,178,5 script Flavius Officer#01a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b01"); - if (.@mapcount2 > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG1 > 0) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",85,223; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070, PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b01") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG1 > 0) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",85,223; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -97,48 +90,41 @@ bat_room,133,121,1 script Flavius Officer#01b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b01"); - if (.@mapcount2 > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG1 > 0) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",85,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b01") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG1 > 0) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",85,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; @@ -254,48 +240,41 @@ bat_room,148,178,5 script Flavius Officer#02a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b02"); - if (.@mapcount2 > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG2 > 0) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",141,224; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070, PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b02") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG2 > 0) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",141,224; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -321,48 +300,41 @@ bat_room,148,121,1 script Flavius Officer#02b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b02"); - if (.@mapcount2 > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG2 > 0) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",141,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b02") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG2 > 0) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",141,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt index 1b5e9062c..8f9f40e2b 100644 --- a/npc/battleground/kvm/kvm_enter.txt +++ b/npc/battleground/kvm/kvm_enter.txt @@ -19,16 +19,16 @@ //============================================================ bat_room,164,178,5 script KVM Mercenary Officer#1 4_M_KY_KNT,{ /* - set .@kvm,checkquest(6026,PLAYTIME); - if ((.@kvm == 0) || (.@kvm == 1)) { + .@kvm = questprogress(6026,PLAYTIME); + if (.@kvm == 1) { mes "[Croix Mercenary Officer]"; mes "I know that you've already signed with the Croix. Go back and join their team. We will not accept traitors to fight for us."; close; } else if (.@kvm == 2) erasequest 6026; */ - set .@permit,checkquest(6025,PLAYTIME); - if ((.@permit == 0) || (.@permit == 1)) { + .@permit = questprogress(6025,PLAYTIME); + if (.@permit == 1) { mes "[Guillaume Mercenary Officer]"; mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again."; close; @@ -119,16 +119,16 @@ bat_room,167,178,5 script Guillaume Knight#kvm 4_M_KY_SOLD,{ //============================================================ bat_room,164,121,1 script KVM Mercenary Officer#2 4_M_CRU_KNT,{ /* - set .@kvm,checkquest(6025,PLAYTIME); - if ((.@kvm == 0) || (.@kvm == 1)) { + .@kvm = questprogress(6025,PLAYTIME); + if (.@kvm == 1) { mes "[Croix Mercenary Officer]"; mes "I know that you've already signed with the Guillaume. Go back and join their team. We will not accept traitors to fight for us."; close; } else if (.@kvm == 2) erasequest 6025; */ - set .@permit,checkquest(6025,PLAYTIME); - if ((.@permit == 0) || (.@permit == 1)) { + .@permit = questprogress(6025,PLAYTIME); + if (.@permit == 1) { mes "[Croix Mercenary Officer]"; mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again."; close; diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index 10e2bfc85..2a6d5991a 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -73,7 +73,7 @@ bat_a01,352,342,0 script #bat_a01_quest_a -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -82,7 +82,7 @@ bat_a01,353,52,0 script #bat_a01_quest_b -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -634,16 +634,14 @@ OnTouch: bat_a01,352,342,0 script A_CODE#bat_a01 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } bat_a01,353,52,0 script B_CODE#bat_a01 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index 0e7cc773d..129d0ee3e 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -72,7 +72,7 @@ bat_a02,352,342,0 script #bat_a02_quest_a -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -81,7 +81,7 @@ bat_a02,353,52,0 script #bat_a02_quest_b -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -633,16 +633,14 @@ OnTouch: bat_a02,352,342,0 script A_CODE#bat_a02 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } bat_a02,353,52,0 script B_CODE#bat_a02 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt index e68058247..19ceb732e 100644 --- a/npc/battleground/tierra/tierra_enter.txt +++ b/npc/battleground/tierra/tierra_enter.txt @@ -31,48 +31,41 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a01"); - if (.@mapcount > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG1) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",57,223; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a01") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG1) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",57,223; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -98,48 +91,41 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if (.@chk_urtime == 1) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a02"); - if (.@mapcount > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG2) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",114,223; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a02") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG2) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",114,223; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -263,48 +249,41 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a02"); - if (.@mapcount > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG1) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",57,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a02") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG1) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",57,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; @@ -330,48 +309,41 @@ bat_room,140,121,1 script Tierra Gorge Officer#02b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if (.@chk_urtime == 1) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a02"); - if (.@mapcount > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG2) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",114,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a02") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG2) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",114,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; -- cgit v1.2.3-70-g09d2