summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-12-28 01:05:20 +0100
committerReid <reidyaro@gmail.com>2015-12-28 01:05:20 +0100
commitab9374c276a2caadd93b35b4634526e3a30e147f (patch)
treea7bfdeeaaec24a14e3056509486fa24531bc4bd7
parent7fbe33296957a3f8404b3a9e213c74f38d29447c (diff)
downloadserverdata-ab9374c276a2caadd93b35b4634526e3a30e147f.tar.gz
serverdata-ab9374c276a2caadd93b35b4634526e3a30e147f.tar.bz2
serverdata-ab9374c276a2caadd93b35b4634526e3a30e147f.tar.xz
serverdata-ab9374c276a2caadd93b35b4634526e3a30e147f.zip
Add past-intro dialogue/skip functions.
-rw-r--r--npc/000-2-1/arpan.txt2
-rw-r--r--npc/000-2-1/dan.txt8
-rw-r--r--npc/000-2-1/savepoint.txt3
3 files changed, 10 insertions, 3 deletions
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 44ec6482..3ddf4fd2 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -145,7 +145,7 @@ L_Menu:
.@equipped = getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200;
menu
- rif(.@q_nard == 5, l("What can I do now?")), L_GotoSleep,
+ rif(.@q_nard == 5 && getq(General_Narrator) < 1, l("What can I do now?")), L_GotoSleep,
lg("Could you tell me where I am?"), L_Where,
lg("Where can I find Julia?"), L_Julia,
l("Who are you?"), L_Who,
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index a8d79258..8c6cc479 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -6,7 +6,13 @@
// There are two kinds of dialogues in this script.
// Dan will randomly choose between a useless sentence, and a quest in Artis.
-000-2-1,32,31,0 script Dan NPC_DEMON_MAN,{
+000-2-1,32,31,0 script Dan#000-2-1 NPC_DEMON_MAN,{
+ if (getq(General_Narrator) > 0)
+ {
+ sailortalk;
+ close;
+ }
+
mesn;
.@q = rand(3);
if (.@q == 0) goto L_QuestStory;
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
index e9ce1a34..a1512429 100644
--- a/npc/000-2-1/savepoint.txt
+++ b/npc/000-2-1/savepoint.txt
@@ -24,8 +24,9 @@ OnInit:
000-2-1,50,38,0 script #name3 NPC_FINAL_POINT,{
.@q_nard = getq(ShipQuests_Nard);
+ .@q_narr = getq(General_Narrator);
- if(.@q_nard == 5)
+ if(.@q_nard == 5 && .@q_narr < 1)
{
OnClick:
narrator 4,