diff options
| author | eaac <eaac@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-17 15:29:12 +0000 |
|---|---|---|
| committer | eaac <eaac@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-17 15:29:12 +0000 |
| commit | 72335036cad7b0f45f42c1a70644ccefbf2a294c (patch) | |
| tree | 1a00bb77e19329d67f24a43f9da308754d251ee7 /npc | |
| parent | 670ff1fcef9ebe3d9a69e5c05a7221cd926343a1 (diff) | |
| download | hercules-72335036cad7b0f45f42c1a70644ccefbf2a294c.tar.gz hercules-72335036cad7b0f45f42c1a70644ccefbf2a294c.tar.bz2 hercules-72335036cad7b0f45f42c1a70644ccefbf2a294c.tar.xz hercules-72335036cad7b0f45f42c1a70644ccefbf2a294c.zip | |
* Whoops, forgot to remove clone_arena from the scripts_eaac.conf. [erKURITA]
* Enabled import: line on scripts_main.conf for scritps_eaac.conf. The scripts
are disabled there anyway.... [erKURITA]
* Commited musashiden's kiel dungeon warps [erKURITA]
Commit done to both trunk & stable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6132 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 4 | ||||
| -rw-r--r-- | npc/scripts_eaac.conf | 7 | ||||
| -rw-r--r-- | npc/scripts_main.conf | 2 | ||||
| -rw-r--r-- | npc/scripts_warps.conf | 1 | ||||
| -rw-r--r-- | npc/warps/dungeons/kiel_dun.txt | 19 |
5 files changed, 25 insertions, 8 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index da50b9012..df214723a 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -28,6 +28,10 @@ Nexon Date Added
======
04/16
+ * Whoops, forgot to remove clone_arena from the scripts_eaac.conf. [erKURITA]
+ * Enabled import: line on scripts_main.conf for scritps_eaac.conf. The scripts
+ are disabled there anyway.... [erKURITA]
+ * Commited musashiden's kiel dungeon warps [erKURITA]
* Commited musashiden's Lighthalzen fixes [MasterOfMuppets]
* Fixed aldeg_cas04 random warp [Playtester]
* Fixed merchants/grandpa_pharmacist.txt thanks to KarLaeda [Playtester]
diff --git a/npc/scripts_eaac.conf b/npc/scripts_eaac.conf index 7174e1882..adb46fdd8 100644 --- a/npc/scripts_eaac.conf +++ b/npc/scripts_eaac.conf @@ -56,13 +56,6 @@ //npc: npc/custom/eAAC_Scripts/messageboards.txt
// --------------------------------------------------------------
-// ----------------------- Clone Arena --------------------------
-// Script made by Miir
-// Forum topic for support:
-//| http://www.eathena.ws/board/index.php?showtopic=75283
-//npc: npc/custom/eAAC_Scripts/clonearena.txt
-
-// --------------------------------------------------------------
// ---------------------- Donation Girl -------------------------
// Script made by joshuaali
// Forum topic for support:
diff --git a/npc/scripts_main.conf b/npc/scripts_main.conf index 829d748a3..e1b771388 100644 --- a/npc/scripts_main.conf +++ b/npc/scripts_main.conf @@ -47,5 +47,5 @@ import: npc/scripts_guild.conf // -- Your NPCs go in this file!
import: npc/scripts_custom.conf
// -- eAAC Scripts
-//import: npc/scripts_eaac.conf
+import: npc/scripts_eaac.conf
// --------------------------------------------------------------
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 31717bd74..41c7879b3 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -62,6 +62,7 @@ npc: npc/warps/dungeons/prt_dun.txt npc: npc/warps/dungeons/thanatos.txt
npc: npc/warps/dungeons/umbala_dun.txt
npc: npc/warps/dungeons/yuno_dun.txt
+npc: npc/warps/dungeons/kiel_dun.txt
// --------------------------- Fields ---------------------------
npc: npc/warps/fields/amatsu_fild.txt
npc: npc/warps/fields/com_fild.txt
diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt new file mode 100644 index 000000000..d1879fbcc --- /dev/null +++ b/npc/warps/dungeons/kiel_dun.txt @@ -0,0 +1,19 @@ +//===== Athena Script ========================================
+//= Kiel Dungeon Warp Script
+//===== By: ==================================================
+//= Lost Kakashi
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena 1.0
+//===== Description: =========================================
+//= Warp Points for the Kiel Dungeon
+//===== Additional Comments: =================================
+//=
+//===========================================================
+
+//= Kiel Dungeon ============================================
+kh_dun01.gat,3,234,0 warp warp01 1,1,kh_dun02.gat,42,197
+kh_dun02.gat,45,194,0 warp warp02 1,1,kh_dun01.gat,4,229
+kh_kiehl02.gat,49,52,0 warp warp05 1,1,kh_dun01.gat,63,10
+kh_dun01.gat,64,7,0 warp warp06 1,1,kh_kiehl02.gat,51,49
\ No newline at end of file |