summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2018-10-22 11:44:27 +0200
committerMicksha <Micksha@users.noreply.github.com>2018-11-05 21:34:37 +0100
commite60f059545cdfaefcb6821fdbb8809ccfa9f265a (patch)
tree4cbbc80b1732f5b0b3f66231a70e6405c1cce243 /npc
parent43b95a0f716046941a93121018b15884132f411f (diff)
downloadserverdata-e60f059545cdfaefcb6821fdbb8809ccfa9f265a.tar.gz
serverdata-e60f059545cdfaefcb6821fdbb8809ccfa9f265a.tar.bz2
serverdata-e60f059545cdfaefcb6821fdbb8809ccfa9f265a.tar.xz
serverdata-e60f059545cdfaefcb6821fdbb8809ccfa9f265a.zip
Add Melinda NPC, fix some issues on dying the Fine Dress, fix of Necklace pending
Diffstat (limited to 'npc')
-rw-r--r--npc/008-1-1/_import.txt1
-rw-r--r--npc/008-1-1/_warps.txt3
-rw-r--r--npc/008-1/_warps.txt1
-rw-r--r--npc/008-2-2/_import.txt1
-rw-r--r--npc/008-2-2/melinda.txt22
5 files changed, 23 insertions, 5 deletions
diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt
index ea6fd468..7063c99e 100644
--- a/npc/008-1-1/_import.txt
+++ b/npc/008-1-1/_import.txt
@@ -1,3 +1,2 @@
// Map 008-1-1: Woodland
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/008-1-1/_warps.txt",
diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt
deleted file mode 100644
index 8dc1e0b5..00000000
--- a/npc/008-1-1/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 008-1-1: Woodland warps
-008-1-1,247,85,0 warp #008-1-1_247_85 0,1,008-1,21,85
diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt
index 46e9891d..ab1728ed 100644
--- a/npc/008-1/_warps.txt
+++ b/npc/008-1/_warps.txt
@@ -24,4 +24,3 @@
008-1,257,130,0 warp #008-1_257_130 0,0,008-2-28,25,31
008-1,233,131,0 warp #008-1_233_131 0,0,008-2-29,36,24
008-1,287,133,0 warp #008-1_287_133 0,0,008-2-30,52,39
-008-1,20,85,0 warp #008-1_20_85 0,1,008-1-1,246,85
diff --git a/npc/008-2-2/_import.txt b/npc/008-2-2/_import.txt
index 5a896da0..f93e2ae3 100644
--- a/npc/008-2-2/_import.txt
+++ b/npc/008-2-2/_import.txt
@@ -2,3 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/008-2-2/_warps.txt",
"npc/008-2-2/mapflags.txt",
+"npc/008-2-2/melinda.txt",
diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt
new file mode 100644
index 00000000..445cfeae
--- /dev/null
+++ b/npc/008-2-2/melinda.txt
@@ -0,0 +1,22 @@
+// Evol scripts.
+// Author:
+// Micksha
+// Description:
+// Melinda, waitress in Hurns` Rusty Pick.
+
+008-2-2,40,29,0 script Melinda#008-2-2 NPC_MELINDA,1,1,{
+
+ speech
+ l("Oh hey!"),
+ l("I would like to serve you a beer or a sandwich, or even a shot (alcohol is bad, remember)."),
+ l("But I am afraid we need Tomminator to teach me this."),
+ lg("So, see you later.");
+
+ close;
+
+OnInit:
+ .sex = G_FEMALE;
+ .distance = 2;
+ end;
+}
+