Compare commits

..

No commits in common. "f8df53ed8368928d241e810a08d6aba6fdb55b36" and "3a4b66f48783654ba11cee673d4381183eb1a7c2" have entirely different histories.

9 changed files with 86 additions and 45 deletions

View file

@ -35,7 +35,7 @@ jobs:
env:
version: ${{steps.get_version.outputs.version-without-v}}
url: https://github.com/${{github.repository}}
manifest: https://raw.githubusercontent.com/{{github.repository}}/V13/system.json
manifest: https://github.com/${{github.repository}}/releases/latest/download/system.json
download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip
# Create a zip file with all files required by the module to add to the release

View file

@ -18,7 +18,7 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
static getRangeLabels(distanceValue, settings) {
let result = { distance: distanceValue, units: '' };
if (!settings.enabled || !canvas.scene) return result;
if (!settings.enabled) return result;
const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement;
const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;

View file

@ -95,7 +95,7 @@ export default class DhTokenManager {
: this.#actor;
const tokenData = await actor.getTokenDocument();
const result = await canvas.scene.createEmbeddedDocuments('Token', [
{ ...tokenData.toObject(), x: this.#activePreview.document.x, y: this.#activePreview.document.y }
{ ...tokenData, x: this.#activePreview.document.x, y: this.#activePreview.document.y }
]);
this.#activePreview = undefined;

View file

@ -65,7 +65,13 @@ export const renderMeasuredTemplate = async event => {
? '180'
: undefined;
const distance = getTemplateDistance(range, type);
let baseDistance = range;
if (Number.isNaN(Number(range))) {
baseDistance = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement[
range
];
}
const distance = type === CONFIG.DH.GENERAL.templateTypes.EMANATION ? baseDistance + 2.5 : baseDistance;
const { width, height } = game.canvas.scene.dimensions;
const data = {
@ -80,23 +86,3 @@ export const renderMeasuredTemplate = async event => {
CONFIG.ux.TemplateManager.createPreview(data);
};
const getTemplateDistance = (range, type) => {
const rangeNumber = Number(range);
if (!Number.isNaN(rangeNumber)) return rangeNumber;
const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
const sceneMeasurements = canvas.scene?.flags.daggerheart?.rangeMeasurement;
const globalMeasurements = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.variantRules
).rangeMeasurement;
const settings = sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
const baseDistance = settings[range];
if (type !== CONFIG.DH.GENERAL.templateTypes.EMANATION) return baseDistance;
const emanationAddDistance = settings.melee / 2;
return baseDistance + emanationAddDistance;
};

View file

@ -36,8 +36,7 @@
"resultBased": false,
"value": {
"custom": {
"enabled": false,
"formula": ""
"enabled": false
},
"multiplier": "prof",
"dice": "d8",
@ -45,9 +44,7 @@
"flatMultiplier": 1
},
"applyTo": "hitPoints",
"type": [
"magical"
],
"type": [],
"base": false,
"valueAlt": {
"multiplier": "prof",
@ -55,8 +52,7 @@
"dice": "d6",
"bonus": null,
"custom": {
"enabled": false,
"formula": ""
"enabled": false
}
}
}
@ -91,6 +87,57 @@
"name": "Cast",
"img": "icons/skills/melee/spear-tips-three-green.webp",
"range": "veryClose"
},
"CUKoYyDxQhNc0pLs": {
"type": "damage",
"_id": "CUKoYyDxQhNc0pLs",
"systemPath": "actions",
"description": "<p>If a target you hit is <em>Vulnerable</em>, they take an extra <strong>1d8</strong> damage.</p>",
"chatDisplay": true,
"actionType": "action",
"cost": [],
"uses": {
"value": null,
"max": "",
"recovery": null
},
"damage": {
"parts": [
{
"value": {
"custom": {
"enabled": false
},
"multiplier": "flat",
"flatMultiplier": 1,
"dice": "d8",
"bonus": null
},
"applyTo": "hitPoints",
"type": [],
"base": false,
"resultBased": false,
"valueAlt": {
"multiplier": "prof",
"flatMultiplier": 1,
"dice": "d6",
"bonus": null,
"custom": {
"enabled": false
}
}
}
],
"includeBase": false
},
"target": {
"type": "any",
"amount": null
},
"effects": [],
"name": "Damage Against Vulnerable",
"img": "icons/skills/melee/spear-tips-three-purple.webp",
"range": ""
}
},
"attribution": {

View file

@ -5,14 +5,22 @@
"_id": "ijWppQzSOqVCb3rE",
"img": "icons/weapons/axes/axe-battle-jagged.webp",
"system": {
"description": "<strong>Protective</strong>: +1 to Armor Score",
"description": "",
"actions": {},
"attached": [],
"tier": 3,
"equipped": false,
"secondary": false,
"burden": "twoHanded",
"weaponFeatures": [],
"weaponFeatures": [
{
"value": "protective",
"effectIds": [
"qTxADRsQnKiYfOiQ"
],
"actionIds": []
}
],
"attack": {
"name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp",
@ -103,13 +111,13 @@
"effects": [
{
"name": "Protective",
"description": "+1 to Armor Score",
"img": "icons/magic/defensive/shield-barrier-deflect-teal.webp",
"description": "Add your character's Tier to your Armor Score",
"img": "icons/skills/melee/shield-block-gray-orange.webp",
"changes": [
{
"key": "system.armorScore",
"mode": 2,
"value": "1"
"value": "ITEM.@system.tier"
}
],
"_id": "qTxADRsQnKiYfOiQ",

View file

@ -2,7 +2,7 @@
"id": "daggerheart",
"title": "Daggerheart",
"description": "An unofficial implementation of the Daggerheart system",
"version": "1.9.7",
"version": "1.9.6",
"compatibility": {
"minimum": "13.346",
"verified": "13.351",

View file

@ -1,9 +1,9 @@
{{#if features.length}}
<div class="item-description-outer-container">
{{#if features.length}}
<div class="item-description-container">
{{#each features as | feature |}}
<div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
{{/each}}
</div>
</div>
{{/if}}
</div>

View file

@ -1,9 +1,9 @@
{{#if features.length}}
<div class="item-description-outer-container">
{{#if features.length}}
<div class="item-description-container">
{{#each features as | feature |}}
<div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
{{/each}}
</div>
</div>
{{/if}}
</div>