summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/mapflag/nobranch.txt6
-rw-r--r--conf/mapflag/nomemo.txt6
-rw-r--r--npc/warps/pvp.txt144
3 files changed, 78 insertions, 78 deletions
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index a05c37df5..0c96bf896 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -199,13 +199,13 @@ force_1-2 mapflag nobranch
force_1-3 mapflag nobranch
ordeal_1-1 mapflag nobranch
ordeal_1-2 mapflag nobranch
-ordeal_1-3 mapflag nobranch
+//ordeal_1-3 mapflag nobranch
ordeal_2-1 mapflag nobranch
ordeal_2-2 mapflag nobranch
-ordeal_2-3 mapflag nobranch
+//ordeal_2-3 mapflag nobranch
ordeal_3-1 mapflag nobranch
ordeal_3-2 mapflag nobranch
-ordeal_3-3 mapflag nobranch
+//ordeal_3-3 mapflag nobranch
pvp_2vs2 mapflag nobranch
pvp_c_room mapflag nobranch
quiz_00 mapflag nobranch
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index dbb35a164..f6628bf46 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -494,13 +494,13 @@ force_4-1 mapflag nomemo
force_5-1 mapflag nomemo
ordeal_1-1 mapflag nomemo
ordeal_1-2 mapflag nomemo
-ordeal_1-3 mapflag nomemo
+//ordeal_1-3 mapflag nomemo
ordeal_2-1 mapflag nomemo
ordeal_2-2 mapflag nomemo
-ordeal_2-3 mapflag nomemo
+//ordeal_2-3 mapflag nomemo
ordeal_3-1 mapflag nomemo
ordeal_3-2 mapflag nomemo
-ordeal_3-3 mapflag nomemo
+//ordeal_3-3 mapflag nomemo
pvp_c_room mapflag nomemo
quiz_00 mapflag nomemo
quiz_01 mapflag nomemo
diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt
index da82d6d09..e9440aeb9 100644
--- a/npc/warps/pvp.txt
+++ b/npc/warps/pvp.txt
@@ -40,30 +40,30 @@ ordeal_1-2,153,180,0 warp ord12-5 1,1,ordeal_1-2,144,284
ordeal_1-2,172,135,0 warp ord12-6 1,1,ordeal_1-2,284,24
ordeal_1-2,172,172,0 warp ord12-7 1,1,ordeal_1-2,284,284
ordeal_1-2,180,154,0 warp ord12-8 1,1,ordeal_1-2,284,164
-ordeal_1-3,100,150,0 warp ord13-1 1,1,ordeal_1-3,128,150
-ordeal_1-3,114,183,0 warp ord13-2 1,1,ordeal_1-3,135,163
-ordeal_1-3,115,115,0 warp ord13-3 1,1,ordeal_1-3,136,136
-ordeal_1-3,123,150,0 warp ord13-4 1,1,ordeal_1-3,95,150
-ordeal_1-3,130,168,0 warp ord13-5 1,1,ordeal_1-3,109,188
-ordeal_1-3,131,131,0 warp ord13-6 1,1,ordeal_1-3,110,110
-ordeal_1-3,148,176,0 warp ord13-7 1,1,ordeal_1-3,149,204
-ordeal_1-3,149,99,0 warp ord13-8 1,1,ordeal_1-3,151,129
-ordeal_1-3,149,199,0 warp ord13-9 1,1,ordeal_1-3,148,171
-ordeal_1-3,151,124,0 warp ord13-10 1,1,ordeal_1-3,151,94
-ordeal_1-3,168,168,0 warp ord13-11 1,1,ordeal_1-3,189,189
-ordeal_1-3,169,131,0 warp ord13-12 1,1,ordeal_1-3,188,111
-ordeal_1-3,176,150,0 warp ord13-13 1,1,ordeal_1-3,204,150
-ordeal_1-3,183,116,0 warp ord13-14 1,1,ordeal_1-3,164,136
-ordeal_1-3,184,184,0 warp ord13-15 1,1,ordeal_1-3,163,163
-ordeal_1-3,199,150,0 warp ord13-16 1,1,ordeal_1-3,171,150
-ordeal_1-4,128,154,0 warp ord14-1 1,1,ordeal_1-4,24,154
-ordeal_1-4,136,136,0 warp ord14-2 1,1,ordeal_1-4,24,24
-ordeal_1-4,136,172,0 warp ord14-3 1,1,ordeal_1-4,24,284
-ordeal_1-4,153,128,0 warp ord14-4 1,1,ordeal_1-4,153,23
-ordeal_1-4,153,180,0 warp ord14-5 1,1,ordeal_1-4,144,284
-ordeal_1-4,172,135,0 warp ord14-6 1,1,ordeal_1-4,284,24
-ordeal_1-4,172,172,0 warp ord14-7 1,1,ordeal_1-4,284,284
-ordeal_1-4,180,154,0 warp ord14-8 1,1,ordeal_1-4,284,164
+//ordeal_1-3,100,150,0 warp ord13-1 1,1,ordeal_1-3,128,150
+//ordeal_1-3,114,183,0 warp ord13-2 1,1,ordeal_1-3,135,163
+//ordeal_1-3,115,115,0 warp ord13-3 1,1,ordeal_1-3,136,136
+//ordeal_1-3,123,150,0 warp ord13-4 1,1,ordeal_1-3,95,150
+//ordeal_1-3,130,168,0 warp ord13-5 1,1,ordeal_1-3,109,188
+//ordeal_1-3,131,131,0 warp ord13-6 1,1,ordeal_1-3,110,110
+//ordeal_1-3,148,176,0 warp ord13-7 1,1,ordeal_1-3,149,204
+//ordeal_1-3,149,99,0 warp ord13-8 1,1,ordeal_1-3,151,129
+//ordeal_1-3,149,199,0 warp ord13-9 1,1,ordeal_1-3,148,171
+//ordeal_1-3,151,124,0 warp ord13-10 1,1,ordeal_1-3,151,94
+//ordeal_1-3,168,168,0 warp ord13-11 1,1,ordeal_1-3,189,189
+//ordeal_1-3,169,131,0 warp ord13-12 1,1,ordeal_1-3,188,111
+//ordeal_1-3,176,150,0 warp ord13-13 1,1,ordeal_1-3,204,150
+//ordeal_1-3,183,116,0 warp ord13-14 1,1,ordeal_1-3,164,136
+//ordeal_1-3,184,184,0 warp ord13-15 1,1,ordeal_1-3,163,163
+//ordeal_1-3,199,150,0 warp ord13-16 1,1,ordeal_1-3,171,150
+//ordeal_1-4,128,154,0 warp ord14-1 1,1,ordeal_1-4,24,154
+//ordeal_1-4,136,136,0 warp ord14-2 1,1,ordeal_1-4,24,24
+//ordeal_1-4,136,172,0 warp ord14-3 1,1,ordeal_1-4,24,284
+//ordeal_1-4,153,128,0 warp ord14-4 1,1,ordeal_1-4,153,23
+//ordeal_1-4,153,180,0 warp ord14-5 1,1,ordeal_1-4,144,284
+//ordeal_1-4,172,135,0 warp ord14-6 1,1,ordeal_1-4,284,24
+//ordeal_1-4,172,172,0 warp ord14-7 1,1,ordeal_1-4,284,284
+//ordeal_1-4,180,154,0 warp ord14-8 1,1,ordeal_1-4,284,164
ordeal_2-1,100,150,0 warp ord21-1 1,1,ordeal_2-1,128,150
ordeal_2-1,123,150,0 warp ord21-2 1,1,ordeal_2-1,95,150
ordeal_2-1,114,183,0 warp ord21-3 1,1,ordeal_2-1,135,163
@@ -88,30 +88,30 @@ ordeal_2-2,153,180,0 warp ord22-5 1,1,ordeal_2-2,144,284
ordeal_2-2,172,135,0 warp ord22-6 1,1,ordeal_2-2,284,24
ordeal_2-2,172,172,0 warp ord22-7 1,1,ordeal_2-2,284,284
ordeal_2-2,180,154,0 warp ord22-8 1,1,ordeal_2-2,284,164
-ordeal_2-3,100,150,0 warp ord23-1 1,1,ordeal_2-3,128,150
-ordeal_2-3,114,183,0 warp ord23-2 1,1,ordeal_2-3,135,163
-ordeal_2-3,115,115,0 warp ord23-3 1,1,ordeal_2-3,136,136
-ordeal_2-3,123,150,0 warp ord23-4 1,1,ordeal_2-3,95,150
-ordeal_2-3,130,168,0 warp ord23-5 1,1,ordeal_2-3,109,188
-ordeal_2-3,131,131,0 warp ord23-6 1,1,ordeal_2-3,110,110
-ordeal_2-3,148,176,0 warp ord23-7 1,1,ordeal_2-3,149,204
-ordeal_2-3,149,99,0 warp ord23-8 1,1,ordeal_2-3,151,129
-ordeal_2-3,149,199,0 warp ord23-9 1,1,ordeal_2-3,148,171
-ordeal_2-3,151,124,0 warp ord23-10 1,1,ordeal_2-3,151,94
-ordeal_2-3,168,168,0 warp ord23-11 1,1,ordeal_2-3,189,189
-ordeal_2-3,169,131,0 warp ord23-12 1,1,ordeal_2-3,188,111
-ordeal_2-3,176,150,0 warp ord23-13 1,1,ordeal_2-3,204,150
-ordeal_2-3,183,116,0 warp ord23-14 1,1,ordeal_2-3,164,136
-ordeal_2-3,184,184,0 warp ord23-15 1,1,ordeal_2-3,163,163
-ordeal_2-3,199,150,0 warp ord23-16 1,1,ordeal_2-3,171,150
-ordeal_2-4,128,154,0 warp ord24-1 1,1,ordeal_2-4,24,154
-ordeal_2-4,136,136,0 warp ord24-2 1,1,ordeal_2-4,24,24
-ordeal_2-4,136,172,0 warp ord24-3 1,1,ordeal_2-4,24,284
-ordeal_2-4,153,128,0 warp ord24-4 1,1,ordeal_2-4,153,23
-ordeal_2-4,153,180,0 warp ord24-5 1,1,ordeal_2-4,144,284
-ordeal_2-4,172,135,0 warp ord24-6 1,1,ordeal_2-4,284,24
-ordeal_2-4,172,172,0 warp ord24-7 1,1,ordeal_2-4,284,284
-ordeal_2-4,180,154,0 warp ord24-8 1,1,ordeal_2-4,284,164
+//ordeal_2-3,100,150,0 warp ord23-1 1,1,ordeal_2-3,128,150
+//ordeal_2-3,114,183,0 warp ord23-2 1,1,ordeal_2-3,135,163
+//ordeal_2-3,115,115,0 warp ord23-3 1,1,ordeal_2-3,136,136
+//ordeal_2-3,123,150,0 warp ord23-4 1,1,ordeal_2-3,95,150
+//ordeal_2-3,130,168,0 warp ord23-5 1,1,ordeal_2-3,109,188
+//ordeal_2-3,131,131,0 warp ord23-6 1,1,ordeal_2-3,110,110
+//ordeal_2-3,148,176,0 warp ord23-7 1,1,ordeal_2-3,149,204
+//ordeal_2-3,149,99,0 warp ord23-8 1,1,ordeal_2-3,151,129
+//ordeal_2-3,149,199,0 warp ord23-9 1,1,ordeal_2-3,148,171
+//ordeal_2-3,151,124,0 warp ord23-10 1,1,ordeal_2-3,151,94
+//ordeal_2-3,168,168,0 warp ord23-11 1,1,ordeal_2-3,189,189
+//ordeal_2-3,169,131,0 warp ord23-12 1,1,ordeal_2-3,188,111
+//ordeal_2-3,176,150,0 warp ord23-13 1,1,ordeal_2-3,204,150
+//ordeal_2-3,183,116,0 warp ord23-14 1,1,ordeal_2-3,164,136
+//ordeal_2-3,184,184,0 warp ord23-15 1,1,ordeal_2-3,163,163
+//ordeal_2-3,199,150,0 warp ord23-16 1,1,ordeal_2-3,171,150
+//ordeal_2-4,128,154,0 warp ord24-1 1,1,ordeal_2-4,24,154
+//ordeal_2-4,136,136,0 warp ord24-2 1,1,ordeal_2-4,24,24
+//ordeal_2-4,136,172,0 warp ord24-3 1,1,ordeal_2-4,24,284
+//ordeal_2-4,153,128,0 warp ord24-4 1,1,ordeal_2-4,153,23
+//ordeal_2-4,153,180,0 warp ord24-5 1,1,ordeal_2-4,144,284
+//ordeal_2-4,172,135,0 warp ord24-6 1,1,ordeal_2-4,284,24
+//ordeal_2-4,172,172,0 warp ord24-7 1,1,ordeal_2-4,284,284
+//ordeal_2-4,180,154,0 warp ord24-8 1,1,ordeal_2-4,284,164
ordeal_3-1,100,150,0 warp ord31-1 1,1,ordeal_3-1,128,150
ordeal_3-1,123,150,0 warp ord31-2 1,1,ordeal_3-1,95,150
ordeal_3-1,114,183,0 warp ord31-3 1,1,ordeal_3-1,135,163
@@ -136,30 +136,30 @@ ordeal_3-2,153,180,0 warp ord32-5 1,1,ordeal_3-2,144,284
ordeal_3-2,172,135,0 warp ord32-6 1,1,ordeal_3-2,284,24
ordeal_3-2,172,172,0 warp ord32-7 1,1,ordeal_3-2,284,284
ordeal_3-2,180,154,0 warp ord32-8 1,1,ordeal_3-2,284,164
-ordeal_3-3,100,150,0 warp ord33-1 1,1,ordeal_3-3,128,150
-ordeal_3-3,114,183,0 warp ord33-2 1,1,ordeal_3-3,135,163
-ordeal_3-3,115,115,0 warp ord33-3 1,1,ordeal_3-3,136,136
-ordeal_3-3,123,150,0 warp ord33-4 1,1,ordeal_3-3,95,150
-ordeal_3-3,130,168,0 warp ord33-5 1,1,ordeal_3-3,109,188
-ordeal_3-3,131,131,0 warp ord33-6 1,1,ordeal_3-3,110,110
-ordeal_3-3,148,176,0 warp ord33-7 1,1,ordeal_3-3,149,204
-ordeal_3-3,149,99,0 warp ord33-8 1,1,ordeal_3-3,151,129
-ordeal_3-3,149,199,0 warp ord33-9 1,1,ordeal_3-3,148,171
-ordeal_3-3,151,124,0 warp ord33-10 1,1,ordeal_3-3,151,94
-ordeal_3-3,168,168,0 warp ord33-11 1,1,ordeal_3-3,189,189
-ordeal_3-3,169,131,0 warp ord33-12 1,1,ordeal_3-3,188,111
-ordeal_3-3,176,150,0 warp ord33-13 1,1,ordeal_3-3,204,150
-ordeal_3-3,183,116,0 warp ord33-14 1,1,ordeal_3-3,164,136
-ordeal_3-3,184,184,0 warp ord33-15 1,1,ordeal_3-3,163,163
-ordeal_3-3,199,150,0 warp ord33-16 1,1,ordeal_3-3,171,150
-ordeal_3-4,128,154,0 warp ord34-1 1,1,ordeal_3-4,24,154
-ordeal_3-4,136,136,0 warp ord34-2 1,1,ordeal_3-4,24,24
-ordeal_3-4,136,172,0 warp ord34-3 1,1,ordeal_3-4,24,284
-ordeal_3-4,153,128,0 warp ord34-4 1,1,ordeal_3-4,153,23
-ordeal_3-4,153,180,0 warp ord34-5 1,1,ordeal_3-4,144,284
-ordeal_3-4,172,135,0 warp ord34-6 1,1,ordeal_3-4,284,24
-ordeal_3-4,172,172,0 warp ord34-7 1,1,ordeal_3-4,284,284
-ordeal_3-4,180,154,0 warp ord34-8 1,1,ordeal_3-4,284,164
+//ordeal_3-3,100,150,0 warp ord33-1 1,1,ordeal_3-3,128,150
+//ordeal_3-3,114,183,0 warp ord33-2 1,1,ordeal_3-3,135,163
+//ordeal_3-3,115,115,0 warp ord33-3 1,1,ordeal_3-3,136,136
+//ordeal_3-3,123,150,0 warp ord33-4 1,1,ordeal_3-3,95,150
+//ordeal_3-3,130,168,0 warp ord33-5 1,1,ordeal_3-3,109,188
+//ordeal_3-3,131,131,0 warp ord33-6 1,1,ordeal_3-3,110,110
+//ordeal_3-3,148,176,0 warp ord33-7 1,1,ordeal_3-3,149,204
+//ordeal_3-3,149,99,0 warp ord33-8 1,1,ordeal_3-3,151,129
+//ordeal_3-3,149,199,0 warp ord33-9 1,1,ordeal_3-3,148,171
+//ordeal_3-3,151,124,0 warp ord33-10 1,1,ordeal_3-3,151,94
+//ordeal_3-3,168,168,0 warp ord33-11 1,1,ordeal_3-3,189,189
+//ordeal_3-3,169,131,0 warp ord33-12 1,1,ordeal_3-3,188,111
+//ordeal_3-3,176,150,0 warp ord33-13 1,1,ordeal_3-3,204,150
+//ordeal_3-3,183,116,0 warp ord33-14 1,1,ordeal_3-3,164,136
+//ordeal_3-3,184,184,0 warp ord33-15 1,1,ordeal_3-3,163,163
+//ordeal_3-3,199,150,0 warp ord33-16 1,1,ordeal_3-3,171,150
+//ordeal_3-4,128,154,0 warp ord34-1 1,1,ordeal_3-4,24,154
+//ordeal_3-4,136,136,0 warp ord34-2 1,1,ordeal_3-4,24,24
+//ordeal_3-4,136,172,0 warp ord34-3 1,1,ordeal_3-4,24,284
+//ordeal_3-4,153,128,0 warp ord34-4 1,1,ordeal_3-4,153,23
+//ordeal_3-4,153,180,0 warp ord34-5 1,1,ordeal_3-4,144,284
+//ordeal_3-4,172,135,0 warp ord34-6 1,1,ordeal_3-4,284,24
+//ordeal_3-4,172,172,0 warp ord34-7 1,1,ordeal_3-4,284,284
+//ordeal_3-4,180,154,0 warp ord34-8 1,1,ordeal_3-4,284,164
//This map doesn't even exists. Is it ordeal_a02 or ordea_la00?
//ordeal_a04,128,154,0 warp orda1 0,0,ordeal_a04,24,154
//ordeal_a04,136,136,0 warp orda2 0,0,ordeal_a04,24,24