fix #H4383 - blasted twice by Excalibur
...when alignment was toggled by helm of opposite alignment. The touch/retouch code is quite convoluted, but I think this simple change is the right fix.
This commit is contained in:
@@ -286,6 +286,8 @@ show in inventory which monster a leash is attached to
|
|||||||
using /? to look up something by name, supplying multiple spaces (with no
|
using /? to look up something by name, supplying multiple spaces (with no
|
||||||
other characters) as the name triggered impossible "singular of null?"
|
other characters) as the name triggered impossible "singular of null?"
|
||||||
add support for the 'altmeta' option to the 'what-does' command ('&' or '?f')
|
add support for the 'altmeta' option to the 'what-does' command ('&' or '?f')
|
||||||
|
when wielded weapon becomes untouchable (after alignment change or polymorph)
|
||||||
|
hero could be 'blasted by its power' twice in succession
|
||||||
|
|
||||||
|
|
||||||
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
|
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
|
||||||
|
|||||||
@@ -1888,7 +1888,7 @@ boolean loseit; /* whether to drop it if hero can longer touch it */
|
|||||||
bane = bane_applies(get_artifact(obj), &youmonst);
|
bane = bane_applies(get_artifact(obj), &youmonst);
|
||||||
|
|
||||||
/* nothing else to do if hero can successfully handle this object */
|
/* nothing else to do if hero can successfully handle this object */
|
||||||
if (!ag && !bane)
|
if (!ag && !bane && !touch_blasted)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* hero can't handle this object, but didn't get touch_artifact()'s
|
/* hero can't handle this object, but didn't get touch_artifact()'s
|
||||||
|
|||||||
Reference in New Issue
Block a user