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

feedback bit

Browse Source 
Handle the candle vs underwater message that just had its punctation
fixed slightly differently.
This commit is contained in:
PatR
2023-01-21 11:24:52 -08:00
parent cf0a652e8f
commit 1f9cb8250b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apply.c
+11 -9
View File
@@ -47,9 +47,9 @@ static boolean get_valid_jump_position(coordxy, coordxy);
static boolean get_valid_polearm_position(coordxy, coordxy); static boolean get_valid_polearm_position(coordxy, coordxy);
static boolean find_poleable_mon(coord *, int, int); static boolean find_poleable_mon(coord *, int, int);
static const char Nothing_seems_to_happen[] = "Nothing seems to happen."; static const char
static const char no_elbow_room[] = Nothing_seems_to_happen[] = "Nothing seems to happen.",
"don't have enough elbow-room to maneuver."; no_elbow_room[] = "don't have enough elbow-room to maneuver.";
static int static int
use_camera(struct obj *obj) use_camera(struct obj *obj)
@@ -1050,8 +1050,9 @@ use_mirror(struct obj *obj)
} }
if (Underwater) { if (Underwater) {
if (useeit) if (useeit)
You(Hallucination ? "give the fish a chance to fix their makeup." You("%s.",
: "reflect the murky water."); Hallucination ? "give the fish a chance to fix their makeup"
: "reflect the murky water");
return ECMD_TIME; return ECMD_TIME;
} }
if (u.dz) { if (u.dz) {
@@ -1190,8 +1191,8 @@ use_bell(struct obj **optr)
&& !(gm.mvitals[PM_WOOD_NYMPH].mvflags & G_GONE) && !(gm.mvitals[PM_WOOD_NYMPH].mvflags & G_GONE)
&& !(gm.mvitals[PM_WATER_NYMPH].mvflags & G_GONE) && !(gm.mvitals[PM_WATER_NYMPH].mvflags & G_GONE)
&& !(gm.mvitals[PM_MOUNTAIN_NYMPH].mvflags & G_GONE) && !(gm.mvitals[PM_MOUNTAIN_NYMPH].mvflags & G_GONE)
&& (mtmp = makemon(mkclass(S_NYMPH, 0), u.ux, u.uy, NO_MINVENT|MM_NOMSG)) && (mtmp = makemon(mkclass(S_NYMPH, 0), u.ux, u.uy,
!= 0) { NO_MINVENT | MM_NOMSG)) != 0) {
You("summon %s!", a_monnam(mtmp)); You("summon %s!", a_monnam(mtmp));
if (!obj_resists(obj, 93, 100)) { if (!obj_resists(obj, 93, 100)) {
pline("%s shattered!", Tobjnam(obj, "have")); pline("%s shattered!", Tobjnam(obj, "have"));
@@ -1598,8 +1599,9 @@ use_lamp(struct obj *obj)
return; return;
} }
if (Underwater) { if (Underwater) {
pline(!Is_candle(obj) ? "This is not a diving lamp." pline("%s.",
: "Sorry, fire and water don't mix."); !Is_candle(obj) ? "This is not a diving lamp"
: "Sorry, fire and water don't mix");
return; return;
} }
/* magic lamps with an spe == 0 (wished for) cannot be lit */ /* magic lamps with an spe == 0 (wished for) cannot be lit */