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

doomed quest

Browse Source 
Your quest leader would tell you to return later, even after you
were converted, which would be futile, and could mislead new
players.

This patch:
1. Causes the quest leader to banish you the first time you
encounter him/her following a conversion, since you cannot ever
complete the quest anyway in the current game.
2. Adds a new general QT_BANISHED message to be delivered, in
which you are told that you won't be able to get the Amulet without
the Bell now.

This helps resolve the complaint about not knowing that your game
cannot be won.
This commit is contained in:
nethack.allison
2002-08-31 20:14:17 +00:00
parent 5088492cf6
commit 47f4cf21aa
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/quest.c
View File

@@ -16,7 +16,7 @@ STATIC_DCL void NDECL(on_start);
STATIC_DCL void NDECL(on_locate);
STATIC_DCL void NDECL(on_goal);
STATIC_DCL boolean NDECL(not_capable);
STATIC_DCL boolean FDECL(is_pure, (BOOLEAN_P));
STATIC_DCL int FDECL(is_pure, (BOOLEAN_P));
STATIC_DCL void FDECL(expulsion, (BOOLEAN_P));
STATIC_DCL void NDECL(chat_with_leader);
STATIC_DCL void NDECL(chat_with_nemesis);
@@ -96,7 +96,7 @@ boolean
ok_to_quest()
{
return((boolean)((Qstat(got_quest) || Qstat(got_thanks)))
&& is_pure(FALSE));
&& (is_pure(FALSE) > 0));
}
STATIC_OVL boolean
@@ -105,10 +105,11 @@ not_capable()
return((boolean)(u.ulevel < MIN_QUEST_LEVEL));
}
STATIC_OVL boolean
STATIC_OVL int
is_pure(talk)
boolean talk;
{
int purity;
aligntyp original_alignment = u.ualignbase[A_ORIGINAL];
#ifdef WIZARD
@@ -126,9 +127,11 @@ boolean talk;
}
}
#endif
return (boolean)(u.ualign.record >= MIN_QUEST_ALIGN &&
u.ualign.type == original_alignment &&
u.ualignbase[A_CURRENT] == original_alignment);
purity = (u.ualign.record >= MIN_QUEST_ALIGN &&
u.ualign.type == original_alignment &&
u.ualignbase[A_CURRENT] == original_alignment) ? 1 :
(u.ualignbase[A_CURRENT] != original_alignment) ? -1 : 0;
return purity;
}
/*
@@ -245,7 +248,10 @@ chat_with_leader()
qt_pager(QT_BADLEVEL);
exercise(A_WIS, TRUE);
expulsion(FALSE);
} else if(!is_pure(TRUE)) {
} else if(is_pure(TRUE) < 0) {
com_pager(QT_BANISHED);
expulsion(TRUE);
} else if(is_pure(TRUE) == 0) {
qt_pager(QT_BADALIGN);
if(Qstat(not_ready) == MAX_QUEST_TRIES) {
qt_pager(QT_LASTLEADER);