summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-16 20:53:05 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-16 20:53:05 +0000
commit25a64bfba88fc3b03a6f8ebef897f447fb3fc61d (patch)
tree4fac6cd4d963eca6d31cc4f3248701472ee2dc6b /npc
parent6196f0e6d34dba214a1598d7df7ab2f07b860a07 (diff)
downloadhercules-25a64bfba88fc3b03a6f8ebef897f447fb3fc61d.tar.gz
hercules-25a64bfba88fc3b03a6f8ebef897f447fb3fc61d.tar.bz2
hercules-25a64bfba88fc3b03a6f8ebef897f447fb3fc61d.tar.xz
hercules-25a64bfba88fc3b03a6f8ebef897f447fb3fc61d.zip
- Updated the Dancer job quest to attach a player to the main timer script.
- Updated script commands startnpctimer, stopnpctimer, initnpctimer so you can attach a player to them, this is done because the attach/detach functions can't be used to attach to a different script than the one currently running. - Some script code cleaning - Updated the script_command reference with the new flag values of [start/stop/init]npctimer. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9872 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/jobs/2-2/dancer.txt7
2 files changed, 6 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index e66311020..951e85959 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -26,7 +26,8 @@ KarLaeda
Date Added
======
-2007/02/17
+2007/02/16
+ * Updated the Dancer job quest to attach a player to the main timer script.
* Updated WoE scripts since the "guardian" script command no longer has a
"amount" argument. [Skotlex]
2007/02/15
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 459e93c94..b49fb7a3b 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.2
+//= 2.3
//===== Compatible With: =====================================
//= eAthena Final
//===== Description: =========================================
@@ -24,6 +24,7 @@
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Script check #1. [Lance]
//= 2.2 Fixed unpassable part, thx2 Alis [Lupus]
+//= 2.3 Updated initnpctimer to attach player to jobDq script [Skotlex]
//============================================================
//= Warning Warp to escape the quest if need be
@@ -689,7 +690,7 @@ job_duncer.gat,32,152,6 script Guide::dancew 69,{
OnWarp:
warpwaitingpc "job_duncer.gat",70,112,1;
disablewaitingroomevent;
- initnpctimer "jobDq";
+ initnpctimer "jobDq",1;
end;
OnInit:
waitingroom "Dance lesson waiting room",20,"dancew::OnWarp",1;
@@ -1052,6 +1053,6 @@ OnInit:
// close;
//Lgo:
// warp "job_duncer.gat",70,112;
-// initnpctimer "jobDq";
+// initnpctimer "jobDq",1;
// end;
//}