summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-21 16:33:06 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-21 16:33:06 +0000
commite3ae5ebcd80e0fe528e522b87aec0022488bb446 (patch)
tree195900d9b4100491d39c20d237a93fdaab0b74e5
parent1446b6d275cc2bda27e647d5bd3e777330479cd3 (diff)
downloadhercules-e3ae5ebcd80e0fe528e522b87aec0022488bb446.tar.gz
hercules-e3ae5ebcd80e0fe528e522b87aec0022488bb446.tar.bz2
hercules-e3ae5ebcd80e0fe528e522b87aec0022488bb446.tar.xz
hercules-e3ae5ebcd80e0fe528e522b87aec0022488bb446.zip
Bugfix wrong code block.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6680 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/custom/jobs/jobmaster.txt267
1 files changed, 133 insertions, 134 deletions
diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt
index 7b6902d0e..36809d8eb 100644
--- a/npc/custom/jobs/jobmaster.txt
+++ b/npc/custom/jobs/jobmaster.txt
@@ -34,55 +34,55 @@ prontera.gat,153,193,6 script Job Master 123,{
mes "Welcome, please select the job you wish to change into";
if(lastJob != 0 && Class == Job_Novice_High){
switch(lastJob){
- case Job_Knight:
- case Job_Crusader:
- set @target_job, Job_Swordman_High;
- break;
- case Job_Monk:
- case Job_Priest:
- set @target_job, Job_Acolyte_High;
- break;
- case Job_Alchem:
- case Job_Blacksmith:
- set @target_job, Job_Merchant_High;
- break;
- case Job_Rogue:
- case Job_Assassin:
- set @target_job, Job_Thief_High;
- break;
- case Job_Wizard:
- case Job_Sage:
- set @target_job, Job_Mage_High;
- break;
- case Job_Hunter:
- case Job_Bard:
- case Job_Dancer:
- set @target_job, Job_Archer_High;
- break;
+ case Job_Knight:
+ case Job_Crusader:
+ set @target_job, Job_Swordman_High;
+ break;
+ case Job_Monk:
+ case Job_Priest:
+ set @target_job, Job_Acolyte_High;
+ break;
+ case Job_Alchem:
+ case Job_Blacksmith:
+ set @target_job, Job_Merchant_High;
+ break;
+ case Job_Rogue:
+ case Job_Assassin:
+ set @target_job, Job_Thief_High;
+ break;
+ case Job_Wizard:
+ case Job_Sage:
+ set @target_job, Job_Mage_High;
+ break;
+ case Job_Hunter:
+ case Job_Bard:
+ case Job_Dancer:
+ set @target_job, Job_Archer_High;
+ break;
}
} else {
switch(select("Swordsman","Mage","Archer","Acolyte","Merchant","Thief",
- "Super Novice","Taekwon","Gunslinger","Ninja")){
- case 7:
- if(Class == Job_Novice_High) goto L_noReq;
- if($@JC_SupNovM > BaseLevel) goto L_BvError;
- set @target_job, Job_SuperNovice;
- break;
- case 8:
- if(Class == Job_Novice_High) goto L_noReq;
- if(Upper == 2) goto L_noReq;
- set @target_job, Job_Taekwon;
- break;
- case 9:
- case 10:
- if(Class == Job_Novice_High) goto L_noReq;
- set @target_job, @menu + 15;
- break;
- default:
- set @target_job, @menu;
- if(Class == Job_Novice_High) set @target_job, @target_job + 4001;
- break;
- }
+ "Super Novice","Taekwon","Gunslinger","Ninja")){
+ case 7:
+ if(Class == Job_Novice_High) goto L_noReq;
+ if($@JC_SupNovM > BaseLevel) goto L_BvError;
+ set @target_job, Job_SuperNovice;
+ break;
+ case 8:
+ if(Class == Job_Novice_High) goto L_noReq;
+ if(Upper == 2) goto L_noReq;
+ set @target_job, Job_Taekwon;
+ break;
+ case 9:
+ case 10:
+ if(Class == Job_Novice_High) goto L_noReq;
+ set @target_job, @menu + 15;
+ break;
+ default:
+ set @target_job, @menu;
+ if(Class == Job_Novice_High) set @target_job, @target_job + 4001;
+ break;
+ }
}
mes "Are you sure?";
if(select("No","Yes") == 2){
@@ -98,54 +98,54 @@ prontera.gat,153,193,6 script Job Master 123,{
default:
if(JobLevel < $@JC_MinimumJB) goto L_LvError;
deletearray @job_opt, getarraysize(@job_opt);
- if(Class < Job_Knight || Class == Job_Taekwon || (Class > Job_Baby && Class < Job_Baby_Knight) || (Class > Job_Novice_High && Class < Job_Lord_Knight))
+ if(Class < Job_Knight || Class == Job_Taekwon || (Class > Job_Baby && Class < Job_Baby_Knight) || (Class > Job_Novice_High && Class < Job_Lord_Knight)){
if(lastJob != 0){
set @target_job, lastJob + 4001;
} else {
switch(Class){
- case Job_Swordman_High:
- case Job_Baby_Swordman:
- case Job_Swordman:
- set @job_opt[0], Job_Knight;
- set @job_opt[1], Job_Crusader;
- break;
- case Job_Mage_High:
- case Job_Baby_Mage:
- case Job_Mage:
- set @job_opt[0], Job_Wizard;
- set @job_opt[1], Job_Sage;
- break;
- case Job_Archer_High:
- case Job_Baby_Archer:
- case Job_Archer:
- set @job_opt[0], Job_Hunter;
- if(Sex == 0)
- set @job_opt[1], Job_Dancer;
- else
- set @job_opt[1], Job_Bard;
- break;
- case Job_Acolyte_High:
- case Job_Baby_Acolyte:
- case Job_Acolyte:
- set @job_opt[0], Job_Priest;
- set @job_opt[1], Job_Monk;
- break;
- case Job_Merchant_High:
- case Job_Baby_Merchant:
- case Job_Merchant:
- set @job_opt[0], Job_Blacksmith;
- set @job_opt[1], Job_Alchem;
- break;
- case Job_Thief_High:
- case Job_Baby_Theif:
- case Job_Theif:
- set @job_opt[0], Job_Assassin;
- set @job_opt[1], Job_Rogue;
- break;
- default:
- set @job_opt[0], Job_Star_Gladiator;
- set @job_opt[1], Job_Soul_Linker;
- break;
+ case Job_Swordman_High:
+ case Job_Baby_Swordman:
+ case Job_Swordman:
+ set @job_opt[0], Job_Knight;
+ set @job_opt[1], Job_Crusader;
+ break;
+ case Job_Mage_High:
+ case Job_Baby_Mage:
+ case Job_Mage:
+ set @job_opt[0], Job_Wizard;
+ set @job_opt[1], Job_Sage;
+ break;
+ case Job_Archer_High:
+ case Job_Baby_Archer:
+ case Job_Archer:
+ set @job_opt[0], Job_Hunter;
+ if(Sex == 0)
+ set @job_opt[1], Job_Dancer;
+ else
+ set @job_opt[1], Job_Bard;
+ break;
+ case Job_Acolyte_High:
+ case Job_Baby_Acolyte:
+ case Job_Acolyte:
+ set @job_opt[0], Job_Priest;
+ set @job_opt[1], Job_Monk;
+ break;
+ case Job_Merchant_High:
+ case Job_Baby_Merchant:
+ case Job_Merchant:
+ set @job_opt[0], Job_Blacksmith;
+ set @job_opt[1], Job_Alchem;
+ break;
+ case Job_Thief_High:
+ case Job_Baby_Theif:
+ case Job_Theif:
+ set @job_opt[0], Job_Assassin;
+ set @job_opt[1], Job_Rogue;
+ break;
+ default:
+ set @job_opt[0], Job_Star_Gladiator;
+ set @job_opt[1], Job_Soul_Linker;
+ break;
}
mes "Welcome, please select the job you wish to change into";
set @target_job, @job_opt[select(callfunc("getJobName",@job_opt[0]), callfunc("getJobName",@job_opt[1]))-1];
@@ -182,55 +182,54 @@ prontera.gat,153,193,6 script Job Master 123,{
}
close;
}
-
}
mes "Looks like something has gone wrong. Please report to the eAthena Development Team about this error.";
close;
L_GivePlat:
- if (BaseClass==Job_SuperNovice) goto L_sSuperN;
- if (BaseClass==Job_Swordman) goto L_sSword;
- if (BaseClass==Job_Mage) goto L_sMage;
- if (BaseClass==Job_Archer) goto L_sArcher;
- if (BaseClass==Job_Acolyte) goto L_sAcolyte;
- if (BaseClass==Job_Merchant) goto L_sMerchant;
- if (BaseClass==Job_Thief) goto L_sThief;
- close;
- L_sSuperN:
- skill 142,1,0;
- close;
- L_sSword:
- skill 142,1,0;
- skill 144,1,0;
- skill 145,1,0;
- skill 146,1,0;
- close;
- L_sMage:
- skill 142,1,0;
- skill 157,1,0;
- close;
- L_sArcher:
- skill 142,1,0;
- skill 147,1,0;
- skill 148,1,0;
- close;
- L_sAcolyte:
- skill 142,1,0;
- skill 156,1,0;
- close;
- L_sMerchant:
- skill 142,1,0;
- skill 153,1,0;
- skill 154,1,0;
- skill 155,1,0;
- close;
- L_sThief:
- skill 142,1,0;
- skill 149,1,0;
- skill 150,1,0;
- skill 151,1,0;
- skill 152,1,0;
- close;
+ if (BaseClass==Job_SuperNovice) goto L_sSuperN;
+ if (BaseClass==Job_Swordman) goto L_sSword;
+ if (BaseClass==Job_Mage) goto L_sMage;
+ if (BaseClass==Job_Archer) goto L_sArcher;
+ if (BaseClass==Job_Acolyte) goto L_sAcolyte;
+ if (BaseClass==Job_Merchant) goto L_sMerchant;
+ if (BaseClass==Job_Thief) goto L_sThief;
+ close;
+L_sSuperN:
+ skill 142,1,0;
+ close;
+L_sSword:
+ skill 142,1,0;
+ skill 144,1,0;
+ skill 145,1,0;
+ skill 146,1,0;
+ close;
+L_sMage:
+ skill 142,1,0;
+ skill 157,1,0;
+ close;
+L_sArcher:
+ skill 142,1,0;
+ skill 147,1,0;
+ skill 148,1,0;
+ close;
+L_sAcolyte:
+ skill 142,1,0;
+ skill 156,1,0;
+ close;
+L_sMerchant:
+ skill 142,1,0;
+ skill 153,1,0;
+ skill 154,1,0;
+ skill 155,1,0;
+ close;
+L_sThief:
+ skill 142,1,0;
+ skill 149,1,0;
+ skill 150,1,0;
+ skill 151,1,0;
+ skill 152,1,0;
+ close;
L_cantCh:
mes "I'm sorry, you do not meet the requirements to change";