diff options
Diffstat (limited to 'npc/custom')
| -rw-r--r-- | npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt | 4 | ||||
| -rw-r--r-- | npc/custom/eAAC_Scripts/quest_warper.txt | 6 | ||||
| -rw-r--r-- | npc/custom/jobs/jobmaster.txt | 6 | ||||
| -rw-r--r-- | npc/custom/jobs/old/jobchange.txt | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt index 5dbe75677..f536e8e32 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt @@ -57,7 +57,7 @@ function script GF_getJobName { return "sage"; case Job_BlackSmith: return "blacksmith"; - case Job_Alchem: + case Job_Alchemist: return "alchemist"; case Job_Knight: case Job_Knight2: @@ -305,7 +305,7 @@ function script GF_getJobClass { case Job_Merchant: case Job_BlackSmith: - case Job_Alchem: + case Job_Alchemist: return Job_Merchant; case Job_Swordman: diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt index 1ffd4ff6a..ec96f800b 100644 --- a/npc/custom/eAAC_Scripts/quest_warper.txt +++ b/npc/custom/eAAC_Scripts/quest_warper.txt @@ -1182,8 +1182,8 @@ function script QWS_Darray { setarray @DGat$[@Dref], "c_tower1.gat", "c_tower2.gat", "c_tower3.gat", "c_tower4.gat", "alde_dun01.gat", "alde_dun02.gat", "alde_dun03.gat", "alde_dun04.gat"; setarray @DLevelName$[@Dref], "Clock Tower Level 1", "Clock Tower Level 2", "Clock Tower Level 3", "Clock Tower Level 4", "Basement 1F", "Basement 2F", "Basement 3F", "Basement 4F"; - setarray @DXcoords[@Dref], 200, 268, 64, 32, 197, 262, 276, 130; - setarray @DYcoords[@Dref], 163, 26, 148, 63, 25, 41, 53, 130; + setarray @DXcoords[@Dref], 200, 268, 64, 32, 197, 262, 276, 122; + setarray @DYcoords[@Dref], 163, 26, 148, 63, 25, 41, 53, 125; setarray @DDepth[@Dref], 0, 1, 2, 3, 1, 2, 3, 4; QWS_Make_Dungeon_Menu 5; @@ -1505,7 +1505,7 @@ function script QWS_Darray { setarray @DGat$[@Dref], "um_dun01.gat", "um_dun02.gat", "yggdrasil01.gat"; setarray @DLevelName$[@Dref], "Carpenter's Shop in The Tree", "Passage to a Foreign World", "Hvergelmir's Fountain"; setarray @DXcoords[@Dref], 205, 48, 40; - setarray @DYcoords[@Dref], 16, 30, 63; + setarray @DYcoords[@Dref], 26, 30, 63; setarray @DDepth[@Dref], 0, 1, 2; QWS_Make_Dungeon_Menu 27; diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt index 2db205ba7..d3bf6f59b 100644 --- a/npc/custom/jobs/jobmaster.txt +++ b/npc/custom/jobs/jobmaster.txt @@ -43,7 +43,7 @@ prontera,153,193,6 script Job Master 123,{ case Job_Priest: set @target_job, Job_Acolyte_High; break; - case Job_Alchem: + case Job_Alchemist: case Job_Blacksmith: set @target_job, Job_Merchant_High; break; @@ -91,7 +91,7 @@ prontera,153,193,6 script Job Master 123,{ 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) { + if(@target_job == Job_Gunslinger || @target_job == Job_Ninja || @target_job == Job_Taekwon) { callfunc "F_ClearJobVar"; } else { if($@JC_Plat) goto L_GivePlat; @@ -138,7 +138,7 @@ prontera,153,193,6 script Job Master 123,{ case Job_Baby_Merchant: case Job_Merchant: set @job_opt[0], Job_Blacksmith; - set @job_opt[1], Job_Alchem; + set @job_opt[1], Job_Alchemist; break; case Job_Thief_High: case Job_Baby_Thief: diff --git a/npc/custom/jobs/old/jobchange.txt b/npc/custom/jobs/old/jobchange.txt index 10c4a9cbe..2c0439eca 100644 --- a/npc/custom/jobs/old/jobchange.txt +++ b/npc/custom/jobs/old/jobchange.txt @@ -617,7 +617,7 @@ LSecondClass2: mes "[ ^0065DFJobra^000000 ]"; if(class !=5) goto LNotMerc2; mes "Cool! Go make some potions! Open a Pharmacy! yeah yeah yeah! ^_^"; - jobchange 18;// Job: Job_Alchem + jobchange 18;// Job: Job_Alchemist cutin "kafra_01",255; close; |