-/* NetHack 3.6 mthrowu.c $NHDT-Date: 1542765360 2018/11/21 01:56:00 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.78 $ */
+/* NetHack 3.6 mthrowu.c $NHDT-Date: 1573688695 2019/11/13 23:44:55 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.86 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2016. */
/* NetHack may be freely redistributed. See license for details. */
/* JNetHack Copyright */
/* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000 */
-/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2019 */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2020 */
/* JNetHack may be freely redistributed. See license for details. */
#include "hack.h"
* Keep consistent with breath weapons in zap.c, and AD_* in monattk.h.
*/
STATIC_OVL NEARDATA const char *breathwep[] = {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
"fragments", "fire", "frost", "sleep gas", "a disintegration blast",
"lightning", "poison gas", "acid", "strange breath #8",
"strange breath #9"
&& Hate_silver) {
/* extra damage already applied by dmgval() */
/*JP
- pline_The("silver sears your flesh!");
+ pline_The("silver sears your flesh!");
*/
- pline("\82 \82È\82½\82Ì\91Ì\82Í\8bâ\82Å\8fÄ\82©\82ê\82½\81I");
+ pline("\82 \82È\82½\82Ì\91Ì\82Í\8bâ\82Å\8fÄ\82©\82ê\82½\81I");
exercise(A_CON, FALSE);
}
if (is_acid)
/* Elven Craftsmanship makes for light, quick bows */
if (otmp->otyp == ELVEN_ARROW && !otmp->cursed)
multishot++;
- if (ammo_and_launcher(otmp, uwep) && mwep->otyp == ELVEN_BOW
+ /* for arrow, we checked bow&arrow when entering block, but for
+ bow, so far we've only validated that otmp is a weapon stack;
+ need to verify that it's a stack of arrows rather than darts */
+ if (mwep && mwep->otyp == ELVEN_BOW && ammo_and_launcher(otmp, mwep)
&& !mwep->cursed)
multishot++;
/* 1/3 of launcher enchantment */
if (!strcmp(trgbuf, "it"))
Strcpy(trgbuf, humanoid(mtmp->data) ? "someone" : something);
#endif
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s %s %s%s%s!", Monnam(mtmp),
m_shot.s ? "shoots" : "throws", onm,
mtarg ? " at " : "", trgbuf);
damage = dmgval(otmp, mtmp);
if (otmp->otyp == ACID_VENOM && resists_acid(mtmp))
damage = 0;
+#if 0 /* can't use this because we don't have the attacker */
+ if (is_orc(mtmp->data) && is_elf(?magr?))
+ damage++;
+#endif
if (ismimic)
seemimic(mtmp);
mtmp->msleeping = 0;
}
if (objects[otmp->otyp].oc_material == SILVER
&& mon_hates_silver(mtmp)) {
- if (vis)
+ boolean flesh = (!noncorporeal(mtmp->data)
+ && !amorphous(mtmp->data));
+
+ /* note: extra silver damage is handled by dmgval() */
+ if (vis) {
+ char *m_name = mon_nam(mtmp);
+
+ if (flesh) /* s_suffix returns a modifiable buffer */
/*JP
- pline_The("silver sears %s flesh!", s_suffix(mon_nam(mtmp)));
+ m_name = strcat(s_suffix(m_name), " flesh");
*/
- pline("%s\82Ì\91Ì\82Í\8bâ\82Å\8fÄ\82©\82ê\82½\81I", mon_nam(mtmp));
- else if (verbose && !target)
+ m_name = strcat(s_suffix(m_name), "\82Ì\91Ì");
+/*JP
+ pline_The("silver sears %s!", m_name);
+*/
+ pline("%s\82Í\8bâ\82Å\8fÄ\82©\82ê\82½\81I", m_name);
+ } else if (verbose && !target) {
/*JP
- pline("Its flesh is seared!");
+ pline("%s is seared!", flesh ? "Its flesh" : "It");
*/
- pline("\89½\8eÒ\82©\82Ì\91Ì\82Í\8fÄ\82©\82ê\82½\81I");
+ pline("\89½%s\82Í\8fÄ\82©\82ê\82½\81I", flesh ? "\8eÒ\82©\82Ì\91Ì" : "\82©");
+ }
}
if (otmp->otyp == ACID_VENOM && cansee(mtmp->mx, mtmp->my)) {
if (resists_acid(mtmp)) {
*/
pline("%s\82Í\82Í\82¸\82µ\82½\81I", Monnam(mon));
else
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s as %s throws it!", Tobjnam(singleobj, "slip"),
mon_nam(mon));
#else
while (range-- > 0) { /* Actually the loop is always exited by break */
bhitpos.x += dx;
bhitpos.y += dy;
- if ((mtmp = m_at(bhitpos.x, bhitpos.y)) != 0) {
+ mtmp = m_at(bhitpos.x, bhitpos.y);
+ if (mtmp && shade_miss(mon, mtmp, singleobj, TRUE, TRUE)) {
+ /* if mtmp is a shade and missile passes harmlessly through it,
+ give message and skip it in order to keep going */
+ mtmp = (struct monst *) 0;
+ } else if (mtmp) {
if (ohitmon(mtmp, singleobj, range, TRUE))
break;
} else if (bhitpos.x == u.ux && bhitpos.y == u.uy) {
You("catch the %s.", xname(singleobj));
*/
You("%s\82ð\82Â\82©\82Ü\82¦\82½\81D", xname(singleobj));
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("are not interested in %s junk.",
s_suffix(mon_nam(mon)));
#else
*/
"\82±\82ê\82ª\97~\82µ\82©\82Á\82½\82ñ\82¾\82Æ\8ev\82¢\82È\82ª\82ç%s\82Ì\91¡\82è\95¨\82ð\8eó\82¯\82Æ\82Á\82½\81D",
s_suffix(mon_nam(mon)));
-#if 0 /*JP*/
+#if 0 /*JP:T*/
(void) hold_another_object(singleobj,
"You catch, but drop, %s.",
xname(singleobj),
*/
pline("\83E\83F\81[\81D\83N\83\8a\81[\83\80\82ð\82©\82Ô\82Á\82½\81D");
else
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("There's %s sticky all over your %s.",
something, body_part(FACE));
#else
break;
default:
impossible("bad attack type in spitmu");
- /* fall through */
+ /*FALLTHRU*/
case AD_ACID:
otmp = mksobj(ACID_VENOM, TRUE, FALSE);
break;
if (canseemon(mtmp)) {
onm = xname(otmp);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s thrusts %s.", Monnam(mtmp),
obj_is_pname(otmp) ? the(onm) : an(onm));
#else
if (mtmp->mcan) {
if (!Deaf)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("A dry rattle comes from %s throat.",
s_suffix(mon_nam(mtmp)));
#else
if (!mtmp->mspec_used && rn2(3)) {
if ((typ >= AD_MAGM) && (typ <= AD_ACID)) {
if (canseemon(mtmp))
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s breathes %s!", Monnam(mtmp),
breathwep[typ - 1]);
#else
}
else if (obj_type == BOULDER || obj_type == HEAVY_IRON_BALL)
/*JP
- pline("Whang!");
+ pline("Whang!");
*/
- pline("\82®\82í\81[\82ñ\81I");
+ pline("\82®\82í\81[\82ñ\81I");
else if (otmp->oclass == COIN_CLASS
|| objects[obj_type].oc_material == GOLD
|| objects[obj_type].oc_material == SILVER)
/*JP
- pline("Clink!");
+ pline("Clink!");
*/
- pline("\83`\83\83\83\8a\83\93\81I");
+ pline("\83`\83\83\83\8a\83\93\81I");
else
/*JP
- pline("Clonk!");
+ pline("Clonk!");
*/
- pline("\83S\83c\83\93\81I");
+ pline("\83S\83c\83\93\81I");
}
/* TRUE iff thrown/kicked/rolled object doesn't pass through iron bars */
OSDN Git Service
