Skip to content
This repository has been archived by the owner on Nov 19, 2019. It is now read-only.

Commit

Permalink
fixing C343-175 - chatting to tame prisoners
Browse files Browse the repository at this point in the history
thanks to Reddit user Nuclear_Winterfell for providing quote - see http://www.reddit.com/r/nethack/comments/1awkre/looking_for_better_chatting_response_from_tame/
  • Loading branch information
matkoniecz committed Mar 25, 2013
1 parent 15c963a commit 541d0b4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Weird messages on decayed food for strangevores are fixed
- C343-299 "Killing tame engulfer from inside gives a warning message." (from GruntHack)
- C343-160 "Name "leather [[spellbook]]" is misleading." (renamed to "torn")
- C343-175 - chatting to tame prisoners is fixed (thanks to Reddit user Nuclear_Winterfell)
Patches are linked at http://nethackwiki.com/wiki/User:Bulwersator/UnNetHackPlus_bug_tracking
* UnNetHack bug fixes
- Angered quest guardians will no longer go berserk.
Expand Down
15 changes: 14 additions & 1 deletion src/sounds.c
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,20 @@ register struct monst *mtmp;
break;
case MS_DJINNI:
if (mtmp->mtame) {
verbl_msg = "Sorry, I'm all out of wishes.";
if (ptr == &mons[PM_PRISONER]) {
char *honorific;
if (is_neuter(youmonst.data)) {
honorific = "creature";
} else if(flags.female) {
honorific = "woman";
} else {
honorific = "man";
}
Sprintf(verbuf, "I understand you're a %s who knows how to get things.", honorific);
verbl_msg = verbuf;
} else {
verbl_msg = "Sorry, I'm all out of wishes.";
}
} else if (mtmp->mpeaceful) {
if (ptr == &mons[PM_WATER_DEMON]) {
pline_msg = "gurgles.";
Expand Down

0 comments on commit 541d0b4

Please sign in to comment.