From 0110531a5ebd2adf841b8a86df0819caf7875f71 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Sun, 15 Nov 2009 21:51:35 +0100
Subject: Cross-train Staves and M&F.

---
 crawl-ref/source/skills.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index 64fd439fc2..d39635531a 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -208,6 +208,14 @@ static int _exercise2(int exsk)
             bonus += random2(30);
         }
 
+        // Maces and Staves.
+        if ((exsk == SK_MACES_FLAILS || exsk == SK_STAVES)
+            && (you.skills[SK_MACES_FLAILS] > you.skills[exsk]
+                || you.skills[SK_STAVES] > you.skills[exsk]))
+        {
+            bonus += random2(30);
+        }
+
         // Slings and Throwing.
         if ((exsk == SK_SLINGS || exsk == SK_THROWING)
             && (you.skills[SK_SLINGS] > you.skills[exsk]
-- 
cgit v1.2.3-54-g00ecf