summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makeitem.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-28 15:33:34 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-28 15:33:34 +0000
commita21c24113144c7bb063afc64ac2dc087117d03e7 (patch)
tree1e67c1a7289444931ab47b198374e36f4080ace2 /crawl-ref/source/makeitem.cc
parent9ad40dd0d2310690f18de13bfb9e2f3671bf727d (diff)
downloadcrawl-ref-a21c24113144c7bb063afc64ac2dc087117d03e7.tar.gz
crawl-ref-a21c24113144c7bb063afc64ac2dc087117d03e7.zip
Since hill orcs can be paladins now, allow orcish weapons of holy wrath.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6182 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
-rw-r--r--crawl-ref/source/makeitem.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 5e5b98403d..4a92ea8a1a 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1615,16 +1615,14 @@ static void _generate_weapon_item(item_def& item, bool allow_uniques,
if (get_equip_race(item) == ISFLAG_ORCISH
&& !(item_race == MAKE_ITEM_ORCISH && forced_ego))
{
- // No holy wrath or slay orc and 1/2 the time no-ego.
- const int brand = get_weapon_brand( item );
- if (brand == SPWPN_HOLY_WRATH
- || brand == SPWPN_ORC_SLAYING
+ // No orc slaying, and no ego at all half the time.
+ const int brand = get_weapon_brand(item);
+ if (brand == SPWPN_ORC_SLAYING
|| (brand != SPWPN_NORMAL && !forced_ego && coinflip()))
{
- set_item_ego_type( item, OBJ_WEAPONS, SPWPN_NORMAL );
+ set_item_ego_type(item, OBJ_WEAPONS, SPWPN_NORMAL);
}
}
- // All done!
}
static item_status_flag_type _determine_missile_race(const item_def& item,