nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix #HH5887 - Dark One / Eye message bug

Browse Source 
Some roles' quest message when returning the nemesis lair refer to
sensing the presence/aura/whatever of the quest artifact, but it might
not be there anymore.  In reported case, the nemesis had picked it up
and later fled up the stairs to another level.  Other situations are
possible; it's feasible for the hero to already have it.  So provide
an alternate message, and some extra code to decide whether to use it.

Other anomalous messages, such as looking down on the dead body of a
nemesis who didn't leave a corpse, can still occur.
This commit is contained in:
PatR
2017-09-11 15:59:50 -07:00
parent d8f4c14c06
commit 2b8c2eac23
6 changed files with 110 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dat/quest.txt
View File

@@ -1,4 +1,4 @@
# NetHack 3.6 quest.txt $NHDT-Date: 1448540693 2015/11/26 12:24:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.32 $
# NetHack 3.6 quest.txt $NHDT-Date: 1505170340 2017/09/11 22:52:20 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.34 $
# Copyright (c) 1991 by M. Stephenson
# NetHack may be freely redistributed. See license for details.
#
@@ -27,9 +27,11 @@
# QT_FIRSTLOCATE 35
# QT_NEXTLOCATE 36
#
# QT_FIRSTACQUIRE 40
# QT_NEXTACQUIRE 41
#
# QT_FIRSTGOAL 40 /* %n (nemesis) and %o (artifact) will always
# be present on first visit in normal play */
# QT_NEXTGOAL 41 /* subsequent visits to goal level */
# QT_ALTGOAL 42 /* alternate to NEXTGOAL if quest artifact
# is absent from the level (optional) */
# QT_FIRSTNEMESIS 50
# QT_NEXTNEMESIS 51
# QT_OTHERNEMESIS 52
@@ -195,6 +197,12 @@ You realize the feeling must be the presence of %o.
%Cp Arc 00041
The familiar presence of %o is in the ether.
%E
# delivered instead of 00041 if %o is not on the level anymore;
# hero might already be carrying it, so don't say anything like
# "%o's presence can't be felt"
%Cp Arc 00042
The have returned to %ns lair.
%E
%Cc Arc 00050
"So, %p, you think that you can succeed in recovering
%o, when your teacher, %l, has already failed.
@@ -2463,6 +2471,9 @@ proudly again. Putting your kami in the hands of fate, you advance.
As you arrive once again at the home of %n, your thoughts
turn only to %o.
%E
%Cp Sam 00042
As you arrive once again at the home of %n.
%E
%Cp Sam 00050
"Ah, so it is to be you, %p-san. I offer you seppuku.
I will be your second if you wish."
@@ -2713,6 +2724,9 @@ You sense the presence of %o.
You gain confidence, knowing that you may soon be united with
%o.
%E
%Cp Tou 00042
You have returned to %ns lair.
%E
%Cc Tou 00050
"So, %p, %l thinks that you can wrest
%o from me!
@@ -3207,6 +3221,9 @@ You feel your mentor's presence; perhaps %o is nearby.
%Cp Wiz 00041
The aura of %o tingles at the edge of your perception.
%E
%Cp Wiz 00042
You have returned to %ns lair.
%E
%Cc Wiz 00050
"Ah, I recognize you, %p. So, %l has sent you to steal
%o from me, hmmm? Well, %lh is a fool to send such