summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-03-03 23:23:27 -0300
committerjesusalva <cpntb1@ymail.com>2018-03-03 23:23:27 -0300
commit6c03fe23b723e7156e5c655a5995dff8fe1f5674 (patch)
tree0372ce432368f29293ce8c1782139d6a930002b8
parent0b641652bf1030b4fb7f68e0ce02e7417033c608 (diff)
downloadserverdata-6c03fe23b723e7156e5c655a5995dff8fe1f5674.tar.gz
serverdata-6c03fe23b723e7156e5c655a5995dff8fe1f5674.tar.bz2
serverdata-6c03fe23b723e7156e5c655a5995dff8fe1f5674.tar.xz
serverdata-6c03fe23b723e7156e5c655a5995dff8fe1f5674.zip
Update Morgan, add missing script, transfer fungus shop, MARRY HER.
-rw-r--r--npc/002-3/juliet.txt1
-rw-r--r--npc/003-1/ninathetraveler.txt3
-rw-r--r--npc/005-6/morgan.txt51
-rw-r--r--npc/005-6/zitoni.txt2
4 files changed, 54 insertions, 3 deletions
diff --git a/npc/002-3/juliet.txt b/npc/002-3/juliet.txt
index 915c66faa..514d97e5d 100644
--- a/npc/002-3/juliet.txt
+++ b/npc/002-3/juliet.txt
@@ -220,7 +220,6 @@ OnInit:
.sex = G_FEMALE;
.distance = 10;
sellitem Cheese;
- sellitem Fungus;
sellitem Aquada;
sellitem Piberries;
diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt
index 80aeb78b9..d08ccde83 100644
--- a/npc/003-1/ninathetraveler.txt
+++ b/npc/003-1/ninathetraveler.txt
@@ -1,5 +1,8 @@
+// TMW2 Script
// Author:
// Jesusalva
+// Description:
+// The Travelers travel around the world telling stories.
003-1,56,143,0 script Nina The Traveler NPC_F_SHOPKEEPER,{
diff --git a/npc/005-6/morgan.txt b/npc/005-6/morgan.txt
index 62632d96f..1e8ce9d60 100644
--- a/npc/005-6/morgan.txt
+++ b/npc/005-6/morgan.txt
@@ -1,9 +1,58 @@
+// TMW2 Script
+// Author:
+// Jesusalva
+// Description:
+// Morgan is the only mage in Candor. She was assigned by the Alliance to defend
+// the small island, and is married with Zitoni.
+
005-6,30,37,0 script Morgan NPC_RUMLY_FEMALE,{
-hello;
+ mesn;
+ mesq lg("Hello there, darling.");
+ next;
+ menu
+ l("Who are you?"), L_Who,
+ l("Do you sell anything here?"), L_Shop,
+ l("Hi."), -; // Let's be honest, many conversations dies this way >.<
+ close;
+
+L_Who:
+ mes "";
+ mesn;
+ mesq l("I am @@, the only mage in Candor.", .name$);
+ next;
+ mesq l("My husband and I have moved here under the Alliance orders.");
+ next;
+ mesq l("I really hope that nothing major happens, though. I would hate to see blood being spilled.");
+ next;
+ mesq l("If you train hard enough, and get access to a Mana Stone, I could teach you a trick or two. But right now, I don't sense magic compatibility in you."); // Because we haven't added that yet, duh.
+ close;
+
+L_Shop:
+ mes "";
+ mesn;
+ mesq l("Why, I actually do sell a few things here! But they probably aren't what you're looking for.");
+ next;
+ openshop;
+ closedialog;
+ close;
OnInit:
+ tradertype(NST_MARKET);
+
+ sellitem CottonCloth, 200, 7;
+ sellitem Fungus, -1, 10;
+ sellitem Bread, -1, 15;
+
.sex = G_FEMALE;
.distance = 5;
end;
+
+OnClock0556:
+OnClock1201:
+OnClock1759:
+OnClock0003:
+ restoreshopitem CottonClotch, 7;
+ restoreshopitem Fungus, 10;
+ restoreshopitem Bread, 15;
}
diff --git a/npc/005-6/zitoni.txt b/npc/005-6/zitoni.txt
index f40fd1d4f..5c19ea989 100644
--- a/npc/005-6/zitoni.txt
+++ b/npc/005-6/zitoni.txt
@@ -3,7 +3,7 @@
// Vasily_Makarov (original from Evol)
// Jesusalva
// Description:
-// Stat resetter.
+// Stat resetter. He is an alchemist, married with Morgan.
// Others:
// .@wasSP - free status points before reset