summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-03 18:18:50 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-03 18:18:50 +0000
commit5f00460ddd810828f3248d1a970b49f965771913 (patch)
tree9b025e88e5fd7ea7f9ad0c2b49c88620a2ed004b /npc
parentb4e34bf1a6c0e676a8414a536353a3496d97a9a5 (diff)
downloadhercules-5f00460ddd810828f3248d1a970b49f965771913.tar.gz
hercules-5f00460ddd810828f3248d1a970b49f965771913.tar.bz2
hercules-5f00460ddd810828f3248d1a970b49f965771913.tar.xz
hercules-5f00460ddd810828f3248d1a970b49f965771913.zip
- Now the server will by default perform symmetric adding of friends
- > TODO - symmetric deletion (http://www.eathena.ws/board/index.php?showtopic=130749) - Added a first approximation of warps for the new maps (by $ephiroth) - Added Rachel and Veins to the list of @go destinations git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9613 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/scripts_warps.conf5
-rw-r--r--npc/warps/cities/veins.txt18
-rw-r--r--npc/warps/dungeons/ice_dun.txt15
-rw-r--r--npc/warps/dungeons/thor_dun.txt20
-rw-r--r--npc/warps/fields/rachel_fild.txt15
-rw-r--r--npc/warps/fields/veins_fild.txt35
7 files changed, 107 insertions, 3 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cf43acf56..8b2a036e3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,8 @@ KarLaeda
Date Added
======
+2007/01/03
+ * Added Veins and Thor Dungeon warps, +fixed some headers [ultramage]
2006/12/28
* Fixed typo in the Priest Quest [KarLaeda]
2006/12/25
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 266a1bc77..c555bb6df 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -36,6 +36,7 @@ npc: npc/warps/cities/payon.txt
npc: npc/warps/cities/prontera.txt
npc: npc/warps/cities/rachel.txt
npc: npc/warps/cities/umbala.txt
+npc: npc/warps/cities/veins.txt
npc: npc/warps/cities/yggdrasil.txt
npc: npc/warps/cities/yuno.txt
// -------------------------- Dungeons --------------------------
@@ -53,6 +54,7 @@ npc: npc/warps/dungeons/gon_dun.txt
npc: npc/warps/dungeons/ice_dun.txt
npc: npc/warps/dungeons/izlude_dun.txt
npc: npc/warps/dungeons/juperos.txt
+npc: npc/warps/dungeons/kiel_dun.txt
npc: npc/warps/dungeons/lhalzen_dun.txt
npc: npc/warps/dungeons/louyang_dun.txt
npc: npc/warps/dungeons/lutie_dun.txt
@@ -64,9 +66,9 @@ npc: npc/warps/dungeons/prt_dun.txt
npc: npc/warps/dungeons/rachel_dun.txt
npc: npc/warps/dungeons/thana_dun.txt
//npc: npc/warps/dungeons/thana_custom.txt
+npc: npc/warps/dungeons/thor_dun.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
@@ -84,6 +86,7 @@ npc: npc/warps/fields/payon_fild.txt
npc: npc/warps/fields/prontera_fild.txt
npc: npc/warps/fields/rachel_fild.txt
npc: npc/warps/fields/umbala_fild.txt
+npc: npc/warps/fields/veins_fild.txt
npc: npc/warps/fields/yuno_fild.txt
npc: npc/warps/fields/abyss_warper.txt
// --------------------------- Others ---------------------------
diff --git a/npc/warps/cities/veins.txt b/npc/warps/cities/veins.txt
new file mode 100644
index 000000000..49f2e7f36
--- /dev/null
+++ b/npc/warps/cities/veins.txt
@@ -0,0 +1,18 @@
+//===== Athena Script ========================================
+//= Veins City Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Veins
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//============================================================
+
+//= Veins City ================================================
+veins.gat,218,361,0 warp veinswarp0501 1,1,ve_fild06.gat,152,221
+veins.gat,146,24,0 warp veinswarp0502 1,1,ve_fild07.gat,148,370
+rachel.gat,130,20,0 warp veinswarp0503 1,1,ve_fild02.gat,196,379 \ No newline at end of file
diff --git a/npc/warps/dungeons/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt
index 570ca4d09..4ac7d4036 100644
--- a/npc/warps/dungeons/ice_dun.txt
+++ b/npc/warps/dungeons/ice_dun.txt
@@ -1,4 +1,17 @@
-//Ice Dungeon Warps
+//===== Athena Script ========================================
+//= Ice Dungeon Warp Script
+//===== By: ==================================================
+//= Playtester
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Ice Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Initial version [Playtester]
+//============================================================
+
ice_dun01.gat,157,10,0 warp ice001 1,1,ra_fild01.gat,233,330
ice_dun01.gat,145,153,0 warp ice002 1,1,ice_dun02.gat,151,155
ice_dun02.gat,151,160,0 warp ice003 1,1,ice_dun01.gat,146,157
diff --git a/npc/warps/dungeons/thor_dun.txt b/npc/warps/dungeons/thor_dun.txt
new file mode 100644
index 000000000..6649f9e0c
--- /dev/null
+++ b/npc/warps/dungeons/thor_dun.txt
@@ -0,0 +1,20 @@
+//===== Athena Script ========================================
+//= Thor's Volcano Dungeon Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Thor's Volcano Dungeon
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//============================================================
+
+//= Thor's Volcano Dungeon====================================
+thor_v01.gat,21,223,0 warp thor00 1,1,ve_fild03.gat,168,238
+thor_v01.gat,202,34,0 warp thor01 1,1,thor_v02.gat,74,205
+thor_v02.gat,72,206,0 warp thor02 1,1,thor_v01.gat,199,34
+thor_v02.gat,191,55,0 warp thor03 1,1,thor_v03.gat,31,272
+thor_v03.gat,28,272,0 warp thor04 1,1,thor_v02.gat,190,57 \ No newline at end of file
diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt
index 7b9889e8d..92db6f111 100644
--- a/npc/warps/fields/rachel_fild.txt
+++ b/npc/warps/fields/rachel_fild.txt
@@ -1,4 +1,17 @@
-//Rachel Fields
+//===== Athena Script ========================================
+//= Rachel Field Warp Script
+//===== By: ==================================================
+//= Playtester
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Rachel Field
+//===== Additional Comments: =================================
+//= 1.0 Initial version [Playtester]
+//============================================================
+
ra_fild01.gat,233,334,0 warp ra000 1,1,ice_dun01.gat,157,14
ra_fild01.gat,305,38,0 warp ra001 1,1,ra_fild04.gat,324,375
ra_fild04.gat,324,379,0 warp ra002 1,1,ra_fild01.gat,305,42
diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt
new file mode 100644
index 000000000..c7584e29a
--- /dev/null
+++ b/npc/warps/fields/veins_fild.txt
@@ -0,0 +1,35 @@
+//===== Athena Script ========================================
+//= Veins Field Warp Script
+//===== By: ==================================================
+//= $ephiroth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Veins Field
+//===== Additional Comments: =================================
+//= 1.0 Initial version [$ephiroth]
+//============================================================
+
+//= Beins Field (ve_fild) ====================================
+ve_fild02.gat,196,382,0 warp veinswarp5001 1,1,rachel.gat,130,23
+ve_fild06.gat,154,219,0 warp veinswarp5002 1,1,veins.gat,218,358
+ve_fild07.gat,147,372,0 warp veinswarp5003 1,1,veins.gat,146,27
+ve_fild03.gat,168,241,0 warp veinswarp5004 1,1,thor_v01.gat,21,226
+ve_fild01.gat,243,369,0 warp veinswarp5005 1,1,ra_fild11.gat,232,29
+ra_fild11.gat,232,26,0 warp veinswarp5006 1,1,ve_fild01.gat,243,366
+ve_fild01.gat,367,263,0 warp veinswarp5007 1,1,ve_fild02.gat,33,259
+ve_fild02.gat,30,259,0 warp veinswarp5008 1,1,ve_fild01.gat,364,263
+ve_fild01.gat,351,95,0 warp veinswarp5009 1,1,ve_fild02.gat,76,133
+ve_fild02.gat,73,133,0 warp veinswarp5010 1,1,ve_fild01.gat,348,95
+ve_fild01.gat,185,19,0 warp veinswarp5011 1,1,ve_fild04.gat,174,337
+ve_fild04.gat,174,340,0 warp veinswarp5012 1,1,ve_fild01.gat,185,22
+ve_fild02.gat,385,309,0 warp veinswarp5013 1,1,ra_fild13.gat,31,311
+ra_fild13.gat,28,311,0 warp veinswarp5014 1,1,ve_fild02.gat,382,309
+ve_fild03.gat,355,222,0 warp veinswarp5015 1,1,ve_fild04.gat,46,249
+ve_fild04.gat,43,249,0 warp veinswarp5016 1,1,ve_fild03.gat,353,221
+ve_fild03.gat,222,42,0 warp veinswarp5017 1,1,ve_fild05.gat,204,330
+ve_fild05.gat,206,331,0 warp veinswarp5018 1,1,ve_fild03.gat,222,45
+ve_fild04.gat,115,49,0 warp veinswarp5019 1,1,ve_fild06.gat,84,179
+ve_fild06.gat,84,176,0 warp veinswarp5020 1,1,ve_fild04.gat,115,52 \ No newline at end of file