summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 05:03:43 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 05:03:43 +0000
commit44ee087d3e229e96e2ae3119e1e61dba215cf613 (patch)
tree642187778f51e8ffba9b2a08b76b1811147fe033
parentaa0c6f842d41eafbc60ca9cfbaa69e6914d46ae0 (diff)
downloadhercules-44ee087d3e229e96e2ae3119e1e61dba215cf613.tar.gz
hercules-44ee087d3e229e96e2ae3119e1e61dba215cf613.tar.bz2
hercules-44ee087d3e229e96e2ae3119e1e61dba215cf613.tar.xz
hercules-44ee087d3e229e96e2ae3119e1e61dba215cf613.zip
fixed dance jq
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7555 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/jobs/2-2/dancer.txt12
2 files changed, 7 insertions, 6 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 99f32a2c3..3c014dc4f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -39,6 +39,7 @@ Playtester
Date Added
======
07/05
+ * Fixed Dancer Job Quest (3rd part) thx2Alis [Lupus]
* Went trough all scripts and turned all job numbers -> constants [Lupus]
07/05
* fixed missing labels socket_enchant.txt [Lupus]
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 4d396c857..c4cc76767 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -4,7 +4,7 @@
//= Kalen - Original jAthena
//= Fredzilla - Converted
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena Final
//===== Description: =========================================
@@ -23,6 +23,7 @@
//= to go. [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Script check #1. [Lance]
+//= 2.2 Fixed unpassable part, thx2 Alis [Lupus]
//============================================================
//= Warning Warp to escape the quest if need be
@@ -680,25 +681,24 @@ Ljobchange:
close;
}
+
//=Start of the 3rd quest is here, once complete you go back to Bijou to change job
job_duncer.gat,32,152,6 script Guide::dancew 69,{
end;
-OnWarp:
+ OnWarp:
warpwaitingpc "job_duncer.gat",70,112,1;
disablewaitingroomevent;
- doevent "jobDq::OnStart";
+ initnpctimer "jobDq";
end;
OnInit:
waitingroom "Dance lesson waiting room",20,"dancew::OnWarp",1;
end;
}
+
job_duncer.gat,0,0,0 script jobDq -1,{
end;
OnStart:
- attachnpctimer;
- initnpctimer;
- end;
OnTimer1000:
mapannounce "job_duncer.gat","Bijou: The test begins, Total time allowed is 1 minute.",8;