From a0eec150a202785a058304d505bf5dcabf503c23 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 22 Aug 2019 18:01:25 -0300 Subject: Well, this sort of stuff may happen - instance is valid but is not what we're looking for --- npc/014-5/sagratha.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'npc/014-5') diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt index a871ea7f5..2b13a8503 100644 --- a/npc/014-5/sagratha.txt +++ b/npc/014-5/sagratha.txt @@ -37,6 +37,13 @@ function script SaggyInstCheck { setq2 HurnscaldQuest_Sagratha, .@inst; } + // It broke + if (getmapinfo(MAPINFO_SIZE_X, .@mapn$) <= 0) { + setq2 HurnscaldQuest_Sagratha, 0; + // Infinite Loop? + return SaggyInstCheck(.@house); + } + if (.@house) { return .@mapn$; } else { -- cgit v1.2.3-70-g09d2 From d8b24f235a1514418b5a8652e34e0ed34d7faf57 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 22 Aug 2019 18:25:22 -0300 Subject: Let's try with callfunc --- npc/014-5/sagratha.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'npc/014-5') diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt index 2b13a8503..93e2ab6f3 100644 --- a/npc/014-5/sagratha.txt +++ b/npc/014-5/sagratha.txt @@ -41,7 +41,7 @@ function script SaggyInstCheck { if (getmapinfo(MAPINFO_SIZE_X, .@mapn$) <= 0) { setq2 HurnscaldQuest_Sagratha, 0; // Infinite Loop? - return SaggyInstCheck(.@house); + return callfunc("SaggyInstCheck", .@house); } if (.@house) { -- cgit v1.2.3-70-g09d2 From 5d7212fcbb648663d87b6b900b79807bd61fe00f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 22 Aug 2019 18:32:59 -0300 Subject: Mouboos are cute password on Sagratha Door and reaction --- npc/014-5/sagratha.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'npc/014-5') diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt index 93e2ab6f3..a5e2ebfb9 100644 --- a/npc/014-5/sagratha.txt +++ b/npc/014-5/sagratha.txt @@ -136,10 +136,17 @@ L_Open: select l("Knock on the door?"), l("Attempt to lockpick?"), + l("Say that Mouboos are Cute?"), l("Leave it alone?"); mes ""; - if (@menu == 3) + if (@menu == 4) close; + if (@menu == 3) { + mesc l("Surprisingly, nothing happens."); + next; + mesc l("A close inspection suggests the lock was busted. You approach to inspect."); + next; + } mesc l("*CREAK*"); mesc l("The pressure you did made the door burst open. It is unusually quiet inside..."); next; -- cgit v1.2.3-70-g09d2