summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-12-24 15:16:05 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-12-24 15:16:05 +0000
commit6b3e3bb6101e8e6e6b284084f341d11afe9ca059 (patch)
tree523837a8e177345207a0f3c8e0b0bc34d25b9932
parent05debeeda0c727bb299950e1abb8b27465943e07 (diff)
downloadhercules-6b3e3bb6101e8e6e6b284084f341d11afe9ca059.tar.gz
hercules-6b3e3bb6101e8e6e6b284084f341d11afe9ca059.tar.bz2
hercules-6b3e3bb6101e8e6e6b284084f341d11afe9ca059.tar.xz
hercules-6b3e3bb6101e8e6e6b284084f341d11afe9ca059.zip
Applied Kazukin's fix for the dancing portion of The Sign Quest. (bugreport:3966)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14214 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/quests/The_Sign_Quest.txt9
2 files changed, 5 insertions, 6 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 6726e175a..03f429196 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2009/12/24
+ * Rev. 14124 Applied Kazukin's fix for the dancing portion of The Sign Quest. (bugreport:3966) [L0ne_W0lf]
2009/12/20
* Rev. 14211 More Orc Instance updates, and some new 13.1 quests. :x [L0ne_W0lf]
- Disabled an exploit related to the orc hero spawn.
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index c7b42c089..d88cb118f 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -19,6 +19,7 @@
//= 3.1 Corrected time check for Sir Jore. [L0ne_W0lf]
//= 3.2 Removed mapannounce used while debugging. [L0ne_W0lf]
//= Moved the disablewaitingroomevent in dancing portion.
+//= 3.3 Applied Kazukin's fix for the dancing portion. (bugreport:3966) [L0ne_W0lf]
//============================================================
//============================================================
@@ -5371,6 +5372,7 @@ OnTimer38000:
end;
OnTimer44000:
+ stopnpctimer;
donpcevent "s_dance#up::Onreset";
donpcevent "s_dance#down::Onreset";
donpcevent "s_dance#left::Onreset";
@@ -5378,8 +5380,7 @@ OnTimer44000:
donpcevent "s_dance#cen::Onreset";
mapannounce "cmd_in01","Well done.",bc_map,"0xFFFF00";
enablenpc "Examiner#sd";
- donpcevent "Examiner#sd::Onreset1";
- stopnpctimer;
+ donpcevent "Standby Room#sign::Onreset";
end;
}
@@ -5739,10 +5740,6 @@ OnDisable:
set .s_check,0;
disablenpc "Examiner#sd";
end;
-
-Onreset1:
- donpcevent "Standby Room#sign::Onreset";
- end;
}
alberta_in,125,101,5 script Wealthy-looking Merchant 807,{