From 8c748978945b24f2b508d54c6068c7ee69a862ad Mon Sep 17 00:00:00 2001 From: masao87 Date: Sun, 5 Aug 2012 11:19:56 +0000 Subject: - Some little adjustments to the job change quests, also reverted some variables to the old job change files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16582 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-1a/AssassinCross.txt | 6 +++--- npc/jobs/2-1a/HighPriest.txt | 6 +++--- npc/jobs/2-1a/HighWizard.txt | 6 +++--- npc/jobs/2-1a/LordKnight.txt | 6 +++--- npc/jobs/2-1a/Sniper.txt | 6 +++--- npc/jobs/2-1a/WhiteSmith.txt | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'npc/jobs/2-1a') diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt index ae3f68db5..0ed46590c 100644 --- a/npc/jobs/2-1a/AssassinCross.txt +++ b/npc/jobs/2-1a/AssassinCross.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,44,58,5 script Assassin Cross#Valkyrie 725,{ - if (FJOB == 0 || Upper != 1) { + if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Assassin Cross]"; @@ -43,7 +43,7 @@ valkyrie,44,58,5 script Assassin Cross#Valkyrie 725,{ mes "Nobody..."; close; } - if ((FJOB == Job_Guillotine_Cross) && (Class == Job_Thief_High) && (JobLevel > 39)) { + if ((ADVJOB == Job_Assassin_Cross) && (Class == Job_Thief_High) && (JobLevel > 39)) { mes "[Assassin Cross]"; mes "The time has come."; mes "The world needs you..."; @@ -79,7 +79,7 @@ valkyrie,44,58,5 script Assassin Cross#Valkyrie 725,{ close; } jobchange Job_Assassin_Cross; - set FJOB,0; + set ADVJOB,0; mes "[Assassin Cross]"; mes "Congratulations."; mes "As an Assassin Cross,"; diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt index f1d38802d..2235ad60e 100644 --- a/npc/jobs/2-1a/HighPriest.txt +++ b/npc/jobs/2-1a/HighPriest.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,44,42,5 script High Priest#Valkyrie 60,{ - if (FJOB == 0 || Upper != 1) { + if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[High Priest]"; @@ -32,7 +32,7 @@ valkyrie,44,42,5 script High Priest#Valkyrie 60,{ mes "us from the forces of evil..."; close; } - if ((FJOB == Job_Arch_Bishop) && (Class == Job_Acolyte_High) && (JobLevel > 39)) { + if ((ADVJOB == Job_High_Priest) && (Class == Job_Acolyte_High) && (JobLevel > 39)) { mes "[High Priest]"; mes "Our world is in"; mes "need of people of"; @@ -59,7 +59,7 @@ valkyrie,44,42,5 script High Priest#Valkyrie 60,{ close; } jobchange Job_High_Priest; - set FJOB,0; + set ADVJOB,0; mes "[High Priest]"; mes "Congratulations."; mes "As a High Priest,"; diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt index 3ba1a57d9..320b1db0d 100644 --- a/npc/jobs/2-1a/HighWizard.txt +++ b/npc/jobs/2-1a/HighWizard.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,44,47,5 script High Wizard#Valkyrie 735,{ - if (FJOB == 0 || Upper != 1) { + if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[High Wizard]"; @@ -38,7 +38,7 @@ valkyrie,44,47,5 script High Wizard#Valkyrie 735,{ mes "was placed in the wrong hands?!"; close; } - if ((FJOB == Job_Warlock) && (Class == Job_Mage_High) && (JobLevel > 39)) { + if ((ADVJOB == Job_High_Wizard) && (Class == Job_Mage_High) && (JobLevel > 39)) { mes "[High Wizard]"; mes "It is time."; mes "And Rune-Midgard has"; @@ -63,7 +63,7 @@ valkyrie,44,47,5 script High Wizard#Valkyrie 735,{ close; } jobchange Job_High_Wizard; - set FJOB,0; + set ADVJOB,0; mes "[High Wizard]"; mes "Congratulations."; mes "As a High Wizard,"; diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt index 7ed54ba3e..73ed005e2 100644 --- a/npc/jobs/2-1a/LordKnight.txt +++ b/npc/jobs/2-1a/LordKnight.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,44,39,5 script Lord Knight#Valkyrie 56,{ - if (FJOB == 0 || Upper != 1) { + if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Lord Knight]"; @@ -36,7 +36,7 @@ valkyrie,44,39,5 script Lord Knight#Valkyrie 56,{ mes "well being of our comrades."; close; } - if ((FJOB == Job_Rune_Knight) && (Class == Job_Swordman_High) && (JobLevel > 39)) { + if ((ADVJOB == Job_Lord_Knight) && (Class == Job_Swordman_High) && (JobLevel > 39)) { mes "[Lord Knight]"; mes "Your time has come!"; mes "The world still needs you."; @@ -61,7 +61,7 @@ valkyrie,44,39,5 script Lord Knight#Valkyrie 56,{ close; } jobchange Job_Lord_Knight; - set FJOB,0; + set ADVJOB,0; mes "[Lord Knight]"; mes "Congratulations!"; mes "As a Lord Knight,"; diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt index f5898ad87..963df71f9 100644 --- a/npc/jobs/2-1a/Sniper.txt +++ b/npc/jobs/2-1a/Sniper.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,44,55,5 script Sniper#Valkyrie 727,{ - if (FJOB == 0 || Upper != 1) { + if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Sniper]"; @@ -33,7 +33,7 @@ valkyrie,44,55,5 script Sniper#Valkyrie 727,{ mes "of battling."; close; } - if ((FJOB == Job_Ranger) && (Class == Job_Archer_High) && (JobLevel > 39)) { + if ((ADVJOB == Job_Sniper) && (Class == Job_Archer_High) && (JobLevel > 39)) { mes "[Sniper]"; mes "The world is in"; mes "need of mighty Bowmen"; @@ -59,7 +59,7 @@ valkyrie,44,55,5 script Sniper#Valkyrie 727,{ close; } jobchange Job_Sniper; - set FJOB,0; + set ADVJOB,0; mes "[Sniper]"; mes "Congratulations!"; mes "As a Sniper, I hope"; diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt index efc2fca35..3100a043d 100644 --- a/npc/jobs/2-1a/WhiteSmith.txt +++ b/npc/jobs/2-1a/WhiteSmith.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,44,50,5 script MasterSmith#Valkyrie 731,{ - if (FJOB == 0 || Upper != 1) { + if (ADVJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[MasterSmith]"; @@ -40,7 +40,7 @@ valkyrie,44,50,5 script MasterSmith#Valkyrie 731,{ mes "crafting..."; close; } - if ((FJOB == Job_Mechanic) && (Class == Job_Merchant_High) && (JobLevel > 39)) { + if ((ADVJOB == Job_WhiteSmith) && (Class == Job_Merchant_High) && (JobLevel > 39)) { mes "[MasterSmith]"; mes "The time has come!"; mes "Our world needs brave,"; @@ -65,7 +65,7 @@ valkyrie,44,50,5 script MasterSmith#Valkyrie 731,{ close; } jobchange Job_Whitesmith; - set FJOB,0; + set ADVJOB,0; mes "[MasterSmith]"; mes "Congratulations!"; mes "As a MasterSmith,"; -- cgit v1.2.3-60-g2f50