summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/map_zone_db.conf42
-rw-r--r--npc/003-1/mapflags.txt26
-rw-r--r--npc/functions/siege.txt4
3 files changed, 57 insertions, 15 deletions
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 7a412023e..35cba0b26 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -221,6 +221,30 @@ zones: (
skill_damage_cap: {
}
},
+{
+ /* Town Zone indoors - cannot mount */
+ name: "indoors"
+
+ disabled_skills: {
+ }
+
+ disabled_items: {
+ RidingMouboo: true
+ RidingTortuga: true
+ LegendaryMouboo: true
+ LegendaryTortuga: true
+ }
+
+ mapflags: (
+ "nopenalty",
+ )
+
+ /* "command:min-group-lv-to-override" e.g. "heal: 70" */
+ disabled_commands: {
+ }
+ skill_damage_cap: {
+ }
+},
{
/* Normal zone is applied to all maps that are not pkable (where players cant fight each other) */
@@ -242,6 +266,24 @@ zones: (
},
{
+ /* Normal2 - same as Normal (bugfix) */
+ name: "Normal2"
+
+ disabled_skills: {
+ WM_LULLABY_DEEPSLEEP: "PLAYER"
+ WM_SIRCLEOFNATURE: "PLAYER"
+ WM_SATURDAY_NIGHT_FEVER: "PLAYER"
+ SO_ARRULLO: "PLAYER"
+ CG_HERMODE: "PLAYER"
+ }
+
+ disabled_items: {
+ }
+
+ mapflags: (
+ )
+},
+{
/* PvP zone is applied to all maps with a pvp mapflag */
name: "PvP" /* changing this name requires MAP_ZONE_PVP_NAME to also be changed in src/map/map.h file */
diff --git a/npc/003-1/mapflags.txt b/npc/003-1/mapflags.txt
index e0e4ca2d7..a4c957436 100644
--- a/npc/003-1/mapflags.txt
+++ b/npc/003-1/mapflags.txt
@@ -1,18 +1,18 @@
003-1 mapflag mask 1
003-1 mapflag town
003-1 mapflag nopenalty
-003-2 mapflag town
-003-3 mapflag town
-003-4 mapflag town
-003-5 mapflag town
-003-6 mapflag town
-003-7 mapflag town
-003-8 mapflag town
-//003-9 mapflag town
-003-10 mapflag town
-//003-11 mapflag town
-//003-12 mapflag town
-003-13 mapflag town
+003-2 mapflag zone indoors
+003-3 mapflag zone indoors
+003-4 mapflag zone indoors
+003-5 mapflag zone indoors
+003-6 mapflag zone indoors
+003-7 mapflag zone indoors
+003-8 mapflag zone indoors
+//003-9 mapflag zone indoors
+003-10 mapflag zone indoors
+//003-11 mapflag zone indoors
+//003-12 mapflag zone indoors
+003-13 mapflag zone indoors
// Town Walls are a no penalty zone
-003-1-2 mapflag town
+003-1-2 mapflag zone indoors
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index 8e39ff7bb..a43badc61 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -201,8 +201,8 @@ function script siege_revert {
// Revert map zone (to town, or to blank) and delete backup
removemapflag(.@m$,mf_zone);
//setmapflag(.@m$,mf_zone,$@MZONE$[getmapinfo(MAPINFO_ID, .@m$)]);
- setmapflag(.@m$,mf_zone,"Normal"); // Broken for some reason
- setmapflag(.@m$,mf_zone,"All");
+ setmapflag(.@m$,mf_zone,"Normal2"); // Normal doesn't works...
+ //setmapflag(.@m$,mf_zone,"All");
//$@MZONE$[getmapinfo(MAPINFO_ID, .@m$)]="";
removemapmask .@m$, MASK_MATTACK;