summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/jobs/novice/supernovice.txt10
-rw-r--r--npc/pre-re/scripts_jobs.conf1
2 files changed, 7 insertions, 4 deletions
diff --git a/npc/pre-re/jobs/novice/supernovice.txt b/npc/pre-re/jobs/novice/supernovice.txt
index 628cb30ff..b0908f3cf 100644
--- a/npc/pre-re/jobs/novice/supernovice.txt
+++ b/npc/pre-re/jobs/novice/supernovice.txt
@@ -3,9 +3,9 @@
//===== By: ==================================================
//= Darkchild
//===== Current Version: =====================================
-//= 2.2
+//= 2.3
//===== Compatible With: =====================================
-//= rAthena SVN
+//= rAthena SVN r15340+
//===== Description: =========================================
//= [Aegis Conversion]
//= Super Novice Job Change Npc
@@ -16,6 +16,7 @@
//= 2.0 Rescripted again, this time using an iRO base. [L0ne_W0lf]
//= 2.1 Swapped use of baseclass for basejob. [L0ne_W0lf]
//= 2.2 Added Quest Log commands. [Kisuka]
+//= 2.3 NPC "Esseray" calls Ex. Super Novice script when enabled. [Euphy]
//============================================================
aldeba_in,223,167,3 script Tzerero#sn 709,{
@@ -105,7 +106,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
mes "^FF000030 Resin^000000.";
close;
}
- if (BaseJob == Job_Novice && upper != 1) {
+ if (BaseJob == Job_Novice && Upper != 1) {
mes "[Tzerero]";
mes "...Hmm?";
mes "Stop.";
@@ -328,6 +329,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
aldeba_in,216,169,5 script Esseray#sn 86,{
if (BaseJob == Job_SuperNovice) {
+ if (is_function("Esseray_Ex")) callfunc "Esseray_Ex";
mes "[Esseray]";
mes "Hm? Hey, you're a member";
mes "of our great Novice Society,";
@@ -349,7 +351,7 @@ aldeba_in,216,169,5 script Esseray#sn 86,{
mes "course!";
close;
}
- if (BaseJob == Job_Novice && upper != 1) {
+ if (BaseJob == Job_Novice && Upper != 1) {
mes "[Esseray]";
mes "Hah~ you don't know anything";
mes "about being a normal person yet!";
diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf
index 28e23d4ab..936d96e55 100644
--- a/npc/pre-re/scripts_jobs.conf
+++ b/npc/pre-re/scripts_jobs.conf
@@ -7,6 +7,7 @@
// -- Novice
npc: npc/pre-re/jobs/novice/novice.txt
npc: npc/pre-re/jobs/novice/supernovice.txt
+//npc: npc/re/jobs/novice/supernovice_ex.txt
// -- 1-1
npc: npc/pre-re/jobs/1-1/thief.txt
npc: npc/pre-re/jobs/1-1/archer.txt