summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/constants.conf1
-rw-r--r--maps/re/018-7.mcachebin414 -> 450 bytes
-rw-r--r--npc/018-7-1/_import.txt3
-rw-r--r--npc/018-7-1/demure.txt19
-rw-r--r--npc/018-7-1/lilit.txt19
-rw-r--r--npc/018-7-1/yetifly.txt20
-rw-r--r--npc/018-7/_mobs.txt4
7 files changed, 66 insertions, 0 deletions
diff --git a/db/constants.conf b/db/constants.conf
index 162552e2c..c00be49a4 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1945,6 +1945,7 @@ constants_db: {
NPC_WOUNDEDSOLDIER: 505
NPC_ACADEMY_HF: 506
NPC_DEMURE: 507
+ NPC_YETIFLY: 508
NPC_SOUL_NORMAL: 700
NPC_SOUL_DESERT: 701
diff --git a/maps/re/018-7.mcache b/maps/re/018-7.mcache
index 2a4c692f5..82e28b99a 100644
--- a/maps/re/018-7.mcache
+++ b/maps/re/018-7.mcache
Binary files differ
diff --git a/npc/018-7-1/_import.txt b/npc/018-7-1/_import.txt
index 0e6e250b5..c18bacb5e 100644
--- a/npc/018-7-1/_import.txt
+++ b/npc/018-7-1/_import.txt
@@ -2,3 +2,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/018-7-1/_mobs.txt",
"npc/018-7-1/_warps.txt",
+"npc/018-7-1/demure.txt",
+"npc/018-7-1/lilit.txt",
+"npc/018-7-1/yetifly.txt",
diff --git a/npc/018-7-1/demure.txt b/npc/018-7-1/demure.txt
new file mode 100644
index 000000000..4da2520c6
--- /dev/null
+++ b/npc/018-7-1/demure.txt
@@ -0,0 +1,19 @@
+// TMW2 scripts.
+// Author:
+// Jesusalva
+// Description:
+// Demure is the Queen of Dragons
+
+
+018-7-1,23,20,0 script Demure, Queen of Dragons NPC_DEMURE,{
+ mesn;
+ mesq l("Greetings mortal; I am Demure, Queen of Dragons.");
+ close;
+
+OnInit:
+ .distance = 4;
+ .sex = G_FEMALE;
+ npcsit;
+ end;
+}
+
diff --git a/npc/018-7-1/lilit.txt b/npc/018-7-1/lilit.txt
new file mode 100644
index 000000000..f8623cd17
--- /dev/null
+++ b/npc/018-7-1/lilit.txt
@@ -0,0 +1,19 @@
+// TMW2 scripts.
+// Author:
+// Jesusalva
+// Description:
+// Lilit is the Queen of Fairies
+// Not Titania nor Oberon? Eh.
+
+
+018-7-1,82,47,0 script Lilit NPC_LILIT,{
+ mesn;
+ mesq l("Greetings, young soul; I am the queen of fairies, Lilit.");
+ close;
+
+OnInit:
+ .distance = 4;
+ .sex = G_FEMALE;
+ end;
+}
+
diff --git a/npc/018-7-1/yetifly.txt b/npc/018-7-1/yetifly.txt
new file mode 100644
index 000000000..30d8d4ed5
--- /dev/null
+++ b/npc/018-7-1/yetifly.txt
@@ -0,0 +1,20 @@
+// TMW2 scripts.
+// Author:
+// Jesusalva
+// Description:
+// Yetifly the Mighty
+
+018-7-1,54,77,0 script Yetifly NPC_YETIFLY,{
+ mesn;
+ mesq l("Heh, congratulations making it this far. Once again, allow me to present myself:");
+ next;
+ mesn;
+ mesq l("I am Yetifly the Mighty, guardian of the fae!");
+ close;
+
+OnInit:
+ .distance = 4;
+ .sex = G_MALE;
+ end;
+}
+
diff --git a/npc/018-7/_mobs.txt b/npc/018-7/_mobs.txt
index ffd338a3f..f45427ebb 100644
--- a/npc/018-7/_mobs.txt
+++ b/npc/018-7/_mobs.txt
@@ -6,3 +6,7 @@
018-7,34,73,25,34 monster Water Fairy 1185,6,20000,40000
018-7,85,73,25,34 monster Fire Fairy 1183,6,20000,40000
018-7,59,40,48,22 monster Earth Fairy 1182,6,20000,40000
+018-7,34,31,14,11 monster Nulity Pixie 1218,1,120000,0
+018-7,81,38,14,11 monster Vanity Pixie 1215,1,120000,0
+018-7,34,86,14,11 monster Holy Pixie 1216,1,120000,0
+018-7,80,80,14,11 monster Shadow Pixie 1217,1,120000,0