summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-02-19 10:10:18 -0800
committerStreusel <advance_me@hotmail.de>2013-02-19 10:10:18 -0800
commit80362e588f45bf245d517334cefa1e84edc24769 (patch)
tree367e8b88d2752742656221f5b1857f49a32a83b0
parent1188df9f38e73590ee3004df18d26105a7a1de37 (diff)
downloadhercules-80362e588f45bf245d517334cefa1e84edc24769.tar.gz
hercules-80362e588f45bf245d517334cefa1e84edc24769.tar.bz2
hercules-80362e588f45bf245d517334cefa1e84edc24769.tar.xz
hercules-80362e588f45bf245d517334cefa1e84edc24769.zip
-Moved Arena to main folder so it can be used by pre-re and re
Signed-off-by: Streusel
-rw-r--r--npc/other/arena/arena_aco.txt (renamed from npc/pre-re/other/arena/arena_aco.txt)0
-rw-r--r--npc/other/arena/arena_lvl50.txt (renamed from npc/pre-re/other/arena/arena_lvl50.txt)0
-rw-r--r--npc/other/arena/arena_lvl60.txt (renamed from npc/pre-re/other/arena/arena_lvl60.txt)0
-rw-r--r--npc/other/arena/arena_lvl70.txt (renamed from npc/pre-re/other/arena/arena_lvl70.txt)0
-rw-r--r--npc/other/arena/arena_lvl80.txt (renamed from npc/pre-re/other/arena/arena_lvl80.txt)0
-rw-r--r--npc/other/arena/arena_party.txt (renamed from npc/pre-re/other/arena/arena_party.txt)0
-rw-r--r--npc/other/arena/arena_point.txt (renamed from npc/pre-re/other/arena/arena_point.txt)0
-rw-r--r--npc/other/arena/arena_room.txt (renamed from npc/pre-re/other/arena/arena_room.txt)0
-rw-r--r--npc/pre-re/other/arena.txt15
-rw-r--r--npc/pre-re/scripts_athena.conf9
-rw-r--r--npc/pre-re/scripts_warps.conf2
-rw-r--r--npc/scripts_athena.conf10
-rw-r--r--npc/scripts_warps.conf3
-rw-r--r--npc/warps/other/arena.txt (renamed from npc/pre-re/warps/other/arena.txt)5
14 files changed, 30 insertions, 14 deletions
diff --git a/npc/pre-re/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 60077b88e..60077b88e 100644
--- a/npc/pre-re/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
diff --git a/npc/pre-re/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index 9eaba7376..9eaba7376 100644
--- a/npc/pre-re/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
diff --git a/npc/pre-re/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index b83dc8eea..b83dc8eea 100644
--- a/npc/pre-re/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
diff --git a/npc/pre-re/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index e3ab5367f..e3ab5367f 100644
--- a/npc/pre-re/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
diff --git a/npc/pre-re/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 729311508..729311508 100644
--- a/npc/pre-re/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
diff --git a/npc/pre-re/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 837c3eab1..837c3eab1 100644
--- a/npc/pre-re/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
diff --git a/npc/pre-re/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index 0890867bf..0890867bf 100644
--- a/npc/pre-re/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
diff --git a/npc/pre-re/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 925976f3b..925976f3b 100644
--- a/npc/pre-re/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
diff --git a/npc/pre-re/other/arena.txt b/npc/pre-re/other/arena.txt
new file mode 100644
index 000000000..ff88f4c28
--- /dev/null
+++ b/npc/pre-re/other/arena.txt
@@ -0,0 +1,15 @@
+//===== Hercules Script ======================================
+//= Arena Warps
+//===== By: ==================================================
+//= Streusel
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Warp Points related to Izlude Arena && Control Panel
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//= Moved welcome_arena & bye_arena from main folder
+//============================================================
+
+izlude,128,226,0 warp welcome_arena 1,1,arena_room,100,30
+arena_room,99,24,0 warp bye_arena 2,2,izlude,128,220 \ No newline at end of file
diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf
index 29e39f1f2..6a69ede0e 100644
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts_athena.conf
@@ -40,15 +40,6 @@ npc: npc/pre-re/kafras/kafras_izl.txt
npc: npc/pre-re/merchants/shops.txt
// --------------------------- Others ---------------------------
-// - Izlude Battle Arena ----------------------------------------
-npc: npc/pre-re/other/arena/arena_aco.txt
-npc: npc/pre-re/other/arena/arena_lvl50.txt
-npc: npc/pre-re/other/arena/arena_lvl60.txt
-npc: npc/pre-re/other/arena/arena_lvl70.txt
-npc: npc/pre-re/other/arena/arena_lvl80.txt
-npc: npc/pre-re/other/arena/arena_party.txt
-npc: npc/pre-re/other/arena/arena_point.txt
-npc: npc/pre-re/other/arena/arena_room.txt
// --------------------------------------------------------------
npc: npc/pre-re/other/mercenary_rent.txt
diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf
index 50e87d0d9..c90a0d6d1 100644
--- a/npc/pre-re/scripts_warps.conf
+++ b/npc/pre-re/scripts_warps.conf
@@ -20,4 +20,4 @@ npc: npc/pre-re/warps/fields/yuno_fild.txt
// --------------------------- Others ---------------------------
npc: npc/pre-re/warps/other/arena.txt
-npc: npc/pre-re/warps/other/sign.txt
+npc: npc/pre-re/warps/other/sign.txt \ No newline at end of file
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 8a925111c..e8265d0c0 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -154,6 +154,16 @@ npc: npc/merchants/wander_pet_food.txt
npc: npc/merchants/cashheadgear_dye.txt
// --------------------------- Others ---------------------------
+// - Izlude Battle Arena ----------------------------------------
+npc: npc/other/arena/arena_aco.txt
+npc: npc/other/arena/arena_lvl50.txt
+npc: npc/other/arena/arena_lvl60.txt
+npc: npc/other/arena/arena_lvl70.txt
+npc: npc/other/arena/arena_lvl80.txt
+npc: npc/other/arena/arena_party.txt
+npc: npc/other/arena/arena_point.txt
+npc: npc/other/arena/arena_room.txt
+// --------------------------------------------------------------
npc: npc/other/auction.txt
npc: npc/other/books.txt
npc: npc/other/bulletin_boards.txt
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 53366d75d..75b14bb47 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -85,5 +85,6 @@ npc: npc/warps/other/god.txt
npc: npc/warps/other/jobquests.txt
npc: npc/warps/other/kiel.txt
npc: npc/warps/other/other.txt
+npc: npc/warps/other/arena.txt
npc: npc/warps/guildcastles.txt
-npc: npc/warps/pvp.txt
+npc: npc/warps/pvp.txt \ No newline at end of file
diff --git a/npc/pre-re/warps/other/arena.txt b/npc/warps/other/arena.txt
index daff4242d..b0287388a 100644
--- a/npc/pre-re/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -3,17 +3,16 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Description: =========================================
//= Warp Points related to Izlude Arena && Control Panel
//===== Additional Comments: =================================
//= 1.0 First version, done by SinSloth. [MasterOfMuppets]
//= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus]
//= 1.2 Made some updates due to Izlude Battle Arena release. [SinSloth]
+//= Moved welcome_arena & bye_arena to pre-re [Streusel]
//============================================================
-izlude,128,226,0 warp welcome_arena 1,1,arena_room,100,30
-arena_room,99,24,0 warp bye_arena 2,2,izlude,128,220
arena_room,84,103,0 warp arn_room_11_1 1,1,arena_room,63,130
arena_room,63,126,0 warp arn_room_11_2 1,1,arena_room,87,100
arena_room,76,87,0 warp arn_room_9_1 1,1,arena_room,46,87