From 712bfb9bd64b224e16e3a364fbd39b663cb42681 Mon Sep 17 00:00:00 2001
From: euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 17 Jul 2012 15:05:13 +0000
Subject: * Added a Super Novice Expansion quest with custom dialogue. Will be
 updated once we get the official script.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16437 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/pre-re/jobs/novice/supernovice.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'npc/pre-re/jobs')

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!";
-- 
cgit v1.2.3-70-g09d2