summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-07 09:57:15 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-07 09:57:15 +0000
commit236e19c49cbcbff7cde02e4ffeb1ee524d13ea07 (patch)
treecb30a3b7498c59f522f98010c733ddaa6d449da1
parente4375a1ffab03bf138e6f43e417d342ed9e70cf1 (diff)
downloadhercules-236e19c49cbcbff7cde02e4ffeb1ee524d13ea07.tar.gz
hercules-236e19c49cbcbff7cde02e4ffeb1ee524d13ea07.tar.bz2
hercules-236e19c49cbcbff7cde02e4ffeb1ee524d13ea07.tar.xz
hercules-236e19c49cbcbff7cde02e4ffeb1ee524d13ea07.zip
- Fixed a "player not attached" error in the Moscovia quest. (bugreport:3041)
- Fixed a race condition in the Arunafeltz quest blocking progress. (bugreport:2782) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13734 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/quests/quests_moscovia.txt28
-rw-r--r--npc/quests/quests_nameless.txt4
3 files changed, 9 insertions, 26 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0bd383e2e..bcd940273 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
======
+2009/05/07
+ - Fixed a "player not attached" error in the Moscovia quest. (bugreport:3041) [brianluau]
+ - Fixed a race condition in the Arunafeltz quest blocking progress. (bugreport:2782)
2009/05/04
- Added a missing zeny check in the Jawaii Bartender. (bugreport:2897) [brianluau]
- Added a missing 'close' in the Mage quest Bookshelf. (bugreport:2873)
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 8d3b73929..e1740a079 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -13,6 +13,7 @@
//===== Additional Comments: =================================
//= 1.0 First version. [Kisuka]
//= 1.1 Small fixes on The Moving Island. [Kisuka]
+//= 1.2 Fixed a "player not attached" error. [brianluau]
//============================================================
//============================================================================
@@ -3136,7 +3137,8 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 963,{
mes "only his own.-";
set mos_whale_edq,14;
close2;
- donpcevent "#Island Control Tower::OnEnable";
+ sleep2 20000;
+ set mos_whale_edq,15;
end;
}
else if (mos_whale_edq == 14) {
@@ -4969,28 +4971,6 @@ OnTimer300000:
end;
}
-mosk_fild01,21,21,0 script #Island Control Tower -1,{
-OnInit:
- disablenpc "#Island Control Tower";
- stopnpctimer;
- end;
-
-OnEnable:
- enablenpc "#Island Control Tower";
- initnpctimer;
- end;
-
-OnDisable:
- disablenpc "#Island Control Tower";
- stopnpctimer;
- end;
-
-OnTimer20000:
- set mos_whale_edq,15;
- disablenpc "#Island Control Tower";
- end;
-}
-
//============================================================================
// Help Mikhail
//============================================================================
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 44a147a98..f34e05995 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -54,6 +54,7 @@
//= moved OnMyMobDead for access quest to a different NPC.
//= 1.9 Fixed mapwarp warping to disabled map. [L0ne_W0lf]
//= 2.0 Removed duplicate dialog. [L0ne_W0lf]
+//= 2.1 Fixed a race condition blocking progress. [brianluau]
//============================================================
// Nameless Island and Cursed Monestary Access Quest
@@ -2329,7 +2330,6 @@ OnTouch:
set .@nawara,rand(1,10);
if (.@nawara < 5) {
hideoffnpc "Foreign Merchant#aru2";
- set aru_em,6;
}
else {
set aru_em,2;