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

Renamed instance_variables to global_variables and iv to g.

Browse Source
This commit is contained in:
Bart House
2018-11-23 09:27:10 -08:00
parent 14bf74c862
commit f9a0db6c44
21 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/artifact.c
View File

@@ -844,15 +844,15 @@ int tmp;
if (!weap || (weap->attk.adtyp == AD_PHYS /* check for `NO_ATTK' */
&& weap->attk.damn == 0 && weap->attk.damd == 0))
iv.spec_dbon_applies = FALSE;
g.spec_dbon_applies = FALSE;
else if (otmp->oartifact == ART_GRIMTOOTH)
/* Grimtooth has SPFX settings to warn against elves but we want its
damage bonus to apply to all targets, so bypass spec_applies() */
iv.spec_dbon_applies = TRUE;
g.spec_dbon_applies = TRUE;
else
iv.spec_dbon_applies = spec_applies(weap, mon);
g.spec_dbon_applies = spec_applies(weap, mon);
if (iv.spec_dbon_applies)
if (g.spec_dbon_applies)
return weap->attk.damd ? rnd((int) weap->attk.damd) : max(tmp, 1);
return 0;
}
@@ -976,14 +976,14 @@ char *hittee; /* target's name: "you" or mon_nam(mdef) */
scare_dieroll /= (1 << (mb->spe / 3));
/* if target successfully resisted the artifact damage bonus,
reduce overall likelihood of the assorted special effects */
if (!iv.spec_dbon_applies)
if (!g.spec_dbon_applies)
dieroll += 1;
/* might stun even when attempting a more severe effect, but
in that case it will only happen if the other effect fails;
extra damage will apply regardless; 3.4.1: sometimes might
just probe even when it hasn't been enchanted */
do_stun = (max(mb->spe, 0) < rn2(iv.spec_dbon_applies ? 11 : 7));
do_stun = (max(mb->spe, 0) < rn2(g.spec_dbon_applies ? 11 : 7));
/* the special effects also boost physical damage; increments are
generally cumulative, but since the stun effect is based on a
@@ -1182,12 +1182,12 @@ int dieroll; /* needed for Magicbane and vorpal blades */
if (attacks(AD_FIRE, otmp)) {
if (realizes_damage)
pline_The("fiery blade %s %s%c",
!iv.spec_dbon_applies
!g.spec_dbon_applies
? "hits"
: (mdef->data == &mons[PM_WATER_ELEMENTAL])
? "vaporizes part of"
: "burns",
hittee, !iv.spec_dbon_applies ? '.' : '!');
hittee, !g.spec_dbon_applies ? '.' : '!');
if (!rn2(4))
(void) destroy_mitem(mdef, POTION_CLASS, AD_FIRE);
if (!rn2(4))
@@ -1201,8 +1201,8 @@ int dieroll; /* needed for Magicbane and vorpal blades */
if (attacks(AD_COLD, otmp)) {
if (realizes_damage)
pline_The("ice-cold blade %s %s%c",
!iv.spec_dbon_applies ? "hits" : "freezes", hittee,
!iv.spec_dbon_applies ? '.' : '!');
!g.spec_dbon_applies ? "hits" : "freezes", hittee,
!g.spec_dbon_applies ? '.' : '!');
if (!rn2(4))
(void) destroy_mitem(mdef, POTION_CLASS, AD_COLD);
return realizes_damage;
@@ -1210,9 +1210,9 @@ int dieroll; /* needed for Magicbane and vorpal blades */
if (attacks(AD_ELEC, otmp)) {
if (realizes_damage)
pline_The("massive hammer hits%s %s%c",
!iv.spec_dbon_applies ? "" : "! Lightning strikes",
hittee, !iv.spec_dbon_applies ? '.' : '!');
if (iv.spec_dbon_applies)
!g.spec_dbon_applies ? "" : "! Lightning strikes",
hittee, !g.spec_dbon_applies ? '.' : '!');
if (g.spec_dbon_applies)
wake_nearto(mdef->mx, mdef->my, 4 * 4);
if (!rn2(5))
(void) destroy_mitem(mdef, RING_CLASS, AD_ELEC);
@@ -1223,10 +1223,10 @@ int dieroll; /* needed for Magicbane and vorpal blades */
if (attacks(AD_MAGM, otmp)) {
if (realizes_damage)
pline_The("imaginary widget hits%s %s%c",
!iv.spec_dbon_applies
!g.spec_dbon_applies
? ""
: "! A hail of magic missiles strikes",
hittee, !iv.spec_dbon_applies ? '.' : '!');
hittee, !g.spec_dbon_applies ? '.' : '!');
return realizes_damage;
}
@@ -1235,7 +1235,7 @@ int dieroll; /* needed for Magicbane and vorpal blades */
return Mb_hit(magr, mdef, otmp, dmgptr, dieroll, vis, hittee);
}
if (!iv.spec_dbon_applies) {
if (!g.spec_dbon_applies) {
/* since damage bonus didn't apply, nothing more to do;
no further attacks have side-effects on inventory */
return FALSE;