* Added Kiel Hyre quest thanks to L0ne_W0lf

- please motivate your players to test it

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10228 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 23 insertions, 71 deletions

diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt
index 18307540b..8b3f572b9 100644
--- a/npc/warps/dungeons/kiel_dun.txt
+++ b/npc/warps/dungeons/kiel_dun.txt
@@ -3,75 +3,22 @@
 //===== By: ==================================================
 //= Lost Kakashi
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena 1.0
 //===== Description: =========================================
 //= Warp Points for the Kiel Dungeon
 //===== Additional Comments: =================================
 //= 1.1 Added official Kiel Dungeon entrance [Playtester]
+//= 1.2 Changed warps because of Kiel quest [Playtester]
 //============================================================
 
 //= Kiel Dungeon =============================================
-kh_dun01,3,234,0	warp	khwarp01	1,1,yuno_fild08,69,170
+kh_dun01,3,234,0	warp	kh_dun_00	1,1,yuno_fild08,69,170
 
-//= Graveyard Switch =========================================
-yuno_fild08,67,169,4	script	Switch#kh	111,1,1,{
+//Factory Restricted Area Exit
+kh_dun01,232,225,0	warp	kh_dun_01	1,1,kh_dun01,14,12
 
-  mes "You examine the grave and find a switch!";
-  mes "Do you want to press it?";
-  next;
-
-  menu "Yes.",-,"No.",L_End;
-
-  mes "Suddenly the grave opens and reveals a staircase.";
-  close2;
-
-  warp "kh_dun01",4,229;
-  end;
-
-L_End:
-  mes "You decided not to press it.";
-  close;
-}
-
-//= Elevator to Floor 2 ======================================
-kh_dun01,44,203,4	script	Switch#khe1::khelevator	111,1,1,{
-
-  mes "The elevator seems to be broken.";
-  mes "But you could repair it with";
-  mes "^0000FF40 Hard Pieces of Steel^000000.";
-  next;
-
-  mes "Be careful, though.";
-  mes "This will only work once and there's no turning back.";
-  next;
-
-  mes "Do you want to repair the elevator?";
-  next;
-
-  menu "Yes.",-,"No.",L_End;
-  
-  if(countitem(7507)<40) goto L_NoItem;
-  delitem 7507,40;
-  mes "The elevator starts moving.";
-  mes "You quickly jump into it.";
-  close2;
-  
-  warp "kh_dun02",44,195;
-  end;
-
-L_NoItem:
-  mes "It appears you don't have enough items.";
-L_End:
-  mes "The elevator remains broken.";
-  close;
-}
-
-kh_dun01,36,195,4	duplicate(khelevator)	Switch#khe2	111
-
-//= Custom Kiel Dungeon Warps ================================
-//kh_dun01,3,234,0	warp	warp01	1,1,kh_dun02,42,197
-//kh_dun02,45,194,0	warp	warp02	1,1,kh_dun01,4,229
-//kh_kiehl02,49,52,0	warp	warp05	1,1,kh_dun01,63,10
-//kh_dun01,64,7,0	warp	warp06	1,1,kh_kiehl02,51,49
\ No newline at end of file
+//Factory side warps
+kh_dun01,63,7,0	warp	kh_dun_02	1,1,kh_dun01,227,176
+kh_dun01,232,176,0	warp	kh_dun_03	1,1,kh_dun01,63,12
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 381d2f5cf..078e35e04 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
@@ -11,8 +11,17 @@
 //===== Additional Comments: =================================
 //= 1.0 Added Kiel warps thanks to Celestria [Playtester]
 //= 1.1 Added more warps thanks to Celestria [Playtester]
+//= 1.2 Added warps according to Kiel quest [Playtester]
 //============================================================
 
+//============================================================
+// kh_mansion
+//============================================================
+//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
@@ -63,16 +72,14 @@ kh_vila,191,18,0	warp	vila14	1,1,kh_vila,27,185
 kh_vila,114,47,0	warp	vila15	1,1,kh_vila,86,49
 kh_vila,126,76,0	warp	vila16	1,1,kh_vila,180,175
 kh_vila,180,170,0	warp	vila17	1,1,kh_vila,127,71
-
-kh_vila,174,72,0	warp	vila19	1,1,kh_vila,181,125
-
+kh_vila,174,72,0	warp	vila18	1,1,kh_vila,181,125
 
 //============================================================
 // kh_rossi - House of the Losimier family
 //============================================================
-//Entrance Level
-//???,???,???,0	warp	rossi01	1,1,kh_rossi,17,93
-//kh_rossi,12,93,0	warp	rossi02	1,1,???,???,???
+//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
@@ -84,7 +91,6 @@ 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
@@ -96,7 +102,6 @@ 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
@@ -110,4 +115,4 @@ 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
\ No newline at end of file
+kh_rossi,260,191,0	warp	rossi36	1,1,kh_rossi,220,234