summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-31 09:11:38 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-31 09:11:38 +0000
commit57c2a527907c73e1615fab2834d7e8a97ef08592 (patch)
tree5611d95505f70892707762be7b728d33586b5f85 /npc/jobs
parentf8251050996d8a3ba6de4d75e1f1adf9e8a97113 (diff)
downloadhercules-57c2a527907c73e1615fab2834d7e8a97ef08592.tar.gz
hercules-57c2a527907c73e1615fab2834d7e8a97ef08592.tar.bz2
hercules-57c2a527907c73e1615fab2834d7e8a97ef08592.tar.xz
hercules-57c2a527907c73e1615fab2834d7e8a97ef08592.zip
* Added the "F_BlockHigh" function back in, as it's still used by 2-x job quests.
- Fix the assassin job quest item reward bug. Cheap fix until it's rewritten. * Added official Pang Voice skill quest for bards. Further official 2-x skill quests to come. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10938 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/2-1/assassin.txt2
-rw-r--r--npc/jobs/valkyrie.txt47
2 files changed, 49 insertions, 0 deletions
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 91008da96..8876f589e 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1566,6 +1566,7 @@ OnTouch:
mes "[Guild Master]";
mes "... I think I've said enough. Here please take this........";
next;
+ if(ASSIN_Q3 == 1) goto L_Cont1;
if(JBLVL == 40) goto L_LowLvl;
L_HighLvl:
@@ -1591,6 +1592,7 @@ OnTouch:
if(@temp==3) getitem 1252, 1;
L_Cont1:
+ set ASSIN_Q3,1;
mes "[Guild Master]";
mes "Now go talk to ^5533FFAssassin Huey^000000 back at the guild entrance.";
mes "For some reason he always looks like he's ^5533FFangry^000000 about something......";
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index ace481cf6..21d6bc5ae 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -30,6 +30,8 @@
//= 2.7 Rescripted to Aegis 10.3 standards. [L0ne_W0;f]
//= Removed all functions as they are no longer required.
//= Correct job level requirements for 1-1 -> 2-x.
+//= 2.7a Added Function "F_BlockHigh" back in until rewriteing of the 2-x [L0ne_W0lf]
+//= scripts are comepleted.
//============================================================
valkyrie,48,86,4 script Valkyrie# 811,{
@@ -386,3 +388,48 @@ S_WarpChar:
valkyrie,48,73,0 warp valk01 1,1,valkyrie,48,64
valkyrie,48,66,0 warp valk01 1,1,valkyrie,48,75
+
+// function GUIDE player to Valhalla for getting 3rd JOB
+// this function prevents passing 2nd JOB QUESTS by advanced classes also
+//getarg(0) - High Job ID
+//getarg(1) - High Job Name
+//getarg(2) - 3rd Job ID
+//getarg(3) - 3rd Job Name
+//getarg(4) - NPC Name
+function script F_BlockHigh {
+ if(Upper != 1) return; //This func should interact with Advanced classes only
+ mes "["+getarg(4)+"]";
+ if(Class == getarg(0) && ADVJOB == getarg(2)) goto L_RIGHTHIGH;
+ if(Class == getarg(2)) goto L_RIGHT3RD;
+ if(Class >= Job_Lord_Knight && Class <= Job_Paladin2) goto L_ALREADY3RD; //already advanced class, but from wrong guild
+//this player is a High Novice
+ if(Class == Job_Novice_High) mes "Hello, Novice High! If you are going to became a "+getarg(1)+", then go visit your very first job teacher.";
+//this player has 1st advanced job, but from wrong guild
+ if(Class == getarg(0)) mes "A "+getarg(1)+"?";
+ if(Class != Job_Novice_High) mes "Rumors say only Valhallana knows your way...";
+ emotion e_sry;
+ close;
+
+L_RIGHT3RD:
+ mes "Well, hello there! You look... younger.";
+ emotion e_hmm;
+ next;
+ mes "["+getarg(4)+"]";
+ mes "You are always welcome here, "+strcharinfo(0)+"!";
+ mes "Our good old guild is your second home, isn't it?";
+ emotion e_no1;
+ close;
+
+L_RIGHTHIGH:
+ mes "Hello, "+strcharinfo(0)+"!";
+ mes "If you are going to become a "+getarg(3)+", then you should visit Valhalla again.";
+ if(JobLevel < 45) mes "But you need at least Job Level 45 or higher.";
+ emotion e_gasp;
+ close;
+
+L_ALREADY3RD:
+ mes "A "+getarg(3)+"?";
+ mes "You don't belong to our guild. Begone!";
+ emotion e_omg;
+ close;
+} \ No newline at end of file