summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-03-01 02:02:35 -0300
committerjesusalva <cpntb1@ymail.com>2018-03-01 02:02:35 -0300
commit92862ebb1dc1f4850ad50c72d0cc1ea25d70ee2e (patch)
tree5dc2450e9cc9a3976792f636a22548fe50696f3e
parentffff34625685c5a1220dca71eeafd0eb8fec6f7d (diff)
downloadserverdata-92862ebb1dc1f4850ad50c72d0cc1ea25d70ee2e.tar.gz
serverdata-92862ebb1dc1f4850ad50c72d0cc1ea25d70ee2e.tar.bz2
serverdata-92862ebb1dc1f4850ad50c72d0cc1ea25d70ee2e.tar.xz
serverdata-92862ebb1dc1f4850ad50c72d0cc1ea25d70ee2e.zip
Continue storyline, to prevent things from getting too lose.
-rw-r--r--npc/002-1/_import.txt1
-rw-r--r--npc/002-1/arpan.txt3
-rw-r--r--npc/002-1/story_save.txt30
-rw-r--r--npc/002-3/juliet.txt2
-rw-r--r--npc/002-4/elmo.txt2
-rw-r--r--npc/002-4/nard.txt17
-rw-r--r--npc/003-2/lua.txt39
7 files changed, 57 insertions, 37 deletions
diff --git a/npc/002-1/_import.txt b/npc/002-1/_import.txt
index 56410529a..459d26fd2 100644
--- a/npc/002-1/_import.txt
+++ b/npc/002-1/_import.txt
@@ -13,4 +13,3 @@
"npc/002-1/knife.txt",
"npc/002-1/mapflags.txt",
"npc/002-1/peter.txt",
-"npc/002-1/story_save.txt",
diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index ca388bc6e..ececf0d5b 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -254,9 +254,6 @@ L_GotoSleep:
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Fine."),
l("We are at half a day from our final destination, by the time that you wake up I'm sure that we will be there!");
-
- closedialog;
- doevent "#name3::OnClick";
close;
break;
diff --git a/npc/002-1/story_save.txt b/npc/002-1/story_save.txt
deleted file mode 100644
index 54c3222e3..000000000
--- a/npc/002-1/story_save.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Evol scripts.
-// Author:
-// Reid
-// Description:
-// Scritpted save locations in 000-2-1 map.
-
-002-1,50,38,0 script #name3 NPC_FINAL_POINT,{
- .@q_nard = getq(ShipQuests_Nard);
- .@q_narr = getq(General_Narrator);
-
- if(.@q_nard == 5 && .@q_narr < 1)
- {
-OnClick:
- narrator S_LAST_NEXT,
- l("You lie in the bed."),
- l("Your head is suddently heavy, your eyes are closing..."),
- lg("You fell asleep.");
-
- warp "000-0-1", 26, 28;
- }
- else
- {
- savepointparticle "002-1", 55, 40;
- }
- close;
-
-OnInit:
- .distance = 2;
- end;
-}
diff --git a/npc/002-3/juliet.txt b/npc/002-3/juliet.txt
index 2e716b76c..1c20c3341 100644
--- a/npc/002-3/juliet.txt
+++ b/npc/002-3/juliet.txt
@@ -15,7 +15,7 @@
// 01 Need to see Julia.
// 02 Has been registered by Julia.
-002-3,38,24,0 script Juliet#TMW2 NPC_JULIA,2,10,{
+002-3,38,24,0 script Juliet NPC_JULIA,2,10,{
function ynMenu {
if (select(l("Yes, I do."), l("No, none.")) == 1) {
diff --git a/npc/002-4/elmo.txt b/npc/002-4/elmo.txt
index 57310866d..6aeafc6f8 100644
--- a/npc/002-4/elmo.txt
+++ b/npc/002-4/elmo.txt
@@ -11,7 +11,7 @@
if (LOCATION$ == "") sailortalk;
if (getq(CandorQuest_Sailors) == 2) goto L_Party;
- if (getq(General_Narrator) == 1) sailortalk;
+ if (getq(General_Narrator) >= 1) sailortalk;
mesn;
mes l("\"Hey, have you already got the money necessary for the travel?");
diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 657363ed4..b1fdacace 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -133,7 +133,22 @@ L_NotYet:
setq General_Narrator, 1;
set Zeny, Zeny-.@price;
LOCATION$="Tulim";
- mesq l("Set sail! We're going to Tulimshar!");
+ mesq l("Set sail! We're going to Tulimshar!"); // Send player to Lua in order to continue story TODO
+ showavatar;
+ setcamnpc "Nard", 0, 0;
+ mes col(l("Some time later..."), 9);
+ next;
+ restorecam;
+ showavatar NPC_NARD; // this is handled by avatars.xml
+ mesn;
+ mesq l("Welcome to Tulimshar, @@!", strcharinfo(0));
+ next;
+ mesq l("You can explore the city as you want, but if I were you, I would visit the townhall first.");
+ next;
+ mesq l("When you get out of the ship, it is the first building you'll see. Talk to ##BLua##b, she is an alliance representative.");
+ next;
+ mesq l("The Alliance have records of everyone. And if you need another trip, talk to me!");
+
} else {
mesq l("You still haven't completed your tasks.");
next;
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index 7392a1eec..0f0db3336 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -3,6 +3,8 @@
// Jesusalva
003-2,38,34,0 script Lua#003-2 NPC_FEMALE,{
+ .@n = getq(General_Narrator);
+
mesn;
mesq l("Hello, I act on the Alliance's behalf.");
@@ -10,6 +12,7 @@ L_Menu:
mes "";
menu
l("Ok, see you later."),L_Close,
+ rif(.@n == 1, l("I was found near Candor Island, on a raft, and can't remember anything. Do you know who I am?")), L_Info,
rif(getgmlevel(), l("I need a GM set, please!")), L_GMItems,
rif(getgmlevel() && #GMEVENT_T <= gettimetick(2), l("I plan in doing an event! Give me the coins!")), L_GMEvent,
rif(getgmlevel(), l("Tell people the name of a new hero.")), L_NewHero,
@@ -50,6 +53,42 @@ L_NewHero:
$MOST_HEROIC$ = .@MH$;
goto L_Menu;
+L_Info:
+ mes "";
+ mesn;
+ mesq l("Of course, give me just a minute to look up for your data, @@.", strcharinfo(0));
+ next;
+ mes "...";
+ next;
+ mes "... ...";
+ next;
+ mes "... ... ...";
+ next;
+ mesn;
+ mesq l("No criminal record, no bank account, not even a tax payment declaration.");
+ next;
+ mesq l("I found your birth record, but it is not complete. Here says you were born on Halinarzo.");
+ next;
+ mesq l("The problem is that Halinarzo was destroyed in the never-ending war and was just recently rebuilt.");
+ next;
+ mesq l("Almost all documents were lost, destroyed or damaged. I cannot even find your parents name.");
+ next;
+ mesq l("All I can say is that you were born there, and moved by the age of 4, but to where? I don't know.");
+ next;
+ mesn;
+ mesq l("I'll arrange here with the alliance documents regarding you. I'll add a \"war victim\" status to make your life easier.");
+ next;
+ mesq l("You will then be able to register citzenship in any city, for free. But just once.");
+ next;
+ mesn;
+ mesq l("Sorry. At best, you can try your luck in Halinarzo, but the odds of someone recognizing you are pretty slim.");
+ next;
+ mesq l("You will be killed on the road if you try to go like this. Try helping people. Get money, experience, equipment.");
+ next;
+ mesq l("And then, finally, depart to ##BHalinarzo##b. Maybe, just maybe, someone recognize you. Or, start a new life! Few people can do that!");
+ setq General_Narrator, 2;
+ close;
+
L_Close:
close;