diff --git a/images/icons/arbalete.webp b/images/icons/arbalete.webp new file mode 100644 index 0000000..49063d6 Binary files /dev/null and b/images/icons/arbalete.webp differ diff --git a/images/icons/arc.webp b/images/icons/arc.webp new file mode 100644 index 0000000..d3431e1 Binary files /dev/null and b/images/icons/arc.webp differ diff --git a/images/icons/constitution.webp b/images/icons/constitution.webp new file mode 100644 index 0000000..10b5508 Binary files /dev/null and b/images/icons/constitution.webp differ diff --git a/images/icons/culturegenerale.webp b/images/icons/culturegenerale.webp new file mode 100644 index 0000000..46a5089 Binary files /dev/null and b/images/icons/culturegenerale.webp differ diff --git a/images/icons/fusil.webp b/images/icons/fusil.webp new file mode 100644 index 0000000..f6bb7de Binary files /dev/null and b/images/icons/fusil.webp differ diff --git a/images/icons/habilite.webp b/images/icons/habilite.webp new file mode 100644 index 0000000..45a8e16 Binary files /dev/null and b/images/icons/habilite.webp differ diff --git a/images/icons/mainsnues.webp b/images/icons/mainsnues.webp new file mode 100644 index 0000000..0483a29 Binary files /dev/null and b/images/icons/mainsnues.webp differ diff --git a/images/icons/perception.webp b/images/icons/perception.webp new file mode 100644 index 0000000..1648443 Binary files /dev/null and b/images/icons/perception.webp differ diff --git a/images/icons/physique.webp b/images/icons/physique.webp new file mode 100644 index 0000000..6d66280 Binary files /dev/null and b/images/icons/physique.webp differ diff --git a/images/icons/rationnalite.webp b/images/icons/rationnalite.webp new file mode 100644 index 0000000..2b5ea21 Binary files /dev/null and b/images/icons/rationnalite.webp differ diff --git a/images/icons/revolver.webp b/images/icons/revolver.webp new file mode 100644 index 0000000..251dfeb Binary files /dev/null and b/images/icons/revolver.webp differ diff --git a/images/icons/spiritualite.webp b/images/icons/spiritualite.webp new file mode 100644 index 0000000..277ebbe Binary files /dev/null and b/images/icons/spiritualite.webp differ diff --git a/modules/malefices-actor-sheet.js b/modules/malefices-actor-sheet.js index a513070..908ba0a 100644 --- a/modules/malefices-actor-sheet.js +++ b/modules/malefices-actor-sheet.js @@ -14,8 +14,8 @@ export class MaleficesActorSheet extends ActorSheet { return mergeObject(super.defaultOptions, { classes: ["fvtt-malefices", "sheet", "actor"], template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs", - width: 960, - height: 720, + width: 640, + height: 640, tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" }], dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }], editScore: true @@ -38,7 +38,6 @@ export class MaleficesActorSheet extends ActorSheet { armes: duplicate(this.actor.getArmes()), equipements: duplicate(this.actor.getEquipements()), subActors: duplicate(this.actor.getSubActors()), - focusData: this.actor.computeFinalFocusData(), encCurrent: this.actor.encCurrent, options: this.options, owner: this.document.isOwner, @@ -113,13 +112,11 @@ export class MaleficesActorSheet extends ActorSheet { html.find('.roll-attribut').click((event) => { let attrKey = $(event.currentTarget).data("attr-key") - let skillKey = $(event.currentTarget).data("skill-key") - this.actor.rollSkill(attrKey, skillKey) + this.actor.rollAttribut(attrKey) }); html.find('.roll-arme').click((event) => { - const li = $(event.currentTarget).parents(".item"); - const weponId = li.data("item-id") - this.actor.rollWeapon(weponId) + const armeId = $(event.currentTarget).data("arme-id") + this.actor.rollArme(armeId) }); html.find('.lock-unlock-sheet').click((event) => { diff --git a/modules/malefices-actor.js b/modules/malefices-actor.js index 8a49809..ec81f09 100644 --- a/modules/malefices-actor.js +++ b/modules/malefices-actor.js @@ -198,15 +198,9 @@ export class MaleficesActor extends Actor { } /* -------------------------------------------- */ getInitiativeScore(combatId, combatantId) { - if (this.type == 'character') { - let init = this.getFlag("world", "initiative" ) - console.log("INIT", init) - if (!init || init == -1) { - ChatMessage.create( { content: "Roll your initiative for this combat"} ) - } - return init - } - return -1; + let init = Math.floor(this.system.attributs.physique.value+this.system.attributs.habilete.value) + let subvalue = new Roll("1d20").roll({async: false}) + return init + (subvalue / 100) } /* -------------------------------------------- */ @@ -268,6 +262,12 @@ export class MaleficesActor extends Actor { } } } + + /* -------------------------------------------- */ + getAtttributImage( attrKey) { + return `systems/fvtt-malefices/images/icons/${attrKey}.webp` + } + /* -------------------------------------------- */ getCommonRollData() { @@ -276,50 +276,54 @@ export class MaleficesActor extends Actor { rollData.actorImg = this.img rollData.actorId = this.id rollData.img = this.img + rollData.phyMalus = this.getPhysiqueMalus() console.log("ROLLDATA", rollData) return rollData } + /* -------------------------------------------- */ + getPhysiqueMalus() { + if ( this.system.attributs.constitution.value <= 8) { + return -(9 - this.system.attributs.constitution.value) + } + return 0 + } /* -------------------------------------------- */ - rollAtribut(attrKey, skillKey) { - let attr = this.system.attributes[attrKey] - let skill = attr.skills[skillKey] - if (skill) { - skill = duplicate(skill) - skill.name = MaleficesUtility.upperFirst(skillKey) - skill.attr = duplicate(attr) - let rollData = this.getCommonRollData() - rollData.mode = "skill" - rollMode.skillKey = skillKey - rollData.skill = skill - rollData.title = "Roll Skill " + skill.name - rollData.img = skill.img - this.startRoll(rollData) - } + rollAttribut(attrKey) { + let attr = this.system.attributs[attrKey] + let rollData = this.getCommonRollData() + rollData.attr = duplicate(attr) + rollData.mode = "attribut" + rollData.title = attr.label + rollData.img = this.getAtttributImage(attrKey) + this.startRoll(rollData) } /* -------------------------------------------- */ rollArme(weaponId) { - let weapon = this.items.get(weaponId) - if (weapon) { - weapon = duplicate(weapon) - this.prepareWeapon(weapon) + let arme = this.items.get(weaponId) + if (arme) { + arme = duplicate(arme) let rollData = this.getCommonRollData() - rollData.modifier = this.system.bonus[weapon.system.weapontype] - rollData.mode = "weapon" - rollData.weapon = weapon - rollData.img = weapon.img + if (arme.system.armetype == "mainsnues" || arme.system.armetype == "epee") { + rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique+this.system.attributs.habilite) / 2) } + } else { + rollData.attr = duplicate(this.system.attributs.habilite) + } + rollData.mode = "arme" + rollData.arme = arme + rollData.img = arme.img + rollData.title = arme.name this.startRoll(rollData) } else { - ui.notifications.warn("Unable to find the relevant weapon ") + ui.notifications.warn("Impossible de trouver l'arme concernée ") } } /* -------------------------------------------- */ async startRoll(rollData) { - this.syncRoll(rollData) let rollDialog = await MaleficesRollDialog.create(this, rollData) rollDialog.render(true) } diff --git a/modules/malefices-commands.js b/modules/malefices-commands.js index 5a511bf..97abf44 100644 --- a/modules/malefices-commands.js +++ b/modules/malefices-commands.js @@ -7,11 +7,11 @@ import { MaleficesRollDialog } from "./malefices-roll-dialog.js"; export class MaleficesCommands { static init() { - if (!game.system.Malefices.commands) { - const MaleficesCommands = new MaleficesCommands(); + if (!game.system.malefices.commands) { + const commands = new MaleficesCommands(); //crucibleCommands.registerCommand({ path: ["/char"], func: (content, msg, params) => crucibleCommands.createChar(msg), descr: "Create a new character" }); //crucibleCommands.registerCommand({ path: ["/pool"], func: (content, msg, params) => crucibleCommands.poolRoll(msg), descr: "Generic Roll Window" }); - game.system.Malefices.commands = MaleficesCommands; + game.system.malefices.commands = commands; } } constructor() { diff --git a/modules/malefices-item-sheet.js b/modules/malefices-item-sheet.js index f5c41fe..1e3b42d 100644 --- a/modules/malefices-item-sheet.js +++ b/modules/malefices-item-sheet.js @@ -58,7 +58,7 @@ export class MaleficesItemSheet extends ItemSheet { editable: this.isEditable, cssClass: this.isEditable ? "editable" : "locked", system: duplicate(this.object.system), - config: duplicate(game.system.malefices), + config: duplicate(game.system.malefices.config), limited: this.object.limited, options: this.options, owner: this.document.isOwner, diff --git a/modules/malefices-roll-dialog.js b/modules/malefices-roll-dialog.js index aa22b57..52347ca 100644 --- a/modules/malefices-roll-dialog.js +++ b/modules/malefices-roll-dialog.js @@ -58,12 +58,15 @@ export class MaleficesRollDialog extends Dialog { } $(function () { onLoad(); }); - html.find('#bonusMalusRoll').change((event) => { - this.rollData.bonusMalusRoll = event.currentTarget.value + html.find('#bonusMalusSituation').change((event) => { + this.rollData.bonusMalusSituation = Number(event.currentTarget.value) }) - html.find('#targetCheck').change((event) => { - this.rollData.targetCheck = event.currentTarget.value + html.find('#bonusMalusPerso').change((event) => { + this.rollData.bonusMalusPerso = Number(event.currentTarget.value) }) - + html.find('#bonusMalusDef').change((event) => { + this.rollData.bonusMalusDef = Number(event.currentTarget.value) + }) + } } \ No newline at end of file diff --git a/modules/malefices-utility.js b/modules/malefices-utility.js index 3668e6b..da4e624 100644 --- a/modules/malefices-utility.js +++ b/modules/malefices-utility.js @@ -155,20 +155,7 @@ export class MaleficesUtility { const templatePaths = [ 'systems/fvtt-malefices/templates/actors/editor-notes-gm.hbs', 'systems/fvtt-malefices/templates/items/partial-item-nav.hbs', - 'systems/fvtt-malefices/templates/items/partial-item-description.hbs', - 'systems/fvtt-malefices/templates/items/partial-common-item-fields.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-damage-types.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-weapon-types.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-weapon-categories.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-attributes.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-equipment-types.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-armor-types.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-spell-types.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-spell-levels.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-spell-schools.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-focus-bond.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-focus-treatment.hbs', - 'systems/fvtt-malefices/templates/items/partial-options-focus-core.hbs', + 'systems/fvtt-malefices/templates/items/partial-item-description.hbs' ] return loadTemplates(templatePaths); } @@ -508,26 +495,10 @@ export class MaleficesUtility { static async rollMalefices(rollData) { let actor = game.actors.get(rollData.actorId) - + // Build the dice formula - let diceFormula = "1d12" - if (rollData.skill) { - diceFormula += "+" + rollData.skill.finalvalue - } - if (rollData.crafting) { - diceFormula += "+" + rollData.crafting.system.level - } - if (rollData.spellAttack) { - diceFormula += "+" + rollData.spellAttack - } - diceFormula += "+" + rollData.bonusMalusRoll - - if (rollData.skill && rollData.skill.good) { - diceFormula += "+1d4" - } - if (rollData.weapon ) { - diceFormula += "+" + rollData.weapon.attackBonus - } + let diceFormula = "1d20" + rollData.target = rollData.attr.value + rollData.bonusMalusPerso + rollData.bonusMalusSituation + rollData.bonusMalusDef rollData.diceFormula = diceFormula // Performs roll @@ -540,22 +511,26 @@ export class MaleficesUtility { rollData.roll = myRoll rollData.isSuccess = false - if (rollData.targetCheck != "none") { - if (myRoll.total >= Number(rollData.targetCheck)) { - rollData.isSuccess = true - } + if (myRoll.total <= rollData.target ) { + rollData.isSuccess = true } - - if (rollData.spell) { - actor.spentFocusPoints(rollData.spell) + if (myRoll.total == 1 ) { + rollData.isSuccess = true + rollData.isCritical = true + } + if (myRoll.total == 20 ) { + rollData.isSuccess = false + rollData.isFumble = true + } + if (myRoll.total <= Math.floor(rollData.target/3) ) { + rollData.isPart = true } let msg = await this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-malefices/templates/chat/chat-generic-result.hbs`, rollData) }) msg.setFlag("world", "rolldata", rollData) - if (rollData.skillKey == "initiative") { - console.log("REGISTERED") + if (rollData.mode == "initiative") { actor.setFlag("world", "initiative", myRoll.total) } @@ -649,8 +624,9 @@ export class MaleficesUtility { static getBasicRollData() { let rollData = { rollId: randomID(16), - bonusMalusRoll: 0, - targetCheck: "none", + bonusMalusPerso: 0, + bonusMalusSituation: 0, + bonusMalusDef: 0, rollMode: game.settings.get("core", "rollMode") } MaleficesUtility.updateWithTarget(rollData) diff --git a/styles/simple.css b/styles/simple.css index 050b6f9..5b879e3 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -222,9 +222,9 @@ table {border: 1px solid #7a7971;} -webkit-box-flex: 0; -ms-flex: 0 0 128px; flex: 0 0 128px; - width: 128px; + width: 256px; height: auto; - max-height:160px; + max-height:256px; margin-top: 0px; margin-right: 10px; object-fit: cover; @@ -561,8 +561,8 @@ ul, li { .list-item { margin: 0.125rem; - box-shadow: inset 0px 0px 1px #00000096; - border-radius: 0.25rem; + /*box-shadow: inset 0px 0px 1px #00000096; + border-radius: 0.25rem;*/ padding: 0.125rem; flex: 1 1 5rem; display: flex !important; @@ -1186,10 +1186,10 @@ ul, li { color: #CCC } #pause > img { - content: url(../images/ui/crucible_pause_logo.jpg); - height: 160px; - width: 160px; - top: -80px; + content: url(../images/ui/logo_pause.webp); + height: 200px; + width: 200px; + top: -100px; left: calc(50% - 132px); } @@ -1302,8 +1302,8 @@ ul, li { .item-field-label-long { margin-top: 4px; flex-grow:1; - max-width: 8rem; - min-width: 8rem; + max-width: 10rem; + min-width: 10rem; } .item-control-end { align-self: flex-end; diff --git a/system.json b/system.json index 670b7f0..78e4f87 100644 --- a/system.json +++ b/system.json @@ -37,7 +37,7 @@ ], "title": "Maléfices, le Jeu de Rôle", "url": "https://www.uberwald.me/gitea/public/fvtt-malefices", - "version": "10.0.0", - "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.0.zip", + "version": "10.0.1", + "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.1.zip", "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp" } \ No newline at end of file diff --git a/template.json b/template.json index 341bf2f..e825dd1 100644 --- a/template.json +++ b/template.json @@ -39,6 +39,7 @@ "label": "Constitution", "abbrev": "constitution", "value": 0, + "hasmax": true, "max": 0 }, "physique": { @@ -68,12 +69,14 @@ "spiritualite": { "label": "Spiritualite", "abbrev": "spiritualite", + "hasmax": true, "value": 0, "max": 0 }, "rationnalite": { "label": "Rationnalite", "abbrev": "rationnalite", + "hasmax": true, "value": 0, "max": 0 } @@ -93,17 +96,22 @@ }, "Item": { "types": [ - "arme" + "arme", + "equipement" ], "templates": { }, + "equipement" : { + "description": "" + }, "arme" : { "armetype": 0, "dommagenormale": 0, "dommagepart": 0, "dommagecritique": 0, "dommagecritiqueKO": false, - "dommagecritiquemort": false + "dommagecritiquemort": false, + "description": "" } } } \ No newline at end of file diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 657ce17..358bfad 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -3,51 +3,12 @@ {{!-- Sheet Header --}}
-

+

- {{#each system.attributes as |attr attrKey|}} -
-
- {{attr.label}} - -
- {{#each attr.skills as |skill skillKey|}} -
- - - {{upperFirst skillKey}} {{skill.finalvalue}} - - -
- {{/each}} -
-   -
- {{#if (eq attrKey "might")}} -
- Universal -
- {{#each @root.system.universal.skills as |skill skillKey|}} -
- - - {{upperFirst skillKey}} - - - -
- {{/each}} - {{else}} -
-
- {{/if}} -
- {{/each}} -
@@ -58,14 +19,10 @@ {{!-- Sheet Tab Navigation --}} {{!-- Sheet Body --}} @@ -74,333 +31,78 @@ {{!-- Skills Tab --}}
-
    -
  • - Level - - -   - - Health - / - - -   - -
    • -
- -
-
    -
  • - -

    -     -
    • - {{#each system.mitigation as |mitigation key|}} -
  • - {{mitigation.label}} - {{mitigation.value}} -
    • - {{/each}} -
- -
    -
  • - -

    -     -
    • - {{#each system.bonus as |bonus key|}} -
  • - {{upperFirst key}} -
      - {{#each bonus as |value key2|}} -
    • - {{upperFirst key2}} - {{value}} -
      • - {{/each}} -
    -
    • - {{/each}} -
-
-
- - {{!-- Modules Tab --}} -
- -
-
    +
    +
    +
    • - -

      + +

      • - {{#each modules as |module key|}} -
    • - - {{module.name}} - -
       
      -
      - -
      + {{#each system.attributs as |attr key|}} +
    • + {{attr.label}} + + {{#if attr.hasmax}} + + {{/if}}
      • {{/each}}
    -
    +
    +
      +
    • + +

      +       +
      • - - {{!-- Spells Tab --}} -
      - -
      - -
        -
      • - Focus Regen - - - -   - - Focus Points - / - - -   -
        • -
      - -
        -
      • - -

        -         - - - - - - -
        • - - {{#each spells as |spell key|}} -
      • - - - {{spell.name}} - - {{upperFirst spell.system.spelltype}} - {{upperFirst spell.system.level}} -
         
        -
        - -
        -
        • - {{/each}} - -
      + {{#each armes as |arme key|}} +
    • + {{arme.name}} +
      • + {{/each}} +
    +
-
- {{!-- moves Tab --}} -
- -
- - - -
    -
  • - -

    -     - - - - - - -
    • - - {{#each spells as |spell key|}} -
  • - - - {{spell.name}} - - {{upperFirst spell.system.spelltype}} - {{upperFirst spell.system.level}} -
     
    -
    - -
    -
    • - {{/each}} -
- -
-
- - {{!-- traits Tab --}} -
- -
- -
    -
  • - -

    -     - - - - - - -
    • - - {{#each traits as |trait key|}} -
  • - - - {{trait.name}} - - {{upperFirst trait.system.spelltype}} - {{upperFirst trait.system.level}} -
     
    -
    - -
    -
    • - {{/each}} - -
- -
{{!-- Equipement Tab --}} -
- -
-

Encumbrance

- Current : {{encCurrent}} - Capacity : {{encCapacity}} -
+
  • -

    -     - - +

    - + - - -
     
    -
    - -
    -
    • - {{#each moneys as |money key|}} -
  • - - {{money.name}} - - + - - - - {{#if money.system.idrDice}} - {{money.system.idrDice}} - {{else}} -  -  - {{/if}} - - -
     
    -
    - -
    -
    • - {{/each}} -
- -
    -
  • - -

    -     - - - - - +
    • - {{#each weapons as |weapon key|}} -
  • + {{#each armes as |arme key|}} +
  • - {{weapon.name}} - - + src="{{arme.img}}" /> + {{arme.name}} + + +
     
    - {{#if weapon.system.equipped}}{{else}}{{/if}}
    • @@ -410,75 +112,10 @@
    • -

      -       - - - - - - - -
       
      -
      - -
      -
      • - {{#each armors as |armor key|}} -
    • - - {{armor.name}} - {{upperFirst armor.system.armortype}} - {{armor.system.absorprionroll}} - -
       
      -
      - {{#if armor.system.equipped}}{{else}}{{/if}} - -
      -
      • - {{/each}} -
    - - - -
      -
    • - -

      +

      - +
       
      @@ -486,22 +123,14 @@
      • - {{#each equipments as |equip key|}} + {{#each equipements as |equip key|}}
    • {{equip.name}} - - -
       
      - {{#if equip.system.equipped}}{{else}}{{/if}}
      • @@ -512,47 +141,14 @@
- {{!-- Equipement Tab --}} -
- - -
    -
  • - -

    -     - - - -
    - -
    -
    • - {{#each craftingSkills as |crafting key|}} -
  • - - {{crafting.name}} - - -
     
    -
    - -
    -
    • - {{/each}} -
- -
- {{!-- Biography Tab --}}
  • - - Lieu de naissance +
  • @@ -560,53 +156,65 @@
  • - - + +
  • - - + +
  • - - + + +
    • +
  • + +
  • - - + +
    • -
  • - - +
  • + +
    • -
  • - - +
  • + +
    • -
  • - - - +
  • + + +
    • +
  • + + +
    • +
  • + +
-
+
+ +
    +
  • + +
    • +
  • + +
    • +
+
+

Background :

@@ -621,6 +229,7 @@
+
\ No newline at end of file diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index c967f5d..24ed27a 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -18,32 +18,48 @@
    - {{#if skill}} -
  • Skill : {{skill.name}} ({{skill.finalvalue}}) + {{#if attr}} +
  • {{attr.label}} : {{attr.value}}
    • {{/if}} - {{#if crafting}} -
  • Crafting : {{crafting.name}} ({{crafting.system.level}}) -
    • - {{/if}} +
  • Bonus/Malus perso: {{bonusMalusPerso}}
    • +
  • Bonus/Malus situation: {{bonusMalusSituation}}
    • +
  • Seuil final: {{target}}
    • +
  • Resultat {{roll.total}}
    • - {{#if spell}} -
  • Spell : {{spell.name}} ({{spell.system.level}}) -
    • -
  • Focus Points Spent : {{spellCost}} -
    • - {{/if}} + {{#if isSuccess}} + {{#if isCritical}} +
  • Réussite Critique !
    • + {{#if arme}} + {{#if arme.system.dommagecritiquemort}} +
  • La victime est morte !
    • + {{else}} + {{#if arme.system.dommagecritiqueko}} +
  • La victime est KO !
    • + {{/if}} +
  • La victime subit {{arme.system.dommagecritique}} dommages
    • + {{/if}} + {{/if}} + {{else}} + {{#if isPart}} +
  • Réussite Particulière !
    • + {{#if arme}} +
  • La victime subit {{arme.system.dommagepart}} dommages
    • + {{/if}} -
  • Bonus/Malus {{bonusMalusRoll}}
    • -
  • Dice Formula {{diceFormula}}
    • -
  • Result {{roll.total}}
    • - - {{#if (ne targetCheck "none")}} - {{#if isSuccess}} -
  • Success !
    • + {{else}} +
  • Succés !
    • + {{#if arme}} +
  • La victime subit {{arme.system.dommagenormale}} dommages
    • + {{/if}} + {{/if}} + {{/if}} + {{else}} + {{#if isFumble}} +
  • Echec Critique !
    • {{else}} -
  • Failure !
    • +
  • Echec !
    • {{/if}} {{/if}} diff --git a/templates/dialogs/roll-dialog-generic.hbs b/templates/dialogs/roll-dialog-generic.hbs index a29824e..0f630fe 100644 --- a/templates/dialogs/roll-dialog-generic.hbs +++ b/templates/dialogs/roll-dialog-generic.hbs @@ -8,47 +8,17 @@
    - {{#if skill}} + {{#if attr}}
    - Skill : - {{skill.name}} ({{skill.finalvalue}}) -
    - {{/if}} - - {{#if crafting}} -
    - Crafting : - {{crafting.name}} ({{crafting.system.level}}) -
    - {{/if}} - - {{#if weapon}} -
    - Weapon Attack Bonus : - {{weapon.attackBonus}} -
    - {{/if}} - - {{#if spell}} -
    - Spell : - {{spell.name}} ({{upperFirst spell.system.level}} - Cost : {{spellCost}}) -
    -
    - Spell Attack level : - {{spellAttack}} -
    -
    - Spell Damage level : - {{spellDamage}} + {{attr.label}} : + {{attr.value}}
    {{/if}}
    - Bonus/Malus : - + {{#select bonusMalusPerso}} @@ -56,33 +26,39 @@ - {{/select}}
    - {{#if (eq skillKey "initiative") }} +
    + Bonus/Malus de situation : + +
    - {{else}} - {{#if (or spell weapon)}} - - {{else}} -
    - Target check : - -
    - {{/if}} + {{#if arme}} +
    + Défense : + +
    {{/if}} - +
    \ No newline at end of file diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-arme-sheet.hbs similarity index 90% rename from templates/items/item-weapon-sheet.hbs rename to templates/items/item-arme-sheet.hbs index e82ccc0..55ab213 100644 --- a/templates/items/item-weapon-sheet.hbs +++ b/templates/items/item-arme-sheet.hbs @@ -6,13 +6,13 @@
- {{> systems/fvtt-avd12/templates/items/partial-item-nav.hbs}} + {{> systems/fvtt-malefices/templates/items/partial-item-nav.hbs}} {{!-- Sheet Body --}}
- {{> systems/fvtt-avd12/templates/items/partial-item-description.hbs}} + {{> systems/fvtt-malefices/templates/items/partial-item-description.hbs}}
@@ -22,9 +22,9 @@
  • diff --git a/templates/items/item-equipement-sheet.hbs b/templates/items/item-equipement-sheet.hbs new file mode 100644 index 0000000..297553d --- /dev/null +++ b/templates/items/item-equipement-sheet.hbs @@ -0,0 +1,27 @@ +
    +
    + +
    +

    +
    +
    + + {{> systems/fvtt-malefices/templates/items/partial-item-nav.hbs}} + + + {{!-- Sheet Body --}} +
    + + {{> systems/fvtt-malefices/templates/items/partial-item-description.hbs}} + +
    + +
    +
      + +
    +
    +
    + +
    +