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

Fire Brand vs sliming

Browse Source 
Being hit by Fire Brand now stops the sliming process if you're
being turned into green slime.  And throwing an artifact up will give
artifact hit effects when it falls back down, making it possible to
hit yourself with Fire Brand (among other things).  Hitting yourself
with Vorpal Blade or the Tsurugi of Muramasa will never behead or
bisect you; hitting yourself with Stormbringer will drain levels.
(I hope the latter doesn't make it too easy for players to manipulate
their experience level.)

     This doesn't add artifact_hit() handling to mthrowu.  If monsters
ever start throwing artifacts that will need to be added.
This commit is contained in:
nethack.rankin
2002-02-22 03:51:14 +00:00
parent ce3bdc7097
commit 6ce22770c9
3 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dothrow.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)dothrow.c 3.4 2001/12/10 */
/* SCCS Id: @(#)dothrow.c 3.4 2002/02/21 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -743,9 +743,14 @@ boolean hitsroof;
}
return FALSE;
} else { /* neither potion nor other breaking object */
boolean less_damage = uarmh && is_metallic(uarmh);
boolean less_damage = uarmh && is_metallic(uarmh), artimsg = FALSE;
int dmg = dmgval(obj, &youmonst);
if (obj->oartifact)
/* need a fake die roll here; rn1(18,2) avoids 1 and 20 */
artimsg = artifact_hit((struct monst *)0, &youmonst,
obj, &dmg, rn1(18,2));
if (!dmg) { /* probably wasn't a weapon; base damage on weight */
dmg = (int) obj->owt / 100;
if (dmg < 1) dmg = 1;
@@ -757,11 +762,13 @@ boolean hitsroof;
if (dmg > 1 && less_damage) dmg = 1;
if (dmg > 0) dmg += u.udaminc;
if (dmg < 0) dmg = 0; /* beware negative rings of increase damage */
if (Half_physical_damage) dmg = (dmg + 1) / 2;
if (uarmh) {
if (less_damage && dmg < (Upolyd ? u.mh : u.uhp))
pline("Fortunately, you are wearing a hard helmet.");
else if (flags.verbose &&
if (less_damage && dmg < (Upolyd ? u.mh : u.uhp)) {
if (!artimsg)
pline("Fortunately, you are wearing a hard helmet.");
} else if (flags.verbose &&
!(obj->otyp == CORPSE && touch_petrifies(&mons[obj->corpsenm])))
Your("%s does not protect you.", xname(uarmh));
} else if (obj->otyp == CORPSE && touch_petrifies(&mons[obj->corpsenm])) {