Added shields of reflection, though they're not randomly generated and have no

valuation is shopping.cc.  It currently only reflects missiles that are blocked
with the shield.  They could also reflect the brand effects of blocked melee
weapons, but I'm not sure if that's a good idea.

drop_item and the item to be dropped have been moved from fire_beam()'s
parameters into the bolt structure, along with the beam's remaining range.
Seems to work fine, but it might still lead to some buggyness.

The game now distinguishes between killing yourself by hitting yourself with a
beam bounced off a wall versus other forms of self targeting.


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

1 files changed, 7 insertions, 0 deletions

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 915223cf6d..e418f1dc7d 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -2672,6 +2672,13 @@ bool is_shield_incompatible(const item_def &weapon, const item_def *shield)
             && !is_range_weapon(weapon));
 }
 
+bool shield_reflects(const item_def &shield)
+{
+    ASSERT(is_shield(shield));
+
+    return (get_armour_ego_type(shield) == SPARM_REFLECTION);
+}
+
 std::string item_base_name(const item_def &item)
 {
     switch (item.base_type)