public/fvtt-yggdrasill
1
0
Fork 1
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Cleanup et preparation Foundry v12

Browse Source
This commit is contained in:
LeRatierBretonnien
2024-05-01 09:33:34 +02:00
parent 8f0bf91464
commit 85e0249822
173 changed files with 659 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/yggdrasill-actor-sheet.js
View File

@@ -11,7 +11,7 @@ export class YggdrasillActorSheet extends ActorSheet {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["yggdrasill", "sheet", "actor"],
template: "systems/fvtt-yggdrasill/templates/actor-sheet.html",
width: 680,
@@ -24,7 +24,7 @@ export class YggdrasillActorSheet extends ActorSheet {
/* -------------------------------------------- */
async getData() {
const objectData = duplicate(this.object)
const objectData = foundry.utils.duplicate(this.object)
let formData = {
title: this.title,
@@ -71,7 +71,8 @@ export class YggdrasillActorSheet extends ActorSheet {
options: this.options,
owner: this.document.isOwner,
editScore: this.options.editScore,
isGM: game.user.isGM
isGM: game.user.isGM,
config: game.system.config
}
// Dynamic update some fields
this.updateDM(formData.data);

102
modules/yggdrasill-actor.js
View File

@@ -411,7 +411,7 @@ export class YggdrasillActor extends Actor {
}
/* -------------------------------------------- */
getEffectByLabel(label) {
return this.getActiveEffects().find(it => it.data.label == label);
return this.getActiveEffects().find(it => it.label == label);
}
/* -------------------------------------------- */
getEffectById(id) {
@@ -424,7 +424,7 @@ export class YggdrasillActor extends Actor {
let categ = this.system.carac[key];
for( let carac in categ.carac) {
if (carac.toLowerCase() == caracName.toLowerCase() ) {
return deepClone(categ.carac[carac]);
return foundry.utils.deepClone(categ.carac[carac]);
}
}
}
@@ -489,7 +489,7 @@ export class YggdrasillActor extends Actor {
async equiperObject( equipementId ) {
let item = this.items.find( item => item.id == equipementId );
if (item && item.system) {
let update = { _id: item.id, "data.equipe": !item.system.equipe };
let update = { _id: item.id, "system.equipe": !item.system.equipe };
await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
}
}
@@ -512,9 +512,9 @@ export class YggdrasillActor extends Actor {
/* -------------------------------------------- */
async rollAttribute( attrkey, subAttrKey = 'defaut') {
let attr = duplicate(this.system.attributs[attrkey]);
let attr = foundry.utils.duplicate(this.system.attributs[attrkey]);
console.log("ATTR : ", attr, attrkey, subAttrKey);
let subAttr = duplicate(this.system.attributs[attrkey].values[subAttrKey] );
let subAttr = foundry.utils.duplicate(this.system.attributs[attrkey].values[subAttrKey] );
if ( attr ) {
subAttr.label = subAttr.label || "";
let title = `Attribut : ${attr.label} ${subAttr.label} : ${subAttr.value}`;
@@ -529,13 +529,8 @@ export class YggdrasillActor extends Actor {
rollMode: game.settings.get("core", "rollMode"),
title: title,
isBlesse: this.system.etat.etat == "blesse",
optionsBonusMalus: YggdrasillUtility.buildListOptions(-15, +15),
bonusMalus: 0,
bonusdefense: 0,
optionsBD: YggdrasillUtility.buildListOptions(0, +15),
optionsSR: YggdrasillUtility.buildSROptions( ),
sr: 0
}
this.addDefaultRoll(rollData)
let rollDialog = await YggdrasillRoll.create( this, rollData);
console.log(rollDialog);
rollDialog.render( true );
@@ -543,11 +538,23 @@ export class YggdrasillActor extends Actor {
ui.notifications.warn("Attribut non trouvée");
}
}
/* -------------------------------------------- */
addDefaultRoll(rollData) {
rollData.optionsBonusMalus= YggdrasillUtility.createOptions(-15, 15)
rollData.bonusMalus= "0"
rollData.optionsFuror= YggdrasillUtility.createOptions(0, this.getCurrentFuror())
rollData.furorUsage= "0"
rollData.optionsBD= YggdrasillUtility.createOptions(0, +15)
rollData.sr= "0"
rollData.puissanceRune = 1
rollData.optionsPuissanceRune= YggdrasillUtility.createOptions(1, +15)
rollData.supportRune= "peau"
rollData.config= game.system.config
}
/* -------------------------------------------- */
async rollCarac( categName, caracName) {
let carac = duplicate(this.system.carac[categName].carac[caracName]);
console.log("CARAC : ", carac, this.system.carac);
let carac = foundry.utils.duplicate(this.system.carac[categName].carac[caracName]);
if ( carac) {
let rollData = {
mode: "carac",
@@ -561,14 +568,9 @@ export class YggdrasillActor extends Actor {
isEpuise: this.isEpuise(),
isBlesse: this.isBlesse(),
isMeurtri: this.isMeurtri(),
optionsBonusMalus: YggdrasillUtility.buildListOptions(-15, +15),
bonusMalus: 0,
optionsFuror: YggdrasillUtility.buildListOptions(0, this.getCurrentFuror() ),
furorUsage: 0,
optionsSR: YggdrasillUtility.buildSROptions( ),
optionsBD: YggdrasillUtility.buildListOptions(0, +15),
sr: 0
}
this.addDefaultRoll(rollData)
console.log("CARAC : ", rollData, this.system.carac);
let rollDialog = await YggdrasillRoll.create( this, rollData);
console.log(rollDialog);
rollDialog.render( true );
@@ -590,17 +592,12 @@ export class YggdrasillActor extends Actor {
img: competence.img,
rollMode: game.settings.get("core", "rollMode"),
title: `Compétence ${competence.name} : ${competence.system.niveau}`,
competence: duplicate(competence),
competence: foundry.utils.duplicate(competence),
isEpuise: this.isEpuise(),
isBlesse: this.isBlesse(),
isMeurtri: this.isMeurtri(),
optionsBonusMalus: YggdrasillUtility.buildListOptions(-15, +15),
bonusMalus: 0,
optionsFuror: YggdrasillUtility.buildListOptions(0, this.getCurrentFuror() ),
furorUsage: 0,
optionsSR: YggdrasillUtility.buildSROptions( ),
sr: 0
}
this.addDefaultRoll(rollData)
let rollDialog = await YggdrasillRoll.create( this, rollData);
console.log(rollDialog);
rollDialog.render( true );
@@ -611,10 +608,10 @@ export class YggdrasillActor extends Actor {
/* -------------------------------------------- */
getAttaqueData( mode ) {
let attackData = duplicate(attackMode[mode]);
let attackData = foundry.utils.duplicate(attackMode[mode]);
if ( attackData){
attackData.mode = mode;
attackData.carac = duplicate(this.system.carac[attackData.categName].carac[attackData.caracName]);
attackData.carac = foundry.utils.duplicate(this.system.carac[attackData.categName].carac[attackData.caracName]);
if ( attackData.malus != 0) {
let malusTab = attackData.malus.split(';');
attackData.malus = this.system.carac[attackData.categName].carac[malusTab[0]].value * Number(malusTab[1])
@@ -633,10 +630,10 @@ export class YggdrasillActor extends Actor {
/* -------------------------------------------- */
getTirData( mode) {
let attackData = duplicate( tirMode[mode] );
let attackData = foundry.utils.duplicate( tirMode[mode] );
if ( attackData){
attackData.mode = mode;
attackData.carac = duplicate(this.system.carac[attackData.categName].carac[attackData.caracName]);
attackData.carac = foundry.utils.duplicate(this.system.carac[attackData.categName].carac[attackData.caracName]);
if ( attackData.malus != 0) {
let malusTab = attackData.malus.split(';');
attackData.malus = this.system.carac[attackData.categName].carac[malusTab[0]].value * Number(malusTab[1])
@@ -661,11 +658,11 @@ export class YggdrasillActor extends Actor {
let carac;
if ( magie == "sejdr") {
carac = duplicate(this.system.carac.ame.carac.instinct);
carac = foundry.utils.duplicate(this.system.carac.ame.carac.instinct);
} else if ( magie == "rune") {
carac = duplicate(this.system.carac.ame.carac.communication);
carac = foundry.utils.duplicate(this.system.carac.ame.carac.communication);
} else {
carac = duplicate(this.system.carac.ame.carac.charisme);
carac = foundry.utils.duplicate(this.system.carac.ame.carac.charisme);
}
if ( sort && competence) {
@@ -680,10 +677,10 @@ export class YggdrasillActor extends Actor {
rollMode: game.settings.get("core", "rollMode"),
title: magie + " - " + sort.name,
selectedCarac: carac,
agiliteCarac: duplicate(this.system.carac.corps.carac.agilite),
instinctCarac: duplicate(this.system.carac.ame.carac.instinct),
sort: duplicate(sort),
competence: duplicate(competence),
agiliteCarac: foundry.utils.duplicate(this.system.carac.corps.carac.agilite),
instinctCarac: foundry.utils.duplicate(this.system.carac.ame.carac.instinct),
sort: foundry.utils.duplicate(sort),
competence: foundry.utils.duplicate(competence),
dureeGaldr: "1d5a",
nbCibles: "1",
zoneGaldr: "INS10cm3",
@@ -691,17 +688,9 @@ export class YggdrasillActor extends Actor {
isEpuise: this.isEpuise(),
isBlesse: this.isBlesse(),
isMeurtri: this.isMeurtri(),
optionsBonusMalus: YggdrasillUtility.buildListOptions(-15, +15),
optionsBD: YggdrasillUtility.buildListOptions(0, +15),
bonusMalus: 0,
optionsFuror: YggdrasillUtility.buildListOptions(0, this.getCurrentFuror() ),
furorUsage: 0,
optionsSR: YggdrasillUtility.buildSROptions( ),
sr: 14,
puissanceRune: 1,
optionsPuissanceRune: YggdrasillUtility.buildListOptions(1, 15),
supportRune: "peau",
}
this.addDefaultRoll(rollData)
rollData.sr = 14
let rollDialog = await YggdrasillRoll.create( this, rollData);
console.log(rollDialog);
rollDialog.render( true );
@@ -735,21 +724,16 @@ export class YggdrasillActor extends Actor {
img: competence.img,
rollMode: game.settings.get("core", "rollMode"),
title: "Attaque !",
selectedCarac: duplicate(this.system.carac.corps.carac.agilite),
arme: duplicate(arme),
competence: duplicate(competence),
selectedCarac: foundry.utils.duplicate(this.system.carac.corps.carac.agilite),
arme: foundry.utils.duplicate(arme),
competence: foundry.utils.duplicate(competence),
bonusdefense: 0,
isEpuise: this.isEpuise(),
isBlesse: this.isBlesse(),
isMeurtri: this.isMeurtri(),
optionsBonusMalus: YggdrasillUtility.buildListOptions(-15, +15),
optionsBD: YggdrasillUtility.buildListOptions(0, +15),
bonusMalus: 0,
optionsFuror: YggdrasillUtility.buildListOptions(0, this.getCurrentFuror() ),
furorUsage: 0,
optionsSR: YggdrasillUtility.buildSROptions( ),
sr: 14
isMeurtri: this.isMeurtri()
}
this.addDefaultRoll(rollData)
rollData.sr = 14
let rollDialog = await YggdrasillRoll.create( this, rollData);
console.log(rollDialog);
rollDialog.render( true );

2
modules/yggdrasill-combat.js
View File

@@ -22,7 +22,7 @@ export class YggdrasillCombat extends Combat {
// Send a chat message
let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
let messageData = mergeObject(
let messageData = foundry.utils.mergeObject(
{
speaker: {
scene: canvas.scene._id,

111
modules/yggdrasill-config.js Normal file
View File

@@ -0,0 +1,111 @@
export const YGGDRASILL_CONFIG = {
optionsEtat: [
{ key: "fringant", label: "Fringant" },
{ key: "blesse", label: "Blessé" },
{ key: "mort", label: "Mort" }
],
optionsArme: [
{ key: "lutte", label: "Lutte" },
{ key: "improvisee", label: "Improvisée" },
{ key: "courte", label: "Courte" },
{ key: "longue", label: "Longue" },
{ key: "deuxmains", label: "A Deux Mains" },
{ key: "hast", label: "Hast" }
],
optionsArmeTir: [
{ key: "jet", label: "Jet" },
{ key: "tir", label: "Tir" }
],
optionsArmure: [
{ key: "armure", label: "Armure" },
{ key: "piecearmure", label: "Pièce d'Armure" }
],
optionsBouclier: [
{ key: "bouclier", label: "Bouclier" }
],
optionsCompetence: [
{ key: "generale", label: "Générale" },
{ key: "magique", label: "Magique" },
{ key: "martiale", label: "Martiale" }
],
optionsMaladie: [
{ key: "mineure", label: "Mineure" },
{ key: "moderee", label: "Modérée" },
{ key: "majeure", label: "Majeure" }
],
optionsProuesse: [
{ key: "attaque", label: "Attaque" },
{ key: "defensive", label: "Défensive" },
{ key: "utilitaire", label: "Utilitaire" }
]
,
optionsGaldr: [
{ key:"malediction", label:"Malédictions" },
{ key:"illusion", label:"Illusions" },
{ key:"charme", label:"Charme" }
],
optionsAttaque: [
{ key:"classique", label:"Attaque classique" },
{ key:"force", label:"Attaque en force" },
{ key:"devastatrice", label:"Attaque dévastatrice" },
{ key:"precise", label:"Attaque Précise" },
{ key:"visee", label:"Attaque Visée" }
],
optionsSR : [
{key: "0", label: "Aucun"},
{key: "5", label: "Très Simple (5)"},
{key: "7", label: "Simple (7)"},
{key: "10", label: "Aisé (10)"},
{key: "14", label: "Moyen (14)"},
{key: "19", label: "Difficile (19)"},
{key: "25", label: "Très Difficile (25)"},
{key: "32", label: "Exceptionnel (32)"},
{key: "40", label: "Légendaire (40)"},
{key: "49", label: "Divin (49)"}
],
optionsCarac: [
{ key: "puissance", label: "Puissance" },
{ key: "vigueur", label: "Vigueur" },
{ key: "agilite", label: "Agilité" },
{ key: "intellect", label: "Intellect" },
{ key: "perception", label: "Perception" },
{ key: "tenacite", label: "Tenacité" },
{ key: "charisme", label: "Charisme" },
{ key: "communication", label: "Communication" },
{ key: "instinct", label: "Instinct" }
],
optionsDureeGaldr: [
{ key:"1d5a", label:"1d5 Actions" },
{ key:"1d10t", label:"1d10 Tours" },
{ key:"1d10m", label:"1d10 Minutes" },
{ key:"1d10h", label:"1d10 Heures" },
{ key:"1d5j", label:"1d5 journées" }
],
optionsZoneGaldr: [
{ key:"INS10cm3", label:"INS x 10 cm3 (chat, balle, épée, ...)" },
{ key:"INS50cm3", label:"INS x 50 cm3 (tabouret, enfant, ...)" },
{ key:"INS1m3", label:"INS x 1 m3 (homme, 2 enfants, ...)" },
{ key:"INS5m3", label:"INS x 5 m3 (charrette, 2 cavaliers, ...)" },
{ key:"INS10m3", label:"INS x 10 m3 (maison, kraken, bateau, ...)" }
],
optionsNbCibles: [
{ key: "1", label: "1" },
{ key: "2_4", label: "2 à 4" },
{ key: "5_9", label: "5 à 9" },
{ key: "10_49", label: "10 à 49" },
{ key: "50plus", label: "50 et +" }
],
optionsSupportRunes: [
{ key: "peau", label: "Peau" },
{ key: "tissu", label: "Tissu" },
{ key: "cuir", label: "Cuir" },
{ key: "bois", label: "Bois" },
{ key: "pierremetal", label: "Pierre, Métal" }
]
}

9
modules/yggdrasill-figurant-sheet.js
View File

@@ -11,7 +11,7 @@ export class YggdrasillFigurantSheet extends ActorSheet {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["yggdrasill", "sheet", "actor"],
template: "systems/fvtt-yggdrasill/templates/figurant-sheet.html",
width: 640,
@@ -24,7 +24,7 @@ export class YggdrasillFigurantSheet extends ActorSheet {
/* -------------------------------------------- */
async getData() {
const objectData = duplicate(this.object)
const objectData = foundry.utils.duplicate(this.object)
let formData = {
title: this.title,
@@ -40,14 +40,15 @@ export class YggdrasillFigurantSheet extends ActorSheet {
effetsmagiques: this.actor.getEffetsMagiques(),
encTotal: this.actor.getEncTotal(),
monnaies: this.actor.getMonnaies(),
optionsAttr: new Array(41).fill('option'),
optionsAttr: Array.fromRange(41, 1),
optionsBase: YggdrasillUtility.createDirectOptionList(0, 20),
description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
notes: await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
options: this.options,
owner: this.document.isOwner,
editScore: this.options.editScore,
isGM: game.user.isGM
isGM: game.user.isGM,
config: game.system.config
}
console.log("FIGURANT : ", formData);

9
modules/yggdrasill-item-sheet.js
View File

@@ -8,7 +8,7 @@ export class YggdrasillItemSheet extends ItemSheet {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["fvtt-yggdrasill", "sheet", "item"],
template: "systems/fvtt-yggdrasill/templates/item-sheet.html",
width: 550,
@@ -43,7 +43,7 @@ export class YggdrasillItemSheet extends ItemSheet {
/* -------------------------------------------- */
async getData() {
const objectData = duplicate(this.object);
const objectData = foundry.utils.duplicate(this.object);
let formData = {
title: this.title,
@@ -55,12 +55,13 @@ export class YggdrasillItemSheet extends ItemSheet {
cssClass: this.isEditable ? "editable" : "locked",
data: foundry.utils.deepClone(this.object.system),
optionsBase: YggdrasillUtility.createDirectOptionList(0, 20),
optionsNiveaux4: YggdrasillUtility.buildListOptions(1, 5),
optionsNiveaux4: Array.fromRange(5, 1),
description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
limited: this.object.limited,
options: this.options,
owner: this.document.isOwner,
isGM: game.user.isGM
isGM: game.user.isGM,
config: game.system.config
}
return formData;
}

3
modules/yggdrasill-main.js
View File

@@ -14,6 +14,7 @@ import { YggdrasillActorSheet } from "./yggdrasill-actor-sheet.js";
import { YggdrasillFigurantSheet } from "./yggdrasill-figurant-sheet.js";
import { YggdrasillUtility } from "./yggdrasill-utility.js";
import { YggdrasillCombat } from "./yggdrasill-combat.js";
import { YGGDRASILL_CONFIG } from "./yggdrasill-config.js";
import { ClassCounter} from "https://www.uberwald.me/fvtt_appcount/count-class-ready.js"
/* -------------------------------------------- */
@@ -35,6 +36,8 @@ Hooks.once("init", async function () {
decimals: 0
};
game.system.config = YGGDRASILL_CONFIG
/* -------------------------------------------- */
game.socket.on("system.fvtt-yggdrasill", data => {
YggdrasillUtility.onSocketMesssage(data);

4
modules/yggdrasill-roll-dialog.js
View File

@@ -124,7 +124,7 @@ export class YggdrasillRoll extends Dialog {
activateListeners(html) {
super.activateListeners(html);
var dialog = this;
let dialog = this;
function onLoad() {
if (dialog.rollData.mode == "competence") {
let carac = dialog.actor.getCarac( "Puissance" );
@@ -194,7 +194,7 @@ export class YggdrasillRoll extends Dialog {
});
html.find('#bonusMalus').change((event) => {
html.find('#bonusMalus').change((event) => {
this.rollData.bonusMalus = Number(event.currentTarget.value);
});
html.find('#furorUsage').change((event) => {

56
modules/yggdrasill-utility.js
View File

@@ -12,9 +12,7 @@ export class YggdrasillUtility {
const templatePaths = [
'systems/fvtt-yggdrasill/templates/actor-sheet.html',
'systems/fvtt-yggdrasill/templates/editor-notes-gm.html',
'systems/fvtt-yggdrasill/templates/hud-actor-attaque.html',
'systems/fvtt-yggdrasill/templates/hud-actor-sort.html'
'systems/fvtt-yggdrasill/templates/editor-notes-gm.html'
]
return loadTemplates(templatePaths);
}
@@ -27,7 +25,14 @@ export class YggdrasillUtility {
}
return options;
}
/* -------------------------------------------- */
static createOptions( min, max) {
let options = [];
for(let i=min; i<=max; i++) {
options.push( {key:i, label: `${i}` } );
}
return options;
}
/* -------------------------------------------- */
static createDirectOptionList( min, max) {
let options = {};
@@ -45,24 +50,15 @@ export class YggdrasillUtility {
}
return options;
}
/* -------------------------------------------- */
static buildSROptions( ) {
static buildListOptions(min, max) {
let options = ""
options += `<option value="0">Aucun</option>`
options += `<option value="5">Très Simple (5)</option>`
options += `<option value="7">Simple (7)</option>`
options += `<option value="10">Aisé (10)</option>`
options += `<option value="14">Moyen (14)</option>`
options += `<option value="19">Difficile (19)</option>`
options += `<option value="25">Trés Difficile (25)</option>`
options += `<option value="32">Exceptionnel (32)</option>`
options += `<option value="40">Légendaire (40)</option>`
options += `<option value="49">Divin (49)</option>`
for (let i = min; i <= max; i++) {
options += `<option value="${i}">${i}</option>`
}
return options;
}
/* -------------------------------------------- */
static onSocketMesssage( msg ) {
if( !game.user.isGM ) return; // Only GM
@@ -92,7 +88,7 @@ export class YggdrasillUtility {
let maxTabMaxIndex = isFurorUsage ? nbDice : 2;
for (let i=0; i<nbDice; i++) {
rolls[i] = new Roll("1d10x10").roll( {async: false}) //+sumDice+"+"+rollData.furorUsage+"d10+"+niveauCompetence+"+"+rollData.finalBM).roll( { async: false} );
rolls[i] = await new Roll("1d10x10").roll( ) //+sumDice+"+"+rollData.furorUsage+"d10+"+niveauCompetence+"+"+rollData.finalBM).roll( { async: false} );
if ( i == nbDice-1 ) {
await this.showDiceSoNice(rolls[i], game.settings.get("core", "rollMode") );
} else {
@@ -122,7 +118,7 @@ export class YggdrasillUtility {
let niveau = rollData.subAttr.value;
// Bonus/Malus total
rollData.finalBM = rollData.bonusMalus;
rollData.finalBM = Number(rollData.bonusMalus);
// Gestion cas blessé (malus de -3)
if ( rollData.isBlesse) { // Cas blesse : malus de -3
rollData.finalBM -= 3;
@@ -132,15 +128,15 @@ export class YggdrasillUtility {
rollData.rawDices = results.rawDices
rollData.maxTab = results.maxTab
rollData.rolls = results.rolls
rollData.bonus = niveau + rollData.finalBM
rollData.bonus = niveau + Number(rollData.finalBM)
rollData.finalTotal = rollData.maxTab[0].value + rollData.maxTab[1].value;
rollData.finalTotal += rollData.bonus
rollData.finalTotal = Number(rollData.maxTab[0].value) + Number(rollData.maxTab[1].value);
rollData.finalTotal += Number(rollData.bonus)
// Compute total SR
rollData.srFinal = rollData.sr;
rollData.srFinal = Number(rollData.sr);
if ( rollData.bonusdefense ) {
rollData.srFinal += rollData.bonusdefense;
rollData.srFinal += Number(rollData.bonusdefense);
}
if ( rollData.srFinal > 0 ) {
isCritical = rollData.finalTotal >= rollData.srFinal*2;
@@ -154,7 +150,7 @@ export class YggdrasillUtility {
// Dégats
if ( isSuccess && rollData.subAttr.degats ) {
rollData.degatsExplain = `Marge(${marge}) + Physique(${rollData.valuePhysique}) + 1d10`;
rollData.rollDegats = new Roll("1d10+"+marge+"+"+rollData.valuePhysique).roll( { async: false} );
rollData.rollDegats = await new Roll("1d10+"+marge+"+"+rollData.valuePhysique).roll( );
await this.showDiceSoNice(rollData.rollDegats, game.settings.get("core", "rollMode") );
rollData.degats = rollData.rollDegats.total;
}
@@ -192,7 +188,7 @@ export class YggdrasillUtility {
}
// Bonus/Malus total
rollData.finalBM = rollData.bonusMalus;
rollData.finalBM = Number(rollData.bonusMalus);
if ( rollData.attackDef) {
rollData.finalBM -= rollData.attackDef.malus;
}
@@ -226,7 +222,7 @@ export class YggdrasillUtility {
for (let i=0; i<rollData.furorUsage; i++) {
rollData.furorResult += rollData.furorMaxTab[i].value
}
rollData.finalTotal += rollData.furorResult + rollData.bonusTotal;
rollData.finalTotal += Number(rollData.furorResult) + Number(rollData.bonusTotal);
rollData.niveauCompetence = niveauCompetence
// Compute total SR
@@ -270,7 +266,7 @@ export class YggdrasillUtility {
// Specific GALDR
if ( rollData.sort?.type == "sortgaldr" && rollData.isSuccess) {
let galdrRoll = new Roll( rollData.dureeGaldr.substring(0, rollData.dureeGaldr.length - 1) ).roll( { async: false} );
let galdrRoll = await new Roll( rollData.dureeGaldr.substring(0, rollData.dureeGaldr.length - 1) ).roll( );
await this.showDiceSoNice(galdrRoll, game.settings.get("core", "rollMode") );
rollData.dureeGaldrText = galdrRoll.total + " " + dureeGaldrText[rollData.dureeGaldr];
if ( rollData.sort.system.voie == "illusion") {
@@ -310,7 +306,7 @@ export class YggdrasillUtility {
/* -------------------------------------------- */
static blindMessageToGM(chatOptions) {
let chatGM = duplicate(chatOptions);
let chatGM = foundry.utils.duplicate(chatOptions);
chatGM.whisper = this.getUsers(user => user.isGM);
chatGM.content = "Message aveugle de " + game.user.name + "<br>" + chatOptions.content;
console.log("blindMessageToGM", chatGM);