summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-29 17:30:19 +0000
committerMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-29 17:30:19 +0000
commitf508c676a9d03252c35ba7b2b015652e86ddba11 (patch)
tree1a79731f9857ac08a5f9ac6671fb59cc478a423e
parent2fa4f33d36dec1e8ed3fc324fcf4d8df19dcaec5 (diff)
downloadhercules-f508c676a9d03252c35ba7b2b015652e86ddba11.tar.gz
hercules-f508c676a9d03252c35ba7b2b015652e86ddba11.tar.bz2
hercules-f508c676a9d03252c35ba7b2b015652e86ddba11.tar.xz
hercules-f508c676a9d03252c35ba7b2b015652e86ddba11.zip
Some preparations for the upcoming Izlude Arena.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8530 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf-tmpl/mapflag/nopenalty.txt11
-rw-r--r--conf-tmpl/mapflag/nosave.txt11
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/other/arena.txt80
-rw-r--r--npc/warps/other/arena.txt28
-rw-r--r--npc/warps/pvp/pvp.txt81
6 files changed, 131 insertions, 81 deletions
diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt
index 1b5aaa46f..436737236 100644
--- a/conf-tmpl/mapflag/nopenalty.txt
+++ b/conf-tmpl/mapflag/nopenalty.txt
@@ -133,6 +133,17 @@ guild_vs5.gat mapflag nopenalty
sec_in01.gat mapflag nopenalty
sec_in02.gat mapflag nopenalty
+// Izlude Arena ========================
+force_1-1.gat mapflag nopenalty
+force_1-2.gat mapflag nopenalty
+force_1-3.gat mapflag nopenalty
+force_2-1.gat mapflag nopenalty
+force_2-2.gat mapflag nopenalty
+force_2-3.gat mapflag nopenalty
+force_3-1.gat mapflag nopenalty
+force_3-2.gat mapflag nopenalty
+force_3-3.gat mapflag nopenalty
+
// PvP Arenas =========================
pvp_y_1-1.gat mapflag nopenalty
pvp_y_1-2.gat mapflag nopenalty
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index 97a14b79d..4da5b05f8 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -47,6 +47,17 @@ guild_vs3.gat mapflag nosave SavePoint
guild_vs4.gat mapflag nosave SavePoint
guild_vs5.gat mapflag nosave SavePoint
+// Izlude Arena ========================
+force_1-1.gat mapflag nosave SavePoint
+force_1-2.gat mapflag nosave SavePoint
+force_1-3.gat mapflag nosave SavePoint
+force_2-1.gat mapflag nosave SavePoint
+force_2-2.gat mapflag nosave SavePoint
+force_2-3.gat mapflag nosave SavePoint
+force_3-1.gat mapflag nosave SavePoint
+force_3-2.gat mapflag nosave SavePoint
+force_3-3.gat mapflag nosave SavePoint
+
//PvP Arenas =================================
pvp_y_room.gat mapflag nosave SavePoint
pvp_y_1-1.gat mapflag nosave SavePoint
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9752e467e..1add9a6e6 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,7 @@ Playtester
Date Added
======
08/29
+ * Some preparations for the upcoming Izlude Arena [MasterOfMuppets]
* eAAC Update to the Coin Banker. [erKURITA]
08/27
* Fixed a syntax error on npc/guild/nguild/nguild_warper.txt line 37 [Toms]
diff --git a/npc/other/arena.txt b/npc/other/arena.txt
index be188eb31..10870e323 100644
--- a/npc/other/arena.txt
+++ b/npc/other/arena.txt
@@ -566,3 +566,83 @@ force_1-1.gat,25,26,0 script tensecsleft -1,{
force_1-1.gat,25,26,0 script arenareturn -1,{
warp "prontera.gat",156,191;
}
+
+//Time Limit Mode
+force_1-1.gat,25,44,0 warp fc101 1,1,force_1-1.gat,25,69
+force_1-1.gat,25,65,0 warp fc101-1 1,1,force_1-1.gat,25,40
+force_1-1.gat,25,134,0 warp fc102 1,1,force_1-1.gat,25,159
+force_1-1.gat,25,155,0 warp fc102-1 1,1,force_1-1.gat,25,130
+force_1-1.gat,44,26,0 warp fc103 1,1,force_1-1.gat,66,26
+force_1-1.gat,62,26,0 warp fc103-1 1,1,force_1-1.gat,40,26
+force_1-1.gat,44,174,0 warp fc104 1,1,force_1-1.gat,69,174
+force_1-1.gat,65,174,0 warp fc104-1 1,1,force_1-1.gat,40,174
+force_1-1.gat,99,54,0 warp fc105 1,1,force_1-1.gat,96,82
+force_1-1.gat,100,81,0 warp fc105-1 1,1,force_1-1.gat,99,51
+force_1-1.gat,134,174,0 warp fc106 1,1,force_1-1.gat,159,174
+force_1-1.gat,155,174,0 warp fc106-1 1,1,force_1-1.gat,130,174
+force_1-1.gat,137,26,0 warp fc107 1,1,force_1-1.gat,159,26
+force_1-1.gat,155,26,0 warp fc107-1 1,1,force_1-1.gat,132,26
+force_1-1.gat,174,44,0 warp fc108 1,1,force_1-1.gat,174,69
+force_1-1.gat,174,65,0 warp fc108-1 1,1,force_1-1.gat,174,40
+force_1-1.gat,174,134,0 warp fc109 1,1,force_1-1.gat,174,159
+force_1-1.gat,174,155,0 warp fc109-1 1,1,force_1-1.gat,174,130
+force_1-2.gat,25,93,0 warp fc201 1,1,force_1-2.gat,25,118
+force_1-2.gat,25,114,0 warp fc201-1 1,1,force_1-2.gat,25,89
+force_1-2.gat,33,178,0 warp fc202 1,1,force_1-2.gat,59,178
+force_1-2.gat,55,178,0 warp fc202-1 1,1,force_1-2.gat,29,178
+force_1-2.gat,41,26,0 warp fc203 1,1,force_1-2.gat,89,26
+force_1-2.gat,85,26,0 warp fc203-1 1,1,force_1-2.gat,37,26
+force_1-2.gat,41,78,0 warp fc204 1,1,force_1-2.gat,88,78
+force_1-2.gat,84,78,0 warp fc204-1 1,1,force_1-2.gat,37,78
+force_1-2.gat,49,130,0 warp fc205 1,1,force_1-2.gat,91,125
+force_1-2.gat,91,129,0 warp fc205-1 1,1,force_1-2.gat,49,134
+force_1-2.gat,95,187,0 warp fc206 1,1,force_1-2.gat,107,141
+force_1-2.gat,107,145,0 warp fc206-1 1,1,force_1-2.gat,95,183
+force_1-2.gat,99,40,0 warp fc207 1,1,force_1-2.gat,99,66
+force_1-2.gat,99,62,0 warp fc207-1 1,1,force_1-2.gat,99,36
+force_1-2.gat,114,26,0 warp fc208 1,1,force_1-2.gat,162,26
+force_1-2.gat,158,26,0 warp fc208-1 1,1,force_1-2.gat,110,26
+force_1-2.gat,115,78,0 warp fc209 1,1,force_1-2.gat,162,78
+force_1-2.gat,158,78,0 warp fc209-1 1,1,force_1-2.gat,111,78
+force_1-2.gat,137,178,0 warp fc210 1,1,force_1-2.gat,162,178
+force_1-2.gat,158,178,0 warp fc210-1 1,1,force_1-2.gat,133,178
+force_1-2.gat,173,93,0 warp fc211 1,1,force_1-2.gat,173,118
+force_1-2.gat,173,114,0 warp fc211-1 1,1,force_1-2.gat,173,89
+force_1-3.gat,10,100,0 warp fc301 1,1,force_1-3.gat,25,180
+force_1-3.gat,29,180,0 warp fc301-1 1,1,force_1-3.gat,14,100
+force_1-3.gat,19,10,0 warp fc302 1,1,force_1-3.gat,19,185
+force_1-3.gat,19,189,0 warp fc302-1 1,1,force_1-3.gat,19,14
+force_1-3.gat,19,29,0 warp fc303 1,1,force_1-3.gat,19,54
+force_1-3.gat,19,50,0 warp fc303-1 1,1,force_1-3.gat,19,25
+force_1-3.gat,19,147,0 warp fc304 1,1,force_1-3.gat,179,94
+force_1-3.gat,179,90,0 warp fc304-1 1,1,force_1-3.gat,19,143
+force_1-3.gat,29,100,0 warp fc305 1,1,force_1-3.gat,174,180
+force_1-3.gat,170,180,0 warp fc305-1 1,1,force_1-3.gat,24,100
+force_1-3.gat,59,29,0 warp fc306 1,1,force_1-3.gat,99,132
+force_1-3.gat,99,128,0 warp fc306-1 1,1,force_1-3.gat,59,25
+force_1-3.gat,59,69,0 warp fc307 1,1,force_1-3.gat,59,94
+force_1-3.gat,59,90,0 warp fc307-1 1,1,force_1-3.gat,59,65
+force_1-3.gat,59,109,0 warp fc308 1,1,force_1-3.gat,139,54
+force_1-3.gat,139,50,0 warp fc308-1 1,1,force_1-3.gat,59,105
+force_1-3.gat,59,128,0 warp fc309 1,1,force_1-3.gat,139,105
+force_1-3.gat,139,109,0 warp fc309-1 1,1,force_1-3.gat,59,132
+force_1-3.gat,69,20,0 warp fc310 1,1,force_1-3.gat,134,100
+force_1-3.gat,130,100,0 warp fc310-1 1,1,force_1-3.gat,65,20
+force_1-3.gat,69,60,0 warp fc311 1,1,force_1-3.gat,94,60
+force_1-3.gat,90,60,0 warp fc311-1 1,1,force_1-3.gat,65,60
+force_1-3.gat,69,138,0 warp fc312 1,1,force_1-3.gat,174,60
+force_1-3.gat,170,60,0 warp fc312-1 1,1,force_1-3.gat,65,138
+force_1-3.gat,99,147,0 warp fc313 1,1,force_1-3.gat,99,168
+force_1-3.gat,99,164,0 warp fc313-1 1,1,force_1-3.gat,99,143
+force_1-3.gat,109,60,0 warp fc314 1,1,force_1-3.gat,134,20
+force_1-3.gat,130,20,0 warp fc314-1 1,1,force_1-3.gat,105,60
+force_1-3.gat,109,100,0 warp fc315 1,1,force_1-3.gat,174,100
+force_1-3.gat,170,100,0 warp fc315-1 1,1,force_1-3.gat,105,100
+force_1-3.gat,109,138,0 warp fc316 1,1,force_1-3.gat,134,138
+force_1-3.gat,130,138,0 warp fc316-1 1,1,force_1-3.gat,105,138
+force_1-3.gat,139,147,0 warp fc317 1,1,force_1-3.gat,179,174
+force_1-3.gat,179,170,0 warp fc317-1 1,1,force_1-3.gat,139,143
+force_1-3.gat,179,29,0 warp fc318 1,1,force_1-3.gat,179,54
+force_1-3.gat,179,50,0 warp fc318-1 1,1,force_1-3.gat,179,25
+force_1-3.gat,179,109,0 warp fc319 1,1,force_1-3.gat,179,132
+force_1-3.gat,179,128,0 warp fc319-1 1,1,force_1-3.gat,179,105
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
new file mode 100644
index 000000000..b818cf8c4
--- /dev/null
+++ b/npc/warps/other/arena.txt
@@ -0,0 +1,28 @@
+//============================================================
+//===== Athena Script ========================================
+//= Arena Warps
+//===== By: ==================================================
+//= SinSloth
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points related to Izlude Arena && Control Panel(to come)
+//===== Additional Comments: =================================
+//= 1.0 First version, done by SinSloth. [MasterOfMuppets]
+//============================================================
+
+izlude.gat,128,126,0 warp welcome_arena 1,1,arena_room.gat,100,30
+arena_room.gat,99,24,0 warp bye_arena 2,2,izlude.gat,128,220
+arena_room.gat,84,103,0 warp arn_room_11_1 1,1,arena_room.gat,63,130
+arena_room.gat,63,126,0 warp arn_room_11_2 1,1,arena_room.gat,87,100
+arena_room.gat,76,87,0 warp arn_room_9_1 1,1,arena_room.gat,46,87
+arena_room.gat,49,87,0 warp arn_room_9_2 1,1,arena_room.gat,78,87
+arena_room.gat,84,71,0 warp arn_room_7_1 1,1,arena_room.gat,60,50
+arena_room.gat,63,53,0 warp arn_room_7_2 1,1,arena_room.gat,86,74
+arena_room.gat,115,71,0 warp arn_room_5_1 1,1,arena_room.gat,139,50
+arena_room.gat,136,53,0 warp arn_room_5_2 1,1,arena_room.gat,113,74
+arena_room.gat,123,88,0 warp arn_room_3_1 1,1,arena_room.gat,153,87
+arena_room.gat,150,87,0 warp arn_room_3_2 1,1,arena_room.gat,120,87
+prt_are_in.gat,54,13,0 warp toarn_room 1,1,arena_room.gat,100,77
diff --git a/npc/warps/pvp/pvp.txt b/npc/warps/pvp/pvp.txt
index d84ecf9d2..321b5556d 100644
--- a/npc/warps/pvp/pvp.txt
+++ b/npc/warps/pvp/pvp.txt
@@ -20,87 +20,6 @@ prt_are_in.gat,55,13,0 warp warp1078 1,1,prt_are_in.gat,125,78
prt_are_in.gat,125,75,0 warp warp1079 1,1,prt_are_in.gat,58,13
prt_are_in.gat,97,7,0 warp warp1080 1,1,izlude.gat,128,222
-
-//Time Limit Mode
-force_1-1.gat,25,44,0 warp fc101 1,1,force_1-1.gat,25,69
-force_1-1.gat,25,65,0 warp fc101-1 1,1,force_1-1.gat,25,40
-force_1-1.gat,25,134,0 warp fc102 1,1,force_1-1.gat,25,159
-force_1-1.gat,25,155,0 warp fc102-1 1,1,force_1-1.gat,25,130
-force_1-1.gat,44,26,0 warp fc103 1,1,force_1-1.gat,66,26
-force_1-1.gat,62,26,0 warp fc103-1 1,1,force_1-1.gat,40,26
-force_1-1.gat,44,174,0 warp fc104 1,1,force_1-1.gat,69,174
-force_1-1.gat,65,174,0 warp fc104-1 1,1,force_1-1.gat,40,174
-force_1-1.gat,99,54,0 warp fc105 1,1,force_1-1.gat,96,82
-force_1-1.gat,100,81,0 warp fc105-1 1,1,force_1-1.gat,99,51
-force_1-1.gat,134,174,0 warp fc106 1,1,force_1-1.gat,159,174
-force_1-1.gat,155,174,0 warp fc106-1 1,1,force_1-1.gat,130,174
-force_1-1.gat,137,26,0 warp fc107 1,1,force_1-1.gat,159,26
-force_1-1.gat,155,26,0 warp fc107-1 1,1,force_1-1.gat,132,26
-force_1-1.gat,174,44,0 warp fc108 1,1,force_1-1.gat,174,69
-force_1-1.gat,174,65,0 warp fc108-1 1,1,force_1-1.gat,174,40
-force_1-1.gat,174,134,0 warp fc109 1,1,force_1-1.gat,174,159
-force_1-1.gat,174,155,0 warp fc109-1 1,1,force_1-1.gat,174,130
-force_1-2.gat,25,93,0 warp fc201 1,1,force_1-2.gat,25,118
-force_1-2.gat,25,114,0 warp fc201-1 1,1,force_1-2.gat,25,89
-force_1-2.gat,33,178,0 warp fc202 1,1,force_1-2.gat,59,178
-force_1-2.gat,55,178,0 warp fc202-1 1,1,force_1-2.gat,29,178
-force_1-2.gat,41,26,0 warp fc203 1,1,force_1-2.gat,89,26
-force_1-2.gat,85,26,0 warp fc203-1 1,1,force_1-2.gat,37,26
-force_1-2.gat,41,78,0 warp fc204 1,1,force_1-2.gat,88,78
-force_1-2.gat,84,78,0 warp fc204-1 1,1,force_1-2.gat,37,78
-force_1-2.gat,49,130,0 warp fc205 1,1,force_1-2.gat,91,125
-force_1-2.gat,91,129,0 warp fc205-1 1,1,force_1-2.gat,49,134
-force_1-2.gat,95,187,0 warp fc206 1,1,force_1-2.gat,107,141
-force_1-2.gat,107,145,0 warp fc206-1 1,1,force_1-2.gat,95,183
-force_1-2.gat,99,40,0 warp fc207 1,1,force_1-2.gat,99,66
-force_1-2.gat,99,62,0 warp fc207-1 1,1,force_1-2.gat,99,36
-force_1-2.gat,114,26,0 warp fc208 1,1,force_1-2.gat,162,26
-force_1-2.gat,158,26,0 warp fc208-1 1,1,force_1-2.gat,110,26
-force_1-2.gat,115,78,0 warp fc209 1,1,force_1-2.gat,162,78
-force_1-2.gat,158,78,0 warp fc209-1 1,1,force_1-2.gat,111,78
-force_1-2.gat,137,178,0 warp fc210 1,1,force_1-2.gat,162,178
-force_1-2.gat,158,178,0 warp fc210-1 1,1,force_1-2.gat,133,178
-force_1-2.gat,173,93,0 warp fc211 1,1,force_1-2.gat,173,118
-force_1-2.gat,173,114,0 warp fc211-1 1,1,force_1-2.gat,173,89
-force_1-3.gat,10,100,0 warp fc301 1,1,force_1-3.gat,25,180
-force_1-3.gat,29,180,0 warp fc301-1 1,1,force_1-3.gat,14,100
-force_1-3.gat,19,10,0 warp fc302 1,1,force_1-3.gat,19,185
-force_1-3.gat,19,189,0 warp fc302-1 1,1,force_1-3.gat,19,14
-force_1-3.gat,19,29,0 warp fc303 1,1,force_1-3.gat,19,54
-force_1-3.gat,19,50,0 warp fc303-1 1,1,force_1-3.gat,19,25
-force_1-3.gat,19,147,0 warp fc304 1,1,force_1-3.gat,179,94
-force_1-3.gat,179,90,0 warp fc304-1 1,1,force_1-3.gat,19,143
-force_1-3.gat,29,100,0 warp fc305 1,1,force_1-3.gat,174,180
-force_1-3.gat,170,180,0 warp fc305-1 1,1,force_1-3.gat,24,100
-force_1-3.gat,59,29,0 warp fc306 1,1,force_1-3.gat,99,132
-force_1-3.gat,99,128,0 warp fc306-1 1,1,force_1-3.gat,59,25
-force_1-3.gat,59,69,0 warp fc307 1,1,force_1-3.gat,59,94
-force_1-3.gat,59,90,0 warp fc307-1 1,1,force_1-3.gat,59,65
-force_1-3.gat,59,109,0 warp fc308 1,1,force_1-3.gat,139,54
-force_1-3.gat,139,50,0 warp fc308-1 1,1,force_1-3.gat,59,105
-force_1-3.gat,59,128,0 warp fc309 1,1,force_1-3.gat,139,105
-force_1-3.gat,139,109,0 warp fc309-1 1,1,force_1-3.gat,59,132
-force_1-3.gat,69,20,0 warp fc310 1,1,force_1-3.gat,134,100
-force_1-3.gat,130,100,0 warp fc310-1 1,1,force_1-3.gat,65,20
-force_1-3.gat,69,60,0 warp fc311 1,1,force_1-3.gat,94,60
-force_1-3.gat,90,60,0 warp fc311-1 1,1,force_1-3.gat,65,60
-force_1-3.gat,69,138,0 warp fc312 1,1,force_1-3.gat,174,60
-force_1-3.gat,170,60,0 warp fc312-1 1,1,force_1-3.gat,65,138
-force_1-3.gat,99,147,0 warp fc313 1,1,force_1-3.gat,99,168
-force_1-3.gat,99,164,0 warp fc313-1 1,1,force_1-3.gat,99,143
-force_1-3.gat,109,60,0 warp fc314 1,1,force_1-3.gat,134,20
-force_1-3.gat,130,20,0 warp fc314-1 1,1,force_1-3.gat,105,60
-force_1-3.gat,109,100,0 warp fc315 1,1,force_1-3.gat,174,100
-force_1-3.gat,170,100,0 warp fc315-1 1,1,force_1-3.gat,105,100
-force_1-3.gat,109,138,0 warp fc316 1,1,force_1-3.gat,134,138
-force_1-3.gat,130,138,0 warp fc316-1 1,1,force_1-3.gat,105,138
-force_1-3.gat,139,147,0 warp fc317 1,1,force_1-3.gat,179,174
-force_1-3.gat,179,170,0 warp fc317-1 1,1,force_1-3.gat,139,143
-force_1-3.gat,179,29,0 warp fc318 1,1,force_1-3.gat,179,54
-force_1-3.gat,179,50,0 warp fc318-1 1,1,force_1-3.gat,179,25
-force_1-3.gat,179,109,0 warp fc319 1,1,force_1-3.gat,179,132
-force_1-3.gat,179,128,0 warp fc319-1 1,1,force_1-3.gat,179,105
-
//Battle Ordeal Mode
ordeal_1-1.gat,100,150,0 warp ord11 1,1,ordeal_1-1.gat,128,150
ordeal_1-1.gat,123,150,0 warp ord11-1 1,1,ordeal_1-1.gat,95,150