+ For 2 Stress, add 1 die to your pool.
(You cannot also accept a Devil's Bargain to increase your dice pool: It's one or the other.)
" @@ -1245,7 +1268,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "The GM has offered you a Devil's Bargain.
Accept the terms to add 1 die to your pool.
(You cannot also Push for +1d to increase your dice pool: It's one or the other.)
" @@ -1256,7 +1279,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "teamwork", + modType: RollModType.teamwork, value: 1, tooltip: "%DOC_NAME% is Assisting your efforts, adding 1 die to your pool.
" }, @@ -1266,7 +1289,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.position, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "teamwork", + modType: RollModType.teamwork, value: 1, tooltip: "%DOC_NAME% has set you up for success with a preceding Setup action, increasing your Position by one level.
" }, @@ -1276,7 +1299,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.ToggledOff, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: ["Cost-Stress2"], tooltip: "For 2 Stress, increase your Effect by one level.
" @@ -1287,7 +1310,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "teamwork", + modType: RollModType.teamwork, value: 1, tooltip: "%DOC_NAME% has set you up for success with a preceding Setup action, increasing your Effect by one level.
" }, @@ -1297,7 +1320,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, tooltip: "By circumstance or advantage, you have Potency in this action, increasing your Effect by one level.
" }, @@ -1307,7 +1330,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.Hidden, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 1, tooltip: "By circumstance or advantage, @OPPOSITION_NAME@ has Potency against you, reducing your Effect by one level." } @@ -2189,17 +2212,58 @@ class BladesRoll extends DocumentSheet { this.rollFactorPenaltiesNegated = {}; this.tempGMBoosts = {}; this.rollMods = modsData.map((modData) => new BladesRollMod(modData, this)); + // ESLINT DISABLE: Dev Code. + // eslint-disable-next-line @typescript-eslint/no-explicit-any const initReport = {}; + let initReportCount = 0; + const watchMod = (label) => { + if (BladesRoll._Debug.modWatch === false) { + return; + } + const reportLabel = `(${initReportCount}) == ${label}`; + const rollMod = this.rollMods + .find((mod) => BladesRoll._Debug.modWatch && BladesRoll._Debug.modWatch.exec(mod.name)); + if (rollMod) { + initReport[`${reportLabel} : ${rollMod.status}`] = { + inst: rollMod, + data: { ...rollMod.data }, + sourceName: rollMod.sourceName, + status: { + ALL: rollMod.status, + base: rollMod.baseStatus, + held: rollMod.heldStatus, + user: rollMod.userStatus + }, + is: { + active: rollMod.isActive, + visible: rollMod.isVisible, + conditional: rollMod.isConditional, + inInactiveBlock: rollMod.isInInactiveBlock, + isPush: rollMod.isPush, + isBasicPush: rollMod.isBasicPush + }, + flags: { ...rollMod.flagParams } + }; + } + else { + initReport[reportLabel] = "MOD NOT FOUND"; + } + initReportCount++; + }; + watchMod("INITIAL"); /* *** PASS ZERO: ROLLTYPE VALIDATION PASS *** */ this.rollMods = this.rollMods.filter((rollMod) => rollMod.isValidForRollType()); + watchMod("ROLLTYPE VALIDATION"); /* *** PASS ONE: DISABLE PASS *** */ - this.rollMods - // ... Conditional Status Pass - .filter((rollMod) => !rollMod.setConditionalStatus()) - // ... AutoReveal/AutoEnable Pass - .filter((rollMod) => !rollMod.setAutoStatus()) - // ... Payable Pass - .forEach((rollMod) => { rollMod.setPayableStatus(); }); + // ... Conditional Status Pass + const conditionalDisablePass = this.rollMods.filter((rollMod) => !rollMod.setConditionalStatus()); + watchMod("DISABLE - CONDITIONAL"); + // ... AutoReveal/AutoEnable Pass + const autoRevealDisablePass = conditionalDisablePass.filter((rollMod) => !rollMod.setAutoStatus()); + watchMod("DISABLE - AUTO-REVEAL/ENABLE"); + // ... Payable Pass + autoRevealDisablePass.forEach((rollMod) => { rollMod.setPayableStatus(); }); + watchMod("DISABLE - PAYABLE"); /* *** PASS TWO: FORCE-ON PASS *** */ const parseForceOnKeys = (mod) => { const holdKeys = mod.effectKeys.filter((key) => key.startsWith("ForceOn")); @@ -2242,6 +2306,7 @@ class BladesRoll extends DocumentSheet { } }; this.getActiveRollMods().forEach((rollMod) => parseForceOnKeys(rollMod)); + watchMod("FORCE-ON PASS"); /* *** PASS THREE: PUSH-CHECK PASS *** */ // IF ROLL FORCED ... if (this.isForcePushed()) { @@ -2249,6 +2314,7 @@ class BladesRoll extends DocumentSheet { this.getInactivePushMods() .filter((mod) => !mod.isBasicPush) .forEach((mod) => { mod.heldStatus = RollModStatus.ForcedOff; }); + watchMod("PUSH-CHECK: FORCE-OFF IS-PUSH"); } // ... BY CATEGORY ... [RollModSection.roll, RollModSection.effect].forEach((cat) => { @@ -2260,17 +2326,20 @@ class BladesRoll extends DocumentSheet { bargainMod.heldStatus = RollModStatus.ForcedOff; } } + watchMod("PUSH-CHECK: FORCE OFF BARGAIN"); } else { // Otherwise, hide all Is-Push mods this.getInactivePushMods(cat) .filter((mod) => !mod.isBasicPush) .forEach((mod) => { mod.heldStatus = RollModStatus.Hidden; }); + watchMod("PUSH-CHECK: HIDE IS-PUSH"); } }); /* *** PASS FOUR: Relevancy Pass *** */ this.getVisibleRollMods() .forEach((mod) => { mod.setRelevancyStatus(); }); + watchMod("RELEVANCY PASS"); /* *** PASS FIVE: Overpayment Pass *** */ // ... If 'Cost-SpecialArmor' active, ForceOff other visible Cost-SpecialArmor mods const activeArmorCostMod = this.getActiveRollMods().find((mod) => mod.effectKeys.includes("Cost-SpecialArmor")); @@ -2278,6 +2347,7 @@ class BladesRoll extends DocumentSheet { this.getVisibleRollMods() .filter((mod) => !mod.isActive && mod.effectKeys.includes("Cost-SpecialArmor")) .forEach((mod) => { mod.heldStatus = RollModStatus.ForcedOff; }); + watchMod("OVERPAYMENT PASS"); } eLog.checkLog2("rollMods", "*** initRollMods() PASS ***", initReport); } @@ -2493,7 +2563,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.ToggledOff, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "
" @@ -2504,7 +2574,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.ToggledOff, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "" @@ -2515,7 +2585,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.ToggledOff, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "" @@ -2526,7 +2596,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.ToggledOff, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "" @@ -2537,7 +2607,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.position, base_status: RollModStatus.ToggledOff, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "Add +1d if you enlist the help of a friend or contact.
" @@ -2548,7 +2618,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.ToggledOff, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "" @@ -2564,7 +2634,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.position, base_status: RollModStatus.ToggledOff, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "Add +1d if you enlist the help of a friend or contact.
" @@ -2576,7 +2646,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.after, base_status: RollModStatus.ForcedOn, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 0, effectKeys: [], tooltip: "After your roll, you can increase the result level by one for each Coin you spend.
" @@ -2590,7 +2660,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.ToggledOff, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "Add +1d if you have previously acquired this asset or service with a Acquire Asset Downtime activity.
" @@ -2601,7 +2671,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.after, base_status: RollModStatus.Hidden, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 0, effectKeys: ["Cost-Heat2"], tooltip: "Whether contraband goods or dangerous materials, this Acquire Asset Downtime activity will add +2 Heat to your crew.
" @@ -2617,7 +2687,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection, base_status: RollModStatus, posNeg: "", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "" @@ -2645,7 +2715,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.position, base_status: RollModStatus.ForcedOn, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "A Consequence on a previous roll has worsened your Position.
" @@ -2667,7 +2737,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.ForcedOn, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "A Consequence has worsened your Effect.
" @@ -3199,14 +3269,14 @@ class BladesRoll extends DocumentSheet { const { chatID } = this.rollConsequence?.resistTo ?? {}; if (csqID && chatID) { const resistedCsq = await BladesConsequence.GetFromID(chatID, csqID); - if (resistedCsq) { - await resistedCsq.applyResistedConsequence("resist"); + if (resistedCsq && this.rollConsequence?.resistTo) { + await resistedCsq.applyResistedConsequence("resist", await this.getResultHTML(chatID, { icon: this.rollConsequence.resistTo.icon ?? "" })); } } if (BladesPC.IsType(this.rollPrimaryDoc)) { this.rollPrimaryDoc.adjustStress(this.resistanceStressCost); } - await this.outputRollToChat(); + // await this.outputRollToChat(); break; } } @@ -3237,11 +3307,9 @@ class BladesRoll extends DocumentSheet { // chatSpeaker.alias = `${chatSpeaker.alias} Rolls ...`; return chatSpeaker; } - async getResultHTML(chatMsgID) { - // eslint-disable-next-line @typescript-eslint/no-this-alias - const templateData = this; - templateData.chatMsgID = chatMsgID; - return await renderTemplate(`systems/eunos-blades/templates/chat/roll-result-${U.lCase(this.rollType)}-roll.hbs`, templateData); + async getResultHTML(chatMsgID, context = {}) { + context = Object.assign(this, context, { chatMsgID }); + return await renderTemplate(`systems/eunos-blades/templates/chat/roll-result-${U.lCase(this.rollType)}-roll.hbs`, context); } _chatMessageID; _chatMessageTemp; diff --git a/module/core/constants.js b/module/core/constants.js index c76cad70..7a90dacf 100644 --- a/module/core/constants.js +++ b/module/core/constants.js @@ -176,6 +176,16 @@ export var RollSubType; RollSubType["GroupLead"] = "GroupLead"; RollSubType["GroupParticipant"] = "GroupParticipant"; })(RollSubType || (RollSubType = {})); +export var RollModType; +(function (RollModType) { + RollModType["general"] = "general"; + RollModType["harm"] = "harm"; + RollModType["teamwork"] = "teamwork"; + RollModType["ability"] = "ability"; + RollModType["gear"] = "gear"; + RollModType["advantage"] = "advantage"; + RollModType["disadvantage"] = "disadvantage"; +})(RollModType || (RollModType = {})); export var ConsequenceType; (function (ConsequenceType) { ConsequenceType["ReducedEffect"] = "ReducedEffect"; diff --git a/module/documents/actors/BladesPC.js b/module/documents/actors/BladesPC.js index 2248d9bf..76a6b9c0 100644 --- a/module/documents/actors/BladesPC.js +++ b/module/documents/actors/BladesPC.js @@ -1,4 +1,4 @@ -import C, { AttributeTrait, Harm, BladesActorType, BladesItemType, Tag, RollModSection, RollModStatus } from "../../core/constants.js"; +import C, { AttributeTrait, Harm, BladesActorType, BladesItemType, Tag, RollModType, RollModSection, RollModStatus } from "../../core/constants.js"; import U from "../../core/utilities.js"; import { BladesActor } from "../BladesActorProxy.js"; import { BladesItem } from "../BladesItemProxy.js"; @@ -352,7 +352,7 @@ class BladesPC extends BladesActor { section: effectCat, posNeg: "negative", base_status: RollModStatus.ToggledOn, - modType: "harm", + modType: RollModType.harm, value: 1, tooltip: [ `
+ 
- 
+ {{else}}
+ {{/if}}
{{!-- Vertical Container --}}
For 2 Stress, add 1 die to your pool.
(You cannot also accept a Devil's Bargain to increase your dice pool: It's one or the other.)
" @@ -1351,7 +1375,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: [], tooltip: "The GM has offered you a Devil's Bargain.
Accept the terms to add 1 die to your pool.
(You cannot also Push for +1d to increase your dice pool: It's one or the other.)
" @@ -1362,7 +1386,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.roll, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "teamwork", + modType: RollModType.teamwork, value: 1, tooltip: "%DOC_NAME% is Assisting your efforts, adding 1 die to your pool.
" }, @@ -1372,7 +1396,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.position, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "teamwork", + modType: RollModType.teamwork, value: 1, tooltip: "%DOC_NAME% has set you up for success with a preceding Setup action, increasing your Position by one level.
" }, @@ -1382,7 +1406,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.ToggledOff, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, effectKeys: ["Cost-Stress2"], tooltip: "For 2 Stress, increase your Effect by one level.
" @@ -1393,7 +1417,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "teamwork", + modType: RollModType.teamwork, value: 1, tooltip: "%DOC_NAME% has set you up for success with a preceding Setup action, increasing your Effect by one level.
" }, @@ -1403,7 +1427,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.Hidden, posNeg: "positive", - modType: "general", + modType: RollModType.general, value: 1, tooltip: "By circumstance or advantage, you have Potency in this action, increasing your Effect by one level.
" }, @@ -1413,7 +1437,7 @@ class BladesRoll extends DocumentSheet { section: RollModSection.effect, base_status: RollModStatus.Hidden, posNeg: "negative", - modType: "general", + modType: RollModType.general, value: 1, tooltip: "By circumstance or advantage, @OPPOSITION_NAME@ has Potency against you, reducing your Effect by one level."
}
@@ -2496,19 +2520,63 @@ class BladesRoll extends DocumentSheet {
this.rollMods = modsData.map((modData) => new BladesRollMod(modData, this));
- const initReport: Record Add +1d if you enlist the help of a friend or contact. Add +1d if you enlist the help of a friend or contact. After your roll, you can increase the result level by one for each Coin you spend. Add +1d if you have previously acquired this asset or service with a Acquire Asset Downtime activity. Whether contraband goods or dangerous materials, this Acquire Asset Downtime activity will add +2 Heat to your crew. A Consequence on a previous roll has worsened your Position. A Consequence has worsened your Effect.Help From a Friend
Help From a Friend
Buying Result Level
Repeat Purchase Bonus
Restricted
Worse Position
Reduced Effect
${effectCat === RollModSection.roll ? Harm.Impaired : Harm.Weakened} (Harm)
`,
@@ -398,7 +398,7 @@ class BladesPC extends BladesActor implements BladesActorSubClass.Scoundrel,
section: RollModSection.roll,
posNeg: "negative",
base_status: RollModStatus.ToggledOn,
- modType: "harm",
+ modType: RollModType.harm,
value: 0,
effectKeys: ["Cost-Stress2"],
tooltip: [
diff --git a/ts/sheets/actor/BladesActorSheet.ts b/ts/sheets/actor/BladesActorSheet.ts
index a0f53507..7ee50da5 100644
--- a/ts/sheets/actor/BladesActorSheet.ts
+++ b/ts/sheets/actor/BladesActorSheet.ts
@@ -424,7 +424,7 @@ class BladesActorSheet extends ActorSheet {
if (!doc) {
return;
}
- await G.effects.blurOut(elem$).then(async () => {
+ await G.effects.blurRemove(elem$).then(async () => {
if (doc instanceof BladesItem) {
await this.actor.remSubItem(doc);
} else {
@@ -439,7 +439,7 @@ class BladesActorSheet extends ActorSheet {
if (!doc) {
return;
}
- await G.effects.blurOut(elem$).then(async () => await doc.delete());
+ await G.effects.blurRemove(elem$).then(async () => await doc.delete());
}
async _onItemToggleClick(event: ClickEvent) {
diff --git a/ts/sheets/actor/BladesCrewSheet.ts b/ts/sheets/actor/BladesCrewSheet.ts
index d91ab757..b9966c7f 100644
--- a/ts/sheets/actor/BladesCrewSheet.ts
+++ b/ts/sheets/actor/BladesCrewSheet.ts
@@ -24,7 +24,7 @@ class BladesCrewSheet extends BladesActorSheet {
const sheetData: Partial
+ ${rollHTML}
+ `))[0].outerHTML;
+ transformRecord["2.2) csqResistedHTML + rollHTML"] = csqResistedHTML;
}
- eLog.checkLog2("csqTransform", "Initial Message Code", {message$, message: message$[0]});
+ // If "special" or "armor", add the roll overlay
+ if (["armor", "special"].includes(typeRef)) {
+ csqResistedHTML = $(csqResistedHTML).prepend($(`
+
+
+
+ `))[0].outerHTML;
+ transformRecord["2.3) csqResistedHTML + overlay"] = csqResistedHTML;
+ }
- // Locate consequence HTML
- message$.find(`.comp.consequence-display-container[data-csq-id='${this._id}']`)
- // Replace with compiled consequence-accepted template, unless type is None, in which case erase it
- .replaceWith(icon === undefined ? "" : `
-
+ // Prepend the resisted consequence HTML to the accepted consequence HTML
+ csqAcceptedHTML = $(csqAcceptedHTML).prepend($(csqResistedHTML))[0].outerHTML;
-
+
-
+ transformRecord["3) csqAcceptedHTML + csqResistedHTML"] = csqAcceptedHTML;
-
-
-
-
-
-
+ // Get message HTML
+ const message$ = $(await this._chatMessage.getHTML());
-
-
-
+ transformRecord["4) message$ before Replace"] = message$[0].outerHTML;
-