From ba0a75439b5373c038f5712f57d46cd2f7de794d Mon Sep 17 00:00:00 2001 From: euphyy Date: Fri, 10 Aug 2012 18:45:05 +0000 Subject: * Raw revert of all job files back to r16578, prior to the rewrite in r16579. The updates will be re-applied after more testing is done. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16621 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-2a/Champion.txt | 4 +- npc/jobs/2-2a/Clown.txt | 4 +- npc/jobs/2-2a/Creator.txt | 103 +++++++++++++++++++++++--------------------- npc/jobs/2-2a/Gypsy.txt | 4 +- npc/jobs/2-2a/Paladin.txt | 4 +- npc/jobs/2-2a/Professor.txt | 5 ++- npc/jobs/2-2a/Stalker.txt | 4 +- 7 files changed, 66 insertions(+), 62 deletions(-) (limited to 'npc/jobs/2-2a') diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt index 1e0df577b..28cd5a9e0 100644 --- a/npc/jobs/2-2a/Champion.txt +++ b/npc/jobs/2-2a/Champion.txt @@ -38,7 +38,7 @@ valkyrie,53,42,3 script Champion#Valkyrie 52,{ mes "so much in life..."; close; } - if ((ADVJOB == Job_Champion) && (Class == Job_Acolyte_High) && (JobLevel > 39)) { + else if (ADVJOB == Job_Champion && Class == Job_Acolyte_High && JobLevel > 39) { mes "[Champion]"; mes "It's time."; mes "Time for great heroes"; @@ -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 b9c0d90b9..656557647 100644 --- a/npc/jobs/2-2a/Clown.txt +++ b/npc/jobs/2-2a/Clown.txt @@ -32,7 +32,7 @@ valkyrie,53,54,3 script Minstrel#Valkyrie 741,{ mes "Sha la la la la~"; close; } - if ((ADVJOB == Job_Clown) &&( Class == Job_Archer_High) && (JobLevel > 39)) { + else if (ADVJOB == Job_Clown && Class == Job_Archer_High && JobLevel > 39) { mes "[Minstrel]"; mes "The dreary world"; mes "of mortals is in need"; @@ -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 6f9b2ed2d..3b85907e9 100644 --- a/npc/jobs/2-2a/Creator.txt +++ b/npc/jobs/2-2a/Creator.txt @@ -40,7 +40,7 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ mes "a place in Valhalla..."; close; } - if ((ADVJOB == Job_Creator) && (Class == Job_Merchant_High) && (JobLevel > 39)) { + else if (ADVJOB == Job_Creator && Class == Job_Merchant_High && JobLevel > 39) { mes "[Biochemist]"; mes "Yes..."; mes "It's about time."; @@ -74,60 +74,63 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ mes "right purposes."; close; } - 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; + else { + if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv("AM_BIOETHICS") == 0) { 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..."; + 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; - skill 238,1,0; + 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; + } 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."; + 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 "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 "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; } - 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 5ab1730a4..95503a1ba 100644 --- a/npc/jobs/2-2a/Gypsy.txt +++ b/npc/jobs/2-2a/Gypsy.txt @@ -33,7 +33,7 @@ valkyrie,53,56,3 script Gypsy#Valkyrie 101,{ mes "For me, it's a way of life~"; close; } - if ((ADVJOB == Job_Gypsy) && (Class == Job_Archer_High) && (JobLevel > 39)) { + else if (ADVJOB == Job_Gypsy && Class == Job_Archer_High && JobLevel > 39) { mes "[Gypsy]"; mes "The land of Rune-Midgard"; mes "is in need of talented women"; @@ -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 179f4caf1..7589ff3f6 100644 --- a/npc/jobs/2-2a/Paladin.txt +++ b/npc/jobs/2-2a/Paladin.txt @@ -33,7 +33,7 @@ valkyrie,53,39,3 script Paladin#Valkyrie 752,{ mes "always brighten our path!"; close; } - if ((ADVJOB == Job_Paladin) && (Class == Job_Swordman_High) && (JobLevel > 39)) { + else if (ADVJOB == Job_Paladin && Class == Job_Swordman_High && JobLevel > 39) { mes "[Paladin]"; mes "The Holy War will"; mes "be upon us before we"; @@ -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 a28d695e6..b6b38afdc 100644 --- a/npc/jobs/2-2a/Professor.txt +++ b/npc/jobs/2-2a/Professor.txt @@ -40,7 +40,7 @@ valkyrie,53,47,3 script Scholar#Valkyrie 743,{ mes "process of learning..."; close; } - if ((ADVJOB == Job_Professor) && (Class == Job_Mage_High) && (JobLevel > 39)) { + else if (ADVJOB == Job_Professor && Class == Job_Mage_High && JobLevel > 39) { mes "[Scholar]"; mes "Rune-Midgard doesn't"; mes "have enough Scholars to"; @@ -89,4 +89,5 @@ 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 e6ee9522c..a2a26e135 100644 --- a/npc/jobs/2-2a/Stalker.txt +++ b/npc/jobs/2-2a/Stalker.txt @@ -41,7 +41,7 @@ valkyrie,53,58,3 script Stalker#Valkyrie 747,{ mes "they need me."; close; } - if ((ADVJOB == Job_Stalker) && (Class == Job_Thief_High) && (JobLevel > 39)) { + else if (ADVJOB == Job_Stalker && Class == Job_Thief_High && JobLevel > 39) { mes "[Stalker]"; mes "This world needs"; mes "more heroes who are"; @@ -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-70-g09d2