summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-21 13:10:13 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-21 13:10:13 +0000
commit7c24f3bbc9553cb7b13826cd07906830fc5e27a1 (patch)
tree04bcf572e3fb3fe23a29f20c6b7be3dc89337b0e
parent16072af808e7a55a0ba1ad5efc36c747c04456e3 (diff)
downloadhercules-7c24f3bbc9553cb7b13826cd07906830fc5e27a1.tar.gz
hercules-7c24f3bbc9553cb7b13826cd07906830fc5e27a1.tar.bz2
hercules-7c24f3bbc9553cb7b13826cd07906830fc5e27a1.tar.xz
hercules-7c24f3bbc9553cb7b13826cd07906830fc5e27a1.zip
fixed custom npc jobmaster:Baby - >Super baby bug
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9887 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/custom/jobs/jobmaster.txt14
2 files changed, 10 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 427501686..4730f0950 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -31,6 +31,7 @@ Date Added
- not fully tested yet! U can use v2.5 as 100% working
- Moved NPC Master Kavaruk (overlapped Phantasmic Arrow Skill quest NPC)
- 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]
2007/02/19
* Fixed Dancer Job Quest mob::OnDie / SP check issues [Lupus]
diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt
index 79e609d93..41680c9a2 100644
--- a/npc/custom/jobs/jobmaster.txt
+++ b/npc/custom/jobs/jobmaster.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team [Ori:LunatikBunnie] [Cur:Lance]
//===== Current Version: =====================================
-//= 1.5
+//= 1.5a
//===== Compatible With: =====================================
//= eAthena SVN Trunk 6674
//===== Description: =========================================
@@ -15,6 +15,7 @@
//= 1.4 Added NJ/GS, changed all job numbers to Job_* constants.
//= All credits go to pxxx [Skotlex]
//= 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,{
mes "^ff0000[Job Master]^000000";
@@ -66,7 +67,10 @@ prontera.gat,153,193,6 script Job Master 123,{
case 7:
if(Class == Job_Novice_High) goto L_noReq;
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;
case 8:
if(Class == Job_Novice_High) goto L_noReq;
@@ -84,7 +88,7 @@ prontera.gat,153,193,6 script Job Master 123,{
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){
callfunc "Job_Change", @target_job;
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;
}
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;
}
- 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){
callfunc "Job_Change", @target_job;
if(@target_job == Job_Star_Gladiator || @target_job == Job_Soul_Linker) {