summaryrefslogtreecommitdiff
path: root/npc/battleground/flavius
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-20 04:20:29 +0200
committerHaru <haru@dotalux.com>2014-10-28 00:27:54 +0100
commit32169c383f2658192b6b8cb02d7f818a361dda03 (patch)
treeff1f1d902920d922b74eb879070e8c9973daa0dd /npc/battleground/flavius
parent3e395756f10befe9aa0707169d8af7897706eb93 (diff)
downloadhercules-32169c383f2658192b6b8cb02d7f818a361dda03.tar.gz
hercules-32169c383f2658192b6b8cb02d7f818a361dda03.tar.bz2
hercules-32169c383f2658192b6b8cb02d7f818a361dda03.tar.xz
hercules-32169c383f2658192b6b8cb02d7f818a361dda03.zip
Removed use of 'checkquest' from scripts (common folder)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/battleground/flavius')
-rw-r--r--npc/battleground/flavius/flavius01.txt4
-rw-r--r--npc/battleground/flavius/flavius02.txt8
-rw-r--r--npc/battleground/flavius/flavius_enter.txt292
3 files changed, 138 insertions, 166 deletions
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!";