summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/012-4/wyara.txt77
-rw-r--r--npc/014-5-1/objects.txt7
-rw-r--r--npc/014-5/sagratha.txt21
3 files changed, 98 insertions, 7 deletions
diff --git a/npc/012-4/wyara.txt b/npc/012-4/wyara.txt
index ba8813bd6..0c371ee91 100644
--- a/npc/012-4/wyara.txt
+++ b/npc/012-4/wyara.txt
@@ -21,11 +21,15 @@ L_Menu:
.@plush_count = .@plush_count/(BaseLevel/10);
.@n=getq(General_Narrator);
+ .@s=getq(HurnscaldQuest_Sagratha);
+ .@s3=getq3(HurnscaldQuest_Sagratha);
select
l("Can you reset my stats please?"),
rif($ARKIM_ST >= 1200,l("I want Piberries Infusion!")),
rif(getq(HurnscaldQuest_InjuriedMouboo) == 2,l("Do you know how to break curses?")),
+ rif(.@s == 1 && .@s3,l("Sagratha was not home.")),
+ rif(.@s == 2,l("About Sagratha...")),
rif(.@n >= 6,l("I am in dire need of Return Potions!")),
lg("You are weird, I have to go sorry.");
@@ -38,8 +42,12 @@ L_Menu:
case 3:
goto L_Uncurse;
case 4:
- goto L_ReturnPot;
+ goto L_SaggyHome;
case 5:
+ goto L_SaggyMain;
+ case 6:
+ goto L_ReturnPot;
+ case 7:
goto L_Quit;
}
@@ -171,6 +179,73 @@ L_ReturnPot:
}
close;
+L_SaggyHome:
+ mesn;
+ mesq l("She probably just went out for a walk. Nothing to worry, I hope.");
+ next;
+ if (.@n < 11) {
+ mesn;
+ mesq l("It's impossible to know when she'll be back, so you should prioritize something else for now.");
+ close;
+ }
+ select
+ l("Yeah, she might be back soon."),
+ l("I don't think so. There have been... Incidents.");
+ if (@menu == 1)
+ close;
+ mes "";
+ mesn;
+ mesq l("...Incidents?");
+ next;
+ mesn strcharinfo(0);
+ mesc l("You tell her about the incident at the Blue Sage's residence and how they were aiming at sages.");
+ next;
+ mesn;
+ mesq l("Well, this is very disturbing, indeed. I hope my good friend Sagratha is fine.");
+ next;
+ mesn;
+ mesq l("Can you, perhaps, do me a favor? Please... Check her house for any signs of battle.");
+ next;
+ mesn;
+ mesq l("She should be safe as she is a strong woman, but... You never know.");
+ setq1 HurnscaldQuest_Sagratha, 2;
+ setq3 HurnscaldQuest_Sagratha, 0;
+ close;
+
+L_SaggyMain:
+ mesn;
+ mesq l("Yes? Have you looked her house for signs of battle?");
+ next;
+ select
+ l("Yes, and there was no signs of a fight."),
+ l("...Not yet.");
+ if (@menu == 2)
+ close;
+ mes "";
+ mesn;
+ mesq l("Are you sure? Like, really really sure?");
+ next;
+ if (!.@s3) {
+ mesn strcharinfo(0);
+ mesq l("Hmm... Thinking well...");
+ next;
+ mesn;
+ mesq l("THEN DON'T WASTE MY TIME! My friend could be in danger!");
+ next;
+ mesn;
+ mesq l("Go do what I told you to do and examine the house thoroughly!");
+ close;
+ }
+ mesn strcharinfo(0);
+ mesq l("Yes, I did. There was only an unlocked secret window.");
+ next;
+ mesn;
+ mesq l("Good, this must mean that Sagratha managed to flee in time.");
+ // TODO
+ //setq1 HurnscaldQuest_Sagratha, 3;
+ //setq3 HurnscaldQuest_Sagratha, 0;
+ close;
+
L_Quit:
goodbye;
close;
diff --git a/npc/014-5-1/objects.txt b/npc/014-5-1/objects.txt
index 701adc605..55d7d395f 100644
--- a/npc/014-5-1/objects.txt
+++ b/npc/014-5-1/objects.txt
@@ -23,7 +23,12 @@ OnInit:
if (@qsagratha >= 31) {
next;
mesn;
- mesc l("Thinking well... There's something behind it! A secret door!");
+ mesc l("Thinking well... There's something behind it! A secret window!");
+ if (getq(HurnscaldQuest_Sagratha) <= 2)
+ setq3 HurnscaldQuest_Sagratha, 1;
+ next;
+ mesn l("Secret Window");
+ mesc l("The window appears to be unlocked. It might have been open some time ago.");
}
close;
OnInit:
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt
index 2b3476b59..defaa2959 100644
--- a/npc/014-5/sagratha.txt
+++ b/npc/014-5/sagratha.txt
@@ -3,6 +3,17 @@
// Jesusalva
// Description:
// Sagratha's House Door
+//
+// getq(HurnscaldQuest_Sagratha)
+// Field 1
+// 0 - Sagratha is home and annyoed
+// 1 - Wyara sent player saggy way
+// 2 - Rumor Confirmed, check again
+// Field 2
+// RESERVED - INSTANCE ID
+// Field 3
+// During stage 1 and 2: Holds if player looked everywhere
+// RESERVED - INSTANCE ID
014-5,122,137,0 script Sagratha Door NPC_HIDDEN,0,0,{
end;
@@ -95,11 +106,11 @@ L_Open:
mesc l("*CREAK*");
mesc l("The pressure you did made the door burst open. It is unusually quiet inside...");
next;
- enable_items();
+ //enable_items();
//mesc l("WARNING: Save your game now."), 3;
- mesc l("WARNING: Change your equipment now."), 3;
- next;
- disable_items();
+ //mesc l("WARNING: Change your equipment now."), 3;
+ //next;
+ //disable_items();
/*
if (has_instance("014-5-1") == "") {
.@inst = instance_create("Sagratha House", getcharid(3), IOT_CHAR);
@@ -137,7 +148,7 @@ L_Welcome:
OnTouch:
.@q=getq(HurnscaldQuest_Sagratha);
if (!MAGIC_LVL) goto L_Magicless;
- if (.@q == 1) goto L_Open;
+ if (.@q >= 1 && .@q < 10) goto L_Open;
if (getq(HurnscaldQuest_InjuriedMouboo) == 3) goto L_Welcome;
// No special condition