Properly choose between either TSO's weapon blessing or his armor

blessing.


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

1 files changed, 17 insertions, 12 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 7f0718d881..08789e574e 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1117,22 +1117,27 @@ bool bless_follower(monsters* follower,
         switch (god)
         {
             case GOD_SHINING_ONE:
-                // Brand a monster's weapon with holy wrath, if
-                // possible.
-                if (_tso_blessing_holy_wpn(mon))
+                if (coinflip())
                 {
-                    result = "holy attack power";
-                    goto blessing_done;
+                    // Brand a monster's weapon with holy wrath, if
+                    // possible.
+                    if (_tso_blessing_holy_wpn(mon))
+                    {
+                        result = "holy attack power";
+                        goto blessing_done;
+                    }
                 }
-                break;
-
-                // Brand a monster's armour with positive energy, if
-                // possible.
-                if (_tso_blessing_holy_arm(mon))
+                else
                 {
-                    result = "life defence";
-                    goto blessing_done;
+                    // Brand a monster's armour with positive energy, if
+                    // possible.
+                    if (_tso_blessing_holy_arm(mon))
+                    {
+                        result = "life defence";
+                        goto blessing_done;
+                    }
                 }
+                break;
 
             case GOD_BEOGH:
                 // Turn a monster into a priestly monster, if possible.