summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/017-0/_import.txt1
-rw-r--r--npc/017-0/_mobs.txt1
-rw-r--r--npc/017-0/wizard.txt30
-rw-r--r--npc/027-0/emma.txt4
4 files changed, 34 insertions, 2 deletions
diff --git a/npc/017-0/_import.txt b/npc/017-0/_import.txt
index e16aaf756..8597a6931 100644
--- a/npc/017-0/_import.txt
+++ b/npc/017-0/_import.txt
@@ -2,3 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/017-0/_mobs.txt",
"npc/017-0/_warps.txt",
+"npc/017-0/wizard.txt",
diff --git a/npc/017-0/_mobs.txt b/npc/017-0/_mobs.txt
index a7f2aed59..85cebf752 100644
--- a/npc/017-0/_mobs.txt
+++ b/npc/017-0/_mobs.txt
@@ -17,6 +17,7 @@
017-0,237,150,25,24 monster Red Mushroom 1042,18,60000,45000
017-0,145,127,26,24 monster Wicked Mushroom 1176,12,60000,45000
017-0,149,98,29,53 monster Vampire Bat 1063,18,60000,45000
+017-0,253,186,6,11 monster Training Dummy 1021,6,10000,10000
017-0,53,83,43,59 monster Red Butterfly 1025,30,60000,45000
017-0,262,182,66,63 monster Red Butterfly 1025,30,60000,45000
017-0,162,121,133,110 monster Cyan Butterfly 1172,140,60000,30000
diff --git a/npc/017-0/wizard.txt b/npc/017-0/wizard.txt
new file mode 100644
index 000000000..d2d4f6dc3
--- /dev/null
+++ b/npc/017-0/wizard.txt
@@ -0,0 +1,30 @@
+// TMW2 Script
+// Author:
+// Jesusalva
+// Description:
+// Wizard at Magic Academy Entrance
+
+017-0,245,223,0 script Red Wizard NPC_RED_WIZARD_F,{
+ mesn;
+ mesq l("Hello. I am the instructor assigned to the magic range training field.");
+ if (!MAGIC_LVL)
+ close;
+ next;
+ mesn;
+ mesq l("Do you wish to return to the Academy?");
+ next;
+ select
+ l("Not yet."),
+ l("Yes please.");
+ mes "";
+ closeclientdialog;
+ if (@menu == 2)
+ warp "027-1", 46, 91;
+ close;
+
+OnInit:
+ .distance = 4;
+ .sex = G_FEMALE;
+ end;
+}
+
diff --git a/npc/027-0/emma.txt b/npc/027-0/emma.txt
index 6b2c503c3..621478e49 100644
--- a/npc/027-0/emma.txt
+++ b/npc/027-0/emma.txt
@@ -4,7 +4,7 @@
// Description:
// Emma is Enrique's wife
-027-0,88,26,2 script Emma NPC_DARK_SORCERER_F,,{
+027-0,88,26,2 script Emma NPC_DARK_SORCERER_F,{
mesn;
mesq l("Hello. I am Emma, Enrique's wife.");
mesc l("Your current scholar rank: %s (%s Research Points)",
@@ -69,7 +69,7 @@ OnTick:
OnInit:
.distance = 4;
- .sex = G_MALE;
+ .sex = G_FEMALE;
.cost = 5000;
.gain = 15;
end;