summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-28 21:52:20 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-28 21:52:20 +0000
commitaf2fe429cfa616683eed98f906e72c8d1815b8f5 (patch)
tree12fb2ddb90a039b10e0240f053ed3e250179c521
parent0d0c5a73f479344f3edb45d75fbfd94638b3453d (diff)
downloadhercules-af2fe429cfa616683eed98f906e72c8d1815b8f5.tar.gz
hercules-af2fe429cfa616683eed98f906e72c8d1815b8f5.tar.bz2
hercules-af2fe429cfa616683eed98f906e72c8d1815b8f5.tar.xz
hercules-af2fe429cfa616683eed98f906e72c8d1815b8f5.zip
* Another bug fixed in the Kiel Hyre quest. (&& instead of ||)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10394 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt3
2 files changed, 3 insertions, 1 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index fa8ff191f..a1bd9808a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/04/29
+ * Another bug fixed in the Kiel Hyre quest. (&& instead of ||) [L0ne_W0lf]
* Fixed doors not resetting in kh_kiehl01 after 30 second timer is up. [L0ne_W0lf]
* Updated Hotel Employee from Einbroch [Samuray22]
* Added AirShip Ticket Quest [Samuray22]
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 7006e636f..dbbfb94ea 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -19,6 +19,7 @@
//= 1.2 Removed duplicate NPCs. [Toms]
//= 1.3 More Bug fixes, fixed typo. Updated Additional comments. [L0ne_W0lf]
//= 1.4 Fixed doors not resetting in kh_kiehl01 after 30 second timer is up. [L0ne_W0lf]
+//= 1.5 Another bug fixed (&& instead of ||). [L0ne_W0lf]
//============================================================
@@ -1448,7 +1449,7 @@ kh_school,179,39,1 script Cute Student 895,{
// Elly's Window
//----------------------------------------------------------------------------
yuno_fild08,69,185,0 script Window::WindowKHQ1 111,{
- if ((KielHyreQuest <= 28) && (KielHyreQuest >= 46)){
+ if ((KielHyreQuest <= 28) || (KielHyreQuest >= 46)){
mes "^3355FFThis must be Elly's room.^000000";
mes "^3355FFIt doesn't sound like anyone^000000";
mes "^3355FFis inside, so the probably^000000";