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

make attack result macros more distinguishable from makemon macros

Browse Source 
Use the MM_ prefix only for the makemon macros, and change these five as follows:

 MM_MISS 0x0     -> M_ATTK_MISS      /* aggressor missed */
 MM_HIT 0x1      -> M_ATTK_HIT       /* aggressor hit defender */
 MM_DEF_DIED 0x2 -> M_ATTK_DEF_DIED  /* defender died */
 MM_AGR_DIED 0x4 -> M_ATTK_AGR_DIED  /* aggressor died */
 MM_AGR_DONE 0x8 -> M_ATTK_AGR_DONE  /* aggressor is done with their turn */

include/hack.h:#define NO_MM_FLAGS     0x000000L /* use this rather than plain 0 */
include/hack.h:#define MM_NOWAIT       0x000002L /* don't set STRAT_WAITMASK flags */
include/hack.h:#define MM_NOCOUNTBIRTH 0x000004L /* don't increment born count (for revival) */
include/hack.h:#define MM_IGNOREWATER  0x000008L /* ignore water when positioning */
include/hack.h:#define MM_ADJACENTOK   0x000010L /* acceptable to use adjacent coordinates */
include/hack.h:#define MM_ANGRY        0x000020L /* monster is created angry */
include/hack.h:#define MM_NONAME       0x000040L /* monster is not christened */
include/hack.h:#define MM_EGD          0x000100L /* add egd structure */
include/hack.h:#define MM_EPRI         0x000200L /* add epri structure */
include/hack.h:#define MM_ESHK         0x000400L /* add eshk structure */
include/hack.h:#define MM_EMIN         0x000800L /* add emin structure */
include/hack.h:#define MM_EDOG         0x001000L /* add edog structure */
include/hack.h:#define MM_ASLEEP       0x002000L /* monsters should be generated asleep */
include/hack.h:#define MM_NOGRP        0x004000L /* suppress creation of monster groups */
include/hack.h:#define MM_NOTAIL       0x008000L /* if a long worm, don't give it a tail */
include/hack.h:#define MM_MALE         0x010000L /* male variation */
include/hack.h:#define MM_FEMALE       0x020000L /* female variation */
include/hack.h:#define MM_NOMSG        0x040000L /* no appear message */

include/hack.h:#define MM_NOEXCLAM     0x400000L /* more sedate "<mon> appears." mesg for ^G */
include/hack.h:#define MM_IGNORELAVA   0x800000L /* ignore lava when positioning */
This commit is contained in:
nhmall
2023-03-19 12:19:34 -04:00
parent e29bfcab54
commit 5f69dc6228
10 changed files with 227 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/mhitu.c
View File

@@ -314,7 +314,7 @@ getmattk(struct monst *magr, struct monst *mdef,
/* prevent a monster with two consecutive disease or hunger attacks
from hitting with both of them on the same turn; if the first has
already hit, switch to a stun attack for the second */
if (indx > 0 && prev_result[indx - 1] > MM_MISS
if (indx > 0 && prev_result[indx - 1] > M_ATTK_MISS
&& (attk->adtyp == AD_DISE || attk->adtyp == AD_PEST
|| attk->adtyp == AD_FAMN)
&& attk->adtyp == mptr->mattk[indx - 1].adtyp) {
@@ -457,14 +457,14 @@ mattacku(register struct monst *mtmp)
&& next2u(mtmp->mx, mtmp->my)) {
/* Attack your steed instead */
i = mattackm(mtmp, u.usteed);
if ((i & MM_AGR_DIED))
if ((i & M_ATTK_AGR_DIED))
return 1;
/* make sure steed is still alive and within range */
if ((i & MM_DEF_DIED) || !u.usteed
if ((i & M_ATTK_DEF_DIED) || !u.usteed
|| !next2u(mtmp->mx, mtmp->my))
return 0;
/* Let your steed retaliate */
return !!(mattackm(u.usteed, mtmp) & MM_DEF_DIED);
return !!(mattackm(u.usteed, mtmp) & M_ATTK_DEF_DIED);
}
}
@@ -677,7 +677,7 @@ mattacku(register struct monst *mtmp)
for (i = 0; i < NATTK; i++) {
/* recalc in case attack moved hero */
calc_mattacku_vars(mtmp, &ranged, &range2, &foundyou, &youseeit);
sum[i] = MM_MISS;
sum[i] = M_ATTK_MISS;
if (i > 0 && firstfoundyou /* previous attack might have moved hero */
&& (mtmp->mux != u.ux || mtmp->muy != u.uy))
continue; /* fill in sum[] with 'miss' but skip other actions */
@@ -825,15 +825,15 @@ mattacku(register struct monst *mtmp)
if (gc.context.botl)
bot();
/* give player a chance of waking up before dying -kaa */
if (sum[i] == MM_HIT) { /* successful attack */
if (sum[i] == M_ATTK_HIT) { /* successful attack */
if (u.usleep && u.usleep < gm.moves && !rn2(10)) {
gm.multi = -1;
gn.nomovemsg = "The combat suddenly awakens you.";
}
}
if ((sum[i] & MM_AGR_DIED))
if ((sum[i] & M_ATTK_AGR_DIED))
return 1; /* attacker dead */
if ((sum[i] & MM_AGR_DONE))
if ((sum[i] & M_ATTK_AGR_DONE))
break; /* attacker teleported, no more attacks */
/* sum[i] == 0: unsuccessful attack */
}
@@ -1028,7 +1028,7 @@ hitmu(register struct monst *mtmp, register struct attack *mattk)
struct permonst *olduasmon = gy.youmonst.data;
int res;
struct mhitm_data mhm;
mhm.hitflags = MM_MISS;
mhm.hitflags = M_ATTK_MISS;
mhm.permdmg = 0;
mhm.specialdmg = 0;
mhm.done = FALSE;
@@ -1141,7 +1141,7 @@ hitmu(register struct monst *mtmp, register struct attack *mattk)
if (mhm.damage)
res = passiveum(olduasmon, mtmp, mattk);
else
res = MM_HIT;
res = M_ATTK_HIT;
stop_occupation();
return res;
}
@@ -1179,9 +1179,9 @@ gulpmu(struct monst *mtmp, struct attack *mattk)
int omx = mtmp->mx, omy = mtmp->my;
if (!engulf_target(mtmp, &gy.youmonst))
return MM_MISS;
return M_ATTK_MISS;
if ((t && is_pit(t->ttyp)) && sobj_at(BOULDER, u.ux, u.uy))
return MM_MISS;
return M_ATTK_MISS;
if (Punished)
unplacebc(); /* ball&chain go away */
@@ -1247,7 +1247,7 @@ gulpmu(struct monst *mtmp, struct attack *mattk)
if (Punished)
placebc();
set_ustuck((struct monst *) 0);
return (!DEADMONSTER(mtmp)) ? MM_MISS : MM_AGR_DIED;
return (!DEADMONSTER(mtmp)) ? M_ATTK_MISS : M_ATTK_AGR_DIED;
}
display_nhwindow(WIN_MESSAGE, FALSE);
@@ -1280,7 +1280,7 @@ gulpmu(struct monst *mtmp, struct attack *mattk)
}
if (mtmp != u.ustuck)
return MM_MISS;
return M_ATTK_MISS;
if (Punished) {
/* ball&chain are in limbo while swallowed; update their internal
location to be at swallower's spot */
@@ -1443,7 +1443,7 @@ gulpmu(struct monst *mtmp, struct attack *mattk)
pline("Obviously %s doesn't like your taste.", mon_nam(mtmp));
expels(mtmp, mtmp->data, FALSE);
}
return MM_HIT;
return M_ATTK_HIT;
}
/* monster explodes in your face */
@@ -1455,7 +1455,7 @@ explmu(struct monst *mtmp, struct attack *mattk, boolean ufound)
int tmp;
if (mtmp->mcan)
return MM_MISS;
return M_ATTK_MISS;
tmp = d((int) mattk->damn, (int) mattk->damd);
not_affected = defended(mtmp, (int) mattk->adtyp);
@@ -1517,7 +1517,7 @@ explmu(struct monst *mtmp, struct attack *mattk, boolean ufound)
if (kill_agr && !DEADMONSTER(mtmp))
mondead(mtmp);
wake_nearto(mtmp->mx, mtmp->my, 7 * 7);
return (!DEADMONSTER(mtmp)) ? MM_MISS : MM_AGR_DIED;
return (!DEADMONSTER(mtmp)) ? M_ATTK_MISS : M_ATTK_AGR_DIED;
}
/* monster gazes at you */
@@ -1539,7 +1539,7 @@ gazemu(struct monst *mtmp, struct attack *mattk)
&& mtmp->mcansee);
if (m_seenres(mtmp, cvt_adtyp_to_mseenres(mattk->adtyp)))
return MM_MISS;
return M_ATTK_MISS;
is_medusa = (mtmp->data == &mons[PM_MEDUSA]);
reflectable = (Reflecting && couldsee(mtmp->mx, mtmp->my) && is_medusa);
@@ -1599,7 +1599,7 @@ gazemu(struct monst *mtmp, struct attack *mattk)
if (!DEADMONSTER(mtmp))
break;
return MM_AGR_DIED;
return M_ATTK_AGR_DIED;
}
if (canseemon(mtmp) && couldsee(mtmp->mx, mtmp->my)
&& !Stone_resistance && !Unaware) {
@@ -1750,7 +1750,7 @@ gazemu(struct monst *mtmp, struct attack *mattk)
: (!rn2(2) ? "a bit " : "somewhat "),
reactions[react]);
}
return MM_MISS;
return M_ATTK_MISS;
}
/* mtmp hits you for n points damage */
@@ -2212,7 +2212,7 @@ passiveum(
*/
for (i = 0; !oldu_mattk; i++) {
if (i >= NATTK)
return MM_HIT;
return M_ATTK_HIT;
if (olduasmon->mattk[i].aatyp == AT_NONE
|| olduasmon->mattk[i].aatyp == AT_BOOM)
oldu_mattk = &olduasmon->mattk[i];
@@ -2265,10 +2265,10 @@ passiveum(
gs.stoned = 1;
xkilled(mtmp, XKILL_NOMSG);
if (!DEADMONSTER(mtmp))
return MM_HIT;
return MM_AGR_DIED;
return M_ATTK_HIT;
return M_ATTK_AGR_DIED;
}
return MM_HIT;
return M_ATTK_HIT;
}
case AD_ENCH: /* KMH -- remove enchantment (disenchanter) */
if (mon_currwep) {
@@ -2277,12 +2277,12 @@ passiveum(
(void) drain_item(mon_currwep, TRUE);
/* No message */
}
return MM_HIT;
return M_ATTK_HIT;
default:
break;
}
if (!Upolyd)
return MM_HIT;
return M_ATTK_HIT;
/* These affect the enemy only if you are still a monster */
if (rn2(3))
@@ -2313,15 +2313,15 @@ passiveum(
return 1;
pline("%s is frozen by your gaze!", Monnam(mtmp));
paralyze_monst(mtmp, tmp);
return MM_AGR_DONE;
return M_ATTK_AGR_DONE;
}
}
} else { /* gelatinous cube */
pline("%s is frozen by you.", Monnam(mtmp));
paralyze_monst(mtmp, tmp);
return MM_AGR_DONE;
return M_ATTK_AGR_DONE;
}
return MM_HIT;
return M_ATTK_HIT;
case AD_COLD: /* Brown mold or blue jelly */
if (resists_cold(mtmp)) {
shieldeff(mtmp->mx, mtmp->my);
@@ -2377,10 +2377,10 @@ passiveum(
pline("%s dies!", Monnam(mtmp));
xkilled(mtmp, XKILL_NOMSG);
if (!DEADMONSTER(mtmp))
return MM_HIT;
return MM_AGR_DIED;
return M_ATTK_HIT;
return M_ATTK_AGR_DIED;
}
return MM_HIT;
return M_ATTK_HIT;
}
struct monst *