summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/db/const.txt1
-rw-r--r--world/map/npc/009-8/_import.txt1
-rw-r--r--world/map/npc/009-8/_mobs.txt6
-rw-r--r--world/map/npc/009-8/_nodes.txt4
-rw-r--r--world/map/npc/016-2/_import.txt1
-rw-r--r--world/map/npc/016-2/_mobs.txt6
-rw-r--r--world/map/npc/016-2/_nodes.txt4
-rw-r--r--world/map/npc/031-4/cindyCave.txt2
8 files changed, 10 insertions, 15 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 1b80db02..0a4b5fb0 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -226,7 +226,6 @@ cOrange 7
cPurple 8
cDarkGreen 9
-SC_HALT_REGENERATE 195
sc_poison 132
sc_slowpoison 14
sc_raiseattackspeed0 37
diff --git a/world/map/npc/009-8/_import.txt b/world/map/npc/009-8/_import.txt
index 72b4aa7c..315f39b2 100644
--- a/world/map/npc/009-8/_import.txt
+++ b/world/map/npc/009-8/_import.txt
@@ -2,6 +2,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
map: 009-8
npc: npc/009-8/_mobs.txt
+npc: npc/009-8/_nodes.txt
npc: npc/009-8/_warps.txt
npc: npc/009-8/celestia.txt
npc: npc/009-8/mapflags.txt
diff --git a/world/map/npc/009-8/_mobs.txt b/world/map/npc/009-8/_mobs.txt
index 291e090f..af8e2169 100644
--- a/world/map/npc/009-8/_mobs.txt
+++ b/world/map/npc/009-8/_mobs.txt
@@ -1,9 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Chez Celestia mobs
-
-
-009-8,0,0,0|script|Mob009-8|32767
-{
- end;
-}
diff --git a/world/map/npc/009-8/_nodes.txt b/world/map/npc/009-8/_nodes.txt
new file mode 100644
index 00000000..0dd108da
--- /dev/null
+++ b/world/map/npc/009-8/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Chez Celestia nodes
+
+// (no nodes)
diff --git a/world/map/npc/016-2/_import.txt b/world/map/npc/016-2/_import.txt
index e44d72ac..14046995 100644
--- a/world/map/npc/016-2/_import.txt
+++ b/world/map/npc/016-2/_import.txt
@@ -2,4 +2,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
map: 016-2
npc: npc/016-2/_mobs.txt
+npc: npc/016-2/_nodes.txt
npc: npc/016-2/_warps.txt
diff --git a/world/map/npc/016-2/_mobs.txt b/world/map/npc/016-2/_mobs.txt
index f66fc9bb..069b9d46 100644
--- a/world/map/npc/016-2/_mobs.txt
+++ b/world/map/npc/016-2/_mobs.txt
@@ -1,9 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Gwendolyn's mobs
-
-
-016-2,0,0,0|script|Mob016-2|32767
-{
- end;
-}
diff --git a/world/map/npc/016-2/_nodes.txt b/world/map/npc/016-2/_nodes.txt
new file mode 100644
index 00000000..71dc557d
--- /dev/null
+++ b/world/map/npc/016-2/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Gwendolyn's nodes
+
+// (no nodes)
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 0e2dd7de..c97b166d 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -181,8 +181,6 @@ OnTick:
OnPetDeath:
set $@YETI_COUNT, $@YETI_COUNT - 1;
- set @mobID, 1072;
- callfunc "MobPoints"; // this is for the Celestia quest
end;
L_CleanUp: