Added dice so nice integration

CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
 
+### 1.2.2
+* Added option to change the color for magic dice
+
+### 1.2.1
+* Fixed some wording and added a reload button after changing specific system settings
+
 ### 1.2.0
-* Added support for the Guild Codex magic system (disabled by default)
+* Added support for the GuildCodex magic system (disabled by default)
 
 ### 1.1.1
 * Automatically updates the prototype token name when an actors name is changed (if both were identical). Can be disabled in the system settings.

src/fatex.ts

@@ -61,11 +61,6 @@ Hooks.once("init", async () => {
     // Register HandlebarsHelpers
     HandlebarsHelpers.registerHelpers();
 
-    // Register Fate die modifier
-    FateDie.MODIFIERS["m"] = function magicModifier(_modifier) {
-        this.results = this.results.map((result) => ({ ...result, count: result.result === 1 ? 2 : result.result }));
-    };
-
     // Unregister Core sheets
     Actors.unregisterSheet("core", ActorSheet);
     Items.unregisterSheet("core", ItemSheet);

src/module/chat/FateChatCard.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 import { FateActor } from "../actor/FateActor";
 import { FateRoll } from "./FateRoll";
 import { FateChatCardDataModel } from "../data/FateChatCardDataModel";

src/module/chat/FateRoll.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 import { FateRollDataModel } from "../data/FateRollDataModel";
 import { SkillItemData } from "../item/ItemTypes";
 import { ItemDataProperties } from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/data.mjs/itemData";
@@ -43,10 +42,8 @@ export class FateRoll extends FateRollDataModel {
     }
 
     async rollMagic(userId = "", magicCount: number) {
-        const normalCount = 4 - magicCount;
-
-        const magicRoll = new Roll(`${this.options.magicCount}dFm`).roll({ async: false });
-        const normalRoll = new Roll(`${normalCount}dF`).roll({ async: false });
+        const magicRoll = new Roll(`${magicCount}dMe`).roll({ async: false });
+        const normalRoll = new Roll(`${4 - magicCount}dF`).roll({ async: false });
 
         this.updateSource({
             faces: [...magicRoll.terms[0].results, ...normalRoll.terms[0].results].map((r) => r.count ?? r.result),

src/module/data/FateChatCardDataModel.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 import { FateRollsArrayField } from "./fields/FateRollsArrayField";
 import { FateRoll } from "../chat/FateRoll";
 

src/module/data/FateRollDataModel.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 import { FateRollHistoryDataModel } from "./FateRollHistoryDataModel";
 
 export class FateRollDataModel extends foundry.abstract.DataModel {

src/module/data/fields/FateRollsArrayField.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 export class FateRollsArrayField extends foundry.data.fields.ArrayField {
     _validateSpecial(value) {
         super._validateSpecial(value);

src/module/features/ChatActionsFeature.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 import { FateChatCard } from "../chat/FateChatCard";
 
 export class ChatActionsFeature {

src/module/features/MagicSystem.ts

@@ -1,4 +1,7 @@
 // @ts-nocheck
+export class MagicDie extends FateDie {
+    static DENOMINATION = "m";
+}
 
 export class MagicSystem {
     static hooks() {
@@ -12,6 +15,30 @@ export class MagicSystem {
                 requiresReload: true,
                 type: Boolean,
             });
+
+            CONFIG.Dice.terms["m"] = MagicDie;
+
+            FateDie.MODIFIERS["e"] = function magicModifier(_modifier) {
+                this.results = this.results.map((result) => ({
+                    ...result,
+                    count: result.result === 1 ? 2 : result.result,
+                }));
+            };
+        });
+
+        Hooks.once("diceSoNiceReady", (dice3d) => {
+            if (!game.settings.get("fatex", "guildCodexMagicSystemEnabled")) return;
+
+            dice3d.addDicePreset(
+                {
+                    type: "dm",
+                    labels: ["−", " ", "+"],
+                    values: { min: -1, max: 1 },
+                    fontScale: 2,
+                    system: "standard",
+                },
+                "d6"
+            );
         });
     }
 }

src/module/features/PrototypeTokenNameSyncFeature.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-
 export class PrototypeTokenNameSyncFeature {
     static hooks() {
         Hooks.once("init", () => {

system/languages/en.json

@@ -229,7 +229,7 @@
                 "Hint": "Automatically updates the prototype token name when an actors name is changed (if both were identical)."
             },
             "magicSystemEnabled": {
-                "Name": "Enable the magic system from Guild Codex",
+                "Name": "Enable the magic system from GuildCodex",
                 "Hint": "This will add a magic skill to the character sheet and allow you to use magic dice."
             }
         },

system/system.json

@@ -2,7 +2,7 @@
     "id": "fatex",
     "title": "FateX - Fate Extended",
     "description": "An extended implementation of Fate and its derivative systems",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "authors": [
         {
             "name": "Patrick Bauer",