Fixing dazzling display

LuminariMUD · Jan 31, 2023 · 7b69f3e · 7b69f3e
1 parent f842587
commit 7b69f3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/act.h b/act.h
@@ -594,7 +594,7 @@ ACMD_DECL(do_dragonborn_breath_weapon);
 ACMDCHECK(can_dragonborn_breath_weapon);
 ACMD_DECL(do_tabaxi_claw_attack);
 ACMDCHECK(can_tabaxi_claw_attack);
-ACMDCHECK(do_dazzling_display);
+ACMD_DECL(do_dazzling_display);
 ACMDCHECK(can_dazzling_display);
 ACMD_DECL(do_blast);
 ACMDCHECK(can_eldritch_blast);

diff --git a/spell_parser.c b/spell_parser.c
@@ -522,13 +522,10 @@ int call_magic(struct char_data *caster, struct char_data *cvict,
     {
     case CLASS_WARLOCK:
     case CLASS_BARD:
-      int max_armor_size = ARMOR_TYPE_LIGHT;
-      if (HAS_FEAT(caster, FEAT_BATTLE_CASTER))
-        max_armor_size = ARMOR_TYPE_MEDIUM;
       if (!canCastAtWill(caster, spellnum))
       {
         /* bards & warlocks can wear light armor and cast unpenalized (bard spells) */
-        if (compute_gear_armor_type(caster) > max_armor_size ||
+        if (compute_gear_armor_type(caster) > (HAS_FEAT(caster, FEAT_BATTLE_CASTER) ? ARMOR_TYPE_MEDIUM : ARMOR_TYPE_LIGHT) ||
             compute_gear_shield_type(caster) > ARMOR_TYPE_SHIELD)
           if (rand_number(1, 100) <= compute_gear_spell_failure(caster))
           {