summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-05 06:00:20 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-05 06:00:20 +0000
commitd841fc529949f361e915b73a073d1fa9d4ec60f7 (patch)
tree6a9a34b176f00c6178700a46c01d1c752821d40e /conf
parent1bea10f578d4e8119659a0373c0a9213fdaab4d4 (diff)
downloadhercules-d841fc529949f361e915b73a073d1fa9d4ec60f7.tar.gz
hercules-d841fc529949f361e915b73a073d1fa9d4ec60f7.tar.bz2
hercules-d841fc529949f361e915b73a073d1fa9d4ec60f7.tar.xz
hercules-d841fc529949f361e915b73a073d1fa9d4ec60f7.zip
- Completed L0ne's 2007 request for 'waitingroom' to support required zeny and level.
- Updated NPC files which required the waitingroom update. - Added Poring War script. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14765 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r--conf/mapflag/nobranch.txt6
-rw-r--r--conf/mapflag/noicewall.txt4
-rw-r--r--conf/mapflag/nomemo.txt4
-rw-r--r--conf/mapflag/nopenalty.txt3
-rw-r--r--conf/mapflag/nosave.txt4
-rw-r--r--conf/mapflag/noteleport.txt5
-rw-r--r--conf/mapflag/nowarp.txt4
-rw-r--r--conf/mapflag/nowarpto.txt4
8 files changed, 33 insertions, 1 deletions
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 3e91263da..0684fbe74 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -335,4 +335,8 @@ jupe_core2 mapflag nobranch
brasilis mapflag nobranch
bra_in01 mapflag nobranch
-//evt_zombie mapflag nobranch \ No newline at end of file
+//evt_zombie mapflag nobranch
+
+// Poring War ==================
+poring_w01 mapflag nobranch
+poring_w02 mapflag nobranch \ No newline at end of file
diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt
index 13af8e2f4..ae64cc3c0 100644
--- a/conf/mapflag/noicewall.txt
+++ b/conf/mapflag/noicewall.txt
@@ -141,3 +141,7 @@ nguild_prt mapflag noicewall
4@tower mapflag noicewall
5@tower mapflag noicewall
6@tower mapflag noicewall
+
+// Poring War ====================
+poring_w01 mapflag noicewall
+poring_w02 mapflag noicewall
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 6e57620c9..e7aea26b6 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -681,3 +681,7 @@ spl_in01 mapflag nomemo
2@nyd mapflag nomemo
//evt_zombie mapflag nomemo
+
+// Poring War ====================
+poring_w01 mapflag nomemo
+poring_w02 mapflag nomemo \ No newline at end of file
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index 0d22861aa..3c7d781a4 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -251,3 +251,6 @@ bat_a01 mapflag nopenalty
bat_a02 mapflag nopenalty
//evt_zombie mapflag nopenalty
+
+// Poring War ==================
+poring_w02 mapflag nopenalty \ No newline at end of file
diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt
index 7c254eee2..5296b049a 100644
--- a/conf/mapflag/nosave.txt
+++ b/conf/mapflag/nosave.txt
@@ -269,3 +269,7 @@ arug_dun01 mapflag nosave SavePoint
schg_dun01 mapflag nosave SavePoint
//evt_zombie mapflag nosave SavePoint
+
+// Poring War ====================
+poring_w01 mapflag nosave SavePoint
+poring_w02 mapflag nosave SavePoint \ No newline at end of file
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index 10672aea9..15bd644f0 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -391,3 +391,8 @@ nyd_dun02 mapflag noteleport
2@nyd mapflag monster_noteleport
//evt_zombie mapflag noteleport
+
+// Poring War ====================
+poring_w01 mapflag noteleport
+poring_w02 mapflag noteleport
+poring_w02 mapflag monster_noteleport \ No newline at end of file
diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt
index 63c9aaaae..853dcf586 100644
--- a/conf/mapflag/nowarp.txt
+++ b/conf/mapflag/nowarp.txt
@@ -65,3 +65,7 @@ bat_b01 mapflag nowarp
bat_b02 mapflag nowarp
bat_a01 mapflag nowarp
bat_a02 mapflag nowarp
+
+// Poring War ==================
+poring_w01 mapflag nowarp
+poring_w02 mapflag nowarp \ No newline at end of file
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index ca81f6d35..3fc30624b 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -139,3 +139,7 @@ spl_in01 mapflag nowarpto
// Nidhoggr's Instance ===========
1@nyd mapflag nowarpto
2@nyd mapflag nowarpto
+
+// Poring War ====================
+poring_w01 mapflag nowarpto
+poring_w02 mapflag nowarpto \ No newline at end of file