diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-29 00:25:49 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-29 00:25:49 -0300 |
| commit | 8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc (patch) | |
| tree | ec33ef42c2a3125a3e875864b43ad1a7c65bef51 /npc/014-5 | |
| parent | 8071ddde86666c1495c5119b3927f5718b690f60 (diff) | |
| parent | d6358d0d127ffac94f243d29eccc6793567e9c60 (diff) | |
| download | serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.tar.gz serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.tar.bz2 serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.tar.xz serverdata-8dc80ccdb7b0916aab47f8d24306c6c865ad4dfc.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'npc/014-5')
| -rw-r--r-- | npc/014-5/sagratha.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt index a871ea7f5..a5e2ebfb9 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 callfunc("SaggyInstCheck", .@house); + } + if (.@house) { return .@mapn$; } else { @@ -129,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; |