diff --git a/css/deltagreen.css b/css/deltagreen.css index 17c6875..7d7990d 100644 --- a/css/deltagreen.css +++ b/css/deltagreen.css @@ -130,6 +130,13 @@ flex-direction: column; } +.flex-left { + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; + text-align: left; +} + /* Styles limited to delta green sheets */ .deltagreen { font-family: "Didact Gothic", "Roboto", sans-serif; @@ -293,11 +300,7 @@ a.btn-tiny{ text-align: center; } -span.breaking-point-label{ - justify-content: right; - margin-right: 10px; - width: 100px; -} + span.left-aligned-label{ justify-content: left; @@ -380,6 +383,34 @@ div span.bio-grid-label{ align-items: center; } +.breaking-point-grid-3col{ + display: grid; + grid-template-columns: 100px 70px 65px; + margin-top: 10px; + margin-bottom: 10px; + align-content: center; + justify-content: left; + align-items: center; + padding-bottom: 5px; + border-bottom: 1px solid #AAA; +} + +.adaptation-grid-5col{ + display: grid; + grid-template-columns: 100px 50px 50px 50px 100px; + margin-top: 10px; + margin-bottom: 10px; + align-content: center; + justify-content: left; + align-items: center; + padding-bottom: 5px; + border-bottom: 1px solid #AAA; +} + +.bolded-label{ + font-weight: bold; +} + .resource .labeled-resource-checkbox{ vertical-align: middle; } diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index d67a614..dbe4d8a 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -312,7 +312,7 @@ export class DeltaGreenActorSheet extends ActorSheet { // In this situation, the lethality threshold doubles (e.g. 20% would become 40%), // and if the lethality roll fails, the damage is doubled per normal. However right now // the attack roll and damage roll are completely separate... Perhaps in the future, use a - // hotkey to allow the doubling logic? + // button in the skill check roll to allow doubling this logic? // try to determine what the d100 result would be as if it was two d10's being rolled let damageDie1 = Math.floor(skillCheckTotal / 10); diff --git a/template.json b/template.json index c80d104..7200712 100644 --- a/template.json +++ b/template.json @@ -310,16 +310,16 @@ "value": 100, "currentBreakingPoint": 101, "adaptations": { - "violence": [ - false, - false, - false - ], - "helplessness": [ - false, - false, - false - ] + "violence": { + "incident1": false, + "incident2": false, + "incident3": false + }, + "helplessness": { + "incident1": false, + "incident2": false, + "incident3": false + } } }, "physical":{ @@ -342,7 +342,8 @@ "weapon", "armor", "motivation", - "bond" + "bond", + "typedSkill" ], "templates": { "base": { @@ -387,6 +388,13 @@ "base" ], "score": 10 + }, + "typedSkill":{ + "group": "Art", + "label": "New Skill", + "proficiency": 20, + "failure": false, + "cannotBeImprovedByFailure": false } } } \ No newline at end of file diff --git a/templates/actor/actor-sheet.html b/templates/actor/actor-sheet.html index e3adf89..a07aafa 100644 --- a/templates/actor/actor-sheet.html +++ b/templates/actor/actor-sheet.html @@ -3,91 +3,70 @@ {{!-- Sheet Header --}}
-
- -
- -
-
-

-
-
-

-
-
-
+
-
- {{!-- "flex-group-center" is also defined in the _grid.scss file - and it will add a small amount of padding, a border, and will - center all of its child elements content and text. --}} -
- -
- - / - {{numberFormat data.health.max decimals=0 sign=false}} -
+ {{!-- Name, Profession, Portrait --}} +
+ +
+
+

-
- -
- - / - {{numberFormat data.wp.max decimals=0 sign=false}} -
+
+

-
- {{!-- "flex-group-center" is also defined in the _grid.scss file - and it will add a small amount of padding, a border, and will - center all of its child elements content and text. --}} -
- -
- SAN - - / - {{numberFormat data.sanity.max decimals=0 sign=false}} - - - - Breaking Point: - - - Reset -
-
-
- {{!-- 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. --}} -
- {{#each data.statistics as |statistic key|}} -
-
-
- - - ({{numberFormat statistic.x5 decimals=0 sign=false}}%) -
-
- -
-
-
- {{/each}} -
+ +
+ + {{!-- HP --}} +
+ +
+ + / + {{numberFormat data.health.max decimals=0 sign=false}} +
+
+ + {{!-- WP --}} +
+ +
+ + / + {{numberFormat data.wp.max decimals=0 sign=false}} +
+
+ + {{!-- Sanity --}} +
+ +
+ + / + {{numberFormat data.sanity.max decimals=0 sign=false}} +
+
+
+
{{!-- Sheet Tab Navigation --}} @@ -106,34 +85,116 @@ {{/each}} -
- {{#each data.type_skills as |typeskill key|}} - -
-
- - + +
+
+ Add Typed or Custom Skill +
+
+ {{#each actor.items as |item id|}} + {{#if_eq item.type 'typedSkill'}} +
+ + + +
+ +
-
- {{#each typeskill.subskills as |subskill index|}} - -
+
+ {{/if_eq}} + {{/each}} +
+
+
- {{!-- Subtyped Skills take the form: data.type_skills.art.types[0].proficiency where 'types' is an array of object. --}} - - - {{this.specialization}} - - - -
- {{/each}} + {{!-- Physical Statistics like STR, CON, etc. --}} +
+
+ {{#each data.statistics as |statistic key|}} +
+
+
+ + + ({{numberFormat statistic.x5 decimals=0 sign=false}}%) +
+
+ +
- {{/each}}
+ {{!-- Motivations Tab --}} +
+
+
+ + + Reset +
+ +
+

Incidents of SAN Loss Without Going Insane

+
+ + + + + + + + + + + + + +
+
+
+ +
+
    + +
  1. +
    Motivations
    +
    Disorders
    +
    + Add +
    +
    2. + + {{#each actor.items as |item id|}} + {{#if_eq item.type 'motivation'}} + +
  2. +

    + {{item.name}} +

    + + {{#if item.data.crossedOut}} +

    {{item.data.disorder}}

    + {{/if}} + +
    + + +
    +
    3. + + {{/if_eq}} + {{/each}} +
+
+
+ {{!-- GEAR Tab --}}
@@ -147,7 +208,7 @@
Damage/Lethality
Armor Piercing
- Add item + Add
@@ -170,7 +231,7 @@ {{#unless item.data.isLethal}} - + {{toUpperCase item.data.damage}} {{/unless}} @@ -203,7 +264,7 @@
Armor Rating
- Add item + Add
@@ -272,7 +333,7 @@
Name
Score
- Add item + Add
@@ -294,46 +355,7 @@
- {{!-- Motivations Tab --}} -
-
-
    - -
  1. -
    Motivation
    -
    Disorder
    -
    - Add item -
    -
    2. - - {{#each actor.items as |item id|}} - {{#if_eq item.type 'motivation'}} - -
  2. -

    - {{item.name}} -

    - - {{#if item.data.crossedOut}} -

    {{item.data.disorder}}

    - {{/if}} - -
    - - -
    -
    3. - - {{/if_eq}} - {{/each}} -
-
-
+ {{!-- About Tab --}}
diff --git a/templates/item/item-item-sheet.html b/templates/item/item-typedSkill-sheet.html similarity index 83% rename from templates/item/item-item-sheet.html rename to templates/item/item-typedSkill-sheet.html index 92155ce..fa7425b 100644 --- a/templates/item/item-item-sheet.html +++ b/templates/item/item-typedSkill-sheet.html @@ -8,10 +8,7 @@
-
- - -
+
@@ -32,7 +29,10 @@ {{!-- Attributes Tab --}}
- {{!-- As you add new fields, add them in here! --}} +
+ + +