Add mapflag constants

3 files changed, 36 insertions, 30 deletions

diff --git a/world/map/conf/tmwa-map.conf b/world/map/conf/tmwa-map.conf
index e26e16c4..135c42e7 100644
--- a/world/map/conf/tmwa-map.conf
+++ b/world/map/conf/tmwa-map.conf
@@ -11,6 +11,7 @@ battle_conf: conf/battle_athena.conf
 atcommand_conf: conf/atcommand_athena.conf
 
 const_db: db/const.txt
+const_db: db/const-mapflags.txt
 const_db: db/const-debugflag.txt
 
 item_db: db/item_db.txt
diff --git a/world/map/db/const-mapflags.txt b/world/map/db/const-mapflags.txt
new file mode 100644
index 00000000..0a0b892d
--- /dev/null
+++ b/world/map/db/const-mapflags.txt
@@ -0,0 +1,35 @@
+// numbers 21 and above were not available in TMWA 14.1.27 or earlier
+// not all flags actually *do* anything
+
+//MF_ALIAS            21
+//MF_NOMEMO           0
+MF_NOTELEPORT       1
+MF_NORETURN         22
+MF_MONSTER_NOTELEPORT 23
+MF_NOSAVE           2
+//MF_NOBRANCH         3
+MF_NOPENALTY        4
+MF_PVP              6
+MF_PVP_NOPARTY      7
+//MF_PVP_NOGUILD      8
+//MF_PVP_NIGHTMAREDROP 24
+MF_PVP_NOCALCRANK   25
+//MF_GVG              9
+//MF_GVG_NOPARTY      10
+//MF_NOZENYPENALTY    5
+//MF_NOTRADE          11
+//MF_NOSKILL          12
+MF_NOWARP           13
+MF_NOWARPTO         26
+MF_NOPVP            14
+//MF_NOICEWALL        15
+MF_SNOW             16
+MF_FOG              17
+MF_SAKURA           18
+MF_LEAVES           19
+MF_RAIN             20
+MF_NO_PLAYER_DROPS  27
+MF_TOWN             28
+MF_OUTSIDE          29
+//MF_UNUSED1          30
+//MF_UNUSED2          31
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 7001cce1..289e4581 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -1,36 +1,6 @@
 // Constants usable in scripts.
 
 // BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
-//MF_NOMEMO           0
-//MF_NOTELEPORT       1
-MF_NOSAVE           2
-//MF_NOBRANCH         3
-//MF_NOPENALTY        4
-//MF_NOZENYPENALTY    5
-MF_PVP              6
-//MF_PVP_NOPARTY      7
-//MF_PVP_NOGUILD      8
-//MF_GVG              9
-//MF_GVG_NOPARTY      10
-//MF_NOTRADE          11
-//MF_NOSKILL          12
-MF_NOWARP           13
-MF_NOPVP            14
-//MF_NOICEWALL        15
-//MF_SNOW             16
-//MF_FOG              17
-//MF_SAKURA           18
-//MF_LEAVES           19
-//MF_RAIN             20
-// Map flags with no assigned value (inaccessible in scripts,
-//      can only be set initially by mapflag):
-//  nowarpto,
-//  noreturn,
-//  monster_noteleport,
-//  pvp_nightmaredrop,
-//  pvp_nocalcrank,
-//  no_player_drops,
-//  town,
 
 // Note: the type-1 constants and the bWhatever are actually
 // the same type internally, but they must be used differently.