diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-25 20:46:31 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-25 20:46:31 +0000 |
| commit | c735b78e9f1c291785f812801e14a8345a6195d2 (patch) | |
| tree | e49f31b59e39514563f664e81b3b88d1b1156cef /npc | |
| parent | 388be58765c0527ef37d7858d606ab49cc9c5c41 (diff) | |
| download | hercules-c735b78e9f1c291785f812801e14a8345a6195d2.tar.gz hercules-c735b78e9f1c291785f812801e14a8345a6195d2.tar.bz2 hercules-c735b78e9f1c291785f812801e14a8345a6195d2.tar.xz hercules-c735b78e9f1c291785f812801e14a8345a6195d2.zip | |
* Fixed a minor label typo in "Endless Tower" script, bugreport:5973 (instances\EndlessTower.txt)
* Fixed reset on Baby job change in custom "Job Master", bugreport:6101 (custom\jobmaster.txt)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16347 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/custom/jobmaster.txt | 12 | ||||
| -rw-r--r-- | npc/instances/EndlessTower.txt | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt index 74c0ee762..1256ec653 100644 --- a/npc/custom/jobmaster.txt +++ b/npc/custom/jobmaster.txt @@ -9,8 +9,7 @@ //===== Description: ========================================= //= A fully functional job changer. //===== Additional Comments: ================================= -//= 1.0 First Version -//= 1.1 Fixed the problem of skill points on change job +//= 1.1 Fixed reset on Baby job change. //============================================================ prontera,153,193,6 script Job Master 123,{ @@ -100,12 +99,9 @@ function Job_Menu { if (select(" ~ Change into ^0055FF"+jobname(.@i)+"^000000 class: ~ ^777777Go back^000000")==1) { mes "[Job Master]"; mes "You are now "+A_An(jobname(.@i))+"!"; - if (.@i==4001) { - if (.LastJob) set lastJob, Class; - jobchange .@i; - resetlvl(1); - set SkillPoint, 0; } - else jobchange .@i; + if (.@i==4001) if (.LastJob) set lastJob, Class; + jobchange .@i; + if (.@i==4001 || .@i==4023) resetlvl(1); specialeffect2 338; specialeffect2 432; if (.Platinum) callsub Get_Platinum; close; } diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 18c390858..ecdc3bed0 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -418,7 +418,7 @@ e_tower,1,1,2 script #102Administrator Mode104 844,{ switch(select("Generate Purification Stone:Remove Purification Stone:Cancel")) { case 1: mes "Create the Purification Stone that stays for 30 minutes."; - donpcevent "Purification Stone#et1::Enable"; + donpcevent "Purification Stone#et1::OnEnable"; break; case 2: mes "Destroy the Purification Stone immediately"; |