fix to optinalRuleExceedsByFive

Xacus · Dec 17, 2024 · 55605c3 · 55605c3
1 parent 6d7b8ae
commit 55605c3
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/module/chat/roll-messages.js b/src/module/chat/roll-messages.js
@@ -1,6 +1,5 @@
 import {buildAttackEffectsMessage, buildAttributeEffectsMessage, buildTalentEffectsMessage} from './effect-messages'
-import { buildActorInfo, formatDice, getChatBaseData } from './base-messages'
-import { optinalRuleExceedsByFive } from './settings.js'
+import {buildActorInfo, formatDice, getChatBaseData} from './base-messages'
 
 function changeBobDieColour (attackRoll)
 {
@@ -55,7 +54,7 @@ export function postAttackToChat(attacker, defender, item, attackRoll, attackAtt
       ? defender?.system.characteristics.defense
       : defender?.getAttribute(defenseAttribute)?.value || ''
 
-  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (optinalRuleExceedsByFive ? 5 : 4) : true)
+  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (game.settings.get('demonlord', 'optinalRuleExceedsByFive') ? 5 : 4) : true)
   const didHit = voidRoll ? false : attackRoll?.total >= targetNumber
 
   let diceTotalGM = attackRoll?.total ?? ''
@@ -224,7 +223,7 @@ export function postTalentToChat(actor, talent, attackRoll, target, inputBoons)
   }
 
   const targetNumber = talentData?.action?.attack ? actor.getTargetNumber(talent) : ''
-  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (optinalRuleExceedsByFive ? 5 : 4) : true)
+  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (game.settings.get('demonlord', 'optinalRuleExceedsByFive') ? 5 : 4) : true)
 
   let resultText =
     !voidRoll && attackRoll != null && targetNumber !== undefined && attackRoll.total >= parseInt(targetNumber)
@@ -340,7 +339,7 @@ export async function postSpellToChat(actor, spell, attackRoll, target, inputBoo
   if (uses >= 0 && usesMax > 0) usesText = game.i18n.localize('DL.SpellCastingsUses') + ': ' + uses + ' / ' + usesMax
 
   const targetNumber = actor.getTargetNumber(spell)
-  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (optinalRuleExceedsByFive ? 5 : 4) : true)
+  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (game.settings.get('demonlord', 'optinalRuleExceedsByFive') ? 5 : 4) : true)
 
   let resultText =
     !voidRoll && targetNumber && attackRoll?.total >= parseInt(targetNumber)
@@ -512,7 +511,7 @@ export const postItemToChat = (actor, item, attackRoll, target, inputBoons) => {
   }*/
 
   const targetNumber = itemData?.action?.attack ? actor.getTargetNumber(item) : ''
-  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (optinalRuleExceedsByFive ? 5 : 4) : true)
+  const plus20 = attackRoll?.total >= 20 && (targetNumber ? attackRoll?.total > targetNumber + (game.settings.get('demonlord', 'optinalRuleExceedsByFive') ? 5 : 4) : true)
 
   let resultText =
     !voidRoll && attackRoll != null && targetNumber !== undefined && attackRoll.total >= parseInt(targetNumber)