Force beams of digging (wand or spell, known or unknown, also /random

effects) to ignore the endpoint target ('.') in favour of continuing
until the end of the range.

Unrestrict tridents for some more species.


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

1 files changed, 15 insertions, 0 deletions

diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 8e8ed3ed92..f4b275b76a 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -2211,6 +2211,21 @@ static char_choice_restriction _weapon_restriction(weapon_type wpn)
             return (CC_BANNED);
         }
 
+        // Tridents are strictly better than spears, so unrestrict them
+        // for some species whose Polearm aptitudes are not too bad.
+        switch (you.species)
+        {
+        case SP_MOUNTAIN_DWARF:
+        case SP_OGRE:
+        case SP_DEMIGOD:
+        case SP_DEMONSPAWN:
+        case SP_GHOUL:
+        case SP_VAMPIRE:
+            return (CC_UNRESTRICTED);
+        default:
+            break;
+        }
+
         // Both are polearms, right?
         return (_weapon_restriction(WPN_SPEAR));