summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2a
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-05 11:19:56 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-05 11:19:56 +0000
commit8c748978945b24f2b508d54c6068c7ee69a862ad (patch)
tree1df1f2150a53bbebe118e9524929580c6bf27461 /npc/jobs/2-2a
parentd6009fd28376933000516e149a60e8d62de51faa (diff)
downloadhercules-8c748978945b24f2b508d54c6068c7ee69a862ad.tar.gz
hercules-8c748978945b24f2b508d54c6068c7ee69a862ad.tar.bz2
hercules-8c748978945b24f2b508d54c6068c7ee69a862ad.tar.xz
hercules-8c748978945b24f2b508d54c6068c7ee69a862ad.zip
- 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
Diffstat (limited to 'npc/jobs/2-2a')
-rw-r--r--npc/jobs/2-2a/Champion.txt6
-rw-r--r--npc/jobs/2-2a/Clown.txt6
-rw-r--r--npc/jobs/2-2a/Creator.txt6
-rw-r--r--npc/jobs/2-2a/Gypsy.txt6
-rw-r--r--npc/jobs/2-2a/Paladin.txt6
-rw-r--r--npc/jobs/2-2a/Professor.txt6
-rw-r--r--npc/jobs/2-2a/Stalker.txt6
7 files changed, 21 insertions, 21 deletions
diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index 1d60bb8f8..1e0df577b 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 (FJOB == 0 || Upper != 1) {
+ if (ADVJOB == 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;
}
- if ((FJOB == Job_Sura) && (Class == Job_Acolyte_High) && (JobLevel > 39)) {
+ if ((ADVJOB == Job_Champion) && (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 FJOB,0;
+ set ADVJOB,0;
mes "[Champion]";
mes "Congratulations!";
mes "Live as a Champion,";
diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 10b897d6d..b9c0d90b9 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 (FJOB == 0 || Upper != 1) {
+ if (ADVJOB == 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;
}
- if ((FJOB == Job_Minstrell) && (Class == Job_Archer_High) && (JobLevel > 39)) {
+ if ((ADVJOB == Job_Clown) &&( 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 FJOB,0;
+ set ADVJOB,0;
mes "[Minstrel]";
mes "Congratulations!";
mes "As a Minstrel, your";
diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 1353c8ab7..6f9b2ed2d 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 (FJOB == 0 || Upper != 1) {
+ if (ADVJOB == 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;
}
- if ((FJOB == Job_Genetic) && (Class == Job_Merchant_High) && (JobLevel > 39)) {
+ if ((ADVJOB == Job_Creator) && (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 FJOB,0;
+ set ADVJOB,0;
mes "[Biochemist]";
mes "Congratulations!";
mes "As a Biochemist,";
diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index fdd65e526..5ab1730a4 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 (FJOB == 0 || Upper != 1) {
+ if (ADVJOB == 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;
}
- if ((FJOB == Job_Wanderer) && (Class == Job_Archer_High) && (JobLevel > 39)) {
+ 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";
@@ -60,7 +60,7 @@ valkyrie,53,56,3 script Gypsy#Valkyrie 101,{
close;
}
jobchange Job_Gypsy;
- set FJOB,0;
+ set ADVJOB,0;
mes "[Gypsy]";
mes "Congratulations!";
mes "As a Gypsy, I know";
diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index d7a6906ea..179f4caf1 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 (FJOB == 0 || Upper != 1) {
+ if (ADVJOB == 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;
}
- if ((FJOB == Job_Royal_Guard) && (Class == Job_Swordman_High) && (JobLevel > 39)) {
+ if ((ADVJOB == Job_Paladin) && (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 FJOB,0;
+ set ADVJOB,0;
mes "[Paladin]";
mes "Congratulations.";
mes "As a Paladin, I hope";
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index 6b8b0e300..a28d695e6 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 (FJOB == 0 || Upper != 1) {
+ if (ADVJOB == 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;
}
- if ((FJOB == Job_Sorcerer) && (Class == Job_Mage_High) && (JobLevel > 39)) {
+ if ((ADVJOB == Job_Professor) && (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 FJOB,0;
+ set ADVJOB,0;
mes "[Scholar]";
mes "Congratulations!";
mes "As a Professor, I hope";
diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index aa94e8501..e6ee9522c 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 (FJOB == 0 || Upper != 1) {
+ if (ADVJOB == 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;
}
- if ((FJOB == Job_Shadow_Chaser) && (Class == Job_Thief_High) && (JobLevel > 39)) {
+ if ((ADVJOB == Job_Stalker) && (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 FJOB,0;
+ set ADVJOB,0;
mes "[Stalker]";
mes "Congratulations!";
mes "As a Stalker, I hope";