Adjust launcher generation brands.

Only crossbows may generate with penetration, and only bows may generate
with reaping. I have also decreased the chances of vorpal appearing on a
launcher.

Hopefully I haven't broken the logic here too much.

1 files changed, 15 insertions, 5 deletions

diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 228dc51339..cb9e135e63 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -767,14 +767,24 @@ void static _get_randart_properties(const item_def &item,
                     proprt[ARTP_BRAND] = SPWPN_NORMAL;
                 }
 
-                if (atype == WPN_SLING
-                    && proprt[ARTP_BRAND] == SPWPN_VENOM)
-                {
-                    proprt[ARTP_BRAND] = SPWPN_NORMAL;
-                }
+                // Removed slings from getting the venom attribute: they can
+                // be branded with it now using Poison Weapon, and perma-branded
+                // via vorpalise weapon.
 
                 if (atype == WPN_CROSSBOW && one_chance_in(5))
                     proprt[ARTP_BRAND] = SPWPN_ELECTROCUTION;
+
+                // XXX: Penetration is only allowed on crossbows. This may change
+                // in future.
+                if (atype != WPN_CROSSBOW && proprt[ARTP_BRAND] == SPWPN_PENETRATION)
+                    proprt[ARTP_BRAND] = SPWPN_NORMAL;
+
+                // XXX: Only allow reaping brand on bows. This may change.
+                if (atype != WPN_BOW && atype != WPN_LONGBOW 
+                    && proprt[ARTP_BRAND] == SPWPN_REAPING)
+                {
+                    proprt[ARTP_BRAND] = SPWPN_NORMAL;
+                }
             }
         }