summaryrefslogtreecommitdiff
path: root/npc/jobs/novice
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/novice')
-rw-r--r--npc/jobs/novice/novice.txt6
-rw-r--r--npc/jobs/novice/supernovice.txt9
2 files changed, 9 insertions, 6 deletions
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index c5b143ac7..71c25f185 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dr.Evil & MasterOfMuppets
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= Added duplicate NPCs to combat training maps.
//= 2.0 Fixed savepoint not being changed sometimes. [L0ne_W0lf]
//= 2.1 Corrected spacing issue in welcome message. [L0ne_W0lf]
+//= 2.2 Corrected Leo's endless dialog. [L0ne_W0lf]
//============================================================
// Bulletin Board
@@ -2088,8 +2089,9 @@ new_1-2,184,172,1 script Understandings of Skills 47,{
mes "as you are cute~!";
mes "I, Leo, am very impressed.";
next;
- break;
+ set .@end,1;
}
+ if (.@end) break;
}
mes "[Leo Handerson]";
mes "Do you wish to";
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 287e395f6..c6037f103 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Darkchild
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,10 +14,11 @@
//===== Additional Comments: =================================
//= 1.9 Rescripted to the Aegis 10.3 Standars. [Samuray22]
//= 2.0 Rescripted again, this time using an iRO base. [L0ne_W0lf]
+//= 2.1 Swapped use of baseclass for basejob. [L0ne_W0lf]
//============================================================
aldeba_in,223,167,3 script Tzerero#sn 709,{
- if (BaseClass == Job_SuperNovice) {
+ if (BaseJob == Job_SuperNovice) {
mes "[Tzerero]";
mes "I trust that you are enjoying";
mes "life as a Super Novice? Ah,";
@@ -102,7 +103,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
mes "^FF000030 Resin^000000.";
close;
}
- if (BaseClass == Job_Novice && upper != 1) {
+ if (BaseJob == Job_Novice && upper != 1) {
mes "[Tzerero]";
mes "...Hmm?";
mes "Stop.";
@@ -269,7 +270,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
}
}
else {
- if (BaseClass == Job_SuperNovice) {
+ if (BaseJob == Job_SuperNovice) {
mes "[Tzerero]";
mes "How do you like living";
mes "life simply as a Super";