summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/map_zone_db.conf4
-rw-r--r--maps/re/014-3.mcachebin1727 -> 1724 bytes
-rw-r--r--npc/003-1/mapflags.txt12
-rw-r--r--npc/005-1/mapflags.txt6
-rw-r--r--npc/005-3/_import.txt1
-rw-r--r--npc/005-3/mapflags.txt2
-rw-r--r--npc/012-1/mapflags.txt7
-rw-r--r--npc/017-1/mapflags.txt7
-rw-r--r--npc/020-1/_import.txt1
-rw-r--r--npc/020-1/mapflags.txt6
-rw-r--r--npc/024-1/mapflags.txt13
11 files changed, 56 insertions, 3 deletions
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index e776b53e3..8be55da8d 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -492,6 +492,10 @@ zones: (
{
name: "Towns"
+ mapflags: (
+ "nopenalty",
+ )
+
disabled_skills: {
AM_CANNIBALIZE: "PLAYER"
AM_SPHEREMINE: "PLAYER"
diff --git a/maps/re/014-3.mcache b/maps/re/014-3.mcache
index d4ef906b4..55dc84964 100644
--- a/maps/re/014-3.mcache
+++ b/maps/re/014-3.mcache
Binary files differ
diff --git a/npc/003-1/mapflags.txt b/npc/003-1/mapflags.txt
index 03aac03d6..fddd693d5 100644
--- a/npc/003-1/mapflags.txt
+++ b/npc/003-1/mapflags.txt
@@ -1,3 +1,15 @@
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
diff --git a/npc/005-1/mapflags.txt b/npc/005-1/mapflags.txt
index db9d43f17..e0cbd8995 100644
--- a/npc/005-1/mapflags.txt
+++ b/npc/005-1/mapflags.txt
@@ -1,2 +1,8 @@
005-1 mapflag town
005-1 mapflag nopenalty
+//005-2 mapflag town // Saxso House
+005-3 mapflag town
+005-4 mapflag town
+005-5 mapflag town
+005-6 mapflag town
+005-7 mapflag town
diff --git a/npc/005-3/_import.txt b/npc/005-3/_import.txt
index 68fd1fb5e..e47ad86f9 100644
--- a/npc/005-3/_import.txt
+++ b/npc/005-3/_import.txt
@@ -3,4 +3,3 @@
"npc/005-3/_mobs.txt",
"npc/005-3/_warps.txt",
"npc/005-3/barrel.txt",
-"npc/005-3/mapflags.txt",
diff --git a/npc/005-3/mapflags.txt b/npc/005-3/mapflags.txt
deleted file mode 100644
index a04066a8d..000000000
--- a/npc/005-3/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-005-3 mapflag town
-005-3 mapflag nopenalty
diff --git a/npc/012-1/mapflags.txt b/npc/012-1/mapflags.txt
index a0f4719c5..19c43528a 100644
--- a/npc/012-1/mapflags.txt
+++ b/npc/012-1/mapflags.txt
@@ -1,2 +1,9 @@
012-1 mapflag town
012-1 mapflag nopenalty
+012-2 mapflag town
+012-3 mapflag town
+012-4 mapflag town
+012-5 mapflag town
+012-6 mapflag town
+012-7 mapflag town
+012-8 mapflag town
diff --git a/npc/017-1/mapflags.txt b/npc/017-1/mapflags.txt
index 08b13a3fe..99a6ba91a 100644
--- a/npc/017-1/mapflags.txt
+++ b/npc/017-1/mapflags.txt
@@ -1,2 +1,9 @@
017-1 mapflag town
017-1 mapflag nopenalty
+017-2 mapflag town
+017-3 mapflag town
+017-4 mapflag town
+017-5 mapflag town
+017-6 mapflag town
+017-7 mapflag town
+017-8 mapflag town
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
index 036f67fba..9dc8a5df6 100644
--- a/npc/020-1/_import.txt
+++ b/npc/020-1/_import.txt
@@ -2,6 +2,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/020-1/_mobs.txt",
"npc/020-1/_warps.txt",
+"npc/020-1/mapflags.txt",
"npc/020-1/misc.txt",
"npc/020-1/serge.txt",
"npc/020-1/siege.txt",
diff --git a/npc/020-1/mapflags.txt b/npc/020-1/mapflags.txt
new file mode 100644
index 000000000..89d51c9a8
--- /dev/null
+++ b/npc/020-1/mapflags.txt
@@ -0,0 +1,6 @@
+020-1 mapflag town
+020-2 mapflag town
+020-3 mapflag town
+020-4 mapflag town
+020-5 mapflag town
+020-6 mapflag town
diff --git a/npc/024-1/mapflags.txt b/npc/024-1/mapflags.txt
index 831039ab1..7913790f4 100644
--- a/npc/024-1/mapflags.txt
+++ b/npc/024-1/mapflags.txt
@@ -1,2 +1,15 @@
024-1 mapflag town
024-1 mapflag nopenalty
+024-2 mapflag town
+024-3 mapflag town
+024-4 mapflag town
+024-5 mapflag town
+024-6 mapflag town
+024-7 mapflag town
+024-8 mapflag town
+024-9 mapflag town
+024-10 mapflag town
+024-11 mapflag town
+024-12 mapflag town
+024-13 mapflag town
+024-14 mapflag town