summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt5
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt33
-rw-r--r--npc/warps/other/kiel.txt163
3 files changed, 108 insertions, 93 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 6340916ab..1e5ca77c2 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,10 @@
Date Added
======
+2007/05.18
+ * Rev 10561 Kiel Hyre quest fixes. [L0ne_W0lf]
+ - Fixed a typo in Elly, in her room. (<= should have been <)
+ - Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
+ * Rev 10561 Complete rewrite of the Kiel Hyre warps. (warps/other/kiel.txt) [L0ne_W0lf]
2007/05/17
* Removed .GAT -s from some recent scripts. Please, don't add them in the scripts [Lupus]
- Fixed Merchan Job Quest Kafra (used old ID for Free Ticket)
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 0c6cbb72c..9be3662d2 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: =====================================
-//= 2.9
+//= 3.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -60,6 +60,9 @@
//= Will add further improper dialogs as I get to them on the second runthrough of the quest.
//= 2.8a minor optimization with extra goto, else or empty switch [Lupus]
//= 2.9 Fixed the "enablenpc problem with the missing spaces. No idea how it happened. [L0ne_W0lf]
+//= 3.0 Fixed a typo in Elly, in her room. (<= should have been <) [L0ne_W0lf]
+//= Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items.
+//=
//============================================================
//============================================================================
@@ -930,7 +933,7 @@ kh_school,176,60,4 script Lady::LadyKHQ 101,{
mes "may go now, and please";
mes "don't wander needlessly";
mes "around the academy.";
- delitem 7487,1;
+ delitem 7487,1; //Culinary_Wine
set KielHyreQuest,4;
close;
@@ -1639,7 +1642,7 @@ kh_school,178,180,5 script Elly 895,{
close;
}
- if (KielHyreQuest <= 30) {
+ if (KielHyreQuest < 30) {
mes "[Elly]";
mes "Oh~!";
mes "Who are you!";
@@ -1858,6 +1861,7 @@ kh_school,175,175,0 script Cookie Basket 111,{
mes "^3355FFthen they're a little cold.^000000";
close;
}
+ end;
}
//----------------------------------------------------------------------------
@@ -2315,7 +2319,7 @@ kh_vila,16,175,0 script Box::BoxKHQ1 111,{
mes "^3355FFat all! It's just^000000";
mes "^3355FFnormal Pet Food!^000000";
set zeny,zeny-1100;
- getitem 537,1;
+ getitem 537,1; //Pet_Food
close;
}
@@ -7451,6 +7455,27 @@ kh_kiehl02,50,52,4 script Kiehl#Original 902,{
else {
mes "......";
close2;
+ delitem 7487,1; //Culinary_Wine
+ delitem 7488,1; //Delivery_Package
+ delitem 7489,1; //Cottage Key
+ delitem 7493,1; //Golden_Key
+ delitem 7494,1; //Exquisite_Button
+ delitem 7495,1; //Blue_Keycard
+ delitem 7490,1; //Letter to Elly
+ delitem 7492,1; //Yellow_Keycard
+ delitem 7516,1; //Green_Keycard
+ delitem 7491,1; //Iron_Box
+ delitem 7496,1; //Red_Keycard
+ delitem 7497,1; //Metal_Fragment
+ delitem 7504,1; //Power_Source
+ delitem 7498,1; //Losimier's_House_Key
+ delitem 7499,1; //Portrait_of_a_Family
+ delitem 7500,1; //Portrait_of_a_Lady
+ delitem 7501,1; //K.H's_Letter
+ delitem 7502,1; //James's_Memo
+ delitem 7503,1; //Portrait_of_a_Guy
+ delitem 7505,1; //Toy_Key
+ delitem 7508,1; //Elisia's_Ring
cutin "",255;
end;
}
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 9b59cf414..486634ba5 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Playtester
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 8+
//===== Description: =========================================
@@ -13,104 +13,89 @@
//= 1.1 Added more warps thanks to Celestria [Playtester]
//= 1.2 Added warps according to Kiel quest [Playtester]
//= 1.3 Removed and altered exploitable warps for Kiel Hyre Quest. [L0ne_W0lf]
-//= 1.4 Removed FIELD entrance into Kiel Hyre's Villa. [L0ne_W0lf
+//= 1.4 Removed FIELD entrance into Kiel Hyre's Villa. [L0ne_W0lf]
+//= 1.5 Rewrite of the warps. No more exploits/bugs should be present after this. [L0ne_W0lf]
//============================================================
//============================================================
-// kh_mansion
+// Kiel Hyre Academy (kh_school)
//============================================================
-//Mansion entrance
-lighthalzen,188,204,0 warp kh_mansion_01 1,1,kh_mansion,84,50
-kh_mansion,88,50,0 warp kh_mansion_02 1,1,lighthalzen,188,199
-//Mansion office -> Entry way
-kh_mansion,21,11,0 warp kh_mansion_03 1,1,kh_mansion,72,49
+kh_school,76,156,0 warp kh_school_01 1,1,yuno_fild08,155,189
+kh_school,30,125,0 warp kh_school_02a 1,1,kh_school,67,14
+kh_school,71,14,0 warp kh_school_02b 1,1,kh_school,36,125
+kh_school,35,133,0 warp kh_school_03a 1,1,kh_school,148,16
+kh_school,153,16,0 warp kh_school_03b 1,1,kh_school,39,136
+kh_school,30,155,0 warp kh_school_04a 1,1,kh_school,182,116
+kh_school,186,117,0 warp kh_school_04b 1,1,kh_school,35,155
+kh_school,35,176,0 warp kh_school_05a 1,1,kh_school,148,56
+kh_school,153,56,0 warp kh_school_05b 1,1,kh_school,40,176
+kh_school,30,185,0 warp kh_school_06a 1,1,kh_school,67,74
+kh_school,71,74,0 warp kh_school_06b 1,1,kh_school,35,184
//============================================================
-// kh_school
+// Kiel Hyre's Cottage (kh_vila)
//============================================================
-//Entrance Level
-kh_school,77,155,0 warp school01 1,1,yuno_fild08,154,189
-kh_school,30,184,0 warp school02 1,1,kh_school,63,75
-kh_school,30,125,0 warp school03 1,1,kh_school,63,14
-kh_school,34,177,0 warp school04 1,1,kh_school,147,57
-kh_school,34,133,0 warp school05 1,1,kh_school,147,17
-//Basement Level
-kh_school,153,57,0 warp school06 1,1,kh_school,39,177
-kh_school,153,17,0 warp school07 1,1,kh_school,39,133
-//Upper Level
-kh_school,71,75,0 warp school08 1,1,kh_school,39,184
-kh_school,71,14,0 warp school09 1,1,kh_school,39,125
-kh_school,12,48,0 warp school10 1,1,kh_school,182,117
-kh_school,187,117,0 warp school11 1,1,kh_school,17,48
-//Detention Room
-kh_school,118,139,0 warp school13 1,1,kh_dun01,231,92
-//Yuno Field
-//yuno_fild08,148,189,0 warp school14 1,1,kh_school,71,158
+kh_vila,79,11,0 warp kh_vila_01 1,1,yuno_fild02,92,208
+kh_vila,71,38,0 warp kh_vila_02a 1,1,kh_vila,42,38
+kh_vila,46,38,0 warp kh_vila_02b 1,1,kh_vila,75,38
+kh_vila,71,54,0 warp kh_vila_03a 1,1,kh_vila,42,54
+kh_vila,46,54,0 warp kh_vila_03b 1,1,kh_vila,75,54
+kh_vila,34,66,0 warp kh_vila_04a 1,1,kh_vila,20,108
+kh_vila,20,103,0 warp kh_vila_04b 1,1,kh_vila,34,61
+kh_vila,84,66,0 warp kh_vila_05a 1,1,kh_vila,44,107
+kh_vila,44,103,,0 warp kh_vila_05b 1,1,kh_vila,84,62
+kh_vila,32,128,0 warp kh_vila_06a 1,1,kh_vila,23,171
+kh_vila,22,167,0 warp kh_vila_06b 1,1,kh_vila,32,123
+kh_vila,90,47,0 warp kh_vila_07a 1,1,kh_vila,119,47
+kh_vila,115,47,0 warp kh_vila_07b 1,1,kh_vila,85,47
+kh_vila,126,75,0 warp kh_vila_08a 1,1,kh_vila,180,176
+kh_vila,180,171,0 warp kh_vila_08b 1,1,kh_vila,126,70
+kh_vila,175,71,0 warp kh_vila_09 1,1,kh_vila,136,64
+kh_vila,191,19,0 warp kh_vila_10 1,1,yuno_fild02,74,215
//============================================================
-// kh_vila
+// Kiel Hyre's Mansion (kh_mansion)
//============================================================
-//Entrance Hall
-kh_vila,79,10,0 warp vila01 1,1,yuno_fild02,92,208
-kh_vila,70,38,0 warp vila02 1,1,kh_vila,43,38
-kh_vila,70,54,0 warp vila03 1,1,kh_vila,43,55
-kh_vila,91,49,0 warp vila04 1,1,kh_vila,118,47
-kh_vila,84,67,0 warp vila05 1,1,kh_vila,45,106
-//Lounge and Atrium
-kh_vila,47,39,0 warp vila06 1,1,kh_vila,74,38
-kh_vila,47,55,0 warp vila07 1,1,kh_vila,74,54
-kh_vila,34,67,0 warp vila08 1,1,kh_vila,20,106
-//Dining Room, Kitchen, Store Room
-//kh_vila,20,102,0 warp vila09 1,1,kh_vila,34,63
-kh_vila,45,102,0 warp vila10 1,1,kh_vila,84,63
-kh_vila,32,129,0 warp vila11 1,1,kh_vila,22,170
-kh_vila,22,166,0 warp vila12 1,1,kh_vila,32,125
-kh_vila,191,18,0 warp vila13 1,1,yuno_fild02,75,214
-//Stairwell and Upstairs
-kh_vila,114,47,0 warp vila14 1,1,kh_vila,86,49
-kh_vila,126,76,0 warp vila15 1,1,kh_vila,180,175
-kh_vila,180,170,0 warp vila16 1,1,kh_vila,127,71
-kh_vila,174,72,0 warp vila17 1,1,kh_vila,136,64
+lighthalzen,188,204,0 warp kh_mansion_01a 1,1,kh_mansion,84,49
+kh_mansion,88,50,0 warp kh_mansion_01b 1,1,lighthalzen,188,199
+kh_mansion,21,11,0 warp kh_mansion_02 1,1,kh_mansion,72,49
//============================================================
-// kh_rossi - House of the Losimier family
+// Abandoned Rosimir Mansion (kh_rossi)
//============================================================
-//Rosimier Mansion exit
-kh_rossi,16,92,0 warp rossi02 1,1,yuno,270,139
-//Lower Level
-kh_rossi,35,99,0 warp rossi03 1,1,kh_rossi,27,146
-kh_rossi,27,142,0 warp rossi04 1,1,kh_rossi,35,95
-kh_rossi,35,86,0 warp rossi05 1,1,kh_rossi,27,39
-kh_rossi,27,43,0 warp rossi06 1,1,kh_rossi,35,90
-kh_rossi,63,86,0 warp rossi07 1,1,kh_rossi,99,39
-kh_rossi,99,43,0 warp rossi08 1,1,kh_rossi,63,90
-kh_rossi,90,86,0 warp rossi09 1,1,kh_rossi,168,31
-kh_rossi,168,35,0 warp rossi10 1,1,kh_rossi,90,90
-kh_rossi,43,26,0 warp rossi11 1,1,kh_rossi,90,25
-kh_rossi,86,25,0 warp rossi12 1,1,kh_rossi,37,26
-kh_rossi,91,101,0 warp rossi13 1,1,kh_rossi,282,65
-//Upper Level
-kh_rossi,282,60,0 warp rossi14 1,1,kh_rossi,91,95
-kh_rossi,222,24,0 warp rossi15 1,1,kh_rossi,22,219
-kh_rossi,22,223,0 warp rossi16 1,1,kh_rossi,222,28
-kh_rossi,248,24,0 warp rossi17 1,1,kh_rossi,88,219
-kh_rossi,88,223,0 warp rossi18 1,1,kh_rossi,248,28
-kh_rossi,258,46,0 warp rossi19 1,1,kh_rossi,225,235
-kh_rossi,222,69,0 warp rossi20 1,1,kh_rossi,22,276
-kh_rossi,22,272,0 warp rossi21 1,1,kh_rossi,222,65
-kh_rossi,248,69,0 warp rossi21 1,1,kh_rossi,88,276
-kh_rossi,88,272,0 warp rossi23 1,1,kh_rossi,248,65
-//Hallway
-kh_rossi,229,235,0 warp rossi24 1,1,kh_rossi,263,46
-kh_rossi,188,239,0 warp rossi25 1,1,kh_rossi,148,281
-kh_rossi,148,278,0 warp rossi26 1,1,kh_rossi,188,235
-kh_rossi,204,239,0 warp rossi27 1,1,kh_rossi,204,281
-kh_rossi,204,278,0 warp rossi28 1,1,kh_rossi,204,235
-kh_rossi,220,239,0 warp rossi29 1,1,kh_rossi,260,281
-kh_rossi,260,278,0 warp rossi30 1,1,kh_rossi,220,235
-kh_rossi,188,230,0 warp rossi31 1,1,kh_rossi,148,187
-kh_rossi,148,191,0 warp rossi32 1,1,kh_rossi,188,234
-kh_rossi,204,230,0 warp rossi33 1,1,kh_rossi,204,187
-kh_rossi,204,191,0 warp rossi34 1,1,kh_rossi,204,234
-kh_rossi,220,230,0 warp rossi35 1,1,kh_rossi,260,187
-kh_rossi,260,191,0 warp rossi36 1,1,kh_rossi,220,234
+kh_rossi,15,92,0 warp kh_rossi_01 1,1,yuno,270,139
+kh_rossi,35,87,0 warp kh_rossi_02a 1,1,kh_rossi,27,37
+kh_rossi,27,42,0 warp kh_rossi_02b 1,1,kh_rossi,35,91
+kh_rossi,63,87,0 warp kh_rossi_03a 1,1,kh_rossi,99,38
+kh_rossi,99,42,0 warp kh_rossi_03b 1,1,kh_rossi,63,91
+kh_rossi,90,87,0 warp kh_rossi_04a 1,1,kh_rossi,168,30
+kh_rossi,168,34,0 warp kh_rossi_04b 1,1,kh_rossi,90,90
+kh_rossi,35,98,0 warp kh_rossi_05a 1,1,kh_rossi,27,147
+kh_rossi,27,143,0 warp kh_rossi_01b 1,1,kh_rossi,35,94
+kh_rossi,90,101,0 warp kh_rossi_06a 1,1,kh_rossi,282,64
+kh_rossi,42,26,0 warp kh_rossi_06b 1,1,kh_rossi,92,25
+kh_rossi,87,25,0 warp kh_rossi_07a 1,1,kh_rossi,36,26
+kh_rossi,282,60,0 warp kh_rossi_07b 1,1,kh_rossi,90,96
+kh_rossi,222,68,0 warp kh_rossi_08a 1,1,kh_rossi,22,277
+kh_rossi,22,273,0 warp kh_rossi_08b 1,1,kh_rossi,222,64
+kh_rossi,248,68,0 warp kh_rossi_09a 1,1,kh_rossi,88,277
+kh_rossi,88,273,0 warp kh_rossi_09b 1,1,kh_rossi,248,64
+kh_rossi,222,25,0 warp kh_rossi_10a 1,1,kh_rossi,22,219
+kh_rossi,22,222,0 warp kh_rossi_10b 1,1,kh_rossi,222,29
+kh_rossi,248,25,0 warp kh_rossi_11a 1,1,kh_rossi,88,217
+kh_rossi,88,222,0 warp kh_rossi_11b 1,1,kh_rossi,248,29
+kh_rossi,259,46,0 warp kh_rossi_12a 1,1,kh_rossi,224,234
+kh_rossi,228,234,0 warp kh_rossi_12b 1,1,kh_rossi,263,46
+kh_rossi,220,231,0 warp kh_rossi_13a 1,1,kh_rossi,260,186
+kh_rossi,260,190,0 warp kh_rossi_13b 1,1,kh_rossi,220,234
+kh_rossi,204,231,0 warp kh_rossi_14a 1,1,kh_rossi,204,186
+kh_rossi,204,190,0 warp kh_rossi_14b 1,1,kh_rossi,204,234
+kh_rossi,188,231,0 warp kh_rossi_15a 1,1,kh_rossi,148,186
+kh_rossi,148,190,0 warp kh_rossi_15b 1,1,kh_rossi,188,234
+kh_rossi,188,238,0 warp kh_rossi_16a 1,1,kh_rossi,148,283
+kh_rossi,148,279,0 warp kh_rossi_16b 1,1,kh_rossi,188,235
+kh_rossi,204,238,0 warp kh_rossi_17a 1,1,kh_rossi,204,283
+kh_rossi,204,279,0 warp kh_rossi_17b 1,1,kh_rossi,204,235
+kh_rossi,220,238,0 warp kh_rossi_18a 1,1,kh_rossi,261,283
+kh_rossi,260,279,0 warp kh_rossi_18b 1,1,kh_rossi,220,235
+
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 18:48:05 +0000