From d6ee391ff53cfb17f0a188ed78f900639cea4bb6 Mon Sep 17 00:00:00 2001 From: Vlyan Date: Fri, 21 Jan 2022 13:45:11 +0100 Subject: [PATCH] Added SoftLock on NPC sheet --- CHANGELOG.md | 2 +- system/template.json | 2 +- system/templates/actors/character-sheet.html | 2 +- system/templates/actors/npc-sheet.html | 4 +-- system/templates/actors/npc/attributes.html | 16 ++++++------ system/templates/actors/npc/identity.html | 6 ++--- system/templates/actors/npc/inventory.html | 6 ++--- system/templates/actors/npc/narrative.html | 26 ++++++++++---------- system/templates/actors/npc/rings.html | 10 ++++---- system/templates/actors/npc/skill.html | 2 +- system/templates/actors/npc/social.html | 10 ++++---- system/templates/actors/npc/techniques.html | 10 ++++---- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d9058..674f19e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## 1.6.0 - SoftLock -- Added SoftLock on PC sheet +- Added SoftLock on PC/NPC sheet - PC & NPC Sheet : Added +/- button to add or subtract Fatigue and Strife - GmMonitor : Added ability to add or subtract fatigue/strife/void/casualties/panic points on mouse clic (left/right). diff --git a/system/template.json b/system/template.json index 1601767..19e2eb1 100644 --- a/system/template.json +++ b/system/template.json @@ -124,7 +124,7 @@ "zeni": 0 }, "npc": { - "templates": ["rings", "social", "techniques", "conflict"], + "templates": ["softlock", "rings", "social", "techniques", "conflict"], "type": "adversary", "attitude": "", "conflict_rank": { diff --git a/system/templates/actors/character-sheet.html b/system/templates/actors/character-sheet.html index 09ca450..aecd7ae 100644 --- a/system/templates/actors/character-sheet.html +++ b/system/templates/actors/character-sheet.html @@ -1,7 +1,7 @@
{{!-- Sheet Header --}}
- +

{{> 'systems/l5r5e/templates/actors/character/identity.html'}} diff --git a/system/templates/actors/npc-sheet.html b/system/templates/actors/npc-sheet.html index 0e49b42..b25a9f6 100644 --- a/system/templates/actors/npc-sheet.html +++ b/system/templates/actors/npc-sheet.html @@ -2,8 +2,8 @@ {{!-- Sheet Header --}}
- -

+ +

{{> 'systems/l5r5e/templates/actors/npc/identity.html'}}
diff --git a/system/templates/actors/npc/attributes.html b/system/templates/actors/npc/attributes.html index 3f02ec6..8dca5c5 100644 --- a/system/templates/actors/npc/attributes.html +++ b/system/templates/actors/npc/attributes.html @@ -2,11 +2,11 @@
  • {{localize 'l5r5e.attributes.focustip'}}

  • @@ -42,15 +42,15 @@ {{#if data.data.is_compromised}} {{else}} - + {{/if}}

    {{localize 'l5r5e.attributes.vigilancetip'}}

  • diff --git a/system/templates/actors/npc/identity.html b/system/templates/actors/npc/identity.html index a88b4e5..a89e050 100644 --- a/system/templates/actors/npc/identity.html +++ b/system/templates/actors/npc/identity.html @@ -1,7 +1,7 @@
      {{!-- Npc Type (minion / adversary) --}}
    • - {{#select data.data.type}} {{#each data.data.types as |t|}} @@ -12,11 +12,11 @@ {{!-- Martial --}}
    • - +
    • {{!-- Social --}}
    • - +
    \ No newline at end of file diff --git a/system/templates/actors/npc/inventory.html b/system/templates/actors/npc/inventory.html index e8d4459..cbdf4ed 100644 --- a/system/templates/actors/npc/inventory.html +++ b/system/templates/actors/npc/inventory.html @@ -5,15 +5,15 @@ {{!-- item patterns list --}}
    - {{localize 'l5r5e.advancements.item_pattern' }} - {{#if options.editable}} + {{localize 'l5r5e.advancements.item_pattern'}} + {{#if data.editable_not_soft_locked}} {{/if}}
      {{#each actor.items as |pattern id|}} {{#ifCond pattern.data.type '==' 'item_pattern'}} - {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../options.editable}} + {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../data.editable_not_soft_locked}} {{/ifCond}} {{/each}}
    diff --git a/system/templates/actors/npc/narrative.html b/system/templates/actors/npc/narrative.html index 4c2c643..fe8918a 100644 --- a/system/templates/actors/npc/narrative.html +++ b/system/templates/actors/npc/narrative.html @@ -4,11 +4,11 @@ {{localize 'l5r5e.social.title'}}
    {{!-- Bushido Tenets --}} @@ -16,11 +16,11 @@ {{localize 'l5r5e.social.bushido_tenets.title'}}
    @@ -29,14 +29,14 @@
    {{localize 'l5r5e.social.advantages'}} - {{#if options.editable}} - + {{#if data.editable_not_soft_locked}} + {{/if}}
      {{#each actor.items as |item id|}} {{#ifCond '["distinction","passion"]' 'includes' item.data.data.peculiarity_type}} - {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../options.editable}} + {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../data.editable_not_soft_locked}} {{/ifCond}} {{/each}}
    @@ -45,14 +45,14 @@
    {{localize 'l5r5e.social.disadvantages'}} - {{#if options.editable}} - + {{#if data.editable_not_soft_locked}} + {{/if}}
      {{#each actor.items as |item id|}} - {{#ifCond '["adversity","anxiety"]' 'includes' item.data.data.peculiarity_type}} - {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../options.editable}} + {{#ifCond '["adversity","anxiety"]' 'includes' item.data.data.peculiarity_type}} + {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../data.editable_not_soft_locked}} {{/ifCond}} {{/each}}
    @@ -61,14 +61,14 @@
    {{localize 'l5r5e.social.bonds' }} - {{#if options.editable}} + {{#if data.editable_not_soft_locked}} {{/if}}
      {{#each actor.items as |bond id|}} {{#ifCond bond.data.type '==' 'bond'}} - {{> 'systems/l5r5e/templates/items/bond/bond-entry.html' bond=bond id=id editable=../options.editable}} + {{> 'systems/l5r5e/templates/items/bond/bond-entry.html' bond=bond id=id editable=../data.editable_not_soft_locked}} {{/ifCond}} {{/each}}
    diff --git a/system/templates/actors/npc/rings.html b/system/templates/actors/npc/rings.html index d4556a0..aa74a24 100644 --- a/system/templates/actors/npc/rings.html +++ b/system/templates/actors/npc/rings.html @@ -3,35 +3,35 @@
  • \ No newline at end of file diff --git a/system/templates/actors/npc/skill.html b/system/templates/actors/npc/skill.html index bee6749..1273a46 100644 --- a/system/templates/actors/npc/skill.html +++ b/system/templates/actors/npc/skill.html @@ -4,7 +4,7 @@ - + {{/each}} \ No newline at end of file diff --git a/system/templates/actors/npc/social.html b/system/templates/actors/npc/social.html index 331e0e1..a428e3d 100644 --- a/system/templates/actors/npc/social.html +++ b/system/templates/actors/npc/social.html @@ -2,32 +2,32 @@
  • {{!-- Attitude --}} {{!-- Strength & Weakness --}} {{#each data.stances as |stance|}} {{/each}}
  • diff --git a/system/templates/actors/npc/techniques.html b/system/templates/actors/npc/techniques.html index 400cc4f..178479a 100644 --- a/system/templates/actors/npc/techniques.html +++ b/system/templates/actors/npc/techniques.html @@ -7,7 +7,7 @@ {{localize 'l5r5e.techniques.type'}} {{#each data.techniquesList as |technique|}} {{/each}} @@ -17,13 +17,13 @@
    {{localize (localize 'l5r5e.techniques.{technique}' technique=technique)}} - {{#ifCond ../options.editable '&&' (lookup ../data.data.techniques technique)}} + {{#ifCond ../data.editable_not_soft_locked '&&' (lookup ../data.data.techniques technique)}} {{/ifCond}}
      {{#each list as |item id|}} - {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item editable=../../options.editable}} + {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item editable=../../data.editable_not_soft_locked}} {{/each}}
    @@ -32,14 +32,14 @@
    {{localize 'l5r5e.advancements.signature_scroll' }} - {{#if options.editable}} + {{#if data.editable_not_soft_locked}} {{/if}}
      {{#each actor.items as |scroll id|}} {{#ifCond scroll.data.type '==' 'signature_scroll'}} - {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../options.editable}} + {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../data.editable_not_soft_locked}} {{/ifCond}} {{/each}}