diff options
-rw-r--r-- | npc/Changelog.txt | 2 | ||||
-rw-r--r-- | npc/jobs/2-2/sage.txt | 5 | ||||
-rw-r--r-- | npc/jobs/valkyrie.txt | 46 |
3 files changed, 6 insertions, 47 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 457a9e353..5f7f7c7e5 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2007/10/06 + * Rev. 11375 Fixed an error in the Sage job quest, thanks to Cara. [L0ne_W0lf] + * Removed function F_BlockHigh from Valkyrie.txt * Fixed scripts that used 'stoptimer' instead of 'stopnpctimer' [ultramage] * Updated Atroce's respawn time on Veins fields [Playtester] 2007/10/05 diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 386ac45ee..960b16ee7 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -5,7 +5,7 @@ //= Unknown Translator (1.0) //= Darkchild (1.2) //===== Current Version: ===================================== -//= 2.2 +//= 2.2b //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 2.1 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 2.2 Small bug fix (== -> !=) thanks to Saithis. [L0ne_W0lf] +//= 2.2b ANotehr smakk bugfix, pointed out by Cara. [L0ne_W0lf] //============================================================ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{ @@ -676,7 +677,7 @@ yuno_in03,105,177,5 script Written Test Professor#sa 754,{ mes "[Claytos Verdo]"; mes "Okay, there's no need to wait. Let's start right away"; mes "Oh, and if you don't answer immediately, the test will be cancelled."; -L_AskQuestion: +L_AskQuestions: next; switch(rand(1,3)) { case 1: diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index 21d6bc5ae..f3af075d9 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -32,6 +32,7 @@ //= 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. +//= 2.7b Removed function "F_BlockHigh" as it's no longer used. [L0ne_W0lf] //============================================================ valkyrie,48,86,4 script Valkyrie# 811,{ @@ -388,48 +389,3 @@ 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 |