From 636432e88348400babec2e5c5cd88b0d535b5bb8 Mon Sep 17 00:00:00 2001 From: PatR Date: Thu, 28 Mar 2024 03:10:38 -0700 Subject: [PATCH] variant spellings of "master lich" From a reddit thread: after genociding "arch-lich", player's next target was "master-lich". The character was a monk who immediately died of genocide. ("Master" other than "master mind[ ]flayer" or "Master Thief" or "Master Assassin" matches level 30 monk rank "Master".) Rather than muck about with fairly complicated matching code, just add "master-lich" and "masterlich" as explicit variations. --- doc/fixes3-7-0.txt | 2 ++ src/mondata.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index baf99f84a..3955ecd79 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1386,6 +1386,8 @@ using '#adjust c d' or '#adjust d c' after splitting slot c via '#adjust Nc d' ring of aggravate monster increases the level difficulty if hero shattered an unseen monster's weapon, the [also unseen] weapon was described in the feedback +don't self-genocide if a monk picks "master-lich" or "masterlich" as target + (was matching "Master" rank) Fixes to 3.7.0-x General Problems Exposed Via git Repository diff --git a/src/mondata.c b/src/mondata.c index dd324b302..9151b2ec7 100644 --- a/src/mondata.c +++ b/src/mondata.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 mondata.c $NHDT-Date: 1685180674 2023/05/27 09:44:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.122 $ */ +/* NetHack 3.7 mondata.c $NHDT-Date: 1711620615 2024/03/28 10:10:15 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.132 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */ /* NetHack may be freely redistributed. See license for details. */ @@ -865,6 +865,8 @@ name_to_monplus( to the rank title prefix (input has been singularized) */ { "master thief", PM_MASTER_OF_THIEVES, NEUTRAL }, { "master of assassin", PM_MASTER_ASSASSIN, NEUTRAL }, + { "master-lich", PM_MASTER_LICH, NEUTRAL }, /* cf arch-lich */ + { "masterlich", PM_MASTER_LICH, NEUTRAL }, /* cf demilich */ /* Outdated names */ { "invisible stalker", PM_STALKER, NEUTRAL }, { "high-elf", PM_ELVEN_MONARCH, NEUTRAL }, /* PM_HIGH_ELF is