summaryrefslogtreecommitdiff
path: root/npc/re/jobs/3-1/warlock.txt
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/re/jobs/3-1/warlock.txt
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/re/jobs/3-1/warlock.txt')
-rw-r--r--npc/re/jobs/3-1/warlock.txt27
1 files changed, 12 insertions, 15 deletions
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index d08d7395d..263ccd9b0 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -1,15 +1,13 @@
//===== Hercules Script ======================================
//= Warlock Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= Muad_Dib, Gepard & L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.3a
-//===== Compatible With: =====================================
-//= Hercules
-//===== Description: =========================================
+//===== Current Version: =====================================
+//= 1.4
+//===== Description: =========================================
//= [Official Conversion]
//= Job change Quest from Wizard / High Wizard -> Warlock.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First version. [Masao]
//= 1.1 Fixed some conversion mistakes, replaced numbers with
//= constants, added item names in comments.
@@ -18,6 +16,8 @@
//= 1.2a Fixed a typo. [Euphy]
//= 1.3 Updated script, optimized. [Euphy]
//= 1.3a Added temporary coordinate fix #distorted_space_1-1. [Euphy]
+//= 1.3b Added official coordinates. [Euphy]
+//= 1.4 Added GM management function. [Euphy]
//============================================================
- script #distorted_space_ -1,{
@@ -66,12 +66,10 @@ OnTouch:
}
end;
}
-morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
+//morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
+morocc,95,132,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]";
mes "Huh!!! Human!?!";
@@ -1056,8 +1054,8 @@ OnTimer6000:
end;
}
-/*
-job3_war01,1,2,0 script Button Girl 66,{
+job3_war01,1,2,0 script Button Girl#wl 66,{
+ callfunc "F_GM_NPC";
switch(select("Open Arena:Close Arena:Open the Chamber of Magic:Close the Chamber of Magic:Hollow Stone On:Hollow Stone Off:Cancel")) {
case 1:
mes "Opening the Arena.";
@@ -1093,7 +1091,6 @@ job3_war01,1,2,0 script Button Girl 66,{
close;
}
}
-*/
spl_fild02,0,0,0,0 monster Bradium Golem 2049,20,5000,0,0
-spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0
+spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0 \ No newline at end of file