diff --git a/modules/heritiers-actor-sheet.js b/modules/heritiers-actor-sheet.js index 3402b7d..319ec51 100644 --- a/modules/heritiers-actor-sheet.js +++ b/modules/heritiers-actor-sheet.js @@ -122,7 +122,7 @@ export class HeritiersActorSheet extends ActorSheet { }) html.find('.roll-initiative').click((event) => { - this.actor.rollAttribut("pre", true) + this.actor.rollInitiative() }) html.find('.roll-carac').click((event) => { diff --git a/modules/heritiers-actor.js b/modules/heritiers-actor.js index 1e0ca32..c4f10a5 100644 --- a/modules/heritiers-actor.js +++ b/modules/heritiers-actor.js @@ -473,7 +473,20 @@ export class HeritiersActor extends Actor { } return rollData } - + /* -------------------------------------------- */ + async rollInitiative() { + let rollData = this.getCommonRollData(undefined, "Art de la guerre") + rollData.mode = "init" + if (this.system.caracteristiques["san"].value > this.system.caracteristiques["per"].value) { + rollData.caracKey = "san" + } else { + rollData.caracKey = "per" + } + rollData.carac = this.system.caracteristiques[rollData.caracKey] + let rollDialog = await HeritiersRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ async rollCarac(key, isInit = false) { let rollData = this.getCommonRollData() diff --git a/modules/heritiers-config.js b/modules/heritiers-config.js index f15513a..c478153 100644 --- a/modules/heritiers-config.js +++ b/modules/heritiers-config.js @@ -109,6 +109,10 @@ export const HERITIERS_CONFIG = { "balle": "Protège ds balles", "melee": "Protège en mélée", "tout": "Tout type de dégats" + }, + typeFee: { + "traditionnelle": "Traditionnelle", + "moderne": "Moderne" } diff --git a/modules/heritiers-utility.js b/modules/heritiers-utility.js index 552e7a6..c718dda 100644 --- a/modules/heritiers-utility.js +++ b/modules/heritiers-utility.js @@ -362,7 +362,7 @@ export class HeritiersUtility { rollData.finalResult = myRoll.total this.computeResult(actor, rollData) - if (rollData.isInit) { + if (rollData.mode == "init") { actor.setFlag("world", "last-initiative", rollData.finalResult) } diff --git a/system.json b/system.json index 993f7d0..abb3b36 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-les-heritiers", "description": "Les Héritiers pour FoundryVTT", - "version": "10.0.9", + "version": "10.0.10", "authors": [ { "name": "Uberwald/LeRatierBretonnien", @@ -19,7 +19,7 @@ "gridUnits": "m", "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/raw/branch/master/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-10.0.9.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-10.0.10.zip", "languages": [ { "lang": "fr", diff --git a/template.json b/template.json index 60fdca8..84139f1 100644 --- a/template.json +++ b/template.json @@ -244,6 +244,7 @@ "feetype": 0, "avantages": "", "desavantages": "", + "pouvoirsfeeriques": "", "atoutsfeeriques": "", "competences": "", "capacitenaturelles": "", diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index ae323e5..d96ee11 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -157,6 +157,43 @@