From aa46fe94d1aeaa0839fad9e10d0a04fe01a26ac6 Mon Sep 17 00:00:00 2001 From: Jonas Karlsson Date: Fri, 21 Aug 2020 22:27:40 +0200 Subject: [PATCH] fix: Info tab visible again. Skill roll shows skill again. Fixed a lot of warnings. --- src/module/handlebars.ts | 24 +-- src/module/sheets/TwodsixActorSheet.ts | 24 +-- src/module/sheets/TwodsixItemSheet.ts | 4 +- static/styles/twodsix.css | 103 +++++++---- static/template.json | 25 +-- static/templates/actors/actor-sheet.html | 166 ++++++++++-------- static/templates/actors/parts/actor-info.html | 40 +++-- .../templates/actors/parts/actor-items.html | 44 +++-- .../templates/actors/parts/actor-skills.html | 83 +++++---- static/templates/items/item-sheet.html | 18 +- 10 files changed, 294 insertions(+), 237 deletions(-) diff --git a/src/module/handlebars.ts b/src/module/handlebars.ts index 19201d6c9..48d7cf0a2 100644 --- a/src/module/handlebars.ts +++ b/src/module/handlebars.ts @@ -1,9 +1,7 @@ -import { SIGKILL } from "constants"; - export default function registerHandlebarsHelpers():void { // If you need to add Handlebars helpers, here are a few useful examples: - Handlebars.registerHelper('concat', function() { + Handlebars.registerHelper('concat', function () { let outStr = ''; for (const arg in arguments) { if (typeof arguments[arg] != 'object') { @@ -13,33 +11,35 @@ export default function registerHandlebarsHelpers():void { return outStr; }); - Handlebars.registerHelper('toLowerCase', function(str) { + Handlebars.registerHelper('toLowerCase', function (str) { return str.toLowerCase(); }); - Handlebars.registerHelper('checkPsi', function(characteristic) { + Handlebars.registerHelper('checkPsi', function (characteristic) { if (!game.user.isGM && characteristic.shortlabel === 'PSI' && characteristic.value === 0) { return false; } return true; }); - Handlebars.registerHelper('checkTrainedSkill', function(skill) { + Handlebars.registerHelper('checkTrainedSkill', function (skill) { return skill.trained }); - Handlebars.registerHelper('shouldShowSkill', function(skill, hideUntrainedSkills) { + Handlebars.registerHelper('shouldShowSkill', function (skill, hideUntrainedSkills) { return skill.trained || hideUntrainedSkills }); - Handlebars.registerHelper('getSkillValueWithJoat', function(skill, joat) { + Handlebars.registerHelper('getSkillValueWithJoat', getSkillValueWithJoat); + + function getSkillValueWithJoat(skill, joat) { if (skill.trained) return skill.value return skill.value + joat.value - }); + } - Handlebars.registerHelper('getTotalSkillValue', function(skill, joat, mod){ - return skill.value + joat.value + skill.mod -}); + Handlebars.registerHelper('getTotalSkillValue', function (skill, joat, mod) { + return getSkillValueWithJoat(skill, joat) + mod + }); Handlebars.registerHelper({ diff --git a/src/module/sheets/TwodsixActorSheet.ts b/src/module/sheets/TwodsixActorSheet.ts index 26954b843..d3bbb34c9 100644 --- a/src/module/sheets/TwodsixActorSheet.ts +++ b/src/module/sheets/TwodsixActorSheet.ts @@ -72,22 +72,22 @@ export class TwodsixActorSheet extends ActorSheet { })); // Delete Inventory Item - html.find('.item-delete').on('click',(ev => { + html.find('.item-delete').on('click', (ev => { const li = $(ev.currentTarget).parents(".item"); this.actor.deleteOwnedItem(li.data("itemId")); li.slideUp(200, () => this.render(false)); })); // Rollable abilities. - html.find('.rollable').on('click',(this._onRoll.bind(this))); + html.find('.rollable').on('click', (this._onRoll.bind(this))); // Upgrade/downgrade skills. - html.find('.upgrade-skill').on('click',this._onUpgrade.bind(this)); - html.find('.downgrade-skill').on('click',this._onDowngrade.bind(this)); - html.find('.upgrade-joat').on('click',this._onUpgradeJoat.bind(this)); - html.find('.downgrade-joat').on('click',this._onDowngradeJoat.bind(this)); + html.find('.upgrade-skill').on('click', this._onUpgrade.bind(this)); + html.find('.downgrade-skill').on('click', this._onDowngrade.bind(this)); + html.find('.upgrade-joat').on('click', this._onUpgradeJoat.bind(this)); + html.find('.downgrade-joat').on('click', this._onDowngradeJoat.bind(this)); - html.find('.toggle-skills').on('click',ev => { + html.find('.toggle-skills').on('click', ev => { ev.preventDefault(); this.options.hideUntrainedSkills = !this.options.hideUntrainedSkills; this.actor.sheet.render(true) @@ -136,7 +136,7 @@ export class TwodsixActorSheet extends ActorSheet { * @param {Event} event The originating click event * @private */ - _onRoll(event: { preventDefault: () => void; currentTarget: any; }):void { + _onRoll(event:{ preventDefault:() => void; currentTarget:any; }):void { event.preventDefault(); const element = event.currentTarget; const dataset = element.dataset; @@ -151,7 +151,7 @@ export class TwodsixActorSheet extends ActorSheet { } } - _onUpgradeJoat(event: { preventDefault: () => void; currentTarget: any; }):void { + _onUpgradeJoat(event:{ preventDefault:() => void; currentTarget:any; }):void { event.preventDefault(); const element = event.currentTarget; const actorData = this.actor.data; @@ -162,7 +162,7 @@ export class TwodsixActorSheet extends ActorSheet { } } - _onDowngradeJoat(event: { preventDefault: () => void; currentTarget: any; }):void { + _onDowngradeJoat(event:{ preventDefault:() => void; currentTarget:any; }):void { event.preventDefault(); const element = event.currentTarget; const actorData = this.actor.data; @@ -178,7 +178,7 @@ export class TwodsixActorSheet extends ActorSheet { * @param {Event} event The originating click event * @private */ - _onUpgrade(event: { preventDefault: () => void; currentTarget: any; }):void { + _onUpgrade(event:{ preventDefault:() => void; currentTarget:any; }):void { event.preventDefault(); const element = event.currentTarget; const skillName = element.getAttribute('data-label'); @@ -198,7 +198,7 @@ export class TwodsixActorSheet extends ActorSheet { * @param {Event} event The originating click event * @private */ - _onDowngrade(event: { preventDefault: () => void; currentTarget: any; }):void { + _onDowngrade(event:{ preventDefault:() => void; currentTarget:any; }):void { event.preventDefault(); const element = event.currentTarget; const skillName = element.getAttribute('data-label'); diff --git a/src/module/sheets/TwodsixItemSheet.ts b/src/module/sheets/TwodsixItemSheet.ts index c4f920c4d..044260e8d 100644 --- a/src/module/sheets/TwodsixItemSheet.ts +++ b/src/module/sheets/TwodsixItemSheet.ts @@ -10,8 +10,8 @@ export class TwodsixItemSheet extends ItemSheet { classes: ["twodsix", "sheet", "item"], width: 520, height: 377, - submitOnClose:true, - submitOnChange:true, + submitOnClose: true, + submitOnChange: true, tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] }); } diff --git a/static/styles/twodsix.css b/static/styles/twodsix.css index 81db0f9c0..5e34d3881 100644 --- a/static/styles/twodsix.css +++ b/static/styles/twodsix.css @@ -37,14 +37,16 @@ textarea:focus { .window-content { background-attachment: fixed !important; - background-image: url(../assets/bg2.jpg)!important; + background-image: url(../assets/bg2.jpg) !important; background-repeat: repeat-x !important; font-family: Consolas, monospace; color: #00E5FF !important; } + .app .window-app .twodsix .sheet .actor .window-content { overflow: hidden !important; } + .character-name h2 { margin-bottom: -0.5em; border: none; @@ -81,7 +83,9 @@ input[type="text"]:focus, input[type="number"] input[type="password"]:focus, inp box-shadow: 0 0 10px #207ab7; } -input::-webkit-inner-spin-button {display:none} +input::-webkit-inner-spin-button { + display: none +} .content-container { display: grid; @@ -123,6 +127,7 @@ img.character-info-mask { vertical-align: middle; height: 3em; } + .character-name { position: relative; top: 1em; @@ -149,13 +154,29 @@ img.character-info-mask { z-index: 6; } -.bgi-age input {width: 1.5em;} -.bgi-gender input {width: 4em;} -.bgi-species input {width: 9.1em;} -.bgi-homeworld input {width: 8em;} +.bgi-age input { + width: 1.5em; +} + +.bgi-gender input { + width: 4em; +} + +.bgi-species input { + width: 9.1em; +} + +.bgi-homeWorld input { + width: 8em; +} + +span.bgi-age { + margin-right: 4em; +} -span.bgi-age {margin-right: 4em;} -.character-bgi span {margin-right: 4em;} +.character-bgi span { + margin-right: 4em; +} .character-characteristics { width: 21em; @@ -237,7 +258,7 @@ span.stat-damage { } span.stat-damage input, span.special-damage input { - color: #612e2e!important; + color: #612e2e !important; } span.special-name { @@ -276,10 +297,10 @@ svg:hover { } .tabs .item.active { - text-shadow: 0 0 2em #29aae1; - text-decoration: none; - background-color: #29aae1; - color: #0d0d0d; + text-shadow: 0 0 2em #29aae1; + text-decoration: none; + background-color: #29aae1; + color: #0d0d0d; } .character-tabs .tabs { @@ -372,7 +393,7 @@ svg:hover { margin-top: -2em; } -.skills div>div:nth-of-type(odd) { +.skills div > div:nth-of-type(odd) { background: #0d0d0d; } @@ -434,6 +455,7 @@ span.mini-dice { text-align: right; margin-left: 1em; } + .skill-total { text-align: center; } @@ -444,7 +466,6 @@ span.mini-dice { } - .resource-label { padding-top: 0.2em; } @@ -469,7 +490,9 @@ span.mini-dice { grid-template-areas: ". . ." "Biography Biography Biography"; } -.Biography { grid-area: Biography; } +.Biography { + grid-area: Biography; +} /*-------------------------------------------------*/ @@ -517,6 +540,7 @@ select { width: 1.5em; margin-left: 0em; } + /*--- Item Page ---*/ .item-page textarea { width: 100%; @@ -562,17 +586,16 @@ select { color: #29aae1; } -.item div>div:nth-of-type(odd) { +.item div > div:nth-of-type(odd) { background: #0d0d0d; } -a.item-control:hover{ +a.item-control:hover { color: #00e5ff; text-shadow: 0 0 5px #29aae1; } - .item-page input[type="text"], input[type="number"] input[type="password"], input[type="datetime-local"] { background: rgba(0, 0, 0, 0.21); margin: 0; @@ -595,13 +618,21 @@ a.item-control:hover{ margin-bottom: 0.4em; } -.item-tl {margin-top: 0.5em;} +.item-tl { + margin-top: 0.5em; +} -.item-qty {margin-top: 0.5em;} +.item-qty { + margin-top: 0.5em; +} -.item-weight {margin-top: 0.5em;} +.item-weight { + margin-top: 0.5em; +} -.item-descr {margin-top: 0.5em;} +.item-descr { + margin-top: 0.5em; +} .item-descr .editor { height: calc(100px); @@ -642,7 +673,7 @@ a.item-control:hover{ } .dice-tooltip .dice-rolls .roll.d6 { - background-image: url(../assets/chatlog/d6.svg)!important; + background-image: url(../assets/chatlog/d6.svg) !important; } .dice-tooltip .dice-rolls .roll.max { @@ -660,7 +691,7 @@ a.item-control:hover{ line-height: 24px; float: left; margin-right: 1px; - background-image: url(../assets/chatlog/d6.svg)!important; + background-image: url(../assets/chatlog/d6.svg) !important; background-repeat: no-repeat; background-size: 24px 24px; font-size: 16px; @@ -764,7 +795,9 @@ form .notes, form .hint { border-color: #00e5ff; } -option {background-color: #000;} +option { + background-color: #000; +} .window-app .window-header { flex: 0 0 30px; @@ -779,7 +812,7 @@ option {background-color: #000;} .app { max-height: 100%; - background-image: url(../assets/bg2.jpg)!important; + background-image: url(../assets/bg2.jpg) !important; background-repeat: repeat-x !important; border-radius: 5px; box-shadow: 0 0 20px #000; @@ -820,7 +853,9 @@ option {background-color: #000;} color: #95b6ca; } -#sidebar-tabs > .item:hover {color: #00e5ff; } +#sidebar-tabs > .item:hover { + color: #00e5ff; +} .sidebar-tab .directory-list .directory-item.context, .sidebar-tab .directory-list .directory-item.active { border-color: #29aae1; @@ -895,6 +930,7 @@ option {background-color: #000;} #hotbar .macro:hover { box-shadow: 0 0 10px #29aae1 inset; } + #hotbar .macro.active:hover { border: 1px solid #00e5ff; } @@ -902,7 +938,7 @@ option {background-color: #000;} /* EDITOR */ .editor { - height: calc(100px); + height: calc(75px); background: rgba(0, 0, 0, 0.51); color: #207ab7; @@ -917,7 +953,9 @@ option {background-color: #000;} fill: #29aae1; } -.tox .tox-tbtn:hover svg{fill:#00e5ff !important} +.tox .tox-tbtn:hover svg { + fill: #00e5ff !important +} .tox .tox-toolbar, .tox .tox-toolbar__overflow, .tox .tox-toolbar__primary { @@ -952,4 +990,9 @@ option {background-color: #000;} background: rgba(215, 246, 253, 0.35); } +.ol-no-indent { + list-style: none; + padding-left: 0; +} + /*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///twodsix.css"],"names":[],"mappings":"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","file":"styles/twodsix.css","sourcesContent":["body {\r\n  font-family: Consolas, monospace;\r\n}\r\n\r\n/*div {border: thin dotted #FFF;}*/\r\n\r\n.window-content {\r\n    background-attachment: fixed !important;\r\n    background-image: url(../assets/actor/bg2.jpg)!important;\r\n    background-repeat: repeat-x !important;\r\n    font-family: Consolas, monospace;\r\n    color: #00E5FF !important;\r\n}\r\n\r\n.character-name h2 {\r\n    margin-bottom: -0.5em;\r\n    border: none;\r\n}\r\n\r\nh2 {\r\n    font-size: 1.5em;\r\n    border-bottom: 1px solid #225078;\r\n}\r\n\r\nimg {\r\n    border: none !important;\r\n    max-width: 100%;\r\n}\r\n\r\n\r\ninput[type=\"text\"], input[type=\"password\"], input[type=\"datetime-local\"] {\r\n    background: rgba(0, 0, 0, 0.21);\r\n    margin: 0;\r\n    color: #6e819e !important;\r\n    font-family: inherit;\r\n    font-size: inherit;\r\n    text-align: inherit;\r\n    line-height: inherit;\r\n    -webkit-user-select: text;\r\n    -moz-user-select: text;\r\n    -ms-user-select: text;\r\n    user-select: text;\r\n    border: none;\r\n}\r\n\r\n\r\n.grid-container {\r\n  height: 600px;\r\n  width: 800px;\r\n  display: grid;\r\n  grid-template-columns: 38% 20.5% 20.5% 20%;\r\n  grid-template-rows: 5% 45% 45% 5%;\r\n  gap: 1px 1px;\r\n  grid-template-areas: \"character-info character-tabs character-tabs character-tabs\" \"character-info character-tabs-info character-tabs-info character-tabs-info\" \"character-info character-tabs-info character-tabs-info character-tabs-info\" \"character-info character-tabs-info character-tabs-info character-tabs-info\";\r\n}\r\n\r\n\r\n.character-info {\r\n\tgrid-area: character-info;\r\n    margin-left: -8px;\r\n    margin-top: -2px;\r\n\tposition: relative;\r\n}\r\n\r\nimg.character-info-mask {\r\n    z-index: 4;\r\n    position: absolute;\r\n    pointer-events: none;\r\n}\r\n\r\n.character-tabs { grid-area: character-tabs; }\r\n\r\n.character-photo {\r\n    margin-top: -0.3em;\r\n    margin-left: 0.3em;\r\n    position: absolute;\r\n    width: 97%;\r\n    height: 100%;\r\n    z-index: 0;\r\n}\r\n\r\n.character-photo img {\r\n    width: 100%;\r\n    vertical-align: middle;\r\n    z-index: -1;\r\n}\r\n\r\n.helper {\r\n\tdisplay: inline-block;\r\n    height: 100%;\r\n    vertical-align: middle;\r\n\theight: 1em;\r\n}\r\n.character-name {\r\n    position: relative;\r\n    top: 1em;\r\n    text-align: center;\r\n    z-index: 6;\r\n}\r\n\r\n.character-name input[type=\"text\"] {\r\n    height: 1.6em;\r\n    margin: 0.1em;\r\n    background-color: #000;\r\n    border: 3px solid #29aae1;\r\n    margin-left: -0.05em;\r\n    position: relative;\r\n    top: -0.45em;\r\n    width: 14em;\r\n}\r\n\r\n.character-bgi {\r\n    margin-left: 1em;\r\n    margin-right: 1em;\r\n    position: relative;\r\n    top: 20.8em;\r\n    z-index: 6;\r\n}\r\n\r\n.bgi-age input {width: 1.5em;}\r\n.bgi-gender input {width: 3.5em;}\r\n.bgi-species input {width: 9.1em;}\r\n.bgi-homeworld input {width: 8em;}\r\n\r\nspan.bgi-age {margin-right: 4em;}\r\n.character-bgi span {margin-right: 4em;}\r\n\r\n.character-characteristics {\r\n    width: 21em;\r\n    margin-top: 21.5em;\r\n    margin-left: 0.5em;\r\n    position: relative;\r\n    z-index: 6;\r\n}\r\n\r\n.stat {\r\n    background-image: url(../assets/actor/statblock1.svg);\r\n    height: 4em;\r\n    width: 5.5em;\r\n    background-size: cover;\r\n    display: inline-block;\r\n    margin-top: 2.5em;\r\n    margin-left: 0.5em;\r\n    margin-right: -1em;\r\n}\r\n\r\n.stat input, .special input {\r\n    width: 1.5em;\r\n    text-align: center;\r\n    margin-left: -0.1em;\r\n}\r\n\r\n.special {\r\n    background-image: url(../assets/actor/psiblock1.svg);\r\n    height: 4.5em;\r\n    width: 5.5em;\r\n    background-size: cover;\r\n    position: relative;\r\n    right: -15.0em;\r\n    top: -8.2em;\r\n}\r\n\r\nspan.stat-name {\r\n    position: relative;\r\n    left: 1.7em;\r\n    top: -1.5em;\r\n    font-size: 1.2em;\r\n}\r\n\r\nspan.stat-ability {\r\n\tmargin: -0.3em;\r\n    position: relative;\r\n    left: -0.9em;\r\n    top: 0.4em;\r\n}\r\n\r\nspan.stat-modifier {\r\n    margin: -5px;\r\n    position: relative;\r\n    left: -0.2em;\r\n    top: 0.4em;\r\n}\r\n\r\nspan.stat-damage {\r\n    position: relative;\r\n    left: 2.35em;\r\n    top: 0.6em;\r\n}\r\n\r\nspan.special-name {\r\n    position: relative;\r\n    top: -1.1em;\r\n    right: -1.85em;\r\n    font-size: 1.2em;\r\n}\r\n\r\nspan.special-ability {\r\n    position: relative;\r\n    top: 0.4em;\r\n}\r\n\r\nspan.special-modifier {\r\n    margin: -5px;\r\n    position: relative;\r\n    left: 0.7em;\r\n    top: 0.8em;\r\n}\r\n\r\nspan.special-damage {\r\n    position: relative;\r\n    left: 3.8em;\r\n    top: -0.3em;\r\n}\r\n\r\nsvg:hover {\r\n  fill: red;\r\n}\r\n\r\n.character-tabs { grid-area: character-tabs; }\r\n\r\n.character-tabs .tabs {\r\n    position: relative;\r\n    top: 0.4em;\r\n    left: 2.75em;\r\n    z-index: 0;\r\n    width: 29.5em;\r\n}\r\n\r\n.character-tabs a.item {\r\n    border: 1px solid;\r\n    padding: 0.3em 1.0em 0.3em 1.0em;\r\n    background-color: #000000a6;\r\n    text-align: center;\r\n}\r\n\r\n.character-tabs-info {\r\n    grid-area: character-tabs-info;\r\n    background-image: url(../assets/actor/tabs-bg.svg);\r\n    background-repeat: no-repeat;\r\n    background-size: cover;\r\n    z-index: 1;\r\n}\r\n\r\n/* TABS */\r\n\r\n.tabs .item.active {\r\n    text-shadow: 0 0 2em #29aae1;\r\n    text-decoration: underline;\r\n}\r\n\r\n.tabs .item.active {\r\n    text-shadow: 0 0 2em #29aae1;\r\n    text-decoration: underline;\r\n}\r\n\r\na:hover {\r\n    text-shadow: 0 0 8px #29aae1;\r\n  }\r\n\r\n/* Style overrides */\r\n\r\n::-webkit-scrollbar-thumb {\r\n    outline: none;\r\n    border-radius: 3px;\r\n    background: #225078;\r\n    border: 1px solid #29aae1;\r\n}\r\n\r\ninput[type=\"text\"]:focus, input[type=\"password\"]:focus, input[type=\"datetime-local\"]:focus {\r\n    box-shadow: 0 0 5px #29aae1;\r\n}\r\n\r\nselect {\r\n    height: 25px;\r\n    background: #000000a6 !important;\r\n    border: 1px solid #7a7971;\r\n    border-radius: 3px;\r\n    padding: 0 3px;\r\n    text-overflow: ellipsis;\r\n    color: #6e819e;\r\n}\r\n\r\nselect:focus {\r\n    box-shadow: 0 0 5px #29aae1;\r\n    outline: none;\r\n    background: #000000a6;\r\n}\r\n\r\nform button {\r\n    background: #000000a6 !important;\r\n    border: 2px groove #6e819e;\r\n    color: #a2bce4;\r\n}\r\n\r\nbutton:hover {\r\n    box-shadow: 0 0 5px #29aae1;\r\n    color: #00e5ff;\r\n    border-color: #00e5ff;\r\n  }\r\n\r\nform .notes, form .hint {\r\n    flex: 0 0 100%;\r\n    font-size: 12px;\r\n    line-height: 16px;\r\n    color: #bfbfbf;\r\n    margin: 3px 0;\r\n}\r\n\r\n#module-management .package-list .package-title, #module-management .package-list .package-metadata, #module-management .package-list .package-description {\r\n    color: #bfbfbf;\r\n}\r\n\r\n.dialog .dialog-buttons button:last-child {\r\n    margin-right: 0;\r\n    border: 2px groove #6e819e;\r\n    color: #a2bce4;\r\n    background-color: #000;\r\n}\r\n\r\n.dialog .dialog-buttons button:last-child:hover {\r\n    margin-right: 0;\r\n    color: #00e5ff;\r\n    border-color: #00e5ff;\r\n}\r\n\r\noption {background-color: #000;}\r\n"],"sourceRoot":""}*/ diff --git a/static/template.json b/static/template.json index 51f9192af..847762a3b 100644 --- a/static/template.json +++ b/static/template.json @@ -5,7 +5,7 @@ ], "traveller": { "name": "name", - "homeworld": "", + "homeWorld": "", "species": "", "age": { "value": 18, @@ -16,6 +16,11 @@ "value": 0, "min": 0 }, + "contacts": "", + "allies": "", + "enemies": "", + "description": "", + "bio": "", "characteristics": { "strength": { "value": 0, @@ -67,7 +72,7 @@ "mod": 0 } }, - "jackofalltrades": { + "jackOfAllTrades": { "label": "Jack of All Trades", "value": 0, "max": 9 @@ -902,11 +907,7 @@ "mod": 0, "characteristic": "strength" } - }, - "contacts": "", - "allies": "", - "enemies": "", - "bio":"Background Information" + } } }, "Item": { @@ -919,12 +920,12 @@ "templates": { "gearTemplate": { "name": "", - "techlevel": 0, + "techLevel": 0, "description": "Item Information", "quantity": 1, "weight": 0, "traits": [], - "equiped": { + "equipped": { "weight": 0 } }, @@ -934,9 +935,9 @@ "weaponTemplate": { "range": 0, "damage": 0, - "damagebonus": 0, - "magazinesize": 0, - "magazinecost": 0, + "damageBonus": 0, + "magazineSize": 0, + "magazineCost": 0, "type": "weapon" }, "armorTemplate": { diff --git a/static/templates/actors/actor-sheet.html b/static/templates/actors/actor-sheet.html index 2ced9d46c..b154d0b27 100644 --- a/static/templates/actors/actor-sheet.html +++ b/static/templates/actors/actor-sheet.html @@ -1,91 +1,105 @@
-
-
-
- -
+
+
? +
+ +
Character image
+
+

+
+ Age: + Gender: + Species: + Home world: +
+ +
+
+ STR roll attribute + + +
-

-
- Age: - Gender: - Species: - Homeworld: +
+ DEX roll attribute + + +
- -
-
- STR - - - -
-
- DEX - - - -
-
- END - - - -
-
- INT - - - -
-
- EDU - - - -
-
- SOC - - - -
-
- PSI - - - -
+
+ END roll attribute + + + +
+
+ INT roll attribute + + + +
+
+ EDU roll attribute + + + +
+
+ SOC roll attribute + + + +
+
+ PSI roll attribute + + +
+
- {{!-- Sheet Body --}} -
+ {{!-- Sheet Body --}} +
- {{!-- Sheet Tab Navigation --}} -
- -
+ {{!-- Sheet Tab Navigation --}} +
+ +
- {{!-- Skills Tab --}} -
+ {{!-- Skills Tab --}} +
{{> "systems/twodsix/templates/actors/parts/actor-skills.html"}} -
+
- {{!-- Owned Items Tab --}} -
+ {{!-- Owned Items Tab --}} +
{{> "systems/twodsix/templates/actors/parts/actor-items.html"}} -
+
- {{!-- Biography Tab --}} -
+ {{!-- Biography Tab --}} +
{{> "systems/twodsix/templates/actors/parts/actor-info.html"}} -
+
-
-
+
+
diff --git a/static/templates/actors/parts/actor-info.html b/static/templates/actors/parts/actor-info.html index c5a6c621f..bb0f52747 100644 --- a/static/templates/actors/parts/actor-info.html +++ b/static/templates/actors/parts/actor-info.html @@ -1,23 +1,27 @@ -
-
-
- Contacts: - {{{editor content=data.contacts target="data.contacts" button=true owner=owner editable=editable}}} +
+
+ Description: + {{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}} +
+ +
+ Bio: + {{{editor content=data.bio target="data.bio" button=true owner=owner editable=editable}}} +
-
-
- Allies: - {{{editor content=data.allies target="data.allies" button=true owner=owner editable=editable}}} +
+ Contacts: + {{{editor content=data.contacts target="data.contacts" button=true owner=owner editable=editable}}} -
-
- Enemies: - {{{editor content=data.enemies target="data.enemies" button=true owner=owner editable=editable}}} +
+
+ Allies: + {{{editor content=data.allies target="data.allies" button=true owner=owner editable=editable}}} + +
+
+ Enemies: + {{{editor content=data.enemies target="data.enemies" button=true owner=owner editable=editable}}} -
-
- Description: - {{{editor content=data.bio target="data.bio" button=true owner=owner editable=editable}}} -
diff --git a/static/templates/actors/parts/actor-items.html b/static/templates/actors/parts/actor-items.html index ff5bc9ff2..0351eb5ec 100644 --- a/static/templates/actors/parts/actor-items.html +++ b/static/templates/actors/parts/actor-items.html @@ -1,33 +1,31 @@
-
Name
-
TL
-
Qty
-
Weight
-
Type
-
- -
+
Name
+
TL
+
Qty
+
Weight
+
Type
+
+ +
- {{#each actor.gear as |item id|}} -
-
  • -
    +{{#each actor.gear as |item id|}} +
    +
      +
    1. +

      {{item.name}}

      -

      {{data.techlevel}}

      +

      {{data.techLevel}}

      {{data.quantity}}

      {{data.weight}}

      {{item.type}}

      -
      - - -
      +
      + +
      -
      2. -
    - {{/each}} - - +
    +
    • -
    \ No newline at end of file +
    +{{/each}} diff --git a/static/templates/actors/parts/actor-skills.html b/static/templates/actors/parts/actor-skills.html index f6c2471db..ae37f3284 100644 --- a/static/templates/actors/parts/actor-skills.html +++ b/static/templates/actors/parts/actor-skills.html @@ -1,68 +1,65 @@ -
    - +
    +
    - + {{data.jackofalltrades.value}}
    - -
    +
    -
    Skill Name
    -
    Level
    -
    Modifier
    -
    Total
    -
    Roll
    -     - {{#each data.skills as |skill key|}} + Skill Name + Level + Modifier + Total + Roll + + {{#each data.skills as |skill key|}} + + {{#if (shouldShowSkill skill @root.options.hideUntrainedSkills)}} - {{#if (shouldShowSkill skill @root.options.hideUntrainedSkills)}} +
    -
    + - - - + - - {{numberFormat (getSkillValueWithJoat skill @root.data.jackofalltrades) decimals=0 sign=true}} + + {{numberFormat (getSkillValueWithJoat skill @root.data.jackofalltrades) decimals=0 sign=true}} {{data.jackofalltrades.value}} - - - {{numberFormat (getTotalSkillValue skill @root.data.jackofalltrades) decimals=0 sign=true}} + - - + {{numberFormat (getTotalSkillValue skill @root.data.jackofalltrades skill.mod) decimals=0 sign=true}} + roll skill -
    - {{/if}} - {{/each}}
    + {{/if}} + {{/each}} +
    diff --git a/static/templates/items/item-sheet.html b/static/templates/items/item-sheet.html index f88828549..52da77a90 100644 --- a/static/templates/items/item-sheet.html +++ b/static/templates/items/item-sheet.html @@ -13,28 +13,28 @@ {{/select}}
    -
    -