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

fixed custom npc jobmaster:Baby - >Super baby bug

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9887 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lupus 2007-02-21 13:10:13 +00:00
parent 84cb63e650
commit 10d382bcb3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
npc/Changelog.txt
View File

@ -31,6 +31,7 @@ Date Added
- not fully tested yet! U can use v2.5 as 100% working - not fully tested yet! U can use v2.5 as 100% working
- Moved NPC Master Kavaruk (overlapped Phantasmic Arrow Skill quest NPC) - Moved NPC Master Kavaruk (overlapped Phantasmic Arrow Skill quest NPC)
- The Sign Quest, minor dialogue fix, thanks to theultramage - The Sign Quest, minor dialogue fix, thanks to theultramage
- Fixed JobMaster Baby -> Super Baby change bug
* Fixed and Tested Dancing part of Dancer Job Quest (the rest chrid issues) [Lupus] * Fixed and Tested Dancing part of Dancer Job Quest (the rest chrid issues) [Lupus]
2007/02/19 2007/02/19
* Fixed Dancer Job Quest mob::OnDie / SP check issues [Lupus] * Fixed Dancer Job Quest mob::OnDie / SP check issues [Lupus]

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

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= eAthena Dev Team [Ori:LunatikBunnie] [Cur:Lance] //= eAthena Dev Team [Ori:LunatikBunnie] [Cur:Lance]
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.5 //= 1.5a
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena SVN Trunk 6674 //= eAthena SVN Trunk 6674
//===== Description: ========================================= //===== Description: =========================================
@ -15,6 +15,7 @@
//= 1.4 Added NJ/GS, changed all job numbers to Job_* constants. //= 1.4 Added NJ/GS, changed all job numbers to Job_* constants.
//= All credits go to pxxx [Skotlex] //= All credits go to pxxx [Skotlex]
//= 1.5 Rewrite everything from scratch. [Lance] //= 1.5 Rewrite everything from scratch. [Lance]
//= 1.5a fixed Baby -> Super Baby change. Switched to JobName() [Lupus]
//============================================================ //============================================================
prontera.gat,153,193,6 script Job Master 123,{ prontera.gat,153,193,6 script Job Master 123,{
mes "^ff0000[Job Master]^000000"; mes "^ff0000[Job Master]^000000";
@ -66,7 +67,10 @@ prontera.gat,153,193,6 script Job Master 123,{
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; if(Upper == 2)
set @target_job, Job_Super_Baby;
else
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;
@ -84,7 +88,7 @@ prontera.gat,153,193,6 script Job Master 123,{
break; break;
} }
} }
mes "Are you sure you want to change to " + callfunc("getJobName",@target_job) + "?"; mes "Are you sure you want to change to " + JobName(@target_job) + "?";
if(select("No","Yes") == 2){ if(select("No","Yes") == 2){
callfunc "Job_Change", @target_job; callfunc "Job_Change", @target_job;
if(@target_job == Job_Gunsliger || @target_job == Job_Ninja || @target_job == Job_Taekwon) { if(@target_job == Job_Gunsliger || @target_job == Job_Ninja || @target_job == Job_Taekwon) {
@ -148,10 +152,10 @@ prontera.gat,153,193,6 script Job Master 123,{
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(JobName(@job_opt[0]), JobName(@job_opt[1]))-1];
if(Class > Job_Novice_High && Class < Job_Lord_Knight) set @target_job, @target_job + 4001; if(Class > Job_Novice_High && Class < Job_Lord_Knight) set @target_job, @target_job + 4001;
} }
mes "Are you sure you want to change to " + callfunc("getJobName",@target_job) + "?"; mes "Are you sure you want to change to " + JobName(@target_job) + "?";
if(select("No","Yes")==2){ if(select("No","Yes")==2){
callfunc "Job_Change", @target_job; callfunc "Job_Change", @target_job;
if(@target_job == Job_Star_Gladiator || @target_job == Job_Soul_Linker) { if(@target_job == Job_Star_Gladiator || @target_job == Job_Soul_Linker) {