Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes wrong novice checks when entering battleground queues. (#6081)

Browse Source 
Fixes #5965
This commit is contained in:
Everade 2021-07-09 00:12:59 +02:00 committed by GitHub
parent 110c0a623e
commit 3b5c2ee127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
npc/battleground/flavius/flavius_enter.txt
View File

@ -26,7 +26,7 @@ bat_room,133,178,5 script Flavius Officer#01a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}
@ -95,7 +95,7 @@ bat_room,133,121,1 script Flavius Officer#01b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}
@ -228,7 +228,7 @@ bat_room,148,178,5 script Flavius Officer#02a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}
@ -297,7 +297,7 @@ bat_room,148,121,1 script Flavius Officer#02b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}

8
npc/battleground/tierra/tierra_enter.txt
View File

@ -27,7 +27,7 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}
@ -96,7 +96,7 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}
@ -233,7 +233,7 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}
@ -302,7 +302,7 @@ bat_room,140,121,1 script Tierra Gorge Officer#02b 414,{
next;
switch(select("I want to join your army!:End Conversation")) {
case 1:
if ((Class == Job_Novice) || (BaseClass == Job_Super_Novice)) {
if ((BaseJob == Job_Novice) || (BaseJob == Job_Super_Novice)) {
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.";
}