-/* NetHack 3.6 artifact.c $NHDT-Date: 1509836679 2017/11/04 23:04:39 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.106 $ */
+/* NetHack 3.6 artifact.c $NHDT-Date: 1553363416 2019/03/23 17:50:16 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.129 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */
struct obj *, int *, int, BOOLEAN_P, char *));
STATIC_DCL unsigned long FDECL(abil_to_spfx, (long *));
STATIC_DCL uchar FDECL(abil_to_adtyp, (long *));
+STATIC_DCL int FDECL(glow_strength, (int));
STATIC_DCL boolean FDECL(untouchable, (struct obj *, BOOLEAN_P));
STATIC_DCL int FDECL(count_surround_traps, (int, int));
if (youmonst.data != old_uasmon)
*dmgptr = 0; /* rehumanized, so no more damage */
if (u.uenmax > 0) {
+ u.uenmax--;
+ if (u.uen > 0)
+ u.uen--;
+ context.botl = TRUE;
/*JP
You("lose magical energy!");
*/
You("\96\82\96@\82Ì\83G\83l\83\8b\83M\81[\82ð\8e¸\82Á\82½\81I");
- u.uenmax--;
- if (u.uen > 0)
- u.uen--;
- context.botl = 1;
}
} else {
if (mdef->data == &mons[PM_CLAY_GOLEM])
mdef->mhp = 1; /* cancelled clay golems will die */
if (youattack && attacktype(mdef->data, AT_MAGC)) {
+ u.uenmax++;
+ u.uen++;
+ context.botl = TRUE;
/*JP
You("absorb magical energy!");
*/
You("\96\82\96@\82Ì\83G\83l\83\8b\83M\81[\82ð\8bz\82¢\82Æ\82Á\82½\81I");
- u.uenmax++;
- u.uen++;
- context.botl = 1;
}
}
}
pline("\8b\90\91å\82È\83n\83\93\83}\81[\82Í%s\82É\96½\92\86\82µ\82½%s", hittee,
!spec_dbon_applies ? "\81D" : "\81I\93d\8c\82\82ª\8fP\82Á\82½\81I");
#endif
+ if (spec_dbon_applies)
+ wake_nearto(mdef->mx, mdef->my, 4 * 4);
if (!rn2(5))
(void) destroy_mitem(mdef, RING_CLASS, AD_ELEC);
if (!rn2(5))
make_slimed(0L, (char *) 0);
if (Blinded > creamed)
make_blinded(creamed, FALSE);
- context.botl = 1;
+ context.botl = TRUE;
break;
}
case ENERGY_BOOST: {
int epboost = (u.uenmax + 1 - u.uen) / 2;
+
if (epboost > 120)
epboost = 120; /* arbitrary */
else if (epboost < 12)
epboost = u.uenmax - u.uen;
if (epboost) {
+ u.uen += epboost;
+ context.botl = TRUE;
/*JP
You_feel("re-energized.");
*/
You("\83G\83l\83\8b\83M\81[\82Å\96\9e\82½\82³\82ê\82½\81D");
- u.uen += epboost;
- context.botl = 1;
} else
goto nothing_special;
break;
otmp = hold_another_object(otmp, "\93Ë\91R%s\82ª\97\8e\82¿\82½\81D",
xname(otmp), 0);
#endif
+ nhUse(otmp);
break;
}
}
}
if ((eprop & ~W_ARTI) || iprop) {
- nothing_special:
+ nothing_special:
/* you had the property from some other source too */
if (carried(obj))
/*JP
return hcolor(colorstr);
}
+/* glow verb; [0] holds the value used when blind */
+static const char *glow_verbs[] = {
+/*JP
+ "quiver", "flicker", "glimmer", "gleam"
+*/
+ "\90k\82¦\82é", "\82Ü\82½\82½\82", "\8cõ\82é", "\8bP\82"
+};
+
+/* relative strength that Sting is glowing (0..3), to select verb */
+STATIC_OVL int
+glow_strength(count)
+int count;
+{
+ /* glow strength should also be proportional to proximity and
+ probably difficulty, but we don't have that information and
+ gathering it is more trouble than this would be worth */
+ return (count > 12) ? 3 : (count > 4) ? 2 : (count > 0);
+}
+
+const char *
+glow_verb(count, ingsfx)
+int count; /* 0 means blind rather than no applicable creatures */
+boolean ingsfx;
+{
+ static char resbuf[20];
+
+ Strcpy(resbuf, glow_verbs[glow_strength(count)]);
+ /* ing_suffix() will double the last consonant for all the words
+ we're using and none of them should have that, so bypass it */
+#if 0 /*JP*//*\93ú\96{\8cê\82Å\82Í\8eg\82í\82È\82¢*/
+ if (ingsfx)
+ Strcat(resbuf, "ing");
+#endif
+ return resbuf;
+}
+
/* use for warning "glow" for Sting, Orcrist, and Grimtooth */
void
Sting_effects(orc_count)
&& (uwep->oartifact == ART_STING
|| uwep->oartifact == ART_ORCRIST
|| uwep->oartifact == ART_GRIMTOOTH)) {
+ int oldstr = glow_strength(warn_obj_cnt),
+ newstr = glow_strength(orc_count);
+
if (orc_count == -1 && warn_obj_cnt > 0) {
/* -1 means that blindness has just been toggled; give a
'continue' message that eventual 'stop' message will match */
#if 0 /*JP*/
pline("%s is %s.", bare_artifactname(uwep),
- !Blind ? "glowing" : "quivering");
+ glow_verb(Blind ? 0 : warn_obj_cnt, TRUE));
#else
- pline("%s\82Í%s\82Ă¢\82é\81D", bare_artifactname(uwep),
- !Blind ? "\8bP\82¢" : "\90k\82¦");
+ pline("%s\82Í%s\82¢\82é\81D", bare_artifactname(uwep),
+ jconj(glow_verb(Blind ? 0 : warn_obj_cnt, TRUE), "\82Ä"));
#endif
- } else if (orc_count > 0 && warn_obj_cnt == 0) {
+ } else if (newstr > 0 && newstr != oldstr) {
/* 'start' message */
if (!Blind)
#if 0 /*JP*/
- pline("%s %s %s!", bare_artifactname(uwep),
- otense(uwep, "glow"), glow_color(uwep->oartifact));
+ pline("%s %s %s%c", bare_artifactname(uwep),
+ otense(uwep, glow_verb(orc_count, FALSE)),
+ glow_color(uwep->oartifact),
+ (newstr > oldstr) ? '!' : '.');
#else
- pline("%s\82Í%s\8bP\82¢\82½\81I", bare_artifactname(uwep),
- glow_color(uwep->oartifact));
+ pline("%s\82Í%s%s%s", bare_artifactname(uwep),
+ jconj_adj(glow_color(uwep->oartifact)),
+ jconj(glow_verb(orc_count, FALSE), "\82½"),
+ (newstr > oldstr) ? "\81I" : "\81D");
#endif
- else
-/*JP
- pline("%s quivers slightly.", bare_artifactname(uwep));
-*/
+ else if (oldstr == 0) /* quivers */
+#if 0 /*JP*/
+ pline("%s %s slightly.", bare_artifactname(uwep),
+ otense(uwep, glow_verb(0, FALSE)));
+#else
pline("%s\82Í\8f\82µ\90k\82¦\82½\81D", bare_artifactname(uwep));
+#endif
} else if (orc_count == 0 && warn_obj_cnt > 0) {
/* 'stop' message */
#if 0 /*JP*/
pline("%s stops %s.", bare_artifactname(uwep),
- !Blind ? "glowing" : "quivering");
+ glow_verb(Blind ? 0 : warn_obj_cnt, TRUE));
#else
- pline("%s\82Ì%s\82Í\8e~\82Ü\82Á\82½\81D", bare_artifactname(uwep),
- !Blind ? "\8bP\82«" : "\90k\82¦");
+ pline("%s\82Í%s\82Ì\82ð\82â\82ß\82½\81D", bare_artifactname(uwep),
+ glow_verb(Blind ? 0 : warn_obj_cnt, TRUE));
#endif
}
}
if (loseit && obj) {
if (Levitation) {
freeinv(obj);
- hitfloor(obj);
+ hitfloor(obj, TRUE);
} else {
/* dropx gives a message iff item lands on an altar */
if (!IS_ALTAR(levl[u.ux][u.uy].typ))
OSDN Git Service
