Преглед изворни кода

* 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://svn.code.sf.net/p/rathena/svn/trunk@6132 54d463be-8e91-2dee-dedb-b68131a5f0ec

eaac пре 19 година
родитељ
комит
dde7d8fa09
5 измењених фајлова са 25 додато и 8 уклоњено
  1. 4 0
      npc/Changelog.txt
  2. 0 7
      npc/scripts_eaac.conf
  3. 1 1
      npc/scripts_main.conf
  4. 1 0
      npc/scripts_warps.conf
  5. 19 0
      npc/warps/dungeons/kiel_dun.txt

+ 4 - 0
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]

+ 0 - 7
npc/scripts_eaac.conf

@@ -55,13 +55,6 @@
 //| http://www.eathena.ws/board/index.php?showtopic=51051
 //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

+ 1 - 1
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
 // --------------------------------------------------------------

+ 1 - 0
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

+ 19 - 0
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