U1270 - monster evading kick produces a teleport message in Sokoban

This time, it was just the message that was incorrect.  Added a
!level.flags.noteleport check before displaying "teleports".
This commit is contained in:
cohrs
2005-01-27 17:21:33 +00:00
parent 4527baa259
commit ce1bf539ac
2 changed files with 23 additions and 21 deletions
+1
View File
@@ -81,6 +81,7 @@ adding more candles than required to total 7 to a candelabrum which
already had between 1 and 6 gave an ungrammatical message already had between 1 and 6 gave an ungrammatical message
give correct message when a spellcasting monster summons other monsters give correct message when a spellcasting monster summons other monsters
correct experience calculation for monsters that cause nonphysical damage correct experience calculation for monsters that cause nonphysical damage
monsters evading a kick on noteleport levels would cause a "teleports" message
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
+3 -2
View File
@@ -214,11 +214,12 @@ doit:
newsym(x, y); newsym(x, y);
} }
pline("%s %s, %s evading your %skick.", Monnam(mon), pline("%s %s, %s evading your %skick.", Monnam(mon),
(can_teleport(mon->data) ? "teleports" : (!level.flags.noteleport && can_teleport(mon->data)) ?
"teleports" :
is_floater(mon->data) ? "floats" : is_floater(mon->data) ? "floats" :
is_flyer(mon->data) ? "swoops" : is_flyer(mon->data) ? "swoops" :
(nolimbs(mon->data) || slithy(mon->data)) ? (nolimbs(mon->data) || slithy(mon->data)) ?
"slides" : "jumps"), "slides" : "jumps",
clumsy ? "easily" : "nimbly", clumsy ? "easily" : "nimbly",
clumsy ? "clumsy " : ""); clumsy ? "clumsy " : "");
(void) passive(mon, FALSE, 1, AT_KICK, FALSE); (void) passive(mon, FALSE, 1, AT_KICK, FALSE);