diff --git a/modules/malefices-actor-sheet.js b/modules/malefices-actor-sheet.js index b6ae9c3..4367654 100644 --- a/modules/malefices-actor-sheet.js +++ b/modules/malefices-actor-sheet.js @@ -12,7 +12,7 @@ export class MaleficesActorSheet extends ActorSheet { static get defaultOptions() { return mergeObject(super.defaultOptions, { - classes: ["fvtt-malefices", "sheet", "actor"], + classes: ["fvtt-malefices", "sheet", "actor", "malefices-actor-sheet"], template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs", width: 640, height:680, @@ -44,8 +44,8 @@ export class MaleficesActorSheet extends ActorSheet { phyMalus: this.actor.getPhysiqueMalus(), elementsbio: this.actor.getElementsBio(), sorts: this.actor.getSorts(), - description: await TextEditor.enrichHTML(this.object.system.description, { async: true }), - notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }), + description: await TextEditor.enrichHTML(this.object.system.biodata.description, { async: true }), + notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, { async: true }), equipementlibre: await TextEditor.enrichHTML(this.object.system.equipementlibre, { async: true }), options: this.options, owner: this.document.isOwner, @@ -54,7 +54,7 @@ export class MaleficesActorSheet extends ActorSheet { } this.formData = formData; - console.log("PC : ", formData, this.object); + console.log("PC : ", formData, this.object ); return formData; } diff --git a/modules/malefices-item-sheet.js b/modules/malefices-item-sheet.js index 655267e..b5ab8a7 100644 --- a/modules/malefices-item-sheet.js +++ b/modules/malefices-item-sheet.js @@ -19,20 +19,6 @@ export class MaleficesItemSheet extends ItemSheet { }); } - /* -------------------------------------------- */ - _getHeaderButtons() { - let buttons = super._getHeaderButtons(); - // Add "Post to chat" button - // We previously restricted this to GM and editable items only. If you ever find this comment because it broke something: eh, sorry! - buttons.unshift( - { - class: "post", - icon: "fas fa-comment", - onclick: ev => { } - }) - return buttons - } - /* -------------------------------------------- */ /** @override */ setPosition(options = {}) { diff --git a/packs/malefices-archetypes/000004.log b/packs/malefices-archetypes/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-archetypes/000005.ldb b/packs/malefices-archetypes/000005.ldb new file mode 100644 index 0000000..b4cc6d7 Binary files /dev/null and b/packs/malefices-archetypes/000005.ldb differ diff --git a/packs/malefices-archetypes/CURRENT b/packs/malefices-archetypes/CURRENT new file mode 100644 index 0000000..1a84852 --- /dev/null +++ b/packs/malefices-archetypes/CURRENT @@ -0,0 +1 @@ +MANIFEST-000002 diff --git a/packs/malefices-archetypes/LOCK b/packs/malefices-archetypes/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-archetypes/LOG b/packs/malefices-archetypes/LOG new file mode 100644 index 0000000..abcd0fb --- /dev/null +++ b/packs/malefices-archetypes/LOG @@ -0,0 +1,5 @@ +2023/10/24-22:56:59.069067 7f688bfff6c0 Delete type=3 #1 +2023/10/24-23:14:50.933686 7f660b7ef6c0 Level-0 table #5: started +2023/10/24-23:14:50.938288 7f660b7ef6c0 Level-0 table #5: 49972 bytes OK +2023/10/24-23:14:50.946150 7f660b7ef6c0 Delete type=0 #3 +2023/10/24-23:14:50.965618 7f660b7ef6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-archetypes/MANIFEST-000002 b/packs/malefices-archetypes/MANIFEST-000002 new file mode 100644 index 0000000..abb4154 Binary files /dev/null and b/packs/malefices-archetypes/MANIFEST-000002 differ diff --git a/packs/malefices-armes/000004.log b/packs/malefices-armes/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-armes/000005.ldb b/packs/malefices-armes/000005.ldb new file mode 100644 index 0000000..9ed8d68 Binary files /dev/null and b/packs/malefices-armes/000005.ldb differ diff --git a/packs/malefices-armes/CURRENT b/packs/malefices-armes/CURRENT new file mode 100644 index 0000000..1a84852 --- /dev/null +++ b/packs/malefices-armes/CURRENT @@ -0,0 +1 @@ +MANIFEST-000002 diff --git a/packs/malefices-armes/LOCK b/packs/malefices-armes/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-armes/LOG b/packs/malefices-armes/LOG new file mode 100644 index 0000000..2079252 --- /dev/null +++ b/packs/malefices-armes/LOG @@ -0,0 +1,5 @@ +2023/10/24-22:56:59.028963 7f68a0df86c0 Delete type=3 #1 +2023/10/24-23:14:50.922783 7f660b7ef6c0 Level-0 table #5: started +2023/10/24-23:14:50.926620 7f660b7ef6c0 Level-0 table #5: 1991 bytes OK +2023/10/24-23:14:50.933356 7f660b7ef6c0 Delete type=0 #3 +2023/10/24-23:14:50.957490 7f660b7ef6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-armes/MANIFEST-000002 b/packs/malefices-armes/MANIFEST-000002 new file mode 100644 index 0000000..f2f1242 Binary files /dev/null and b/packs/malefices-armes/MANIFEST-000002 differ diff --git a/packs/malefices-macros/000004.log b/packs/malefices-macros/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-macros/000005.ldb b/packs/malefices-macros/000005.ldb new file mode 100644 index 0000000..213bf4d Binary files /dev/null and b/packs/malefices-macros/000005.ldb differ diff --git a/packs/malefices-macros/CURRENT b/packs/malefices-macros/CURRENT new file mode 100644 index 0000000..1a84852 --- /dev/null +++ b/packs/malefices-macros/CURRENT @@ -0,0 +1 @@ +MANIFEST-000002 diff --git a/packs/malefices-macros/LOCK b/packs/malefices-macros/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-macros/LOG b/packs/malefices-macros/LOG new file mode 100644 index 0000000..b259e4b --- /dev/null +++ b/packs/malefices-macros/LOG @@ -0,0 +1,5 @@ +2023/10/24-22:56:59.116622 7f68a0df86c0 Delete type=3 #1 +2023/10/24-23:14:50.946390 7f660b7ef6c0 Level-0 table #5: started +2023/10/24-23:14:50.949887 7f660b7ef6c0 Level-0 table #5: 803 bytes OK +2023/10/24-23:14:50.956586 7f660b7ef6c0 Delete type=0 #3 +2023/10/24-23:14:50.965669 7f660b7ef6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-macros/MANIFEST-000002 b/packs/malefices-macros/MANIFEST-000002 new file mode 100644 index 0000000..2db4617 Binary files /dev/null and b/packs/malefices-macros/MANIFEST-000002 differ diff --git a/packs/malefices-tarots/000004.log b/packs/malefices-tarots/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-tarots/000005.ldb b/packs/malefices-tarots/000005.ldb new file mode 100644 index 0000000..0017619 Binary files /dev/null and b/packs/malefices-tarots/000005.ldb differ diff --git a/packs/malefices-tarots/CURRENT b/packs/malefices-tarots/CURRENT new file mode 100644 index 0000000..1a84852 --- /dev/null +++ b/packs/malefices-tarots/CURRENT @@ -0,0 +1 @@ +MANIFEST-000002 diff --git a/packs/malefices-tarots/LOCK b/packs/malefices-tarots/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/malefices-tarots/LOG b/packs/malefices-tarots/LOG new file mode 100644 index 0000000..ae33c3c --- /dev/null +++ b/packs/malefices-tarots/LOG @@ -0,0 +1,5 @@ +2023/10/24-22:56:58.978401 7f688bfff6c0 Delete type=3 #1 +2023/10/24-23:14:50.900132 7f660b7ef6c0 Level-0 table #5: started +2023/10/24-23:14:50.904356 7f660b7ef6c0 Level-0 table #5: 3817 bytes OK +2023/10/24-23:14:50.911636 7f660b7ef6c0 Delete type=0 #3 +2023/10/24-23:14:50.922754 7f660b7ef6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-tarots/MANIFEST-000002 b/packs/malefices-tarots/MANIFEST-000002 new file mode 100644 index 0000000..c62da2f Binary files /dev/null and b/packs/malefices-tarots/MANIFEST-000002 differ diff --git a/styles/simple.css b/styles/simple.css index 045fd20..19195d4 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1,64 +1,64 @@ - /* ==================== (A) Fonts ==================== */ - @font-face { - font-family: "Rivanna"; - src: url('../fonts/rivanna.ttf') format("truetype"); - } - - :root { - /* =================== 1. ACTOR SHEET FONT STYLES =========== */ - --window-header-title-font-size: 1.3rem; - --window-header-title-font-weight: normal; - --window-header-title-color: #f5f5f5; +/* ==================== (A) Fonts ==================== */ +@font-face { + font-family: "Rivanna"; + src: url('../fonts/rivanna.ttf') format("truetype"); +} - --major-button-font-size: 1.05rem; - --major-button-font-weight: normal; - --major-button-color: #dadada; +:root { +/* =================== 1. ACTOR SHEET FONT STYLES =========== */ + --window-header-title-font-size: 1.3rem; + --window-header-title-font-weight: normal; + --window-header-title-color: #f5f5f5; - --tab-header-font-size: 1.0rem; - --tab-header-font-weight: 700; - --tab-header-color: #403f3e; - --tab-header-color-active: #4a0404; + --major-button-font-size: 1.05rem; + --major-button-font-weight: normal; + --major-button-color: #dadada; - --actor-input-font-size: 0.8rem; - --actor-input-font-weight: 500; - --actor-input-color: black; + --tab-header-font-size: 1.0rem; + --tab-header-font-weight: 700; + --tab-header-color: #403f3e; + --tab-header-color-active: #4a0404; - --actor-label-font-size: 0.8rem; - --actor-label-font-weight: 700; - --actor-label-color: #464331c4; + --actor-input-font-size: 0.8rem; + --actor-input-font-weight: 500; + --actor-input-color: black; - /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ - --debug-background-color-red: #ff000054; - --debug-background-color-blue: #1d00ff54; - --debug-background-color-green: #54ff0054; + --actor-label-font-size: 0.8rem; + --actor-label-font-weight: 700; + --actor-label-color: #464331c4; - --debug-box-shadow-red: inset 0 0 2px red; - --debug-box-shadow-blue: inset 0 0 2px blue; - --debug-box-shadow-green: inset 0 0 2px green; - } +/* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ + --debug-background-color-red: #ff000054; + --debug-background-color-blue: #1d00ff54; + --debug-background-color-green: #54ff0054; + + --debug-box-shadow-red: inset 0 0 2px red; + --debug-box-shadow-blue: inset 0 0 2px blue; + --debug-box-shadow-green: inset 0 0 2px green; +} /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/ /* Global styles & Font */ -.window-app { - text-align: justify; - font-size: 16px; - letter-spacing: 1px; +.fvtt-malefices .window-app { +text-align: justify; +font-size: 16px; +letter-spacing: 1px; } /* Fonts */ .sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item { - font-size: 1.0rem; +font-size: 1.0rem; } /* For title, sidebar character and scene */ -.sheet nav.sheet-tabs { - font-size: 0.8rem; +.fvtt-malefices .sheet nav.sheet-tabs { +font-size: 0.8rem; } /* For nav and title */ .window-app input, .fvtt-malefices .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; +font-size: 0.8rem; } .window-header{ - background: rgba(0,0,0,0.75); -} +background: rgba(0,0,0,0.75); +} .window-app.sheet .window-content { margin: 0; @@ -401,7 +401,7 @@ li.folder > .folder-header h3 { /* ======================================== */ /* Sheet */ -.window-app.sheet .window-content .sheet-header{ +.fvtt-malefices .window-app.sheet .window-content .sheet-header{ color: rgba(19, 18, 18, 0.95); background: url("../images/ui/background_01_clear.webp"); /*background: #494e6b;*/ @@ -447,7 +447,7 @@ select { margin-left: 2px; } -.window-app .window-content, .window-app.sheet .window-content .sheet-body{ +.fvtt-malefices .window-app .window-content, .fvtt-malefices .window-app.sheet .window-content .sheet-body{ font-size: 0.8rem; /*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/ background: url("../images/ui/background_01_clear.webp"); @@ -465,7 +465,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;} padding: 0; } -.sheet nav.sheet-tabs { +.malefices-actor-sheet nav.sheet-tabs { font-size: 1.2rem; font-weight: bold; height: 3rem; @@ -495,7 +495,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] { @@ -803,6 +803,9 @@ ul, li { color: rgba(19, 18, 18, 0.95); } +#sidebar .scene { + color: rgba(237, 240, 199, 0.95); +} /* background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/ #sidebar.collapsed { diff --git a/system.json b/system.json index 04dbdf8..1aecd38 100644 --- a/system.json +++ b/system.json @@ -73,7 +73,7 @@ ], "title": "Maléfices, le Jeu de Rôle", "url": "https://www.uberwald.me/gitea/public/fvtt-malefices", - "version": "11.0.0", - "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v11.0.0.zip", + "version": "11.0.1", + "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v11.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 05d5d8b..31c3501 100644 --- a/template.json +++ b/template.json @@ -25,6 +25,7 @@ "religion": "", "fantastique": "", "description": "", + "notes": "", "gmnotes": "" } }, diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index ac4046d..4584d17 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -396,8 +396,7 @@

- {{editor description target="system.biodata.description" button=true owner=owner - editable=editable}} + {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}