diff --git a/assets/ui/hawkmoon_background_01.png b/assets/ui/hawkmoon_background_01.png new file mode 100644 index 0000000..8f1a52c Binary files /dev/null and b/assets/ui/hawkmoon_background_01.png differ diff --git a/assets/ui/hawkmoon_background_02.png b/assets/ui/hawkmoon_background_02.png new file mode 100644 index 0000000..ce1e64d Binary files /dev/null and b/assets/ui/hawkmoon_background_02.png differ diff --git a/assets/ui/pc_sheet_bg.webp b/assets/ui/pc_sheet_bg.webp index 53d6304..60a9f6e 100644 Binary files a/assets/ui/pc_sheet_bg.webp and b/assets/ui/pc_sheet_bg.webp differ diff --git a/modules/hawkmoon-actor-sheet.js b/modules/hawkmoon-actor-sheet.js index 0366273..a0b771a 100644 --- a/modules/hawkmoon-actor-sheet.js +++ b/modules/hawkmoon-actor-sheet.js @@ -40,6 +40,7 @@ export class HawkmoonActorSheet extends ActorSheet { limited: this.object.limited, skills: this.actor.getSkills(), armes: duplicate(this.actor.getWeapons()), + monnaies: duplicate(this.actor.getMonnaies()), protections: duplicate(this.actor.getArmors()), historique: duplicate(this.actor.getHistorique() || {}), talents: duplicate(this.actor.getTalents() || {}), diff --git a/modules/hawkmoon-actor.js b/modules/hawkmoon-actor.js index 0e19db9..15aa655 100644 --- a/modules/hawkmoon-actor.js +++ b/modules/hawkmoon-actor.js @@ -81,6 +81,10 @@ export class HawkmoonActor extends Actor { } return armes } + /* -------------------------------------------- */ + getMonnaies() { + return this.items.filter( it => it.type == "monnaie") + } /* ----------------------- --------------------- */ addMember( actorId) { diff --git a/modules/hawkmoon-utility.js b/modules/hawkmoon-utility.js index 721ec90..f6a9fc6 100644 --- a/modules/hawkmoon-utility.js +++ b/modules/hawkmoon-utility.js @@ -147,6 +147,7 @@ export class HawkmoonUtility { const templatePaths = [ 'systems/fvtt-hawkmoon-cyd/templates/editor-notes-gm.html', + 'systems/fvtt-hawkmoon-cyd/templates/partial-item-header.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', diff --git a/styles/simple.css b/styles/simple.css index 7337f9d..b1db581 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -48,21 +48,33 @@ text-align: justify; font-size: 12px; letter-spacing: 1px; + background-image: url("../assets/ui/pc_sheet_bg.webp"); + background-repeat: repeat; } - /* Fonts */ -.sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item { +.window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item { font-family: "Charlemagne"; font-size: 0.8rem; } /* For title, sidebar character and scene */ +.sheet header.sheet-header h1 input { + font-family: "Charlemagne"; + font-size: 0.8rem; + color: lightgray; +} .sheet nav.sheet-tabs { font-family: "Charlemagne"; font-size: 0.8rem; + color: #151c1f; } /* For nav and title */ .window-app input, .fvtt-hawkmoon-cyd .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle { font-size: 0.8rem; } - +.fvtt-hawkmoon-cyd .sheet-header select option { + background-color: rgb(68, 25, 25); +} +.fvtt-hawkmoon-cyd .sheet-header input, .fvtt-hawkmoon-cyd .sheet-header select { + color: lightgray; +} .window-header{ background: rgba(0,0,0,0.75); } @@ -70,6 +82,8 @@ .window-app.sheet .window-content { margin: 0; padding: 0; + background-image: url("../assets/ui/pc_sheet_bg.webp"); + background-repeat: repeat; } .strong-text{ font-weight: bold; @@ -222,6 +236,13 @@ table {border: 1px solid #7a7971;} -ms-flex-pack: start; justify-content: flex-start; margin-bottom: 10px; + background-image: url("../assets/ui/hawkmoon_background_01.png"); +} + +.background-sheet-header { + background-image: url("../assets/ui/hawkmoon_background_01.png"); + background-blend-mode: soft-light; + color: lightgray; } .fvtt-hawkmoon-cyd .sheet-header .profile-img { @@ -278,6 +299,7 @@ table {border: 1px solid #7a7971;} font-weight: bold; font-size: 2rem; font-family: "Charlemagne"; + color: lightgray; } .fvtt-hawkmoon-cyd .sheet-header h1.charname input { @@ -287,6 +309,7 @@ table {border: 1px solid #7a7971;} font-weight: bold; font-family: "Charlemagne"; font-size: 2rem; + color: lightgray; } .fvtt-hawkmoon-cyd .sheet-tabs { @@ -300,6 +323,11 @@ table {border: 1px solid #7a7971;} .fvtt-hawkmoon-cyd .sheet-body .tab .editor { height: 100%; font-size: 0.8rem; + color:rgba(0,0,0,0.9) +} + +.fvtt-hawkmoon-cyd .sheet-body input, .fvtt-hawkmoon-cyd .sheet-body select { + color:rgba(0,0,0,0.9) } .editor { @@ -341,7 +369,7 @@ table {border: 1px solid #7a7971;} } .fvtt-hawkmoon-cyd .tabs .item { - line-height: 40px; + /*line-height: 40px;*/ font-weight: bold; } @@ -395,26 +423,28 @@ table {border: 1px solid #7a7971;} /* Sheet */ .window-app.sheet .window-content .sheet-header{ /*background: #011d33 url("../images/ui/fond1.webp") repeat left top;*/ - background: url("../assets/ui/pc_sheet_bg.webp") repeat left top; - /*color: rgba(168, 139, 139, 0.5);*/ + background: url("../assets/ui/pc_sheet_bg.webp"); + background-repeat: repeat; } .window-app.sheet .window-content .sheet-header input[type="text"], .window-app.sheet .window-content .sheet-header input[type="number"], .window-app.sheet .window-content .sheet-header input[type="password"], .window-app.sheet .window-content .sheet-header input[type="date"], .window-app.sheet .window-content .sheet-header input[type="time"] { - color: rgba(36, 37, 37, 0.75); + /*color: rgba(36, 37, 37, 0.75);*/ /*background: rgba(255, 255, 255, 0.05);*/ - border: 2px saddlebrown; - border-width: 2px; + /*border: 2px saddlebrown;*/ + /*color: lightgray;*/ + border-width: 1px; margin-bottom: 0.25rem; } .window-app .window-content, .window-app.sheet .window-content .sheet-body{ font-size: 0.8rem; - background: url("../assets/ui/pc_sheet_bg.webp") repeat left top; + background: url("../assets/ui/pc_sheet_bg.webp"); + background-repeat: repeat-y; + color: black; } -/* background: rgba(245,245,240,0.6) url("../images/ui/sheet_background.webp") left top;*/ - -section.sheet-body{padding: 0.25rem 0.5rem;} +/*section.sheet-body{ + padding: 0.25rem 0.5rem;}*/ .sheet header.sheet-header .profile-img { object-fit: cover; @@ -427,7 +457,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;} .sheet nav.sheet-tabs { font-size: 0.70rem; font-weight: bold; - height: 3rem; + height: 2.5rem; flex: 0 0 3rem; margin: 0; padding: 0 0 0 0.25rem; @@ -436,12 +466,12 @@ section.sheet-body{padding: 0.25rem 0.5rem;} line-height: 1.5rem; border-top: 0 none; border-bottom: 0 none; - background-color:#2e5561; - color:beige; + /*background-color:#2e5561;*/ + color: #151c1f; + /*background-image: url("../assets/ui/hawkmoon_background_02.png");*/ } /* background: rgb(245,245,240) url("../images/ui/fond4.webp") repeat left top;*/ - nav.sheet-tabs .item { position: relative; padding: 0 0.25rem; @@ -454,7 +484,7 @@ nav.sheet-tabs .item:after { right: 0; height: 2rem; width: 1px; - border-right: 1px dashed rgba(52, 52, 52, 0.25); + /*border-right: 1px dashed rgba(52, 52, 52, 0.25);*/ } .sheet .tab[data-tab] { @@ -1385,4 +1415,7 @@ ul, li { font-size: 1.2rem; font-weight: bold; color: darkred; +} +.adversite-modify { + margin-top: 12px; } \ No newline at end of file diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 1da5b2c..1620bb1 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -2,7 +2,7 @@ {{!-- Sheet Header --}}
-
+
@@ -29,11 +29,22 @@

Eclat

- + +
  • +

    Vigueur

    + +

    Etat

    + +
    • +
    -
    @@ -42,7 +53,7 @@ @@ -53,78 +64,110 @@ {{!-- Main Tab --}}
    -
    +
    + +
    -
    -
      - {{#each system.attributs as |attr key|}} -
    • - - {{attr.label}} - -
      • - {{/each}} -
    -

    Santé

    -
      -
    • - - -
      • -
    • - - -
      • -
    +
    +
      + {{#each system.attributs as |attr key|}} +
    • + + {{attr.label}} + +
      • + {{/each}} -

      Combat

      -
        -
      • - -
        • -
      +
    • + Vitesse + +
      • + +
    +
    +
    + +

    Adversités

    +
      + {{#each system.adversite as |adv key|}} +
    • + - +
      + +
      {{adv}}
      +
      + + +
       
      +
       
      +
       
      +
      • + {{/each}} +
    +
    -

    Adversité

      - {{#each system.adversite as |adv key|}} -
    • - - -
      - -
      {{adv}}
      +
    • + +

      +       + + + +
       
      +
      • + {{#each talents as |talent key|}} +
    • + + {{talent.name}} + {{talent.system.resumebonus}} + +
       
      +
      + +
      - + -
       
      -
       
      -
       
      • {{/each}}
    - -

    Vitesse

    -
      -
    • - -
      • -
    - -
    +
    +
    +
      +
    • + +

      +       + + + +
       
      +
      • + {{#each talentsCell as |talent key|}} +
    • + + {{talent.name}} + {{talent.system.resumebonus}} +
       
      +
      + +
      +
      • + {{/each}} +
    +
    + +
    @@ -153,21 +196,21 @@ {{#if (ne skill.system.attribut1 "none")}} - + {{/if}} {{#if (ne skill.system.attribut2 "none")}} - + {{/if}} {{#if (ne skill.system.attribut3 "none")}} - + {{/if}}
     
    @@ -184,71 +227,14 @@
    - {{!-- Talents Tab --}} -
    - -
    - -
    -
      -
    • - -

      -       - - - -
       
      -
      • - {{#each talents as |talent key|}} -
    • - - {{talent.name}} - {{talent.system.resumebonus}} - -
       
      -
      - - -
      -
      • - {{/each}} -
    -
    -
    - -
    -
    -
      -
    • - -

      -       - - - -
       
      -
      • - {{#each talentsCell as |talent key|}} -
    • - - {{talent.name}} - {{talent.system.resumebonus}} -
       
      -
      - -
      -
      • - {{/each}} -
    -
    - -
    - -
    - {{!-- Equipement Tab --}} -
    +
    + +
      +
    • + +
      • +
    @@ -290,7 +276,8 @@ {{else}} - + {{/if}} @@ -344,6 +331,14 @@ {{/each}}
    +
    +
    + + + {{!-- Equipement Tab --}} +
    + +
      @@ -391,15 +386,15 @@
    {{#each profils as |profil key|}} -
  • - - - -
    - - -
    -
    • +
  • + + + +
    + + +
    +
    • {{/each}}
    diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index ac9b02f..2f3febf 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -44,17 +44,18 @@ {{#if difficulte}} {{#if isSuccess}} -
  • Succés!!!
    • +
  • Succés... +
    • {{else}} -
  • Echec ...
    • +
  • Echec...
    • {{/if}} {{/if}} {{#if isHeroique}} -
  • Succés Héroïque!!!
    • +
  • Héroïque !!!
    • {{/if}} {{#if isDramatique}} -
  • Echec Dramatique!!!
    • +
  • Dramatique !!!
    • {{/if}} {{#if isInit}} diff --git a/templates/item-arme-sheet.html b/templates/item-arme-sheet.html index 4297282..b34fbe2 100644 --- a/templates/item-arme-sheet.html +++ b/templates/item-arme-sheet.html @@ -1,10 +1,5 @@
    -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-artefact-sheet.html b/templates/item-artefact-sheet.html index af68fe2..49d0e80 100644 --- a/templates/item-artefact-sheet.html +++ b/templates/item-artefact-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-competence-sheet.html b/templates/item-competence-sheet.html index 666f26d..c454cbf 100644 --- a/templates/item-competence-sheet.html +++ b/templates/item-competence-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-contact-sheet.html b/templates/item-contact-sheet.html index d1451dc..f37dfd3 100644 --- a/templates/item-contact-sheet.html +++ b/templates/item-contact-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-equipement-sheet.html b/templates/item-equipement-sheet.html index 142533c..4b0c079 100644 --- a/templates/item-equipement-sheet.html +++ b/templates/item-equipement-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-historique-sheet.html b/templates/item-historique-sheet.html index 93b08ca..b9733e9 100644 --- a/templates/item-historique-sheet.html +++ b/templates/item-historique-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-monnaie-sheet.html b/templates/item-monnaie-sheet.html index f2c2762..d1e0a70 100644 --- a/templates/item-monnaie-sheet.html +++ b/templates/item-monnaie-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-profil-sheet.html b/templates/item-profil-sheet.html index fe97d52..3e8213c 100644 --- a/templates/item-profil-sheet.html +++ b/templates/item-profil-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-protection-sheet.html b/templates/item-protection-sheet.html index b0d3070..be69c39 100644 --- a/templates/item-protection-sheet.html +++ b/templates/item-protection-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-ressource-sheet.html b/templates/item-ressource-sheet.html index 387f9c6..82b0e91 100644 --- a/templates/item-ressource-sheet.html +++ b/templates/item-ressource-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/item-talent-sheet.html b/templates/item-talent-sheet.html index c09e5bc..89daeed 100644 --- a/templates/item-talent-sheet.html +++ b/templates/item-talent-sheet.html @@ -1,10 +1,5 @@ -
    - -
    -

    -
    -
    + {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html}} {{> systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html}} diff --git a/templates/partial-item-header.html b/templates/partial-item-header.html new file mode 100644 index 0000000..8b4c994 --- /dev/null +++ b/templates/partial-item-header.html @@ -0,0 +1,8 @@ +
    +
    + +
    +

    +
    +
    +