Card-summon dancing weapons no longer leave the weapon behind.

Reworded some of the extra god help, removed unnecessary meta-information
about Trog not needing Invocations and Nemelex using Evocations. Such things
can be left to the player to discover without affecting their enjoyment of
the game.

Extra religion help is now in lightgrey (darkgrey presents display problems
on 8-colour terms).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2013 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 12 insertions, 7 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 036e70aa16..950b5b93a1 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1207,13 +1207,18 @@ static void summon_dancing_weapon(int power, deck_rarity_type rarity)
 {
     const int power_level = get_power_level(power, rarity);
     const bool friendly = (power_level > 0 || !one_chance_in(4));
-    create_monster( MONS_DANCING_WEAPON, power_level + 3,
-                    friendly ? BEH_FRIENDLY : BEH_HOSTILE,
-                    you.x_pos, you.y_pos,
-                    friendly ? you.pet_target : MHITYOU,
-                    250 );
-    // Intentionally not setting hard_reset here. Maybe this should
-    // depend on power_level?
+    const int mon = create_monster( MONS_DANCING_WEAPON, power_level + 3,
+                                    friendly ? BEH_FRIENDLY : BEH_HOSTILE,
+                                    you.x_pos, you.y_pos,
+                                    friendly ? you.pet_target : MHITYOU,
+                                    250 );
+    
+    // Given the abundance of Nemelex decks, not setting hard reset
+    // leaves a trail of weapons behind, most of which just get
+    // offered to Nemelex again, adding an unnecessary source of
+    // piety.
+    if (mon != -1)
+        menv[mon].flags |= MF_HARD_RESET;
 }
 
 static int card_power(deck_rarity_type rarity)