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

mondata.c formatting

Browse Source
This commit is contained in:
PatR
2023-05-27 02:44:49 -07:00
parent 2abe156516
commit b19062d2c4
1 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mondata.c
+34 -33
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 mondata.c $NHDT-Date: 1672003297 2022/12/25 21:21:37 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.119 $ */ /* NetHack 3.7 mondata.c $NHDT-Date: 1685180674 2023/05/27 09:44:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.122 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -364,7 +364,8 @@ mstrength(struct permonst* ptr)
/* {freezing,flaming,shocking} spheres are fairly weak but /* {freezing,flaming,shocking} spheres are fairly weak but
can destroy equipment; {yellow,black} lights can't */ can destroy equipment; {yellow,black} lights can't */
n += ((tmp3 == AD_COLD || tmp3 == AD_FIRE) ? 3 n += ((tmp3 == AD_COLD || tmp3 == AD_FIRE) ? 3
: (tmp3 == AD_ELEC) ? 5 : 0); : (tmp3 == AD_ELEC) ? 5
: 0);
} }
} }
@@ -397,7 +398,7 @@ mstrength(struct permonst* ptr)
/* returns True if monster can attack at range */ /* returns True if monster can attack at range */
static boolean static boolean
mstrength_ranged_attk(register struct permonst* ptr) mstrength_ranged_attk(struct permonst *ptr)
{ {
register int i, j; register int i, j;
register int atk_mask = (1 << AT_BREA) | (1 << AT_SPIT) | (1 << AT_GAZE); register int atk_mask = (1 << AT_BREA) | (1 << AT_SPIT) | (1 << AT_GAZE);
@@ -519,17 +520,16 @@ can_be_strangled(struct monst* mon)
/* returns True if monster can track well */ /* returns True if monster can track well */
boolean boolean
can_track(register struct permonst* ptr) can_track(struct permonst *ptr)
{ {
if (u_wield_art(ART_EXCALIBUR)) if (u_wield_art(ART_EXCALIBUR))
return TRUE; return TRUE;
else
return (boolean) haseyes(ptr); return (boolean) haseyes(ptr);
} }
/* creature will slide out of armor */ /* creature will slide out of armor */
boolean boolean
sliparm(register struct permonst* ptr) sliparm(struct permonst *ptr)
{ {
return (boolean) (is_whirly(ptr) || ptr->msize <= MZ_SMALL return (boolean) (is_whirly(ptr) || ptr->msize <= MZ_SMALL
|| noncorporeal(ptr)); || noncorporeal(ptr));
@@ -537,7 +537,7 @@ sliparm(register struct permonst* ptr)
/* creature will break out of armor */ /* creature will break out of armor */
boolean boolean
breakarm(register struct permonst* ptr) breakarm(struct permonst *ptr)
{ {
if (sliparm(ptr)) if (sliparm(ptr))
return FALSE; return FALSE;
@@ -958,7 +958,8 @@ name_to_monplus(
continue; continue;
m_i_len = strlen(mons[i].pmnames[mgend]); m_i_len = strlen(mons[i].pmnames[mgend]);
if (m_i_len > (size_t) len && !strncmpi(mons[i].pmnames[mgend], str, (int) m_i_len)) { if (m_i_len > (size_t) len
&& !strncmpi(mons[i].pmnames[mgend], str, (int) m_i_len)) {
if (m_i_len == slen) { if (m_i_len == slen) {
mntmp = i; mntmp = i;
len = (int) m_i_len; len = (int) m_i_len;
@@ -1274,45 +1275,45 @@ raceptr(struct monst* mtmp)
{ {
if (mtmp == &gy.youmonst && !Upolyd) if (mtmp == &gy.youmonst && !Upolyd)
return &mons[gu.urace.mnum]; return &mons[gu.urace.mnum];
else
return mtmp->data; return mtmp->data;
} }
static const char *const levitate[4] = { "float", "Float", "wobble", "Wobble" }; typedef const char *const locoverbs[4];
static const char *const flys[4] = { "fly", "Fly", "flutter", "Flutter" }; locoverbs levitate = { "float", "Float", "wobble", "Wobble" },
static const char *const flyl[4] = { "fly", "Fly", "stagger", "Stagger" }; flys = { "fly", "Fly", "flutter", "Flutter" },
static const char *const slither[4] = { "slither", "Slither", "falter", "Falter" }; flyl = { "fly", "Fly", "stagger", "Stagger" },
static const char *const ooze[4] = { "ooze", "Ooze", "tremble", "Tremble" }; slither = { "slither", "Slither", "falter", "Falter" },
static const char *const immobile[4] = { "wiggle", "Wiggle", "pulsate", "Pulsate" }; ooze = { "ooze", "Ooze", "tremble", "Tremble" },
static const char *const crawl[4] = { "crawl", "Crawl", "falter", "Falter" }; immobile = { "wiggle", "Wiggle", "pulsate", "Pulsate" },
crawl = { "crawl", "Crawl", "falter", "Falter" };
const char * const char *
locomotion(const struct permonst *ptr, const char *def) locomotion(const struct permonst *ptr, const char *def)
{ {
int capitalize = (*def == highc(*def)); int locoindx = (*def != highc(*def)) ? 0 : 1;
return (is_floater(ptr) ? levitate[capitalize] return (is_floater(ptr) ? levitate[locoindx]
: (is_flyer(ptr) && ptr->msize <= MZ_SMALL) ? flys[capitalize] : (is_flyer(ptr) && ptr->msize <= MZ_SMALL) ? flys[locoindx]
: (is_flyer(ptr) && ptr->msize > MZ_SMALL) ? flyl[capitalize] : (is_flyer(ptr) && ptr->msize > MZ_SMALL) ? flyl[locoindx]
: slithy(ptr) ? slither[capitalize] : slithy(ptr) ? slither[locoindx]
: amorphous(ptr) ? ooze[capitalize] : amorphous(ptr) ? ooze[locoindx]
: !ptr->mmove ? immobile[capitalize] : !ptr->mmove ? immobile[locoindx]
: nolimbs(ptr) ? crawl[capitalize] : nolimbs(ptr) ? crawl[locoindx]
: def); : def);
} }
const char * const char *
stagger(const struct permonst *ptr, const char *def) stagger(const struct permonst *ptr, const char *def)
{ {
int capitalize = 2 + (*def == highc(*def)); int locoindx = (*def != highc(*def)) ? 2 : 3;
return (is_floater(ptr) ? levitate[capitalize] return (is_floater(ptr) ? levitate[locoindx]
: (is_flyer(ptr) && ptr->msize <= MZ_SMALL) ? flys[capitalize] : (is_flyer(ptr) && ptr->msize <= MZ_SMALL) ? flys[locoindx]
: (is_flyer(ptr) && ptr->msize > MZ_SMALL) ? flyl[capitalize] : (is_flyer(ptr) && ptr->msize > MZ_SMALL) ? flyl[locoindx]
: slithy(ptr) ? slither[capitalize] : slithy(ptr) ? slither[locoindx]
: amorphous(ptr) ? ooze[capitalize] : amorphous(ptr) ? ooze[locoindx]
: !ptr->mmove ? immobile[capitalize] : !ptr->mmove ? immobile[locoindx]
: nolimbs(ptr) ? crawl[capitalize] : nolimbs(ptr) ? crawl[locoindx]
: def); : def);
} }
@@ -1410,7 +1411,7 @@ msummon_environ(struct permonst *mptr, const char **cloud)
* False if monster definitely does not have a sense of smell. * False if monster definitely does not have a sense of smell.
* *
* Do not base this on presence of a head or nose, since many * Do not base this on presence of a head or nose, since many
* creatures sense smells other ways (feelers, forked-tongues, etc.) * creatures sense smells other ways (feelers, forked-tongues, etc).
* We're assuming all insects can smell at a distance too. * We're assuming all insects can smell at a distance too.
*/ */
boolean boolean