summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/const.txt2
-rw-r--r--db/pre-re/map_zone_db.conf7
-rw-r--r--db/re/map_zone_db.conf7
3 files changed, 14 insertions, 2 deletions
diff --git a/db/const.txt b/db/const.txt
index af3dedbc5..6ecae2177 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -365,6 +365,8 @@ mf_monster_noteleport 49
mf_pvp_nocalcrank 50
mf_battleground 51
mf_reset 52
+mf_notomb 53
+mf_nocashshop 54
cell_walkable 0
cell_shootable 1
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index 384384fec..3bc0fd95e 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -87,6 +87,9 @@ zones: (
disabled_items: {
Greed_Scroll: true
}
+
+ mapflags: ( "nocashshop" )
+
},
{
/* PK Mode zone is only used when server is on pk_mode (battle.conf),
@@ -157,7 +160,9 @@ zones: (
"magic_damage_rate 60",
"misc_damage_rate 60",
"long_damage_rate 80",
- "short_damage_rate 80" )
+ "short_damage_rate 80",
+ "nocashshop"
+ )
},
{
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 384384fec..7a8331216 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -87,6 +87,9 @@ zones: (
disabled_items: {
Greed_Scroll: true
}
+
+ /* cashshop disabled in pvp maps */
+ mapflags: ( "nocashshop" )
},
{
/* PK Mode zone is only used when server is on pk_mode (battle.conf),
@@ -157,7 +160,9 @@ zones: (
"magic_damage_rate 60",
"misc_damage_rate 60",
"long_damage_rate 80",
- "short_damage_rate 80" )
+ "short_damage_rate 80",
+ "nocashshop"
+ )
},
{