diff options
| -rw-r--r-- | crawl-ref/source/item_use.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 29d371fd83..d5707703d0 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2934,6 +2934,7 @@ void zap_wand(void) } const bool alreadyknown = item_type_known(wand); + const bool alreadytried = item_type_tried(wand); if (!alreadyknown) beam.effect_known = false; @@ -3030,7 +3031,7 @@ void zap_wand(void) exercise( SK_EVOCATIONS, 1 ); alert_nearby_monsters(); - if (!alreadyknown && dangerous) + if (!alreadyknown && !alreadytried && dangerous) { // Xom loves it when you use an unknown wand and there is a // dangerous monster nearby... diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index d08588ced8..a0e4193b51 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -577,8 +577,8 @@ static bool xom_is_good(int sever) god_speaks(GOD_XOM, (temp_rand == 0) ? "\"Serve the mortal, my child!\"" : - (temp_rand == 1) ? "Xom grants you a demonic assistant." - : "Xom opens a gate."); + (temp_rand == 1) ? "\"Serve the toy, my child!\"" : + "Xom opens a gate."); done = true; } } @@ -641,8 +641,8 @@ static bool xom_is_good(int sever) { temp_rand = random2(3); god_speaks(GOD_XOM, - (temp_rand == 0) ? "\"Serve the toy, my child!\"" : - (temp_rand == 1) ? "Xom grants you a demonic servitor." + (temp_rand == 0) ? "Xom grants you a demonic assistant." + : (temp_rand == 1) ? "Xom grants you a demonic servitor." : "Xom opens a gate."); done = true; } |