add blast button to chat when using abilities that have blast, other fixes

moo-man · moo-man · commit 7418feb5440a · 2025-09-30T05:17:07.000-05:00
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ The **official** system for playing Warhammer 40k: Wrath & Glory on [Foundry VTT
 
 ![](https://img.shields.io/github/v/release/moo-man/WrathAndGlory-FoundryVTT?label=Latest%20Version)
 ![](https://img.shields.io/github/downloads/moo-man/WrathAndGlory-FoundryVTT/latest/wrath-and-glory.zip?label=Downloads%20%28Latest%20Version%29)
-![](https://img.shields.io/badge/FoundryVTT%20Compatibility-V12-orange)
+![](https://img.shields.io/badge/FoundryVTT%20Compatibility-V13-orange)
 
 ![repo-cover-wng](https://user-images.githubusercontent.com/28637157/146312294-3568bd17-9556-4a66-8072-905b42d3cff7.png)
 
@@ -19,10 +19,12 @@ The **official** system for playing Warhammer 40k: Wrath & Glory on [Foundry VTT
 - [Wrath & Glory - Redacted Records I](https://foundryvtt.com/packages/wng-records1) - This magazine-style collection of articles uncovers numerous secrets of the Gilead System, opening up new settings and antagonists for players to explore and confront, and new character options to increase Agents’ chance of surviving these new and perilous situations.
 - [Wrath & Glory - Church of Steel](https://foundryvtt.com/packages/wng-cos) - Unveil the mysteries of the Machine Spirit and unleash the massive power of machines of war with this comprehensive guide to vehicles.
 - [Wrath & Glory - Threat Assessment: Xenos](https://foundryvtt.com/packages/wng-xenos) - Contains a mass of new alien threats to challenge Agents of any Tier, and is the perfect companion to any Warhammer 40,000 Wrath & Glory campaign.
-
+- [Wrath & Glory - Redacted Records II](https://foundryvtt.com/packages/wng-records2) - An invaluable resource suffused with scriptures of righteous destruction and technological liturgies to empower your games with an abundance of new ways to play.
+- [Wrath & Glory - Darktide: Extraction](https://foundryvtt.com/packages/wng-darktide) - Explore the setting of Warhammer 40,000: Darktide as Inquisitor Grendyl dispatches you to a lost region of Hive Tertium. Play Darktide? Bring your Darktide character to life by importing them directly into the game!
 
 ## Special Thanks
 - Cubicle 7
+- FatShark
 - Perfectro (original system creator)
 - Thul (Features, testing and suggestions)
 
diff --git a/scripts/apps/character-creation.js b/scripts/apps/character-creation.js
@@ -60,8 +60,18 @@ export default class CharacterCreation extends FormApplication {
         let data = super.getData();
         this.species = await this.species;
         this.faction = await this.faction;
-        this.archetypeAbilities = await this.archetype.system.abilities.awaitDocuments();
-        this.speciesAbilities = await this.species.system.abilities.awaitDocuments()
+        if (!this.species)
+        {
+            ui.notifications.error("Archetypes must assign a Species Item");
+            throw "Archetypes must assign a Species Item";
+        }
+        if (!this.faction)
+        {
+            ui.notifications.error("Archetypes must assign a Faction Item");
+            throw "Archetypes must assign a Faction Item";
+        }
+        this.archetypeAbilities = await this.archetype?.system.abilities.awaitDocuments() || [];
+        this.speciesAbilities = await this.species?.system.abilities.awaitDocuments() || []
 
         await this.initializeCharacter()
 
diff --git a/scripts/common/config.js b/scripts/common/config.js
@@ -357,6 +357,7 @@ WNG.premiumModules = {
     "wng-xenos" : "Threat Assessment: Xenos",
     "wng-starter-set" : "Starter Set",
     "wng-records2" : "Redacted Records: Vol. II",
+    "wng-darktide" : "DarkTide: Extraction",
 }
 
 WNG.transferTypes = {
diff --git a/scripts/common/tests/ability-roll.js b/scripts/common/tests/ability-roll.js
@@ -47,6 +47,7 @@ export default class AbilityRoll extends WNGTest {
     if (this.testData.damage)
     {
       this.computeDamage()
+      this.result.blast = this.item.system.traits.has("blast").rating;
     }
   }
   
diff --git a/scripts/common/utility.js b/scripts/common/utility.js
@@ -107,6 +107,7 @@ export default class WNGUtility {
     }
   }
 
+  // TODO remove this (church of steel, xenos), prefer @Embed
   static async tableToHTML(table, label, options=[]) 
   {
       let noCenter = options.includes("no-center");
diff --git a/scripts/document/actor.js b/scripts/document/actor.js
@@ -238,7 +238,7 @@ export class WrathAndGloryActor extends WarhammerActor {
         roll.sendToChat();
     }
 
-    async setupTestFromItem(item, context, options)
+    async setupTestFromItem(item, context={}, options={})
     {
         if (typeof item == "string")
         {
@@ -437,6 +437,8 @@ export class WrathAndGloryActor extends WarhammerActor {
         ap += modifiers.ap.reduce((acc, mod) => acc + mod.value, 0);
         mortal += modifiers.mortal.reduce((acc, mod) => acc + mod.value, 0);
         res += modifiers.resilience.reduce((acc, mod) => acc + mod.value, 0);
+        
+        addModifierBreakdown("resilience", "Resilience");
 
         if (invuln)
         {
diff --git a/scripts/model/item/faction.js b/scripts/model/item/faction.js
@@ -21,6 +21,11 @@ export class FactionModel extends StandardItemModel
 
     shouldTransferEffect(effect)
     {
+        if (effect.getFlag(game.system.id, "forceTransfer"))
+        {
+            return true;
+        }
+
         for (let bg of this.backgrounds.origin.concat(this.backgrounds.accomplishment).concat(this.backgrounds.goal))
         {
             if (bg.chosen && bg.effect.id == effect.id && !effect.changes.some(c => c.mode == 0))
diff --git a/scripts/model/message/test.js b/scripts/model/message/test.js
@@ -139,7 +139,7 @@ export class WrathAndGloryTestMessageModel extends WarhammerTestMessageModel
         let table = game.tables.getName("Mutation Severity")
         let roll = new Roll(table.formula)
         let result = await table.roll({ roll })
-        ChatMessage.create({ content: result.results[0].getChatText() + ` (${result.roll.total})`, roll : result.roll, type: CONST.CHAT_MESSAGE_TYPES.ROLL, flavor: `Mutation`, speaker : test.context.speaker })
+        ChatMessage.create({ content: await result.results[0].getHTML() + ` (${result.roll.total})`, roll : result.roll, type: CONST.CHAT_MESSAGE_TYPES.ROLL, flavor: `Mutation`, speaker : test.context.speaker })
     }
     static _onAddPotency(ev, target)
     {
diff --git a/static/templates/actor/agent/agent-notes.hbs b/static/templates/actor/agent/agent-notes.hbs
@@ -103,7 +103,7 @@
     <h2 class="sheet-divider">{{localize "TITLE.ASCENSION"}}</h2>
 
     <div class="ascensions">
-        <button data-action="createItem" data-type="ascension"><i class="fa-solid fa-plus"></i></button>
+        <button type="button" data-action="createItem" data-type="ascension"><i class="fa-solid fa-plus"></i></button>
         {{#each items.ascension}}
             <div class="ascension context-menu-alt" data-uuid="{{this.uuid}}">
                 <img src="{{this.img}}">
diff --git a/static/templates/chat/roll/ability/ability-use.hbs b/static/templates/chat/roll/ability/ability-use.hbs
@@ -13,12 +13,20 @@
 </div>
 {{/if}}
 
+{{#if result.blast}}
+        <div class="wrapper">
+                <button type="button" data-action="blast" data-blast="{{result.blast}}"><i class="fa-solid fa-ruler-combined"></i> Blast</button>
+        </div>
+{{/if}}
+
+
 {{#if showTest}}
 <div class="wrapper">
         <button type="button" data-action="rollTest">{{testDisplay}}</button>
 </div>
 {{/if}}
 
+
 <div class="wrapper">
 {{> effectButtons}}
 </div>
diff --git a/style/theme/_apps.scss b/style/theme/_apps.scss
@@ -79,9 +79,8 @@ body.wng-theme {
         }
 
         .window-header {
-            border-image: url(./assets/image/header.webp) repeat;
-            border-image-slice: 8 8 7 7 fill;
-            border-image-width: 0px 0px 2px 2px;
+            background: url(./assets/image/header.webp) repeat;
+            background-size: cover;
             font-family: var(--font-text);
         }
 
diff --git a/style/theme/_sheet.scss b/style/theme/_sheet.scss
@@ -59,9 +59,8 @@ body.wng-theme {
         }
 
         .window-header {
-            border-image: url(./assets/image/header.webp) repeat;
-            border-image-slice: 8 8 7 7 fill;
-            border-image-width: 0px 0px 2px 2px;
+            background: url(./assets/image/header.webp) repeat;
+            background-size: cover;
             font-family: var(--font-text);
         }
 
diff --git a/system.json b/system.json
@@ -1,8 +1,8 @@
 {
   "id": "wrath-and-glory",
   "title": "Warhammer 40,000: Wrath & Glory",
-  "description": "The official system for Warhammer 40,000 Roleplay: Wrath & Glory! Time is running out in the 41st Millennium. This accursed age needs heroes more than ever before. Will you answer the call?",
-  "version": "7.2.2",
+  "description": "Explore the setting of Warhammer 40,000: Darktide as Inquisitor Grendyl dispatches you to a lost region of Hive Tertium. Play Darktide? Bring your character to life by importing them directly into Foundry!",
+  "version": "7.3.0",
   "compatibility" : {
     "minimum" : 13,
     "verified" : 13,
@@ -48,10 +48,10 @@
     "requires": [{
       "id": "warhammer-lib",
       "type": "module",
-      "manifest": "https://raw.githubusercontent.com/moo-man/WarhammerLibrary-FVTT/2.4.0/module.json",
+      "manifest": "https://raw.githubusercontent.com/moo-man/WarhammerLibrary-FVTT/2.6.0/module.json",
       "compatibility": {
-        "minimum" : "2.4.0",
-        "verified": "2.4.0"
+        "minimum" : "2.6.0",
+        "verified": "2.6.0"
       }
     }]
   },
@@ -67,7 +67,7 @@
   "url": "https://github.com/moo-man/WrathAndGlory-FoundryVTT",
   "socket": true,
   "manifest": "https://github.com/moo-man/WrathAndGlory-FoundryVTT/releases/latest/download/system.json",
-  "download": "https://github.com/moo-man/WrathAndGlory-FoundryVTT/releases/download/7.2.2/wrath-and-glory.zip",
+  "download": "https://github.com/moo-man/WrathAndGlory-FoundryVTT/releases/download/7.3.0/wrath-and-glory.zip",
   "license": "LICENSE.txt"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,7 @@ WNG.premiumModules = {`
`357`	`357`	`"wng-xenos" : "Threat Assessment: Xenos",`
`358`	`358`	`"wng-starter-set" : "Starter Set",`
`359`	`359`	`"wng-records2" : "Redacted Records: Vol. II",`
	`360`	`+ "wng-darktide" : "DarkTide: Extraction",`
`360`	`361`	`}`
`361`	`362`
`362`	`363`	`WNG.transferTypes = {`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ export default class AbilityRoll extends WNGTest {`
`47`	`47`	`if (this.testData.damage)`
`48`	`48`	`{`
`49`	`49`	`this.computeDamage()`
	`50`	`+ this.result.blast = this.item.system.traits.has("blast").rating;`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ export default class WNGUtility {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ // TODO remove this (church of steel, xenos), prefer @Embed`
`110`	`111`	`static async tableToHTML(table, label, options=[])`
`111`	`112`	`{`
`112`	`113`	`let noCenter = options.includes("no-center");`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ export class WrathAndGloryActor extends WarhammerActor {`
`238`	`238`	`roll.sendToChat();`
`239`	`239`	`}`
`240`	`240`
`241`		`- async setupTestFromItem(item, context, options)`
	`241`	`+ async setupTestFromItem(item, context={}, options={})`
`242`	`242`	`{`
`243`	`243`	`if (typeof item == "string")`
`244`	`244`	`{`
`@@ -437,6 +437,8 @@ export class WrathAndGloryActor extends WarhammerActor {`
`437`	`437`	`ap += modifiers.ap.reduce((acc, mod) => acc + mod.value, 0);`
`438`	`438`	`mortal += modifiers.mortal.reduce((acc, mod) => acc + mod.value, 0);`
`439`	`439`	`res += modifiers.resilience.reduce((acc, mod) => acc + mod.value, 0);`
	`440`	`+`
	`441`	`+ addModifierBreakdown("resilience", "Resilience");`
`440`	`442`
`441`	`443`	`if (invuln)`
`442`	`444`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,11 @@ export class FactionModel extends StandardItemModel`
`21`	`21`
`22`	`22`	`shouldTransferEffect(effect)`
`23`	`23`	`{`
	`24`	`+ if (effect.getFlag(game.system.id, "forceTransfer"))`
	`25`	`+ {`
	`26`	`+ return true;`
	`27`	`+ }`
	`28`	`+`
`24`	`29`	`for (let bg of this.backgrounds.origin.concat(this.backgrounds.accomplishment).concat(this.backgrounds.goal))`
`25`	`30`	`{`
`26`	`31`	`if (bg.chosen && bg.effect.id == effect.id && !effect.changes.some(c => c.mode == 0))`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ export class WrathAndGloryTestMessageModel extends WarhammerTestMessageModel`
`139`	`139`	`let table = game.tables.getName("Mutation Severity")`
`140`	`140`	`let roll = new Roll(table.formula)`
`141`	`141`	`let result = await table.roll({ roll })`
`142`		- ChatMessage.create({ content: result.results[0].getChatText() + ` (${result.roll.total})`, roll : result.roll, type: CONST.CHAT_MESSAGE_TYPES.ROLL, flavor: `Mutation`, speaker : test.context.speaker })
	`142`	+ ChatMessage.create({ content: await result.results[0].getHTML() + ` (${result.roll.total})`, roll : result.roll, type: CONST.CHAT_MESSAGE_TYPES.ROLL, flavor: `Mutation`, speaker : test.context.speaker })
`143`	`143`	`}`
`144`	`144`	`static _onAddPotency(ev, target)`
`145`	`145`	`{`