-/* NetHack 3.6 polyself.c $NHDT-Date: 1448496566 2015/11/26 00:09:26 $ $NHDT-Branch: master $:$NHDT-Revision: 1.104 $ */
+/* NetHack 3.6 polyself.c $NHDT-Date: 1520797126 2018/03/11 19:38:46 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.117 $ */
/* Copyright (C) 1987, 1988, 1989 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */
STATIC_DCL void NDECL(uunstick);
STATIC_DCL int FDECL(armor_to_dragon, (int));
STATIC_DCL void NDECL(newman);
-STATIC_DCL boolean FDECL(polysense, (struct permonst *));
+STATIC_DCL void NDECL(polysense);
STATIC_VAR const char no_longer_petrify_resistant[] =
/*JP
set_uasmon()
{
struct permonst *mdat = &mons[u.umonnum];
+ int new_speed, old_speed = youmonst.data ? youmonst.data->mmove : 0;
set_mon_data(&youmonst, mdat, 0);
PROPSET(PASSES_WALLS, passes_walls(mdat));
PROPSET(REGENERATION, regenerates(mdat));
PROPSET(REFLECTING, (mdat == &mons[PM_SILVER_DRAGON]));
+#undef PROPSET
float_vs_flight(); /* maybe toggle (BFlying & I_SPECIAL) */
+ polysense();
-#undef PROPSET
+ if (youmonst.movement) {
+ new_speed = mdat->mmove;
+ /* prorate unused movement if new form is slower so that
+ it doesn't get extra moves leftover from previous form;
+ if new form is faster, leave unused movement as is */
+ if (new_speed < old_speed)
+ youmonst.movement = new_speed * youmonst.movement / old_speed;
+ }
-#ifdef STATUS_VIA_WINDOWPORT
+#ifdef STATUS_HILITES
status_initialize(REASSESS_ONLY);
#endif
}
BFlying |= I_SPECIAL;
else
BFlying &= ~I_SPECIAL;
+ context.botl = TRUE;
}
/* for changing into form that's immune to strangulation */
vulnerable form into another causes the counter to be reset */
if (uamul && uamul->otyp == AMULET_OF_STRANGULATION
&& can_be_strangled(&youmonst)) {
+ Strangled = 6L;
+ context.botl = TRUE;
#if 0 /*JP*/
Your("%s %s your %s!", simpleonames(uamul),
Strangled ? "still constricts" : "begins constricting",
body_part(NECK),
Strangled ? "\82Ä\82¢\82é" : "\82Í\82¶\82ß\82½");
#endif
- Strangled = 6L;
makeknown(AMULET_OF_STRANGULATION);
}
} else {
if (Strangled && !can_be_strangled(&youmonst)) {
Strangled = 0L;
+ context.botl = TRUE;
/*JP
You("are no longer being strangled.");
*/
You(fmt, arg);
/* check whether player foolishly genocided self while poly'd */
- if ((mvitals[urole.malenum].mvflags & G_GENOD)
- || (urole.femalenum != NON_PM
- && (mvitals[urole.femalenum].mvflags & G_GENOD))
- || (mvitals[urace.malenum].mvflags & G_GENOD)
- || (urace.femalenum != NON_PM
- && (mvitals[urace.femalenum].mvflags & G_GENOD))) {
+ if (ugenocided()) {
/* intervening activity might have clobbered genocide info */
struct kinfo *kptr = find_delayed_killer(POLYMORPH);
Strcpy(killer.name, "\95Ï\89»\82Ì\8e¸\94s\82Å");
done(DIED);
newuhs(FALSE);
- (void) polysense(youmonst.data);
return; /* lifesaved */
}
}
*/
polyman("%s\82Æ\82µ\82Ä\90¶\82Ü\82ê\82©\82í\82Á\82½\82æ\82¤\82È\8bC\82ª\82µ\82½\81I",
/* use saved gender we're about to revert to, not current */
- (u.mfemale && urace.individual.f)
+ ((Upolyd ? u.mfemale : flags.female) && urace.individual.f)
? urace.individual.f
- : (urace.individual.m) ? urace.individual.m : urace.noun);
+ : (urace.individual.m)
+ ? urace.individual.m
+ : urace.noun);
if (Slimed) {
/*JP
Your("body transforms, but there is still slime on you.");
make_slimed(10L, (const char *) 0);
}
- (void) polysense(youmonst.data);
context.botl = 1;
see_monsters();
(void) encumber_msg();
polyself(psflags)
int psflags;
{
- char buf[BUFSZ];
+ char buf[BUFSZ] = DUMMY;
int old_light, new_light, mntmp, class, tryct;
boolean forcecontrol = (psflags == 1), monsterpoly = (psflags == 2),
draconian = (uarm && Is_dragon_armor(uarm)),
polymon(mntmp)
int mntmp;
{
+ char buf[BUFSZ];
boolean sticky = sticks(youmonst.data) && u.ustuck && !u.uswallow,
was_blind = !!Blind, dochange = FALSE;
int mlvl;
if (sex_change_ok && !rn2(10))
dochange = TRUE;
}
+
+#if 0 /*JP*/
+ Strcpy(buf, (u.umonnum != mntmp) ? "" : "new ");
+#else /*\93ú\96{\8cê\82Æ\82µ\82Ä\95s\8e©\91R\82É\82È\82é\82Ì\82Å\88ê\92U\82»\82Ì\82Ü\82Ü\82É\82·\82é*/
+ Strcpy(buf, "");
+#endif
if (dochange) {
flags.female = !flags.female;
#if 0 /*JP*/
- You("%s %s%s!",
- (u.umonnum != mntmp) ? "turn into a" : "feel like a new",
- (is_male(&mons[mntmp]) || is_female(&mons[mntmp]))
- ? ""
- : flags.female ? "female " : "male ",
- mons[mntmp].mname);
+ Strcat(buf, (is_male(&mons[mntmp]) || is_female(&mons[mntmp]))
+ ? "" : flags.female ? "female " : "male ");
#else
- You("%s%s\82É\82È\82Á\82½%s\81I",
- (is_male(&mons[mntmp]) || is_female(&mons[mntmp]))
- ? ""
- : flags.female ? "\8f\97\82Ì" : "\92j\82Ì",
- mons[mntmp].mname,
- (u.umonnum != mntmp) ? "" : "\82æ\82¤\82È\8bC\82ª\82µ\82½");
+ Strcat(buf, (is_male(&mons[mntmp]) || is_female(&mons[mntmp]))
+ ? "" : flags.female ? "\8f\97\82Ì" : "\92j\82Ì");
#endif
- } else {
- if (u.umonnum != mntmp)
-/*JP
- You("turn into %s!", an(mons[mntmp].mname));
-*/
- You("%s\82É\82È\82Á\82½\81I", mons[mntmp].mname);
- else
+ }
+ Strcat(buf, mons[mntmp].mname);
/*JP
- You_feel("like a new %s!", mons[mntmp].mname);
+ You("%s %s!", (u.umonnum != mntmp) ? "turn into" : "feel like", an(buf));
*/
- You("\95Ê\82Ì%s\82É\82È\82Á\82½\82æ\82¤\82È\8bC\82ª\82µ\82½\81I", mons[mntmp].mname);
- }
+ You("%s%s\81I", an(buf), (u.umonnum != mntmp) ? "\82É\82È\82Á\82½" : "\82Ì\82æ\82¤\82È\8bC\82ª\82µ\82½");
+
if (Stoned && poly_when_stoned(&mons[mntmp])) {
/* poly_when_stoned already checked stone golem genocide */
mntmp = PM_STONE_GOLEM;
uunstick();
if (u.usteed) {
if (touch_petrifies(u.usteed->data) && !Stone_resistance && rnl(3)) {
- char buf[BUFSZ];
-
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s touch %s.", no_longer_petrify_resistant,
mon_nam(u.usteed));
#else
&& u.utraptype == TT_LAVA) {
u.utrap = 0;
/*JP
- pline_The("lava now feels soothing.");
+ pline_The("%s now feels soothing.", hliquid("lava"));
*/
- pline("\97n\8aâ\82ª\90¸\90_\82ð\97\8e\82¿\82Â\82©\82¹\82Ä\82\82ê\82é\81D");
+ pline_The("%s\82ª\90¸\90_\82ð\97\8e\82¿\82Â\82©\82¹\82Ä\82\82ê\82é\81D", hliquid("\97n\8aâ"));
}
if (amorphous(youmonst.data) || is_whirly(youmonst.data)
|| unsolid(youmonst.data)) {
u.utrap = 0;
}
check_strangling(TRUE); /* maybe start strangling */
- (void) polysense(youmonst.data);
context.botl = 1;
vision_full_recalc = 1;
#else
const char *which, *whichtoo;
#endif
- boolean candropwep, candropswapwep;
+ boolean candropwep, candropswapwep, updateinv = TRUE;
if (uwep) {
/* !alone check below is currently superfluous but in the
You("%s\82ð\97\8e\82Æ\82µ\82½\82±\82Æ\82É\8bC\82Ã\82¢\82½\81I", which);
#endif
}
+ /* if either uwep or wielded uswapwep is flagged as 'in_use'
+ then don't drop it or explicitly update inventory; leave
+ those actions to caller (or caller's caller, &c) */
if (u.twoweap) {
otmp = uswapwep;
uswapwepgone();
- if (candropswapwep)
+ if (otmp->in_use)
+ updateinv = FALSE;
+ else if (candropswapwep)
dropx(otmp);
}
otmp = uwep;
uwepgone();
- if (candropwep)
+ if (otmp->in_use)
+ updateinv = FALSE;
+ else if (candropwep)
dropx(otmp);
- update_inventory();
+
+ if (updateinv)
+ update_inventory();
} else if (!could_twoweap(youmonst.data)) {
untwoweapon();
}
rehumanize()
{
/* You can't revert back while unchanging */
- if (Unchanging && (u.mh < 1)) {
+ if (Unchanging) {
+ if (u.mh < 1) {
#if 0 /*JP*/
- killer.format = NO_KILLER_PREFIX;
- Strcpy(killer.name, "killed while stuck in creature form");
+ killer.format = NO_KILLER_PREFIX;
+ Strcpy(killer.name, "killed while stuck in creature form");
#else
- killer.format = KILLED_BY;
- Strcpy(killer.name, "\8c³\82Ì\8ep\82Ö\96ß\82ê\82¸\82É");
+ killer.format = KILLED_BY;
+ Strcpy(killer.name, "\8c³\82Ì\8ep\82Ö\96ß\82ê\82¸\82É");
#endif
- done(DIED);
+ done(DIED);
+ } else if (uamul && uamul->otyp == AMULET_OF_UNCHANGING) {
+ Your("%s %s!", simpleonames(uamul), otense(uamul, "fail"));
+ uamul->dknown = 1;
+ makeknown(AMULET_OF_UNCHANGING);
+ }
}
if (emits_light(youmonst.data))
#endif
if (yn(qbuf) != 'y')
continue;
- setmangry(mtmp);
}
+ setmangry(mtmp, TRUE);
if (!mtmp->mcanmove || mtmp->mstun || mtmp->msleeping
|| !mtmp->mcansee || !haseyes(mtmp->data)) {
looked--;
if (mtmp->data == &mons[PM_FLOATING_EYE] && !mtmp->mcan) {
if (!Free_action) {
-/*JP
+#if 0 /*JP*/
You("are frozen by %s gaze!",
-*/
- You("%s\82Ì\82É\82ç\82Ý\82Å\93®\82¯\82È\82\82È\82Á\82½\81I",
s_suffix(mon_nam(mtmp)));
+#else
+ You("%s\82Ì\82É\82ç\82Ý\82Å\93®\82¯\82È\82\82È\82Á\82½\81I",
+ mon_nam(mtmp));
+#endif
nomul((u.ulevel > 6 || rn2(4))
? -d((int) mtmp->m_lev + 1,
(int) mtmp->data->mattk[0].damd)
nomovemsg = 0;
return 1;
} else
-/*JP
+#if 0 /*JP*/
You("stiffen momentarily under %s gaze.",
-*/
- You("%s\82Ì\82É\82ç\82Ý\82Å\88ê\8fu\8dd\92¼\82µ\82½\81D",
s_suffix(mon_nam(mtmp)));
+#else
+ You("%s\82Ì\82É\82ç\82Ý\82Å\88ê\8fu\8dd\92¼\82µ\82½\81D",
+ mon_nam(mtmp));
+#endif
}
/* Technically this one shouldn't affect you at all because
* the Medusa gaze is an active monster attack that only
/* can't hide while being held (or holding) or while trapped
(except for floor hiders [trapper or mimic] in pits) */
if (u.ustuck || (u.utrap && (u.utraptype != TT_PIT || on_ceiling))) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You_cant("hide while you're %s.",
- !u.ustuck ? "trapped" : !sticks(youmonst.data)
- ? "being held"
- : humanoid(u.ustuck->data)
- ? "holding someone"
- : "holding that creature");
+ !u.ustuck ? "trapped"
+ : u.uswallow ? (is_animal(u.ustuck->data) ? "swallowed"
+ : "engulfed")
+ : !sticks(youmonst.data) ? "being held"
+ : (humanoid(u.ustuck->data) ? "holding someone"
+ : "holding that creature"));
#else
You_cant("%s\8aÔ\82Í\89B\82ê\82ç\82ê\82È\82¢\81D",
- !u.ustuck ? "\95ß\82Ü\82Á\82Ä\82¢\82é" : !sticks(youmonst.data)
- ? "\95ß\82Ü\82¦\82ç\82ê\82Ä\82¢\82é"
- : humanoid(u.ustuck->data)
- ? "\92N\82©\82ð\82Â\82©\82ñ\82Å\82¢\82é"
- : "\89ö\95¨\82ð\82Â\82©\82ñ\82Å\82¢\82é");
+ !u.ustuck ? "\95ß\82Ü\82Á\82Ä\82¢\82é"
+ : u.uswallow ? "\88ù\82Ý\8d\9e\82Ü\82ê\82Ä\82¢\82é"
+ : !sticks(youmonst.data) ? "\95ß\82Ü\82¦\82ç\82ê\82Ä\82¢\82é"
+ : humanoid(u.ustuck->data) ? "\92N\82©\82ð\82Â\82©\82ñ\82Å\82¢\82é"
+ : "\89ö\95¨\82ð\82Â\82©\82ñ\82Å\82¢\82é");
#endif
if (u.uundetected
|| (ismimic && youmonst.m_ap_type != M_AP_NOTHING)) {
The("\90ò\82Í\89B\82ê\82ç\82ê\82é\82Ù\82Ç\90[\82\82È\82¢\81D");
else
/*JP
- There("is no water to hide in here.");
+ There("is no %s to hide in here.", hliquid("water"));
*/
- There("\82±\82±\82É\82Í\89B\82ê\82é\82½\82ß\82Ì\90\85\82ª\82È\82¢\81D");
+ There("\82±\82±\82É\82Í\89B\82ê\82é\82½\82ß\82Ì%s\82ª\82È\82¢\81D", hliquid("\90\85"));
u.uundetected = 0;
return 0;
}
}
}
-/*
- * Some species have awareness of other species
- */
-static boolean
-polysense(mptr)
-struct permonst *mptr;
+/* some species have awareness of other species */
+static void
+polysense()
{
- short warnidx = 0;
+ short warnidx = NON_PM;
- context.warntype.speciesidx = 0;
+ context.warntype.speciesidx = NON_PM;
context.warntype.species = 0;
context.warntype.polyd = 0;
+ HWarn_of_mon &= ~FROMRACE;
- switch (monsndx(mptr)) {
+ switch (u.umonnum) {
case PM_PURPLE_WORM:
warnidx = PM_SHRIEKER;
break;
case PM_VAMPIRE_LORD:
context.warntype.polyd = M2_HUMAN | M2_ELF;
HWarn_of_mon |= FROMRACE;
- return TRUE;
+ return;
}
- if (warnidx) {
+ if (warnidx >= LOW_PM) {
context.warntype.speciesidx = warnidx;
context.warntype.species = &mons[warnidx];
HWarn_of_mon |= FROMRACE;
- return TRUE;
}
- context.warntype.speciesidx = 0;
- context.warntype.species = 0;
- HWarn_of_mon &= ~FROMRACE;
- return FALSE;
+}
+
+/* True iff hero's role or race has been genocided */
+boolean
+ugenocided()
+{
+ return (boolean) ((mvitals[urole.malenum].mvflags & G_GENOD)
+ || (urole.femalenum != NON_PM
+ && (mvitals[urole.femalenum].mvflags & G_GENOD))
+ || (mvitals[urace.malenum].mvflags & G_GENOD)
+ || (urace.femalenum != NON_PM
+ && (mvitals[urace.femalenum].mvflags & G_GENOD)));
+}
+
+/* how hero feels "inside" after self-genocide of role or race */
+const char *
+udeadinside()
+{
+ /* self-genocide used to always say "you feel dead inside" but that
+ seems silly when you're polymorphed into something undead;
+ monkilled() distinguishes between living (killed) and non (destroyed)
+ for monster death message; we refine the nonliving aspect a bit */
+#if 0 /*JP*/
+ return !nonliving(youmonst.data)
+ ? "dead" /* living, including demons */
+ : !weirdnonliving(youmonst.data)
+ ? "condemned" /* undead plus manes */
+ : "empty"; /* golems plus vortices */
+#else
+ return !nonliving(youmonst.data)
+ ? "\8e\80\82ñ\82¾" /* living, including demons */
+ : !weirdnonliving(youmonst.data)
+ ? "\94j\89ó\82³\82ê\82½" /* undead plus manes */
+ : "\82È\82\82È\82Á\82½"; /* golems plus vortices */
+#endif
}
/*polyself.c*/
OSDN Git Service
