summaryrefslogtreecommitdiff
path: root/conf-tmpl/map_athena.conf
diff options
context:
space:
mode:
authorkobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-18 10:29:00 +0000
committerkobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-18 10:29:00 +0000
commitc74f75edf05cc01af73bfe0a714f69081442b31e (patch)
treea0f53fb297f90021370153ec6d5edbf224a56c46 /conf-tmpl/map_athena.conf
parent375af9e4a30a85670a6d8dac40c573042a883fb5 (diff)
downloadhercules-c74f75edf05cc01af73bfe0a714f69081442b31e.tar.gz
hercules-c74f75edf05cc01af73bfe0a714f69081442b31e.tar.bz2
hercules-c74f75edf05cc01af73bfe0a714f69081442b31e.tar.xz
hercules-c74f75edf05cc01af73bfe0a714f69081442b31e.zip
Moved mapflags organized by type to main mapflag folder and removed "type" folder. Removed mapflags organized by location.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@249 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl/map_athena.conf')
-rw-r--r--conf-tmpl/map_athena.conf29
1 files changed, 14 insertions, 15 deletions
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 72e9c8a12..638fdfdaf 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -67,22 +67,21 @@ mapreg_txt: save/mapreg.txt
// Files to set options in maps such as PVP, etc.
//=======================================
-// Arenas
-npc: conf/mapflag/arenas.txt
-// Dungeons
-npc: conf/mapflag/dungeons.txt
-// Guild Castles
-npc: conf/mapflag/guildcastles.txt
-// GvG Arenas
npc: conf/mapflag/gvg.txt
-// Job Quests
-npc: conf/mapflag/jobquests.txt
-// PvP Arenas
-npc: conf/mapflag/pvp.txt
-// Towns
-npc: conf/mapflag/towns.txt
-// Jails
+npc: conf/mapflag/indoors.txt
npc: conf/mapflag/jail.txt
+npc: conf/mapflag/nightmare.txt
+npc: conf/mapflag/nobranch.txt
+npc: conf/mapflag/noicewall.txt
+npc: conf/mapflag/nomemo.txt
+npc: conf/mapflag/nopenalty.txt
+npc: conf/mapflag/nopvp.txt
+npc: conf/mapflag/nosave.txt
+npc: conf/mapflag/noteleport.txt
+npc: conf/mapflag/nowarp.txt
+npc: conf/mapflag/nowarpto.txt
+npc: conf/mapflag/pvp.txt
+npc: conf/mapflag/pvp_noparty.txt
// Water Flag
npc: conf/mapflag/water.txt
// How high is the water in maps?
@@ -528,7 +527,7 @@ npc: npc/warps/pvp/pvp.txt
//--------------------- Mobs ---------------------------
npc: npc/mobs/pvp.txt
npc: npc/mobs/fields/amatsu.txt
-npc: npc/mobs/fields/ayothana.txt
+npc: npc/mobs/fields/ayothaya.txt
npc: npc/mobs/fields/comodo.txt
npc: npc/mobs/fields/gefenia.txt
npc: npc/mobs/fields/geffen.txt