Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix wrong code block.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6680 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-05-21 16:33:06 +00:00
parent 4908a915e7
commit 9e7055026e
1 changed files with 133 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

267
npc/custom/jobs/jobmaster.txt
View File

@ -34,55 +34,55 @@ prontera.gat,153,193,6 script Job Master 123,{
mes "Welcome, please select the job you wish to change into"; mes "Welcome, please select the job you wish to change into";
if(lastJob != 0 && Class == Job_Novice_High){ if(lastJob != 0 && Class == Job_Novice_High){
switch(lastJob){ switch(lastJob){
case Job_Knight: case Job_Knight:
case Job_Crusader: case Job_Crusader:
set @target_job, Job_Swordman_High; set @target_job, Job_Swordman_High;
break; break;
case Job_Monk: case Job_Monk:
case Job_Priest: case Job_Priest:
set @target_job, Job_Acolyte_High; set @target_job, Job_Acolyte_High;
break; break;
case Job_Alchem: case Job_Alchem:
case Job_Blacksmith: case Job_Blacksmith:
set @target_job, Job_Merchant_High; set @target_job, Job_Merchant_High;
break; break;
case Job_Rogue: case Job_Rogue:
case Job_Assassin: case Job_Assassin:
set @target_job, Job_Thief_High; set @target_job, Job_Thief_High;
break; break;
case Job_Wizard: case Job_Wizard:
case Job_Sage: case Job_Sage:
set @target_job, Job_Mage_High; set @target_job, Job_Mage_High;
break; break;
case Job_Hunter: case Job_Hunter:
case Job_Bard: case Job_Bard:
case Job_Dancer: case Job_Dancer:
set @target_job, Job_Archer_High; set @target_job, Job_Archer_High;
break; break;
} }
} else { } else {
switch(select("Swordsman","Mage","Archer","Acolyte","Merchant","Thief", switch(select("Swordsman","Mage","Archer","Acolyte","Merchant","Thief",
"Super Novice","Taekwon","Gunslinger","Ninja")){ "Super Novice","Taekwon","Gunslinger","Ninja")){
case 7: case 7:
if(Class == Job_Novice_High) goto L_noReq; if(Class == Job_Novice_High) goto L_noReq;
if($@JC_SupNovM > BaseLevel) goto L_BvError; if($@JC_SupNovM > BaseLevel) goto L_BvError;
set @target_job, Job_SuperNovice; set @target_job, Job_SuperNovice;
break; break;
case 8: case 8:
if(Class == Job_Novice_High) goto L_noReq; if(Class == Job_Novice_High) goto L_noReq;
if(Upper == 2) goto L_noReq; if(Upper == 2) goto L_noReq;
set @target_job, Job_Taekwon; set @target_job, Job_Taekwon;
break; break;
case 9: case 9:
case 10: case 10:
if(Class == Job_Novice_High) goto L_noReq; if(Class == Job_Novice_High) goto L_noReq;
set @target_job, @menu + 15; set @target_job, @menu + 15;
break; break;
default: default:
set @target_job, @menu; set @target_job, @menu;
if(Class == Job_Novice_High) set @target_job, @target_job + 4001; if(Class == Job_Novice_High) set @target_job, @target_job + 4001;
break; break;
} }
} }
mes "Are you sure?"; mes "Are you sure?";
if(select("No","Yes") == 2){ if(select("No","Yes") == 2){
@ -98,54 +98,54 @@ prontera.gat,153,193,6 script Job Master 123,{
default: default:
if(JobLevel < $@JC_MinimumJB) goto L_LvError; if(JobLevel < $@JC_MinimumJB) goto L_LvError;
deletearray @job_opt, getarraysize(@job_opt); 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){ if(lastJob != 0){
set @target_job, lastJob + 4001; set @target_job, lastJob + 4001;
} else { } else {
switch(Class){ switch(Class){
case Job_Swordman_High: case Job_Swordman_High:
case Job_Baby_Swordman: case Job_Baby_Swordman:
case Job_Swordman: case Job_Swordman:
set @job_opt[0], Job_Knight; set @job_opt[0], Job_Knight;
set @job_opt[1], Job_Crusader; set @job_opt[1], Job_Crusader;
break; break;
case Job_Mage_High: case Job_Mage_High:
case Job_Baby_Mage: case Job_Baby_Mage:
case Job_Mage: case Job_Mage:
set @job_opt[0], Job_Wizard; set @job_opt[0], Job_Wizard;
set @job_opt[1], Job_Sage; set @job_opt[1], Job_Sage;
break; break;
case Job_Archer_High: case Job_Archer_High:
case Job_Baby_Archer: case Job_Baby_Archer:
case Job_Archer: case Job_Archer:
set @job_opt[0], Job_Hunter; set @job_opt[0], Job_Hunter;
if(Sex == 0) if(Sex == 0)
set @job_opt[1], Job_Dancer; set @job_opt[1], Job_Dancer;
else else
set @job_opt[1], Job_Bard; set @job_opt[1], Job_Bard;
break; break;
case Job_Acolyte_High: case Job_Acolyte_High:
case Job_Baby_Acolyte: case Job_Baby_Acolyte:
case Job_Acolyte: case Job_Acolyte:
set @job_opt[0], Job_Priest; set @job_opt[0], Job_Priest;
set @job_opt[1], Job_Monk; set @job_opt[1], Job_Monk;
break; break;
case Job_Merchant_High: case Job_Merchant_High:
case Job_Baby_Merchant: case Job_Baby_Merchant:
case Job_Merchant: case Job_Merchant:
set @job_opt[0], Job_Blacksmith; set @job_opt[0], Job_Blacksmith;
set @job_opt[1], Job_Alchem; set @job_opt[1], Job_Alchem;
break; break;
case Job_Thief_High: case Job_Thief_High:
case Job_Baby_Theif: case Job_Baby_Theif:
case Job_Theif: case Job_Theif:
set @job_opt[0], Job_Assassin; set @job_opt[0], Job_Assassin;
set @job_opt[1], Job_Rogue; set @job_opt[1], Job_Rogue;
break; break;
default: default:
set @job_opt[0], Job_Star_Gladiator; set @job_opt[0], Job_Star_Gladiator;
set @job_opt[1], Job_Soul_Linker; set @job_opt[1], Job_Soul_Linker;
break; break;
} }
mes "Welcome, please select the job you wish to change into"; 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]; 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; close;
} }
} }
mes "Looks like something has gone wrong. Please report to the eAthena Development Team about this error."; mes "Looks like something has gone wrong. Please report to the eAthena Development Team about this error.";
close; close;
L_GivePlat: L_GivePlat:
if (BaseClass==Job_SuperNovice) goto L_sSuperN; if (BaseClass==Job_SuperNovice) goto L_sSuperN;
if (BaseClass==Job_Swordman) goto L_sSword; if (BaseClass==Job_Swordman) goto L_sSword;
if (BaseClass==Job_Mage) goto L_sMage; if (BaseClass==Job_Mage) goto L_sMage;
if (BaseClass==Job_Archer) goto L_sArcher; if (BaseClass==Job_Archer) goto L_sArcher;
if (BaseClass==Job_Acolyte) goto L_sAcolyte; if (BaseClass==Job_Acolyte) goto L_sAcolyte;
if (BaseClass==Job_Merchant) goto L_sMerchant; if (BaseClass==Job_Merchant) goto L_sMerchant;
if (BaseClass==Job_Thief) goto L_sThief; if (BaseClass==Job_Thief) goto L_sThief;
close; close;
L_sSuperN: L_sSuperN:
skill 142,1,0; skill 142,1,0;
close; close;
L_sSword: L_sSword:
skill 142,1,0; skill 142,1,0;
skill 144,1,0; skill 144,1,0;
skill 145,1,0; skill 145,1,0;
skill 146,1,0; skill 146,1,0;
close; close;
L_sMage: L_sMage:
skill 142,1,0; skill 142,1,0;
skill 157,1,0; skill 157,1,0;
close; close;
L_sArcher: L_sArcher:
skill 142,1,0; skill 142,1,0;
skill 147,1,0; skill 147,1,0;
skill 148,1,0; skill 148,1,0;
close; close;
L_sAcolyte: L_sAcolyte:
skill 142,1,0; skill 142,1,0;
skill 156,1,0; skill 156,1,0;
close; close;
L_sMerchant: L_sMerchant:
skill 142,1,0; skill 142,1,0;
skill 153,1,0; skill 153,1,0;
skill 154,1,0; skill 154,1,0;
skill 155,1,0; skill 155,1,0;
close; close;
L_sThief: L_sThief:
skill 142,1,0; skill 142,1,0;
skill 149,1,0; skill 149,1,0;
skill 150,1,0; skill 150,1,0;
skill 151,1,0; skill 151,1,0;
skill 152,1,0; skill 152,1,0;
close; close;
L_cantCh: L_cantCh:
mes "I'm sorry, you do not meet the requirements to change"; mes "I'm sorry, you do not meet the requirements to change";