diff --git a/assets/icons/adresse.webp b/assets/icons/adresse.webp new file mode 100644 index 0000000..0f509a5 Binary files /dev/null and b/assets/icons/adresse.webp differ diff --git a/assets/icons/clairvoyance.webp b/assets/icons/clairvoyance.webp new file mode 100644 index 0000000..66fce08 Binary files /dev/null and b/assets/icons/clairvoyance.webp differ diff --git a/assets/icons/notoriete.webp b/assets/icons/notoriete.webp new file mode 100644 index 0000000..a95bf30 Binary files /dev/null and b/assets/icons/notoriete.webp differ diff --git a/assets/icons/presence.webp b/assets/icons/presence.webp new file mode 100644 index 0000000..3b73761 Binary files /dev/null and b/assets/icons/presence.webp differ diff --git a/assets/icons/puissance.webp b/assets/icons/puissance.webp new file mode 100644 index 0000000..eae4532 Binary files /dev/null and b/assets/icons/puissance.webp differ diff --git a/assets/icons/reseau.webp b/assets/icons/reseau.webp new file mode 100644 index 0000000..d9a5a8b Binary files /dev/null and b/assets/icons/reseau.webp differ diff --git a/assets/icons/resistance.webp b/assets/icons/resistance.webp new file mode 100644 index 0000000..c88c9d4 Binary files /dev/null and b/assets/icons/resistance.webp differ diff --git a/assets/icons/ressources_materielles.webp b/assets/icons/ressources_materielles.webp new file mode 100644 index 0000000..36dc71a Binary files /dev/null and b/assets/icons/ressources_materielles.webp differ diff --git a/assets/icons/talents_de_groupe.webp b/assets/icons/talents_de_groupe.webp new file mode 100644 index 0000000..fb3f27c Binary files /dev/null and b/assets/icons/talents_de_groupe.webp differ diff --git a/assets/icons/trempe.webp b/assets/icons/trempe.webp new file mode 100644 index 0000000..1f00983 Binary files /dev/null and b/assets/icons/trempe.webp differ diff --git a/modules/hawkmoon-actor-sheet.js b/modules/hawkmoon-actor-sheet.js index 2eec519..5d57af3 100644 --- a/modules/hawkmoon-actor-sheet.js +++ b/modules/hawkmoon-actor-sheet.js @@ -41,15 +41,9 @@ export class HawkmoonActorSheet extends ActorSheet { skills: this.actor.getSkills(), armes: duplicate(this.actor.getWeapons()), protections: duplicate(this.actor.getArmors()), - dons: duplicate(this.actor.getDons()), - alignement: this.actor.getAlignement(), - aspect: this.actor.getAspect(), - marge: this.actor.getMarge(), - tendances:duplicate(this.actor.getTendances()), - runes:duplicate(this.actor.getRunes()), - origine: duplicate(this.actor.getOrigine() || {}), - heritage: duplicate(this.actor.getHeritage() || {}), - metier: duplicate(this.actor.getMetier() || {}), + historique: duplicate(this.actor.getHistorique() || {}), + talents: duplicate(this.actor.getTalents() || {}), + profils: duplicate(this.actor.getProfil() || {}), combat: this.actor.getCombatValues(), equipements: duplicate(this.actor.getEquipments()), description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), diff --git a/modules/hawkmoon-actor.js b/modules/hawkmoon-actor.js index 1a78c33..e457998 100644 --- a/modules/hawkmoon-actor.js +++ b/modules/hawkmoon-actor.js @@ -71,20 +71,6 @@ export class HawkmoonActor extends Actor { } return arme } - /* -------------------------------------------- */ - prepareBouclier(bouclier) { - bouclier = duplicate(bouclier) - let combat = this.getCombatValues() - bouclier.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée")) - bouclier.system.attrKey = "pui" - bouclier.system.totalDegats = bouclier.system.degats + "+" + combat.bonusDegatsTotal - bouclier.system.totalOffensif = this.system.attributs.pui.value + bouclier.system.competence.system.niveau - bouclier.system.isdefense = true - bouclier.system.bonusmaniementoff = 0 - bouclier.system.totalDefensif = combat.defenseTotal + bouclier.system.competence.system.niveau + bouclier.system.bonusdefense - return bouclier - } - /* -------------------------------------------- */ getWeapons() { let armes = [] @@ -99,17 +85,6 @@ export class HawkmoonActor extends Actor { return armes } - /* -------------------------------------------- */ - getDons() { - return this.items.filter(item => item.type == "don") - } - /* -------------------------------------------- */ - getTendances() { - return this.items.filter(item => item.type == "tendance") - } - getRunes() { - return this.items.filter(item => item.type == "rune") - } /* -------------------------------------------- */ getEquipments() { return this.items.filter(item => item.type == "equipement") @@ -118,14 +93,14 @@ export class HawkmoonActor extends Actor { getArmors() { return this.items.filter(item => item.type == "protection") } - getOrigine() { - return this.items.find(item => item.type == "origine") + getHistorique() { + return this.items.find(item => item.type == "historique") } - getMetier() { - return this.items.find(item => item.type == "metier") + getProfil() { + return this.items.find(item => item.type == "profil") } - getHeritage() { - return this.items.find(item => item.type == "heritage") + getTalents() { + return this.items.find(item => item.type == "talent") } /* -------------------------------------------- */ getSkills() { @@ -160,20 +135,9 @@ export class HawkmoonActor extends Actor { }) } - /* -------------------------------------------- */ - getAspect() { - return (this.system.balance.loi > this.system.balance.chaos) ? this.system.balance.loi : this.system.balance.chaos - } - getMarge() { - return Math.abs( this.system.balance.loi - this.system.balance.chaos) - } - getAlignement() { - return (this.system.balance.loi > this.system.balance.chaos) ? "loyal" : "chaotique" - } - /* -------------------------------------------- */ getDefenseBase() { - return this.system.attributs.tre.value + 5 + return this.system.attributs.tre.value } /* -------------------------------------------- */ @@ -209,14 +173,7 @@ export class HawkmoonActor extends Actor { prepareDerivedData() { if (this.type == 'personnage') { - let newSante = this.system.sante.bonus + (this.system.attributs.pui.value + this.system.attributs.tre.value) * 2 + 5 - if (this.system.sante.base != newSante) { - this.update({ 'system.sante.base': newSante }) - } - let newAme = (this.system.attributs.cla.value + this.system.attributs.tre.value) * this.system.biodata.amemultiplier + 5 - if (this.system.ame.fullmax != newAme) { - this.update({ 'system.ame.fullmax': newAme }) - } + // TODO } super.prepareDerivedData() @@ -285,21 +242,6 @@ export class HawkmoonActor extends Actor { this.update({ 'system.eclat.value': newE }) } - /* -------------------------------------------- */ - canEclatDoubleD20() { - return (this.getAlignement() == "loyal" && this.system.eclat.value > 0) - } - /* -------------------------------------------- */ - subPointsAme(runeMode, value) { - let ame = duplicate(this.system.ame) - if(runeMode == "prononcer") { - ame.value -= value - } else { - ame.currentmax -= value - } - this.update( {'system.ame': ame}) - } - /* -------------------------------------------- */ compareName(a, b) { if (a.name < b.name) { @@ -408,14 +350,14 @@ export class HawkmoonActor extends Actor { rollData.actorImg = this.img rollData.actorId = this.id rollData.img = this.img - rollData.canEclatDoubleD20 = this.canEclatDoubleD20() + rollData.canEclatDoubleD20 = true rollData.doubleD20 = false rollData.attributs = HawkmoonUtility.getAttributs() if (attrKey) { rollData.attrKey = attrKey if (attrKey != "tochoose") { - rollData.actionImg = "systems/fvtt-mournblade/assets/icons/" + this.system.attributs[attrKey].labelnorm + ".webp" + rollData.actionImg = "systems/fvtt-mournblade-cyd/assets/icons/" + this.system.attributs[attrKey].labelnorm + ".webp" rollData.attr = duplicate(this.system.attributs[attrKey]) } } @@ -445,23 +387,6 @@ export class HawkmoonActor extends Actor { rollDialog.render(true) } - /* -------------------------------------------- */ - async rollRune(runeId) { - let comp = this.items.find(comp => comp.type == "competence" && comp.name.toLowerCase() == "savoir : runes") - if ( !comp) { - ui.notifications.warn("La compétence Savoirs : Runes n'a pas été trouvée, abandon.") - return - } - let rollData = this.getCommonRollData("cla", undefined, "Savoir : Runes") - rollData.rune = duplicate(this.items.get(runeId) || {}) - rollData.difficulte = rollData.rune?.system?.seuil || 0 - rollData.runemode = "prononcer" - rollData.runeame = 1 - console.log("runeData", rollData) - let rollDialog = await HawkmoonRollDialog.create(this, rollData) - rollDialog.render(true) - } - /* -------------------------------------------- */ async rollArmeOffensif(armeId) { let arme = this.items.get(armeId) diff --git a/modules/hawkmoon-item-sheet.js b/modules/hawkmoon-item-sheet.js index 25c0457..25d1d62 100644 --- a/modules/hawkmoon-item-sheet.js +++ b/modules/hawkmoon-item-sheet.js @@ -14,8 +14,8 @@ export class HawkmoonItemSheet extends ItemSheet { template: "systems/fvtt-hawkmoon-cyd/templates/item-sheet.html", dragDrop: [{ dragSelector: null, dropSelector: null }], width: 620, - height: 550 - //tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] + height: 550, + tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] }); } diff --git a/modules/hawkmoon-main.js b/modules/hawkmoon-main.js index 56d16cd..b1fccc4 100644 --- a/modules/hawkmoon-main.js +++ b/modules/hawkmoon-main.js @@ -44,7 +44,7 @@ Hooks.once("init", async function () { CONFIG.Combat.documentClass = HawkmoonCombat CONFIG.Actor.documentClass = HawkmoonActor CONFIG.Item.documentClass = HawkmoonItem - game.system.hawkmosn = { + game.system.hawkmoon = { HawkmoonUtility } diff --git a/modules/hawkmoon-utility.js b/modules/hawkmoon-utility.js index 7bf67bb..d423092 100644 --- a/modules/hawkmoon-utility.js +++ b/modules/hawkmoon-utility.js @@ -121,6 +121,7 @@ export class HawkmoonUtility { const templatePaths = [ 'systems/fvtt-hawkmoon-cyd/templates/editor-notes-gm.html', 'systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html', + 'systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html', 'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html' ] return loadTemplates(templatePaths); diff --git a/packs/armes.db b/packs/armes.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/equipement.db b/packs/equipement.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/heritages.db b/packs/heritages.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/metiers.db b/packs/metiers.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/origines.db b/packs/origines.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/profils.db b/packs/profils.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/protection.db b/packs/protection.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/runes.db b/packs/runes.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/skills.db b/packs/skills.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/tables.db b/packs/tables.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/talents.db b/packs/talents.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/tendances.db b/packs/tendances.db new file mode 100644 index 0000000..e69de29 diff --git a/packs/traits-chaotiques.db b/packs/traits-chaotiques.db new file mode 100644 index 0000000..e69de29 diff --git a/styles/simple.css b/styles/simple.css index 0243d1a..a3c499f 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -434,7 +434,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;} line-height: 1.5rem; border-top: 0 none; border-bottom: 0 none; - background-color:black; + background-color:#2e5561; color:beige; } @@ -1092,26 +1092,9 @@ ul, li { opacity: 1; } -.river-button { - box-shadow: inset 0px 1px 0px 0px #a6827e; - background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%); - background-color: #7d5d3b00; - border-radius: 3px; - border: 2px ridge #846109; - display: inline-block; - cursor: pointer; - color: #ffffff; - font-size: 0.8rem; - padding: 2px 4px 0px 4px; - text-decoration: none; - text-shadow: 0px 1px 0px #4d3534; - position: relative; - margin:4px; -} - .chat-card-button { box-shadow: inset 0px 1px 0px 0px #a6827e; - background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%); + background: linear-gradient(to bottom, #41545a 5%, #2e5561 100%); background-color: #7d5d3b00; border-radius: 3px; border: 2px ridge #846109; @@ -1128,7 +1111,7 @@ ul, li { .chat-card-button:hover { background: linear-gradient(to bottom, #800000 5%, #3e0101 100%); - background-color: red; + background-color: rgb(56, 33, 33); } .chat-card-button:active { position:relative; diff --git a/template.json b/template.json index c828595..3363a87 100644 --- a/template.json +++ b/template.json @@ -8,7 +8,6 @@ "biodata": { "name": "", "age": 0, - "alignement": "", "poids": "", "taille": "", "cheveux": "", @@ -17,6 +16,7 @@ "description": "", "amemultiplier": 2, "notes": "", + "statut": "", "gmnotes": "" } }, diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index b64a962..eddf66e 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -10,59 +10,32 @@
@@ -74,7 +47,6 @@ @@ -89,7 +61,7 @@
@@ -129,15 +101,15 @@

Combat

@@ -146,28 +118,28 @@ + value="{{system.combat.initbonus}}" data-dtype="Number" />
  • + value="{{system.combat.bonusdegats}}" data-dtype="Number" />
  • + value="{{system.combat.vitessebonus}}" data-dtype="Number" />
  • + value="{{system.combat.defensebonus}}" data-dtype="Number" />
    • @@ -238,105 +210,6 @@
    - {{!-- Dons/Pactes Tab --}} -
    - -
    - -
    - -
    - -
    -
      -
    • - -

      -       - - - - - - -
       
      -
      -
      -
      • - {{#each runes as |rune key|}} -
    • - - {{rune.name}} - {{rune.system.formule}} - {{rune.system.seuil}} -
       
      -
      - - -
      -
      • - {{/each}} -
    -
    - - -
    -
      -
    • - -

      -       - - - -
       
      -
      -
      -
      • - {{#each tendances as |tendance key|}} -
    • - - {{tendance.name}} - {{tendance.system.allegeance}} -
       
      -
      - - -
      -
      • - {{/each}} -
    -
    - -
    - -
    - - {{!-- Equipement Tab --}}
    @@ -370,30 +243,31 @@ {{#if arme.system.equipped}} - + {{else}} - + {{/if}} {{#if arme.system.isdefense}} - + {{else}} {{/if}} - - {{#if arme.system.equipped}} - - {{else}} - - {{/if}} - + + {{#if arme.system.equipped}} + + {{else}} + + {{/if}} + -
     
    +
     
    {{#if arme.system.equipped}}{{else}}{{/if}} + class="fas fa-circle">{{else}}{{/if}}
    @@ -496,8 +370,8 @@
  • - +
    • @@ -506,19 +380,23 @@ @@ -526,16 +404,17 @@
  • - +
  • -
  • -
    • @@ -545,7 +424,7 @@

    Description

    - {{editor description target="system.biodata.description" button=true owner=owner editable=editable}} + {{editor description target="system.biosystem.description" button=true owner=owner editable=editable}}
    diff --git a/templates/item-competence-sheet.html b/templates/item-competence-sheet.html index 6df35fa..c004ea0 100644 --- a/templates/item-competence-sheet.html +++ b/templates/item-competence-sheet.html @@ -6,82 +6,86 @@ + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} + {{!-- Sheet Body --}}
    - {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html}} +
    + +
    diff --git a/templates/item-historique-sheet.html b/templates/item-historique-sheet.html index 4808491..93b08ca 100644 --- a/templates/item-historique-sheet.html +++ b/templates/item-historique-sheet.html @@ -1,14 +1,19 @@
    -
    - -
    -

    -
    -
    +
    + +
    +

    +
    +
    - {{!-- Sheet Body --}} -
    - + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} + + {{!-- Sheet Body --}} +
    + + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html}} + +
    • @@ -17,11 +22,8 @@
      • -
    - {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html}} -
    - -
    - + +
    + \ No newline at end of file diff --git a/templates/item-profil-sheet.html b/templates/item-profil-sheet.html index ea5a8d2..de45cbe 100644 --- a/templates/item-profil-sheet.html +++ b/templates/item-profil-sheet.html @@ -6,88 +6,89 @@ + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} + {{!-- Sheet Body --}}
    - +
    +
    -
    - {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html}} +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
    diff --git a/templates/partial-item-description.html b/templates/partial-item-description.html index 89dd3db..541eb68 100644 --- a/templates/partial-item-description.html +++ b/templates/partial-item-description.html @@ -1,6 +1,5 @@ - -

    Description

    -     -
    - {{editor description target="system.description" button=true owner=owner editable=editable}} +
    +
    + {{editor description target="system.description" button=true owner=owner editable=editable}}
    +
    diff --git a/templates/partial-item-nav.html b/templates/partial-item-nav.html new file mode 100644 index 0000000..95b52cd --- /dev/null +++ b/templates/partial-item-nav.html @@ -0,0 +1,5 @@ +{{!-- Sheet Tab Navigation --}} +