Lasth31/fvtt-yggdrasill
0
0
Fork 0
forked from public/fvtt-yggdrasill
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix v9

Browse Source
This commit is contained in:
sladecraven 2022-01-12 11:32:08 +01:00
parent c28c7d8c0d
commit e4f8505cc7
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/yggdrasill-actor.js
View File

@ -484,8 +484,8 @@ export class YggdrasillActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
async rollAttribute( attrkey, subAttrKey = 'defaut') { async rollAttribute( attrkey, subAttrKey = 'defaut') {
let attr = duplicate(this.data.data.attributs[attrkey]); let attr = duplicate(this.data.data.attributs[attrkey]);
console.log("ATTR : ", attr, attrkey, subAttrKey);
let subAttr = duplicate(this.data.data.attributs[attrkey].values[subAttrKey] ); let subAttr = duplicate(this.data.data.attributs[attrkey].values[subAttrKey] );
console.log("ATTR : ", attr, subAttr);
if ( attr ) { if ( attr ) {
subAttr.label = subAttr.label || ""; subAttr.label = subAttr.label || "";
let title = `Attribut : ${attr.label} ${subAttr.label} : ${subAttr.value}`; let title = `Attribut : ${attr.label} ${subAttr.label} : ${subAttr.value}`;

29
modules/yggdrasill-utility.js
View File

@ -114,18 +114,31 @@ export class YggdrasillUtility {
rollData.finalBM -= 3; rollData.finalBM -= 3;
} }
let myRoll = new Roll("2d10+"+niveau+"+"+rollData.finalBM).roll( { async: false} ); let rolls = []
await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode") ); rollData.rawDices = []
for (let i=0; i < 2; i++) {
rolls[i] = new Roll("1d10x10").roll( { async: false} );
rollData.rawDices.push({ 'result': rolls[i].total});
}
this.showDiceSoNice(rolls[0], game.settings.get("core", "rollMode") );
await this.showDiceSoNice(rolls[1], game.settings.get("core", "rollMode") );
rollData.bonus = niveau + rollData.finalBM
rollData.finalTotal = 0
for (let i=0; i< 2; i++) {
rollData.finalTotal = rolls[i].dice[0].results[0].result
}
rollData.finalTotal += rollData.bonus
// Compute total SR // Compute total SR
rollData.srFinal = rollData.sr; rollData.srFinal = rollData.sr;
if ( rollData.srFinal > 0 ) { if ( rollData.srFinal > 0 ) {
isCritical = myRoll.total >= rollData.srFinal*2; isCritical = rollData.finalTotal >= rollData.srFinal*2;
isSuccess = myRoll.total >= rollData.srFinal; isSuccess = rollData.finalTotal >= rollData.srFinal;
marge = myRoll.total - rollData.srFinal; marge = rollData.finalTotal - rollData.srFinal;
} }
if (myRoll.dice[0].results[0].result == 1 && myRoll.dice[0].results[1].result == 1) { if (rolls[0].dice[0].results[0].result == 1 && rolls[1].dice[0].results[0].result == 1) {
isFailure = true; isFailure = true;
} }
// Dégats // Dégats
@ -141,7 +154,7 @@ export class YggdrasillUtility {
rollData.isSuccess = isSuccess; rollData.isSuccess = isSuccess;
rollData.isCritical = isCritical; rollData.isCritical = isCritical;
rollData.marge = marge; rollData.marge = marge;
rollData.roll = myRoll rollData.rolls = rolls
console.log("ROLLLL ATTR!!!!", rollData); console.log("ROLLLL ATTR!!!!", rollData);

2
system.json
View File

@ -2,7 +2,7 @@
"name": "fvtt-yggdrasill", "name": "fvtt-yggdrasill",
"title": "Yggdrasill", "title": "Yggdrasill",
"description": "Système non-officiel Yggdrasill (7ièm Cercle) pour FoundryVTT", "description": "Système non-officiel Yggdrasill (7ièm Cercle) pour FoundryVTT",
"version": "1.1.5", "version": "1.1.6",
"manifestPlusVersion": "1.0.0", "manifestPlusVersion": "1.0.0",
"minimumCoreVersion": "0.8.0", "minimumCoreVersion": "0.8.0",
"compatibleCoreVersion": "9", "compatibleCoreVersion": "9",

3
templates/figurant-sheet.html
View File

@ -43,7 +43,8 @@
{{#each attr.values as |value index|}} {{#each attr.values as |value index|}}
{{#if value.label}} {{#if value.label}}
<span class="stat-label flexrow tooltip tooltip-nobottom" name="{{index}}"><a class="attribut-roll" data-attr-sub-key="{{index}}">{{value.label}}</a></span> <span class="stat-label flexrow tooltip tooltip-nobottom" name="{{index}}">
<a class="attribut-roll" data-attr-sub-key="{{index}}">{{value.label}}</a></span>
{{/if}} {{/if}}
<select class="carac-base flexrow" type="text" name="data.attributs.{{key}}.values.{{index}}.value" value="{{value.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}> <select class="carac-base flexrow" type="text" name="data.attributs.{{key}}.values.{{index}}.value" value="{{value.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
{{#select value.value}} {{#select value.value}}