Make sceptre of Asmodeus success depend on evocations skill

1 files changed, 29 insertions, 32 deletions

diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h
index 2184568165..0fbbddd398 100644
--- a/crawl-ref/source/art-func.h
+++ b/crawl-ref/source/art-func.h
@@ -70,42 +70,39 @@ static void _ASMODEUS_melee_effect(item_def* weapon, actor* attacker,
 
 static bool _evoke_sceptre_of_asmodeus()
 {
-    bool rc = false;
-    if (one_chance_in(3))
+    if (!x_chance_in_y(you.skill(SK_EVOCATIONS, 100), 3000))
+        return (false);
+
+    const monster_type mon = random_choose_weighted(
+                                   3, MONS_EFREET,
+                                   3, MONS_SUN_DEMON,
+                                   2, MONS_BALRUG,
+                                   2, MONS_HELLION,
+                                   1, MONS_PIT_FIEND,
+                                   1, MONS_BRIMSTONE_FIEND,
+                                   0);
+
+    mgen_data mg(mon, BEH_CHARMED, &you,
+                 0, 0, you.pos(), MHITYOU,
+                 MG_FORCE_BEH, you.religion);
+
+    const int mons = create_monster(mg);
+
+    if (mons != -1)
     {
-        const monster_type mon = random_choose_weighted(
-                                       3, MONS_EFREET,
-                                       3, MONS_SUN_DEMON,
-                                       2, MONS_BALRUG,
-                                       2, MONS_HELLION,
-                                       1, MONS_PIT_FIEND,
-                                       1, MONS_BRIMSTONE_FIEND,
-                                       0);
-
-        mgen_data mg(mon, BEH_CHARMED, &you,
-                     0, 0, you.pos(), MHITYOU,
-                     MG_FORCE_BEH, you.religion);
-
-        const int mons = create_monster(mg);
-
-        if (mons != -1)
-        {
-            rc = true;
-            mpr("The Sceptre summons one of its servants.");
-            did_god_conduct(DID_UNHOLY, 3);
+        mpr("The Sceptre summons one of its servants.");
+        did_god_conduct(DID_UNHOLY, 3);
 
-            monster* m = &menv[mons];
-            m->add_ench(mon_enchant(ENCH_FAKE_ABJURATION, 6));
+        monster* m = &menv[mons];
+        m->add_ench(mon_enchant(ENCH_FAKE_ABJURATION, 6));
 
-            if (!player_angers_monster(m))
-            {
-                mpr("You don't feel so good about this...");
-            }
-        }
-        else
-            mpr("The air shimmers briefly.");
+        if (!player_angers_monster(m))
+            mpr("You don't feel so good about this...");
     }
-    return (rc);
+    else
+        mpr("The air shimmers briefly.");
+
+    return (true);
 }