summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsamuray22 <samuray22@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-22 20:28:15 +0000
committersamuray22 <samuray22@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-22 20:28:15 +0000
commit58d195fc32989719a8d3a1c14ad9895c655a8b2b (patch)
treec07ac282b24e30492ade47d98ee9fb52d42167c0
parent7877c436abaa40a2569995936325ac9bb958f234 (diff)
downloadhercules-58d195fc32989719a8d3a1c14ad9895c655a8b2b.tar.gz
hercules-58d195fc32989719a8d3a1c14ad9895c655a8b2b.tar.bz2
hercules-58d195fc32989719a8d3a1c14ad9895c655a8b2b.tar.xz
hercules-58d195fc32989719a8d3a1c14ad9895c655a8b2b.zip
* Fixed a little Exploit to bug the Dancer Job Quest. (bugreport:2252)
* Fixed a Little Bug with Whispers Summoned in the Sage Job Quest. (bugreport:2253) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13231 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/jobs/2-2/dancer.txt9
-rw-r--r--npc/jobs/2-2/sage.txt5
3 files changed, 12 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index a847425b9..31c839c54 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
======
+2008/09/22
+ * Fixed a little Exploit to bug the Dancer Job Quest. (bugreport:2252) [Samuray22]
+ * Fixed a Little Bug with Whispers Summoned in the Sage Job Quest. (bugreport:2253)
2008/09/21
* Rev. 13229 Large update to Einbroch. Requires testing. [L0ne_W0lf]
- Added missing somewhat-global einbroch quest.
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 87bf5ea37..14c61affc 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -4,7 +4,7 @@
//= Kalen - Original jAthena
//= Fredzilla - Converted, Lupus
//===== Current Version: =====================================
-//= 3.6
+//= 3.6a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -18,6 +18,7 @@
//= 3.4 Fixed bad variables, bugreport:1685 [Brainstorm]
//= 3.5 Minor corrections to script. (bugreport:1766) [L0ne_W0lf]
//= 3.6 Applied Correction bug with for loop. [L0ne_W0lf]
+//= 3.6a Fixed a little Exploit to bug the quest with a timeout. (bugreport:2252) [Samuray22]
//============================================================
comodo,180,153,4 script Sonotora#1 90,{
@@ -1210,9 +1211,8 @@ OnTimer82000:
end;
OnTimer89000:
- donpcevent "dance#return::OnEnable";
donpcevent "dance#poring::OnDisable";
- stopnpctimer;
+ donpcevent "dance#return::OnEnable";
end;
}
@@ -1263,6 +1263,7 @@ OnDisable:
OnEnable:
enablenpc "dance#return#3";
+ donpcevent "Bijou#dance_timer::OnDisable";
donpcevent "Waiting Room#dance::OnEnable";
end;
}
@@ -1274,10 +1275,12 @@ OnTouch:
donpcevent "Backdancer#1::OnOmg";
mapannounce "job_duncer"," " + strcharinfo(0) + ", you lack rhythm... Your timing was too late!",bc_map;
set DANC_Q,8;
+ donpcevent "Bijou#dance_timer::OnDisable";
donpcevent "Waiting Room#dance::OnEnable";
warp "comodo",188,162;
end;
}
+
job_duncer,69,113,0 duplicate(StepTrigger) dance#up -1,1,1
job_duncer,69,107,0 duplicate(StepTrigger) dance#down -1,1,1
job_duncer,66,110,0 duplicate(StepTrigger) dance#left -1,1,1
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 6011c2248..a93bd68d0 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -5,7 +5,7 @@
//= Unknown Translator (1.0)
//= Darkchild (1.2)
//===== Current Version: =====================================
-//= 2.6
+//= 2.6a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -24,6 +24,7 @@
// -Changed an incorrect "!=" to "==". (bugreport:1572)
// -And Small Typo Error
//= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm]
+//= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22]
//============================================================
yuno_in02,38,61,5 script Dean of the Academy#sa 743,{
@@ -2736,7 +2737,7 @@ OnTimer50000:
OnTimer60000:
mapannounce "job_sage","Time over.",bc_map;
- disablenpc "Arena#Doorkeeper";
+ donpcevent "Arena#Doorkeeper::OnReset";
end;
OnTimer61000: