summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKisuka <kisuka@kisuka.com>2015-12-22 13:49:35 -0800
committerKisuka <kisuka@kisuka.com>2015-12-22 13:49:35 -0800
commit647dc0981d2f5b27eac46a11d32b7ee5fba78878 (patch)
tree2d26b0ade123de38ae2c1d0b3b79971b6a451aa9
parentc69a756f5c2b403cc809aac4df0bda806ec2483b (diff)
parent0aadc44f37617dbe5762e31f50effc1ee07afd79 (diff)
downloadhercules-647dc0981d2f5b27eac46a11d32b7ee5fba78878.tar.gz
hercules-647dc0981d2f5b27eac46a11d32b7ee5fba78878.tar.bz2
hercules-647dc0981d2f5b27eac46a11d32b7ee5fba78878.tar.xz
hercules-647dc0981d2f5b27eac46a11d32b7ee5fba78878.zip
Merge pull request #1004 from HerculesWS/WoE-TE-Items
Split zone mapflag for pre/re.
-rw-r--r--npc/mapflag/zone.txt16
-rw-r--r--npc/re/mapflag/zone.txt49
-rw-r--r--npc/re/scripts_main.conf1
-rw-r--r--npc/re/scripts_mapflags.conf31
4 files changed, 81 insertions, 16 deletions
diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt
index 1b3ddc76f..a405934a2 100644
--- a/npc/mapflag/zone.txt
+++ b/npc/mapflag/zone.txt
@@ -131,19 +131,3 @@ umbala mapflag zone Towns
veins mapflag zone Towns
xmas mapflag zone Towns
yuno mapflag zone Towns
-
-// WoE:TE
-te_prt_gld mapflag zone WoE TE
-te_prtcas01 mapflag zone WoE TE
-te_prtcas02 mapflag zone WoE TE
-te_prtcas03 mapflag zone WoE TE
-te_prtcas04 mapflag zone WoE TE
-te_prtcas05 mapflag zone WoE TE
-te_alde_gld mapflag zone WoE TE
-te_aldecas1 mapflag zone WoE TE
-te_aldecas2 mapflag zone WoE TE
-te_aldecas3 mapflag zone WoE TE
-te_aldecas4 mapflag zone WoE TE
-te_aldecas5 mapflag zone WoE TE
-teg_dun01 mapflag zone WoE TE
-teg_dun02 mapflag zone WoE TE
diff --git a/npc/re/mapflag/zone.txt b/npc/re/mapflag/zone.txt
new file mode 100644
index 000000000..a6cfd95f1
--- /dev/null
+++ b/npc/re/mapflag/zone.txt
@@ -0,0 +1,49 @@
+//================= Hercules Script =======================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2013-2015 Hercules Dev Team
+//= Copyright (C) Ind
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program. If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Mapflag: Zone.
+//================= Current Version =======================================
+//= 1.0
+//================= Description ===========================================
+//= Flags maps as part of zones defined in map_zone_db.txt
+//=========================================================================
+
+// WoE:TE
+te_prt_gld mapflag zone WoE TE
+te_prtcas01 mapflag zone WoE TE
+te_prtcas02 mapflag zone WoE TE
+te_prtcas03 mapflag zone WoE TE
+te_prtcas04 mapflag zone WoE TE
+te_prtcas05 mapflag zone WoE TE
+te_alde_gld mapflag zone WoE TE
+te_aldecas1 mapflag zone WoE TE
+te_aldecas2 mapflag zone WoE TE
+te_aldecas3 mapflag zone WoE TE
+te_aldecas4 mapflag zone WoE TE
+te_aldecas5 mapflag zone WoE TE
+teg_dun01 mapflag zone WoE TE
+teg_dun02 mapflag zone WoE TE
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index 1fa54f723..fd0d85fad 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -62,6 +62,7 @@ import: npc/scripts_warps.conf
import: npc/re/scripts.conf
import: npc/re/scripts_woe.conf
import: npc/re/scripts_jobs.conf
+import: npc/re/scripts_mapflags.conf
import: npc/re/scripts_monsters.conf
import: npc/re/scripts_warps.conf
diff --git a/npc/re/scripts_mapflags.conf b/npc/re/scripts_mapflags.conf
new file mode 100644
index 000000000..9f10792ef
--- /dev/null
+++ b/npc/re/scripts_mapflags.conf
@@ -0,0 +1,31 @@
+//================= Hercules Configuration ================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) Athena Dev Teams
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program. If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Map Flags
+//=========================================================================
+
+npc: npc/re/mapflag/zone.txt