diff options
author | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
---|---|---|
committer | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
commit | 8c3c4577bde31ccee677ea75649b89cfa5822240 (patch) | |
tree | 6f1c3cf85deea0932b974d5a8943184966bff46a /npc/re/jobs/3-1/warlock.txt | |
parent | 3a6517e14649805db47b332934f4cad972d00e95 (diff) | |
parent | 038174e232c03519474f86e5738cecac34bbdee3 (diff) | |
download | hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.gz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.bz2 hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.xz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.zip |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'npc/re/jobs/3-1/warlock.txt')
-rw-r--r-- | npc/re/jobs/3-1/warlock.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 363597c10..8a8e1f0ce 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_Dib, Gepard & L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -14,12 +14,13 @@ //= 1.1 Fixed some conversion mistakes, replaced numbers with //= constants, added item names in comments. //= 1.2 Fixed the problem where NPC are not enabled and chamber -//= will never open for the second try or use. +//= will never open for the second try or use. //= 1.2a Fixed a typo. [Euphy] //= 1.3 Updated script, optimized. [Euphy] +//= 1.3a Added temporary coordinate fix #distorted_space_1-1. [Euphy] //============================================================ -morocc,103,144,0 script #distorted_space_1 139,1,1,{ +- script #distorted_space_ -1,{ OnTouch: if (job_wl > 1) { mes " - There is a strange distortion here - "; @@ -65,7 +66,11 @@ OnTouch: } end; } -splendide,141,284,0 duplicate(#distorted_space_1) #distorted_space_2 139,1,1 +morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1 +splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 139,1,1 + +// This is a temporary fix until new official coordinates are found. +morocc,98,144,0 duplicate(#distorted_space_) #distorted_space_1-1 139,1,1 function script F_Warlock { mes "[Assistant]"; |