summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-29 00:09:53 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-29 00:09:53 +0000
commitc709a476952f9009fb523c8532fb586fd55bffb3 (patch)
treee1fc445a5c25187951790f9da21b6c7b01806463 /npc
parent1e59d05eaeaf59174bb1bdb7a5fb8625cf11ab67 (diff)
downloadhercules-c709a476952f9009fb523c8532fb586fd55bffb3.tar.gz
hercules-c709a476952f9009fb523c8532fb586fd55bffb3.tar.bz2
hercules-c709a476952f9009fb523c8532fb586fd55bffb3.tar.xz
hercules-c709a476952f9009fb523c8532fb586fd55bffb3.zip
* More squashed bugs with if checking in Kiel Hyre quest.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10399 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt13
2 files changed, 8 insertions, 6 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0d98f8276..e1483d469 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/04/29
+ * More squashed bugs with if checking in Kiel Hyre quest. [L0ne_W0lf]
* 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]
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index dbbfb94ea..33b1c5947 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf (Script), DZeroX (Timer)
//===== Current Version: =====================================
-//= 1.4
+//= 1.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 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]
+//= 1.6 More squashed bugs with if checking. [L0ne_W0lf]
//============================================================
@@ -1032,7 +1033,7 @@ kh_school,179,39,1 script Cute Student 895,{
else if (KielHyreQuest == 6) {
//519 - Milk; 548 - Cheese; 7182 - Cacao; 7487 - Culinary_Wine; 7488 - Delivery_Package
- if ((countitem(519) < 7) || (countitem(548) < 2) || (countitem(7182) < 5) || (countitem(7487) < 1) || (countitem(7487) < 1)) {
+ if ((countitem(519) < 7) || (countitem(548) < 2) || (countitem(7182) < 5) || (countitem(7487) < 1) || (countitem(7488) < 1)) {
mes "[Elly]";
mes "Let's see, would you";
mes "like me to remind you";
@@ -2396,7 +2397,7 @@ kh_vila,33,184,0 script Pot 111,{
// Cottage interior, fire place; Calabash
//----------------------------------------------------------------------------
kh_vila,14,55,0 script Calabash 111,{
- if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 30)) {
+ if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
mes "^3355FFIt's an expensive^000000";
mes "^3355FFlooking calabash--^000000";
mes "^3355FFor in less fancy^000000";
@@ -2666,7 +2667,7 @@ kh_vila,115,186,0 script Drawer::DrawerKHQ1 111,{
// Cottage interior, upstairs; Box
//----------------------------------------------------------------------------
kh_vila,107,126,0 script Box::BoxKHQ2 111,{
- if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 30)) {
+ if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
mes "^3355FFA solid box is laid^000000";
mes "^3355FFon the floor in which^000000";
mes "^3355FFa smaller, locked box^000000";
@@ -2674,7 +2675,7 @@ kh_vila,107,126,0 script Box::BoxKHQ2 111,{
close;
}
- else if ((countitem(7329) >= 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 30)) {
+ else if ((countitem(7329) >= 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
mes "^3355FFA solid box is laid^000000";
mes "^3355FFon the floor in which^000000";
mes "^3355FFa smaller, locked box^000000";
@@ -3549,7 +3550,7 @@ kh_school,121,149,4 duplicate(BeatifulLadyKHQ1) Beautiful lady::BeatifulLadyKHQ5
//----------------------------------------------------------------------------
kh_school,122,186,4 script Beautiful lady 894,{
cutin "kh_ellisia",2;
- if (KielHyreQuest == 38) {
+ if (KielHyreQuest <= 38) {
mes "[Allysia]";
mes "Friend of prototype Elly,";
mes "I welcome you. As you may";