From 2f48669c85f6f80b338f6df556c4816d34973635 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 15 Dec 2022 22:12:28 +0100 Subject: [PATCH] HERO6 - First import --- modules/hero6-commands.js | 10 ++-- modules/hero6-item-sheet.js | 11 +++-- modules/hero6-main.js | 4 +- styles/simple.css | 74 ++++++++++++++-------------- templates/items/item-skill-sheet.hbs | 6 ++- 5 files changed, 57 insertions(+), 48 deletions(-) diff --git a/modules/hero6-commands.js b/modules/hero6-commands.js index 1919ba9..776effd 100644 --- a/modules/hero6-commands.js +++ b/modules/hero6-commands.js @@ -10,11 +10,11 @@ const __saveFirstToKey = { r: "reflex", f: "fortitude", w: "willpower"} export class Hero6Commands { static init() { - if (!game.system.Hero6.commands) { - const Hero6Commands = new Hero6Commands(); - Hero6Commands.registerCommand({ path: ["/rtarget"], func: (content, msg, params) => Hero6Commands.rollTarget(msg, params), descr: "Launch the target roll window" }); - Hero6Commands.registerCommand({ path: ["/rsave"], func: (content, msg, params) => Hero6Commands.rollSave(msg, params), descr: "Performs a save roll" }); - game.system.Hero6.commands = Hero6Commands; + if (!game.system.hero6.commands) { + const hero6Commands = new Hero6Commands(); + hero6Commands.registerCommand({ path: ["/rtarget"], func: (content, msg, params) => Hero6Commands.rollTarget(msg, params), descr: "Launch the target roll window" }); + hero6Commands.registerCommand({ path: ["/rsave"], func: (content, msg, params) => Hero6Commands.rollSave(msg, params), descr: "Performs a save roll" }); + game.system.hero6.commands = hero6Commands; } } diff --git a/modules/hero6-item-sheet.js b/modules/hero6-item-sheet.js index e214127..cf24432 100644 --- a/modules/hero6-item-sheet.js +++ b/modules/hero6-item-sheet.js @@ -59,10 +59,8 @@ export class Hero6ItemSheet extends ItemSheet { name: this.object.name, editable: this.isEditable, cssClass: this.isEditable ? "editable" : "locked", - weaponSkills: Hero6Utility.getWeaponSkills(), - shieldSkills: Hero6Utility.getShieldSkills(), description: await TextEditor.enrichHTML(this.object.system.description, {async: true}), - config: game.system.Hero6.config, + config: game.system.hero6.config, system: objectData, limited: this.object.limited, options: this.options, @@ -70,6 +68,13 @@ export class Hero6ItemSheet extends ItemSheet { isGM: game.user.isGM } + // Specific skill processing + if( this.object.type == "skill") { + if (objectData.characteristic != "manual") { + //objectData.system.base = 9 + } + } + this.options.editable = !(this.object.origin == "embeddedItem"); console.log("ITEM DATA", formData, this); return formData; diff --git a/modules/hero6-main.js b/modules/hero6-main.js index dd3431a..8507e35 100644 --- a/modules/hero6-main.js +++ b/modules/hero6-main.js @@ -28,7 +28,7 @@ Hooks.once("init", async function () { console.log(`Initializing Hero6 RPG`); - game.system.Hero6 = { + game.system.hero6 = { Hero6Commands, config: Hero6_CONFIG } @@ -109,7 +109,7 @@ Hooks.on("chatMessage", (html, content, msg) => { if (content[0] == '/') { let regExp = /(\S+)/g; let commands = content.match(regExp); - if (game.system.cruciblerpg.commands.processChatCommand(commands, content, msg)) { + if (game.system.hero6.commands.processChatCommand(commands, content, msg)) { return false; } } diff --git a/styles/simple.css b/styles/simple.css index 6571b66..c0f1b2d 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -55,7 +55,7 @@ color: rgba(228, 240, 240, 0.75); background: rgba(66, 66, 64, 0.95); } /* For nav and title */ -.window-app input, .fvtt-dark-stars .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 { +.window-app input, .fvtt-hero-system-6 .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; color: rgba(228, 240, 240, 0.75); background: rgba(66, 66, 64, 0.95); @@ -80,12 +80,12 @@ } .tabs .item.active, .blessures-list li ul li:first-child:hover, a:hover { - text-shadow: 1px 0px 0px #ff6600; + text-shadow: 1px 0px 0px #dd2c4a; } .rollable:hover, .rollable:focus { color: #000; - text-shadow: 0 0 10px red; + text-shadow: 0 0 10px #dd2c4a; cursor: pointer; } input:disabled { @@ -94,7 +94,7 @@ input:disabled { select:disabled { color:#1c2058; } -table {border: 1px solid #7a7971;} +table { border: 1px solid #7a7971;} .grid, .grid-2col { display: grid; @@ -208,7 +208,7 @@ table {border: 1px solid #7a7971;} /* Styles limited to foundryvtt-vadentis sheets */ -.fvtt-dark-stars .sheet-header { +.fvtt-hero-system-6 .sheet-header { -webkit-box-flex: 0; -ms-flex: 0 0 210px; flex: 0 0 210px; @@ -228,7 +228,7 @@ table {border: 1px solid #7a7971;} margin-bottom: 10px; } -.fvtt-dark-stars .sheet-header .profile-img { +.fvtt-hero-system-6 .sheet-header .profile-img { -webkit-box-flex: 0; -ms-flex: 0 0 128px; flex: 0 0 128px; @@ -270,34 +270,34 @@ table {border: 1px solid #7a7971;} vertical-align: bottom; } -.fvtt-dark-stars .sheet-header .header-fields { +.fvtt-hero-system-6 .sheet-header .header-fields { -webkit-box-flex: 1; -ms-flex: 1; flex: 1; } -.fvtt-dark-stars .sheet-header h1.charname { +.fvtt-hero-system-6 .sheet-header h1.charname { height: 50px; padding: 0px; margin: 5px 0; border-bottom: 0; } -.fvtt-dark-stars .sheet-header h1.charname input { +.fvtt-hero-system-6 .sheet-header h1.charname input { width: 100%; height: 100%; margin: 0; } -.fvtt-dark-stars .sheet-tabs { +.fvtt-hero-system-6 .sheet-tabs { -webkit-box-flex: 0; -ms-flex: 0; flex: 0; } -.fvtt-dark-stars .sheet-body, -.fvtt-dark-stars .sheet-body .tab, -.fvtt-dark-stars .sheet-body .tab .editor { +.fvtt-hero-system-6 .sheet-body, +.fvtt-hero-system-6 .sheet-body .tab, +.fvtt-hero-system-6 .sheet-body .tab .editor { height: 100%; font-size: 0.8rem; } @@ -320,70 +320,70 @@ table {border: 1px solid #7a7971;} padding: 0 3px; } -.fvtt-dark-stars .tox .tox-editor-container { +.fvtt-hero-system-6 .tox .tox-editor-container { background: #fff; } -.fvtt-dark-stars .tox .tox-edit-area { +.fvtt-hero-system-6 .tox .tox-edit-area { padding: 0 8px; } -.fvtt-dark-stars .resource-label { +.fvtt-hero-system-6 .resource-label { font-weight: bold; text-transform: uppercase; } -.fvtt-dark-stars .tabs { +.fvtt-hero-system-6 .tabs { height: 40px; border-top: 1px solid #AAA; border-bottom: 1px solid #AAA; - color: #000000; + color: #246cd8; } -.fvtt-dark-stars .tabs .item { +.fvtt-hero-system-6 .tabs .item { line-height: 40px; font-weight: bold; } -.fvtt-dark-stars .tabs .item.active { +.fvtt-hero-system-6 .tabs .item.active { text-decoration: underline; text-shadow: none; } -.fvtt-dark-stars .items-list { +.fvtt-hero-system-6 .items-list { list-style: none; margin: 1px 0; padding: 0; overflow-y: auto; } -.fvtt-dark-stars .items-list .item-header { +.fvtt-hero-system-6 .items-list .item-header { font-weight: bold; } -.fvtt-dark-stars .items-list .item { +.fvtt-hero-system-6 .items-list .item { height: 30px; line-height: 24px; padding: 1px 0; border-bottom: 1px solid #BBB; } -.fvtt-dark-stars .items-list .item .item-image { +.fvtt-hero-system-6 .items-list .item .item-image { -webkit-box-flex: 0; -ms-flex: 0 0 24px; flex: 0 0 24px; margin-right: 5px; } -.fvtt-dark-stars .items-list .item img { +.fvtt-hero-system-6 .items-list .item img { display: block; } -.fvtt-dark-stars .items-list .item-name { +.fvtt-hero-system-6 .items-list .item-name { margin: 0; } -.fvtt-dark-stars .items-list .item-controls { +.fvtt-hero-system-6 .items-list .item-controls { -webkit-box-flex: 0; -ms-flex: 0 0 86px; flex: 0 0 86px; @@ -400,24 +400,24 @@ table {border: 1px solid #7a7971;} /*color: rgba(168, 139, 139, 0.5);*/ .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(228, 240, 240, 0.75); - background: rgba(66, 66, 64, 0.95); + background: rgba(228, 240, 240, 0.75); + color: rgba(66, 66, 64, 0.95); border: 1 none; margin-bottom: 0.25rem; margin-left: 2px; } .window-app.sheet .window-content .sheet-body input[type="text"], .window-app.sheet .window-content .sheet-body input[type="number"], .window-app.sheet .window-content .sheet-body input[type="password"], .window-app.sheet .window-content .sheet-body input[type="date"], .window-app.sheet .window-content .sheet-body input[type="time"] { - color: rgba(228, 240, 240, 0.75); - background: rgba(66, 66, 64, 0.95); + background: rgba(228, 240, 240, 0.75); + color: rgba(66, 66, 64, 0.95); border: 1 none; margin-bottom: 0.25rem; margin-left: 2px; } .window-app.sheet .window-content .sheet-body select, .window-app.sheet .window-content .sheet-header select { - color: rgba(228, 240, 240, 0.75); - background: rgba(66, 66, 64, 0.95); + background: rgba(228, 240, 240, 0.75); + color: rgba(66, 66, 64, 0.95); border: 1 none; margin-bottom: 0.25rem; margin-left: 2px; @@ -426,8 +426,8 @@ table {border: 1px solid #7a7971;} .window-app .window-content, .window-app.sheet .window-content .sheet-body{ font-size: 0.8rem; background: url("../images/ui/pc_sheet_bg.webp") repeat left top; - color: rgba(228, 240, 240, 0.75); - background: rgba(66, 66, 64, 0.95); + background: rgba(228, 240, 240, 0.75); + color: rgba(66, 66, 64, 0.95); } /* background: rgba(245,245,240,0.6) url("../images/ui/sheet_background.webp") left top;*/ @@ -453,7 +453,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:rgb(64, 133, 236); color:beige; } @@ -1257,7 +1257,7 @@ ul, li { color: #CCC } #pause > img { - content: url(../images/ui/crucible_pause_logo.jpg); + content: url(../images/ui/logo_circle_yellow_01.webp); height: 160px; width: 160px; top: -80px; diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs index f79b650..956065b 100644 --- a/templates/items/item-skill-sheet.hbs +++ b/templates/items/item-skill-sheet.hbs @@ -31,11 +31,15 @@ {{#each config.rollCharac as |char key|}} {{/each}} - + {{/select}} +
  • + +
  • +