TakeV/foundryvtt-beam-saber
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'release/2.12'

Browse source
This commit is contained in:
Megastruktur 2021-01-04 18:25:07 +03:00
parent 4f7cdb2f72 664f99b1a0
commit e95b79419c
7 changed files with 59 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.txt
View file

@ -1,3 +1,6 @@
v2.12
- Fix turf and cohort edge/flaws checkboxes
v2.11
- Fix localize for Rolls (@kinote)
- Adjust avatar image position for Actor, Crew and Item (@olivier-grech)

9
module/blades.js
View file

@ -49,6 +49,15 @@ Hooks.once("init", async function() {
preloadHandlebarsTemplates();
// Is the value Turf side.
Handlebars.registerHelper('is_turf_side', function(value, options) {
if (["left", "right", "top", "bottom"].includes(value)) {
return options.fn(this);
} else {
return options.inverse(this);
}
});
// Multiboxes.
Handlebars.registerHelper('multiboxes', function(selected, options) {

6
system.json
View file

@ -2,9 +2,9 @@
"name": "blades-in-the-dark",
"title": "Blades in the Dark",
"description": "Blades in the dark game system.",
"version": "2.11",
"version": "2.12",
"minimumCoreVersion": "0.7.2",
"compatibleCoreVersion": "0.7.8",
"compatibleCoreVersion": "0.7.9",
"templateVersion": 1,
"author": "megastruktur",
"esmodules": [
@ -32,7 +32,7 @@
],
"url": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/",
"manifest": "https://raw.githubusercontent.com/megastruktur/foundryvtt-blades-in-the-dark/master/system.json",
"download": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/archive/2.11.zip",
"download": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/archive/2.12.zip",
"packs": [
{
"name": "class",

24
template.json
View file

@ -237,38 +237,46 @@
"edges_list": {
"Fearsome": {
"label": "BITD.EdgesFearsome",
"description": "BITD.EdgesFearsomeDescription"
"description": "BITD.EdgesFearsomeDescription",
"selected": false
},
"Independent": {
"label": "BITD.EdgesIndependent",
"description": "BITD.EdgesIndependentDescription"
"description": "BITD.EdgesIndependentDescription",
"selected": false
},
"Loyal": {
"label": "BITD.EdgesLoyal",
"description": "BITD.EdgesLoyalDescription"
"description": "BITD.EdgesLoyalDescription",
"selected": false
},
"Tenacious": {
"label": "BITD.EdgesTenacious",
"description": "BITD.EdgesTenaciousDescription"
"description": "BITD.EdgesTenaciousDescription",
"selected": false
}
},
"flaws": [],
"flaws_list": {
"Principled": {
"label": "BITD.FlawsPrincipled",
"description": "BITD.FlawsPrincipledDescription"
"description": "BITD.FlawsPrincipledDescription",
"selected": false
},
"Savage": {
"label": "BITD.FlawsSavage",
"description": "BITD.FlawsSavageDescription"
"description": "BITD.FlawsSavageDescription",
"selected": false
},
"Unreliable": {
"label": "BITD.FlawsUnreliable",
"description": "BITD.FlawsUnreliableDescription"
"description": "BITD.FlawsUnreliableDescription",
"selected": false
},
"Wild": {
"label": "BITD.FlawsWild",
"description": "BITD.FlawsWildDescription"
"description": "BITD.FlawsWildDescription",
"selected": false
}
},
"harm": ["No"],

14
templates/items/cohort.html
View file

@ -74,24 +74,22 @@
<div class="edgeflaw-container flex-vertical">
<div class="label-stripe">{{localize "BITD.Edges"}}</div>
{{#each data.edges_list as |edge key|}}
{{#multiboxes ../data.edges}}
<div class="edgeflaw flex-horizontal">
<input id="edge-{{key}}" type="checkbox" name="data.edges" value="{{key}}">
<label for="edge-{{key}}">{{localize edge.label}}</label>
<input id="cohort-{{item._id}}-edge-{{key}}" type="checkbox" name="data.edges_list.{{key}}.selected"
{{checked edge.selected}}>
<label for="cohort-{{item._id}}-edge-{{key}}">{{localize edge.label}}</label>
</div>
{{/multiboxes}}
{{/each}}
</div>
<div class="edgeflaw-container flex-vertical">
<div class="label-stripe">{{localize "BITD.Flaws"}}</div>
{{#each data.flaws_list as |flaw key|}}
{{#multiboxes ../data.flaws}}
<div class="edgeflaw flex-horizontal">
<input id="flaw-{{key}}" type="checkbox" name="data.flaws" value="{{key}}">
<label for="flaw-{{key}}">{{localize flaw.label}}</label>
<input id="cohort-{{item._id}}-flaw-{{key}}" type="checkbox" name="data.flaws_list.{{key}}.selected"
{{checked flaw.selected}}>
<label for="cohort-{{item._id}}-flaw-{{key}}">{{localize flaw.label}}</label>
</div>
{{/multiboxes}}
{{/each}}
</div>

16
templates/parts/cohort-block.html
View file

@ -27,15 +27,15 @@
<div class="flex-vertical">
<div class="flex-vertical">
{{#each item.data.edges as |edge key|}}
{{#with (lookup ../item.data.edges_list edge)}}
<div class="description">{{localize description}} <b>({{localize label}})</b></div>
{{/with}}
{{#each item.data.edges_list as |edge key|}}
{{#if edge.selected }}
<div class="description">{{localize edge.description}} <b>({{localize edge.label}})</b></div>
{{/if}}
{{/each}}
{{#each item.data.flaws as |flaw key|}}
{{#with (lookup ../item.data.flaws_list flaw)}}
<div class="description">{{localize description}} <b>({{localize label}})</b></div>
{{/with}}
{{#each item.data.flaws_list as |flaw key|}}
{{#if flaw.selected }}
<div class="description">{{localize flaw.description}} <b>({{localize flaw.label}})</b></div>
{{/if}}
{{/each}}
</div>
</div>

20
templates/parts/turf-list.html
View file

@ -4,8 +4,16 @@
{{#each turfs_data as |turf id|}}
<div class="turf-block {{#if turf.value}}turf-selected{{/if}}">
{{#each turf.connects as |connect|}}
<div class="connector {{connect}}"></div>
{{#each turf.connects as |connect key|}}
{{#is_turf_side key}}
{{#if connect}}
<div class="connector {{key}}"></div>
{{/if}}
{{else}}
<div class="connector {{connect}}"></div>
{{/is_turf_side}}
{{/each}}
{{#if ../can_edit}}
@ -16,10 +24,10 @@
<div>
{{#multiboxes turf.connects}}
<input type="checkbox" name="data.turfs.{{id}}.connects" value="left">
<input type="checkbox" name="data.turfs.{{id}}.connects" value="top">
<input type="checkbox" name="data.turfs.{{id}}.connects" value="right">
<input type="checkbox" name="data.turfs.{{id}}.connects" value="bottom">
<input type="checkbox" name="data.turfs.{{id}}.connects.left" {{checked turf.connects.left}}>
<input type="checkbox" name="data.turfs.{{id}}.connects.top" {{checked turf.connects.top}}>
<input type="checkbox" name="data.turfs.{{id}}.connects.right" {{checked turf.connects.right}}>
<input type="checkbox" name="data.turfs.{{id}}.connects.bottom" {{checked turf.connects.bottom}}>
{{/multiboxes}}
</div>