summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-11-04 22:16:01 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-11-04 22:16:01 +0000
commit39cdba08be9a260339159397740959e8586d80e7 (patch)
tree0eb1c043af6e95e056727c66531b8c48cd2bc2a5
parentb1975db8f1d17d1286cf8bccf4da8676b6f35129 (diff)
parentf6ca36e136a1d2cba3f3a9295a2470e2e37f0be9 (diff)
downloadserverdata-39cdba08be9a260339159397740959e8586d80e7.tar.gz
serverdata-39cdba08be9a260339159397740959e8586d80e7.tar.bz2
serverdata-39cdba08be9a260339159397740959e8586d80e7.tar.xz
serverdata-39cdba08be9a260339159397740959e8586d80e7.zip
Merge branch 'restore_obelisk_spawns' into 'master'
Mining camp, outside map and obelisk now spawn player in the mining camp again See merge request legacy/serverdata!685
-rw-r--r--world/map/npc/018-1/_import.txt1
-rw-r--r--world/map/npc/018-1/mapflags.txt1
-rw-r--r--world/map/npc/018-2/_import.txt1
-rw-r--r--world/map/npc/018-2/mapflags.txt1
-rw-r--r--world/map/npc/018-3/_import.txt1
-rw-r--r--world/map/npc/018-3/mapflags.txt1
-rw-r--r--world/map/npc/055-1/_import.txt1
-rw-r--r--world/map/npc/055-1/mapflags.txt1
8 files changed, 8 insertions, 0 deletions
diff --git a/world/map/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt
index 5bfd8537..bf00cad9 100644
--- a/world/map/npc/018-1/_import.txt
+++ b/world/map/npc/018-1/_import.txt
@@ -5,6 +5,7 @@ npc: npc/018-1/_mobs.txt
npc: npc/018-1/_nodes.txt
npc: npc/018-1/_warps.txt
npc: npc/018-1/flowerpentagram3.txt
+npc: npc/018-1/mapflags.txt
npc: npc/018-1/mike.txt
npc: npc/018-1/miners.txt
npc: npc/018-1/sword.txt
diff --git a/world/map/npc/018-1/mapflags.txt b/world/map/npc/018-1/mapflags.txt
new file mode 100644
index 00000000..434b6d7c
--- /dev/null
+++ b/world/map/npc/018-1/mapflags.txt
@@ -0,0 +1 @@
+018-1|mapflag|resave|018-2,88,32 \ No newline at end of file
diff --git a/world/map/npc/018-2/_import.txt b/world/map/npc/018-2/_import.txt
index 4328ad11..93025f9d 100644
--- a/world/map/npc/018-2/_import.txt
+++ b/world/map/npc/018-2/_import.txt
@@ -7,5 +7,6 @@ npc: npc/018-2/_warps.txt
npc: npc/018-2/angus.txt
npc: npc/018-2/books.txt
npc: npc/018-2/caul.txt
+npc: npc/018-2/mapflags.txt
npc: npc/018-2/miners.txt
npc: npc/018-2/receptionist.txt
diff --git a/world/map/npc/018-2/mapflags.txt b/world/map/npc/018-2/mapflags.txt
new file mode 100644
index 00000000..8de271e1
--- /dev/null
+++ b/world/map/npc/018-2/mapflags.txt
@@ -0,0 +1 @@
+018-2|mapflag|resave|018-2,88,32 \ No newline at end of file
diff --git a/world/map/npc/018-3/_import.txt b/world/map/npc/018-3/_import.txt
index b3628a19..1845c3d1 100644
--- a/world/map/npc/018-3/_import.txt
+++ b/world/map/npc/018-3/_import.txt
@@ -6,4 +6,5 @@ npc: npc/018-3/_nodes.txt
npc: npc/018-3/_warps.txt
npc: npc/018-3/bookcase.txt
npc: npc/018-3/evil-obelisk.txt
+npc: npc/018-3/mapflags.txt
npc: npc/018-3/sword.txt
diff --git a/world/map/npc/018-3/mapflags.txt b/world/map/npc/018-3/mapflags.txt
new file mode 100644
index 00000000..3f703925
--- /dev/null
+++ b/world/map/npc/018-3/mapflags.txt
@@ -0,0 +1 @@
+018-3|mapflag|resave|018-2,88,32 \ No newline at end of file
diff --git a/world/map/npc/055-1/_import.txt b/world/map/npc/055-1/_import.txt
index 66463af2..8760f125 100644
--- a/world/map/npc/055-1/_import.txt
+++ b/world/map/npc/055-1/_import.txt
@@ -5,5 +5,6 @@ npc: npc/055-1/_mobs.txt
npc: npc/055-1/_nodes.txt
npc: npc/055-1/_warps.txt
npc: npc/055-1/flowerpentagram4.txt
+npc: npc/055-1/mapflags.txt
npc: npc/055-1/pumpkins.txt
npc: npc/055-1/traveler.txt
diff --git a/world/map/npc/055-1/mapflags.txt b/world/map/npc/055-1/mapflags.txt
new file mode 100644
index 00000000..d58a3bf8
--- /dev/null
+++ b/world/map/npc/055-1/mapflags.txt
@@ -0,0 +1 @@
+055-1|mapflag|resave|055-1,133,61 \ No newline at end of file