diff --git a/module/rdd-utility.js b/module/rdd-utility.js index aecf6742..7a05c7a3 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -65,22 +65,23 @@ const tableCaracDerivee = { /* -------------------------------------------- */ const premierRoundInit = [ - { type: 'competence', pattern: 'hast', init: 3.90}, - { type: 'competence', pattern: 'lance', init: 3.85}, - { type: 'arme', pattern: 'bâton', init: 3.80}, - { type: 'arme', pattern: 'double dragonne', init: 3.75}, - { type: 'arme', pattern: 'esparlongue', init: 3.70}, - { type: 'arme', pattern: 'pée dragonne', init: 3.65}, - { type: 'arme', pattern: 'bâtarde', init: 3.60}, - { type: 'arme', pattern: 'cyane', init: 3.55}, - { type: 'arme', pattern: 'sorde', init: 3.50}, - { type: 'arme', pattern: 'grande hache', init: 3.45}, - { type: 'arme', pattern: 'bataille', init: 3.40}, - { type: 'arme', pattern: 'gnome', init: 3.35}, - { type: 'arme', pattern: 'masse', init: 3.30}, - { type: 'arme', pattern: 'gourdin', init: 3.25}, - { type: 'competence', pattern: 'fléau', init: 3.20}, - { type: 'arme', pattern: 'dague', init: 3.15}, + { pattern: 'hast', init: 3.90}, + { pattern: 'lance', init: 3.85}, + { pattern: 'baton', init: 3.80}, + { pattern: 'doubledragonne', init: 3.75}, + { pattern: 'esparlongue', init: 3.70}, + { pattern: 'epeedragonne', init: 3.65}, + { pattern: 'epeebatarde', init: 3.60}, + { pattern: 'epeecyane', init: 3.55}, + { pattern: 'epeesorde', init: 3.50}, + { pattern: 'grandehache', init: 3.45}, + { pattern: 'bataille', init: 3.40}, + { pattern: 'epeegnome', init: 3.35}, + { pattern: 'masse', init: 3.30}, + { pattern: 'gourdin', init: 3.25}, + { pattern: 'fléau', init: 3.20}, + { pattern: 'dague', init: 3.15}, + { pattern: 'autre', init: 3.10}, ]; /* -------------------------------------------- */ @@ -214,6 +215,7 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-competence.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html', 'systems/foundryvtt-reve-de-dragon/templates/sort-draconic.html', 'systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html', @@ -699,8 +701,7 @@ export class RdDUtility { //console.log("Parsed !!!", combatant, initDone, game.combat.current, arme); if ( arme && arme.type == "arme" ) { for (let initData of premierRoundInit) { - if ( ( initData == 'competence' && arme.data.competence.toLowerCase().includes(initData.pattern)) || - (arme.name.toLowerCase().includes(initData.pattern)) ) { + if ( arme.data.initpremierround.toLowerCase().includes(initData.pattern) ) { let msg = `