[#4684] Adjust alert feat to add proficiency to initiative if using m…

…odern rules.
foundryvtt · Nov 11, 2024 · a887ee2 · a887ee2
1 parent fd35784
commit a887ee2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/dnd5e.mjs b/dnd5e.mjs
@@ -440,6 +440,7 @@ Hooks.once("i18nInit", () => {
         racePl: game.i18n.localize("TYPES.Item.raceLegacyPl")
       },
       DND5E: {
+        FlagsAlertHint: game.i18n.localize("DND5E.FlagsAlertHintLegacy"),
         LanguagesExotic: game.i18n.localize("DND5E.LanguagesExoticLegacy"),
         LongRestHint: game.i18n.localize("DND5E.LongRestHintLegacy"),
         LongRestHintGroup: game.i18n.localize("DND5E.LongRestHintGroupLegacy"),

diff --git a/lang/en.json b/lang/en.json
@@ -2010,7 +2010,8 @@
 "DND5E.FlagsInitiativeAdv": "Advantage on Initiative",
 "DND5E.FlagsInitiativeAdvHint": "Provided by feats or magical items.",
 "DND5E.FlagsAlert": "Alert Feat",
-"DND5E.FlagsAlertHint": "Provides +5 to Initiative.",
+"DND5E.FlagsAlertHint": "Proficient in Initiative rolls.",
+"DND5E.FlagsAlertHintLegacy": "Provides +5 to Initiative.",
 "DND5E.FlagsJOAT": "Jack of All Trades",
 "DND5E.FlagsJOATHint": "Half-Proficiency to Ability Checks in which you are not already Proficient.",
 "DND5E.FlagsObservant": "Observant Feat",

diff --git a/module/documents/actor/actor.mjs b/module/documents/actor/actor.mjs
@@ -591,16 +591,18 @@ export default class Actor5e extends SystemDocumentMixin(Actor) {
     init.mod = ability.mod ?? 0;
 
     // Initiative proficiency
+    const isLegacy = game.settings.get("dnd5e", "rulesVersion") === "legacy";
     const prof = this.system.attributes.prof ?? 0;
-    const joat = flags.jackOfAllTrades && (game.settings.get("dnd5e", "rulesVersion") === "legacy");
+    const joat = flags.jackOfAllTrades && isLegacy;
     const ra = this._isRemarkableAthlete(abilityId);
-    init.prof = new Proficiency(prof, (joat || ra) ? 0.5 : 0, !ra);
+    const alert = flags.initiativeAlert && !isLegacy;
+    init.prof = new Proficiency(prof, alert ? 1 : (joat || ra) ? 0.5 : 0, !ra);
 
     // Total initiative includes all numeric terms
     const initBonus = simplifyBonus(init.bonus, bonusData);
     const abilityBonus = simplifyBonus(ability.bonuses?.check, bonusData);
     init.total = init.mod + initBonus + abilityBonus + globalCheckBonus
-      + (flags.initiativeAlert ? 5 : 0)
+      + (flags.initiativeAlert && isLegacy ? 5 : 0)
       + (Number.isNumeric(init.prof.term) ? init.prof.flat : 0);
   }