diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/009-1_Hurnscald/old_woman.txt | 12 | ||||
| -rw-r--r-- | npc/028-1/Doctor2.txt | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/npc/009-1_Hurnscald/old_woman.txt b/npc/009-1_Hurnscald/old_woman.txt index a8d02128..62f427e7 100644 --- a/npc/009-1_Hurnscald/old_woman.txt +++ b/npc/009-1_Hurnscald/old_woman.txt @@ -70,6 +70,7 @@ L_NohMask_Fake_Satchel: L_Easter: if ((Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE) goto L_Easter_Complete; if ((Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_RETURNED) goto L_Easter_Gaveup; + if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY) goto L_Defeat_Impossible; if ((Easter_2010_QuestState & E10_STATE_EGG_MASK) == E10_STATE_EGG_COLLECTING) goto L_Easter_Check; if ((Easter_2010_QuestState & E10_STATE_EGG_MASK) == E10_STATE_EGG_COLLECTED) goto L_Easter_Reward; if ((Easter_2010_QuestState & E10_STATE_EGG_MASK) == E10_STATE_EGG_REWARDED) goto L_Easter_Hint; @@ -172,6 +173,7 @@ L_Easter_Hint: L_Easter_Complete: + if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK != E10_FLAG_RETURN_READY) goto L_Help_Impossible; if ((Easter_2010_QuestState >> E10_STATE_REWARDS_SHIFT) & E10_STATE_REWARDS_MASK == 0) goto L_Easter_Complete_New_Rewards; if ((Easter_2010_QuestState >> E10_STATE_REWARDS_SHIFT) & E10_STATE_REWARDS_MASK == E10_STATE_REWARDS_MASK) goto L_Easter_Done_All; @@ -275,6 +277,16 @@ L_Hats_No_Room: mes "\"Please see me again when you are ready, honey.\""; close; +L_Help_Impossible: + mes "[Old Woman]"; + mes "She seems confused. \"How did you get back here without defeating the evil force plaguing that world, and without giving up? That shouldn't be possible...\""; + close; + +L_Defeat_Impossible: + mes "[Old Woman]"; + mes "She seems confused. \"How did you manage to get back here without helping that nice man to fix things, and without giving up? That shouldn't be possible...\""; + close; + // The all important rose die script. Hooked into the old woman script for now. OnPCDieEvent: if (countitem(E10_TOKEN_ID) < 1) end; diff --git a/npc/028-1/Doctor2.txt b/npc/028-1/Doctor2.txt index e828e91b..1a4b9f36 100644 --- a/npc/028-1/Doctor2.txt +++ b/npc/028-1/Doctor2.txt @@ -381,7 +381,7 @@ L_island_end_menu_loop: set @i, 0; if (@c == 0) goto L_island_post_menu_loop_sub; L_island_end_menu_loop_sub: - if (@submenu$[@c] == @menuitems$[@index]) goto L_island_end_menu_loop; + if (@submenu$[@i] == @menuitems$[@index]) goto L_island_end_menu_loop; set @i, @i + 1; if (@i < @c) goto L_island_end_menu_loop_sub; L_island_post_menu_loop_sub: @@ -395,7 +395,7 @@ L_island_post_menu_loop_sub: @submenu$[2], -, @submenu$[3], -; set @menu, @menu - 1; - if (@menu >= 4) goto L_island_oo_range; + if (@menu >= 4 || @menu < 0) goto L_island_oo_range; if (@submenuindex[@menu] == 8 || @submenuindex[@menu] == 9) goto L_At_Island_Resolve; |