From 2d0f1e86b6e87a170cce2366ad1be59e2501c80f Mon Sep 17 00:00:00 2001 From: UltraKev <68220757+UltraKev@users.noreply.github.com> Date: Fri, 21 Aug 2020 10:34:43 +0100 Subject: [PATCH] fix: Fixed differences between versions --- src/module/entities/TwodsixActor.ts | 1 - src/module/handlebars.ts | 1 - static/styles/twodsix.css | 2 +- static/system.json | 7 +- static/template.json | 39 ++-- static/templates/actors/actor-sheet.html | 170 +----------------- static/templates/actors/parts/actor-info.html | 25 ++- .../templates/actors/parts/actor-items.html | 17 +- .../templates/actors/parts/actor-skills.html | 66 +++++++ 9 files changed, 131 insertions(+), 197 deletions(-) diff --git a/src/module/entities/TwodsixActor.ts b/src/module/entities/TwodsixActor.ts index 180a445bf..2906c6476 100644 --- a/src/module/entities/TwodsixActor.ts +++ b/src/module/entities/TwodsixActor.ts @@ -40,7 +40,6 @@ export default class TwodsixActor extends Actor { for (const skill of Object.values(data.skills as Record)) { const characteristic = skill.characteristic; - console.log(skill) skill.mod = calcModFor(data.characteristics[characteristic].value); } } diff --git a/src/module/handlebars.ts b/src/module/handlebars.ts index bd9586686..19201d6c9 100644 --- a/src/module/handlebars.ts +++ b/src/module/handlebars.ts @@ -29,7 +29,6 @@ export default function registerHandlebarsHelpers():void { }); Handlebars.registerHelper('shouldShowSkill', function(skill, hideUntrainedSkills) { - // console.log('shouldShowSkill', skill, hideUntrainedSkills) return skill.trained || hideUntrainedSkills }); diff --git a/static/styles/twodsix.css b/static/styles/twodsix.css index 9fd99254f..a0beb4138 100644 --- a/static/styles/twodsix.css +++ b/static/styles/twodsix.css @@ -810,7 +810,7 @@ option {background-color: #000;} /* EDITOR */ .editor { - height: calc(100% - 115px); + height: calc(100px); background: rgba(0, 0, 0, 0.51); color: #207ab7; diff --git a/static/system.json b/static/system.json index 96a81ae07..188571dc6 100644 --- a/static/system.json +++ b/static/system.json @@ -5,8 +5,13 @@ "url": "https://github.com/xdy/twodsix-foundryvtt/", "manifest": "https://github.com/xdy/twodsix-foundryvtt/releases/latest/download/system.json", "download": "https://github.com/xdy/twodsix-foundryvtt/releases/latest/download/twodsix.zip", - "version": "0.3.4", +<<<<<<< HEAD + "version": "0.3.8", + "author": "Jonas Karlsson (xdy#3735), Kevin Maree (Ultra Kev#9816), Rob (RobCubed #9180)", +======= + "version": "0.3.0", "author": "Jonas Karlsson (xdy#3735), Kevin Maree (Ultra Kev#9816)", +>>>>>>> 557c1b7... chore(release): 0.3.0 [skip ci] "bugs": "", "changelog": "", "minimumCoreVersion": "0.6.2", diff --git a/static/template.json b/static/template.json index 92786734c..a12b859d5 100644 --- a/static/template.json +++ b/static/template.json @@ -1,6 +1,8 @@ { "Actor": { - "types": ["traveller"], + "types": [ + "traveller" + ], "traveller": { "name": "", "homeworld": "", @@ -463,7 +465,6 @@ "max": 9, "mod": 0, "characteristic": "strength" - }, "language": { "label": "Languages", @@ -481,7 +482,6 @@ "max": 9, "mod": 0, "characteristic": "strength" - }, "language-2": { "label": "Language 2", @@ -491,7 +491,6 @@ "max": 9, "mod": 0, "characteristic": "strength" - }, "language-3": { "label": "Language 3", @@ -501,7 +500,6 @@ "max": 9, "mod": 0, "characteristic": "strength" - }, "language-4": { "label": "Language 4", @@ -511,7 +509,6 @@ "max": 9, "mod": 0, "characteristic": "strength" - }, "language-5": { "label": "Language 5", @@ -521,7 +518,6 @@ "max": 9, "mod": 0, "characteristic": "strength" - }, "leadership": { "label": "Leadership", @@ -907,11 +903,18 @@ "mod": 0, "characteristic": "strength" } - } + }, + "contacts": "", + "allies": "", + "enemies": "" } }, "Item": { - "types": ["equipment", "weapon", "armor"], + "types": [ + "equipment", + "weapon", + "armor" + ], "templates": { "carried": { "name": "", @@ -934,15 +937,21 @@ } }, "equipment": { - "templates": ["carried"] + "templates": [ + "carried" + ] }, "weapon": { - "templates": ["carried", "weapon"] + "templates": [ + "carried", + "weapon" + ] }, "armor": { - "templates": ["carried", "armor"] + "templates": [ + "carried", + "armor" + ] } - }, - "Contacts": {} - + } } diff --git a/static/templates/actors/actor-sheet.html b/static/templates/actors/actor-sheet.html index 66a60d263..f0825c0ba 100644 --- a/static/templates/actors/actor-sheet.html +++ b/static/templates/actors/actor-sheet.html @@ -61,7 +61,7 @@ {{!-- Sheet Body --}}
- + {{!-- Sheet Tab Navigation --}}
- {{!-- Skills Tab --}} -
- {{!-- The grid classes are defined in scss/global/_grid.scss. To use, - use both the "grid" and "grid-Ncol" class where "N" can be any number - from 1 to 12 and will create that number of columns. --}} - -
- - - -
- - - - - {{data.jackofalltrades.value}} -
- - - -
- -
Skill Name
-
Level
-
Modifier
-
Total
-
Roll
- - {{#each data.skills as |skill key|}} - - {{#if (shouldShowSkill skill @root.options.hideUntrainedSkills)}} - -
- - - - - - - {{numberFormat (getSkillValueWithJoat skill @root.data.jackofalltrades) decimals=0 sign=true}} - - - {{data.jackofalltrades.value}} - - - - - - {{numberFormat (getTotalSkillValue skill @root.data.jackofalltrades) decimals=0 sign=true}} - - - - - -
- {{/if}} - {{/each}} -
-
+ {{> "systems/twodsix/templates/actors/parts/actor-skills.html"}} {{!-- Owned Items Tab --}} - -
-
    -
  1. -
    -
    Name
    -
    - Add - item -
    -
    2. - {{#each actor.gear as |item id|}} -
  2. -
    -

    {{item.name}}

    -
    - - -
    -
    3. - {{/each}} -
-
+ {{> "systems/twodsix/templates/actors/parts/actor-items.html"}} {{!-- Biography Tab --}} - -
-
-
-
-
-
- {{editor content=data.biography target="data.biography" button=true owner=owner editable=editable}} -
-
- -
- - + {{> "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 b97fa3f74..f2855f833 100644 --- a/static/templates/actors/parts/actor-info.html +++ b/static/templates/actors/parts/actor-info.html @@ -1,4 +1,23 @@ -{{!-- Biography Tab --}} -
- {{editor content=data.biography target="data.biography" button=true owner=owner editable=editable}} +
+
+
+ contacts: + {{{editor content=data.contacts target="data.contacts" 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.description target="data.description" 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 3d0488915..a92644a15 100644 --- a/static/templates/actors/parts/actor-items.html +++ b/static/templates/actors/parts/actor-items.html @@ -1,14 +1,13 @@ -{{!-- Owned Items Tab --}}
    -
  1. -
    -
    Name
    -
    - Add - item -
    -
    2. + + + + + + + + {{#each actor.gear as |item id|}}
  2. diff --git a/static/templates/actors/parts/actor-skills.html b/static/templates/actors/parts/actor-skills.html index e69de29bb..a61fffff8 100644 --- a/static/templates/actors/parts/actor-skills.html +++ b/static/templates/actors/parts/actor-skills.html @@ -0,0 +1,66 @@ +
    + {{!-- The grid classes are defined in scss/global/_grid.scss. To use, + use both the "grid" and "grid-Ncol" class where "N" can be any number + from 1 to 12 and will create that number of columns. --}} + +
    + + + +
    + + + + + {{data.jackofalltrades.value}} +
    + + + +
    + + {{#each data.skills as |skill key|}} + + {{#if (shouldShowSkill skill @root.options.hideUntrainedSkills)}} + +
    + + + + + + + + + + + {{data.jackofalltrades.value}} + + + + {{numberFormat (getSkillValueWithJoat skill @root.data.jackofalltrades) decimals=0 sign=true}} + + + +
    + {{/if}} + {{/each}} +
    +