From b7a88442cefed36b81f80139310061fed10527e1 Mon Sep 17 00:00:00 2001 From: masao87 Date: Sat, 4 Aug 2012 21:45:50 +0000 Subject: - Here comes the big Job folder Update. * Updated all 1-1, 2-1, 2-2 and the expanded files to the latest available official files and also added support for baby job change. * There might be some optimizations still needed at some places and there maybe occur some errors as well or the job change isn't fully working anymore since I didn't test all the jobs through the end (Me = Lazy), if so then please fill out a bug report in our bug tracker: http://rathena.org/board/tracker/project-4-scripts/ * Ninja, Gunslinger and the other files will follow within the next days. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16579 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-1a/AssassinCross.txt | 8 ++++---- npc/jobs/2-1a/HighPriest.txt | 8 ++++---- npc/jobs/2-1a/HighWizard.txt | 10 +++++----- npc/jobs/2-1a/LordKnight.txt | 8 ++++---- npc/jobs/2-1a/Sniper.txt | 8 ++++---- npc/jobs/2-1a/WhiteSmith.txt | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'npc/jobs/2-1a') diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt index 0776825fb..ae3f68db5 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 (ADVJOB == 0 || Upper != 1) { + if (FJOB == 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; } - else if (ADVJOB == Job_Assassin_Cross && Class == Job_Thief_High && JobLevel > 39) { + if ((FJOB == Job_Guillotine_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 ADVJOB,0; + set FJOB,0; mes "[Assassin Cross]"; mes "Congratulations."; mes "As an Assassin Cross,"; @@ -97,4 +97,4 @@ valkyrie,44,58,5 script Assassin Cross#Valkyrie 725,{ mes "while you are here."; mes "Honor to the warriors."; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt index ae96a122e..f1d38802d 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 (ADVJOB == 0 || Upper != 1) { + if (FJOB == 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; } - else if (ADVJOB == Job_High_Priest && Class == Job_Acolyte_High && JobLevel > 39) { + if ((FJOB == Job_Arch_Bishop) && (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 ADVJOB,0; + set FJOB,0; mes "[High Priest]"; mes "Congratulations."; mes "As a High Priest,"; @@ -79,4 +79,4 @@ valkyrie,44,42,5 script High Priest#Valkyrie 60,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt index 58f1bfce8..3ba1a57d9 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 (ADVJOB == 0 || Upper != 1) { + if (FJOB == 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; } - else if (ADVJOB == Job_High_Wizard && Class == Job_Mage_High && JobLevel > 39) { + if ((FJOB == Job_Warlock) && (Class == Job_Mage_High) && (JobLevel > 39)) { mes "[High Wizard]"; mes "It is time."; mes "And Rune-Midgard has"; @@ -62,8 +62,8 @@ valkyrie,44,47,5 script High Wizard#Valkyrie 735,{ mes "all of your remaining Skill Points before returning to me."; close; } - jobchange Job_high_Wizard; - set ADVJOB,0; + jobchange Job_High_Wizard; + set FJOB,0; mes "[High Wizard]"; mes "Congratulations."; mes "As a High Wizard,"; @@ -83,4 +83,4 @@ valkyrie,44,47,5 script High Wizard#Valkyrie 735,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt index ba998483e..7ed54ba3e 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 (ADVJOB == 0 || Upper != 1) { + if (FJOB == 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; } - else if (ADVJOB == Job_Lord_Knight && Class == Job_Swordman_High && JobLevel > 39) { + if ((FJOB == Job_Rune_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 ADVJOB,0; + set FJOB,0; mes "[Lord Knight]"; mes "Congratulations!"; mes "As a Lord Knight,"; @@ -81,4 +81,4 @@ valkyrie,44,39,5 script Lord Knight#Valkyrie 56,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt index cf5f4881e..f5898ad87 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 (ADVJOB == 0 || Upper != 1) { + if (FJOB == 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; } - else if (ADVJOB == Job_Sniper && Class == Job_Archer_High && JobLevel > 39) { + if ((FJOB == Job_Ranger) && (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 ADVJOB,0; + set FJOB,0; mes "[Sniper]"; mes "Congratulations!"; mes "As a Sniper, I hope"; @@ -80,4 +80,4 @@ valkyrie,44,55,5 script Sniper#Valkyrie 727,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt index 42ac6164b..efc2fca35 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 (ADVJOB == 0 || Upper != 1) { + if (FJOB == 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; } - else if (ADVJOB == Job_WhiteSmith && Class == Job_Merchant_High && JobLevel > 39) { + if ((FJOB == Job_Mechanic) && (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 ADVJOB,0; + set FJOB,0; mes "[MasterSmith]"; mes "Congratulations!"; mes "As a MasterSmith,"; @@ -85,4 +85,4 @@ valkyrie,44,50,5 script MasterSmith#Valkyrie 731,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file -- cgit v1.2.3-60-g2f50