summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makeitem.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 14:24:50 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-30 14:24:50 +0000
commit9876ce66bfd29003796a8182b20696e57fe7add5 (patch)
treeecff8a89b72e683208e92897ee51356bc507b911 /crawl-ref/source/makeitem.cc
parent8f709e97f1d6483880922ba7c3a902c24c35c90b (diff)
downloadcrawl-ref-9876ce66bfd29003796a8182b20696e57fe7add5.tar.gz
crawl-ref-9876ce66bfd29003796a8182b20696e57fe7add5.zip
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6243 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
-rw-r--r--crawl-ref/source/makeitem.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 4a92ea8a1a..07b854f7be 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1463,9 +1463,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
rc = SPWPN_VENOM;
break;
- case WPN_DEMON_TRIDENT:
case WPN_DEMON_WHIP:
case WPN_DEMON_BLADE:
+ case WPN_DEMON_TRIDENT:
if (one_chance_in(10))
rc = SPWPN_PAIN;
@@ -3497,11 +3497,11 @@ static item_make_species_type _give_weapon(monsters *mon, int level,
if (one_chance_in(7))
item.sub_type = WPN_BROAD_AXE;
if (one_chance_in(7))
- item.sub_type = WPN_DEMON_TRIDENT;
+ item.sub_type = WPN_DEMON_WHIP;
if (one_chance_in(7))
item.sub_type = WPN_DEMON_BLADE;
if (one_chance_in(7))
- item.sub_type = WPN_DEMON_WHIP;
+ item.sub_type = WPN_DEMON_TRIDENT;
if (one_chance_in(3))
set_item_ego_type( item, OBJ_WEAPONS, SPWPN_FLAMING );