summaryrefslogtreecommitdiff
path: root/npc/re/jobs
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-03-31 01:19:36 +0000
committershennetsind <ind@henn.et>2013-04-11 16:29:34 -0300
commit53369ab05d2f087d826b5fbb2dcb335a1ac59a1d (patch)
treec7cf2e833c13005702b658d538f672956268221a /npc/re/jobs
parent4519b9f207fec921433843278198a8ff886c9a72 (diff)
downloadhercules-53369ab05d2f087d826b5fbb2dcb335a1ac59a1d.tar.gz
hercules-53369ab05d2f087d826b5fbb2dcb335a1ac59a1d.tar.bz2
hercules-53369ab05d2f087d826b5fbb2dcb335a1ac59a1d.tar.xz
hercules-53369ab05d2f087d826b5fbb2dcb335a1ac59a1d.zip
* Added "Play with Baby Cats" to Malangdo quests.
* Updated quest_db with all remaining Malangdo entries. * Temporariliy added new coordinates to Warlock job quest to match new Morroc map. (tid:80650) * Fixed some misplaced 'close2' commands in El Dicastes quests (incl. bugreport:7431). * Moved equip index constants in pc.h so that equip_index no longer needs to updating. (follow-up r17221, Hercules ea42e92) * Minor changes to script_commands.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17224 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/re/jobs')
-rw-r--r--npc/re/jobs/3-1/warlock.txt13
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]";