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-2a/Champion.txt | 8 ++-- npc/jobs/2-2a/Clown.txt | 8 ++-- npc/jobs/2-2a/Creator.txt | 107 +++++++++++++++++++++----------------------- npc/jobs/2-2a/Gypsy.txt | 8 ++-- npc/jobs/2-2a/Paladin.txt | 8 ++-- npc/jobs/2-2a/Professor.txt | 9 ++-- npc/jobs/2-2a/Stalker.txt | 8 ++-- 7 files changed, 76 insertions(+), 80 deletions(-) (limited to 'npc/jobs/2-2a') diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt index 28cd5a9e0..1d60bb8f8 100644 --- a/npc/jobs/2-2a/Champion.txt +++ b/npc/jobs/2-2a/Champion.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,53,42,3 script Champion#Valkyrie 52,{ - if (ADVJOB == 0 || Upper != 1) { + if (FJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Champion]"; @@ -38,7 +38,7 @@ valkyrie,53,42,3 script Champion#Valkyrie 52,{ mes "so much in life..."; close; } - else if (ADVJOB == Job_Champion && Class == Job_Acolyte_High && JobLevel > 39) { + if ((FJOB == Job_Sura) && (Class == Job_Acolyte_High) && (JobLevel > 39)) { mes "[Champion]"; mes "It's time."; mes "Time for great heroes"; @@ -64,7 +64,7 @@ valkyrie,53,42,3 script Champion#Valkyrie 52,{ close; } jobchange Job_Champion; - set ADVJOB,0; + set FJOB,0; mes "[Champion]"; mes "Congratulations!"; mes "Live as a Champion,"; @@ -84,4 +84,4 @@ valkyrie,53,42,3 script Champion#Valkyrie 52,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt index 656557647..10b897d6d 100644 --- a/npc/jobs/2-2a/Clown.txt +++ b/npc/jobs/2-2a/Clown.txt @@ -18,7 +18,7 @@ //============================================================ valkyrie,53,54,3 script Minstrel#Valkyrie 741,{ - if (ADVJOB == 0 || Upper != 1) { + if (FJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Minstrel]"; @@ -32,7 +32,7 @@ valkyrie,53,54,3 script Minstrel#Valkyrie 741,{ mes "Sha la la la la~"; close; } - else if (ADVJOB == Job_Clown && Class == Job_Archer_High && JobLevel > 39) { + if ((FJOB == Job_Minstrell) && (Class == Job_Archer_High) && (JobLevel > 39)) { mes "[Minstrel]"; mes "The dreary world"; mes "of mortals is in need"; @@ -60,7 +60,7 @@ valkyrie,53,54,3 script Minstrel#Valkyrie 741,{ close; } jobchange Job_Clown; - set ADVJOB,0; + set FJOB,0; mes "[Minstrel]"; mes "Congratulations!"; mes "As a Minstrel, your"; @@ -80,4 +80,4 @@ valkyrie,53,54,3 script Minstrel#Valkyrie 741,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt index 3b85907e9..1353c8ab7 100644 --- a/npc/jobs/2-2a/Creator.txt +++ b/npc/jobs/2-2a/Creator.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ - if (ADVJOB == 0 || Upper != 1) { + if (FJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Biochemist]"; @@ -40,7 +40,7 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ mes "a place in Valhalla..."; close; } - else if (ADVJOB == Job_Creator && Class == Job_Merchant_High && JobLevel > 39) { + if ((FJOB == Job_Genetic) && (Class == Job_Merchant_High) && (JobLevel > 39)) { mes "[Biochemist]"; mes "Yes..."; mes "It's about time."; @@ -65,7 +65,7 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ close; } jobchange Job_Creator; - set ADVJOB,0; + set FJOB,0; mes "[Biochemist]"; mes "Congratulations!"; mes "As a Biochemist,"; @@ -74,63 +74,60 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ mes "right purposes."; close; } - else { - if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv("AM_BIOETHICS") == 0) { + if ((Class == Job_Creator) && (MISC_QUEST & 64) && (getskilllv("AM_BIOETHICS") == 0)) { + mes "[Biochemist]"; + mes "Ah, have you come to"; + mes "retrieve the memories"; + mes "lost to you? Yes, you"; + mes "must be here for the"; + mes "secrets of life that"; + mes "were once yours..."; + next; + if (select("Yes:No") == 1) { + mes "[Biochemist]"; + mes "Close your eyes and"; + mes "put your mind at rest."; + mes "We will return to your"; + mes "past to recollect the"; + mes "fragments of your lost"; + mes "memories."; + next; mes "[Biochemist]"; - mes "Ah, have you come to"; - mes "retrieve the memories"; - mes "lost to you? Yes, you"; - mes "must be here for the"; - mes "secrets of life that"; - mes "were once yours..."; + mes "When you open your eyes,"; + mes "you will clearly remember"; + mes "the secret of life. You will"; + mes "also remember the weight of"; + mes "responsibility in using these"; + mes "secrets for the right ends..."; next; - if (select("Yes:No") == 1) { - mes "[Biochemist]"; - mes "Close your eyes and"; - mes "put your mind at rest."; - mes "We will return to your"; - mes "past to recollect the"; - mes "fragments of your lost"; - mes "memories."; - next; - mes "[Biochemist]"; - mes "When you open your eyes,"; - mes "you will clearly remember"; - mes "the secret of life. You will"; - mes "also remember the weight of"; - mes "responsibility in using these"; - mes "secrets for the right ends..."; - next; - skill 238,1,0; - mes "[Biochemist]"; - mes "Open your eyes..."; - mes "Now that you have"; - mes "remembered how to"; - mes "create artificial life, I only"; - mes "ask that you treat all of your"; - mes "creations with respect."; - close; - } + skill 238,1,0; mes "[Biochemist]"; - mes "If you wish to"; - mes "retrieve your lost"; - mes "memories, please"; - mes "come back to me."; - mes "The secret to creating"; - mes "life is no trifling thing..."; + mes "Open your eyes..."; + mes "Now that you have"; + mes "remembered how to"; + mes "create artificial life, I only"; + mes "ask that you treat all of your"; + mes "creations with respect."; close; } mes "[Biochemist]"; - mes "Welcome"; - mes "to Valhalla,"; - mes "the Hall of Honor."; - next; - mes "[Biochemist]"; - mes "Please make"; - mes "yourself comfortable"; - mes "while you are here."; - mes "Honor to the warriors!"; + mes "If you wish to"; + mes "retrieve your lost"; + mes "memories, please"; + mes "come back to me."; + mes "The secret to creating"; + mes "life is no trifling thing..."; close; } -} - + mes "[Biochemist]"; + mes "Welcome"; + mes "to Valhalla,"; + mes "the Hall of Honor."; + next; + mes "[Biochemist]"; + mes "Please make"; + mes "yourself comfortable"; + mes "while you are here."; + mes "Honor to the warriors!"; + close; +} \ No newline at end of file diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt index 95503a1ba..fdd65e526 100644 --- a/npc/jobs/2-2a/Gypsy.txt +++ b/npc/jobs/2-2a/Gypsy.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,53,56,3 script Gypsy#Valkyrie 101,{ - if (ADVJOB == 0 || Upper != 1) { + if (FJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Gypsy]"; @@ -33,7 +33,7 @@ valkyrie,53,56,3 script Gypsy#Valkyrie 101,{ mes "For me, it's a way of life~"; close; } - else if (ADVJOB == Job_Gypsy && Class == Job_Archer_High && JobLevel > 39) { + if ((FJOB == Job_Wanderer) && (Class == Job_Archer_High) && (JobLevel > 39)) { mes "[Gypsy]"; mes "The land of Rune-Midgard"; mes "is in need of talented women"; @@ -60,7 +60,7 @@ valkyrie,53,56,3 script Gypsy#Valkyrie 101,{ close; } jobchange Job_Gypsy; - set ADVJOB,0; + set FJOB,0; mes "[Gypsy]"; mes "Congratulations!"; mes "As a Gypsy, I know"; @@ -80,4 +80,4 @@ valkyrie,53,56,3 script Gypsy#Valkyrie 101,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt index 7589ff3f6..d7a6906ea 100644 --- a/npc/jobs/2-2a/Paladin.txt +++ b/npc/jobs/2-2a/Paladin.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,53,39,3 script Paladin#Valkyrie 752,{ - if (ADVJOB == 0 || Upper != 1) { + if (FJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Paladin]"; @@ -33,7 +33,7 @@ valkyrie,53,39,3 script Paladin#Valkyrie 752,{ mes "always brighten our path!"; close; } - else if (ADVJOB == Job_Paladin && Class == Job_Swordman_High && JobLevel > 39) { + if ((FJOB == Job_Royal_Guard) && (Class == Job_Swordman_High) && (JobLevel > 39)) { mes "[Paladin]"; mes "The Holy War will"; mes "be upon us before we"; @@ -61,7 +61,7 @@ valkyrie,53,39,3 script Paladin#Valkyrie 752,{ close; } jobchange Job_Paladin; - set ADVJOB,0; + set FJOB,0; mes "[Paladin]"; mes "Congratulations."; mes "As a Paladin, I hope"; @@ -82,4 +82,4 @@ valkyrie,53,39,3 script Paladin#Valkyrie 752,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt index b6b38afdc..6b8b0e300 100644 --- a/npc/jobs/2-2a/Professor.txt +++ b/npc/jobs/2-2a/Professor.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,53,47,3 script Scholar#Valkyrie 743,{ - if (ADVJOB == 0 || Upper != 1) { + if (FJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Scholar]"; @@ -40,7 +40,7 @@ valkyrie,53,47,3 script Scholar#Valkyrie 743,{ mes "process of learning..."; close; } - else if (ADVJOB == Job_Professor && Class == Job_Mage_High && JobLevel > 39) { + if ((FJOB == Job_Sorcerer) && (Class == Job_Mage_High) && (JobLevel > 39)) { mes "[Scholar]"; mes "Rune-Midgard doesn't"; mes "have enough Scholars to"; @@ -68,7 +68,7 @@ valkyrie,53,47,3 script Scholar#Valkyrie 743,{ close; } jobchange Job_Professor; - set ADVJOB,0; + set FJOB,0; mes "[Scholar]"; mes "Congratulations!"; mes "As a Professor, I hope"; @@ -89,5 +89,4 @@ valkyrie,53,47,3 script Scholar#Valkyrie 743,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} - +} \ No newline at end of file diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt index a2a26e135..aa94e8501 100644 --- a/npc/jobs/2-2a/Stalker.txt +++ b/npc/jobs/2-2a/Stalker.txt @@ -16,7 +16,7 @@ //============================================================ valkyrie,53,58,3 script Stalker#Valkyrie 747,{ - if (ADVJOB == 0 || Upper != 1) { + if (FJOB == 0 || Upper != 1) { set .@karma_d,rand(1,10); if (.@karma_d > 4) { mes "[Stalker]"; @@ -41,7 +41,7 @@ valkyrie,53,58,3 script Stalker#Valkyrie 747,{ mes "they need me."; close; } - else if (ADVJOB == Job_Stalker && Class == Job_Thief_High && JobLevel > 39) { + if ((FJOB == Job_Shadow_Chaser) && (Class == Job_Thief_High) && (JobLevel > 39)) { mes "[Stalker]"; mes "This world needs"; mes "more heroes who are"; @@ -69,7 +69,7 @@ valkyrie,53,58,3 script Stalker#Valkyrie 747,{ close; } jobchange Job_Stalker; - set ADVJOB,0; + set FJOB,0; mes "[Stalker]"; mes "Congratulations!"; mes "As a Stalker, I hope"; @@ -90,4 +90,4 @@ valkyrie,53,58,3 script Stalker#Valkyrie 747,{ mes "while you are here."; mes "Honor to the warriors!"; close; -} +} \ No newline at end of file -- cgit v1.2.3-60-g2f50