summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/2-2/dancer.txt9
-rw-r--r--npc/jobs/novice/novice.txt6
-rw-r--r--npc/jobs/novice/supernovice.txt9
3 files changed, 16 insertions, 8 deletions
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index c492cb2a8..87bf5ea37 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -4,7 +4,7 @@
//= Kalen - Original jAthena
//= Fredzilla - Converted, Lupus
//===== Current Version: =====================================
-//= 3.5
+//= 3.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 3.3 Updated waiting room. (Removes global var) [L0ne_W0lf]
//= 3.4 Fixed bad variables, bugreport:1685 [Brainstorm]
//= 3.5 Minor corrections to script. (bugreport:1766) [L0ne_W0lf]
+//= 3.6 Applied Correction bug with for loop. [L0ne_W0lf]
//============================================================
comodo,180,153,4 script Sonotora#1 90,{
@@ -294,7 +295,11 @@ job_duncer,43,93,4 script Aile#da 724,{
break;
}
set .@size, getarraysize(.@item);
- for( set .@i, 0; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i]; set .@i, .@i + 1 );
+ for( set .@i, 0; .@i < .@size; set .@i,.@i+1 ) {
+ if( countitem(.@item[.@i]) < .@count[.@i] ) {
+ break;
+ }
+ }
if( .@i == .@size && Zeny > 9999 ) {
cutin "job_dancer_eir02",2;
mes "[Aile]";
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";