Merge from main to development - with conflist fixes

This commit is contained in:
Chris Ryan 2025-11-08 21:23:05 +10:00
commit 73fd1cf8d2
88 changed files with 3270 additions and 559 deletions

View file

@ -8,11 +8,11 @@
"description": "<p>When you succeed on an attack against a target within Melee range, you can <strong>spend a Hope</strong> to gore the target with your tusks, dealing an extra <strong>1d6</strong> damage.</p>",
"resource": null,
"actions": {
"1n4ZsA6s2iBAL1tG": {
"type": "effect",
"_id": "1n4ZsA6s2iBAL1tG",
"ytSFDCONRi5L4THz": {
"type": "damage",
"_id": "ytSFDCONRi5L4THz",
"systemPath": "actions",
"description": "",
"description": "<p>When you succeed on an attack against a target within Melee range, you can <strong>spend a Hope</strong> to gore the target with your tusks, dealing an extra <strong>1d6</strong> damage.</p>",
"chatDisplay": true,
"actionType": "action",
"cost": [
@ -20,22 +20,55 @@
"key": "hope",
"value": 1,
"scalable": false,
"step": null
"step": null,
"consumeOnSuccess": false
}
],
"uses": {
"value": null,
"max": "",
"recovery": null
"recovery": null,
"consumeOnSuccess": false
},
"damage": {
"parts": [
{
"value": {
"custom": {
"enabled": false,
"formula": ""
},
"multiplier": "flat",
"dice": "d6",
"bonus": null,
"flatMultiplier": 1
},
"applyTo": "hitPoints",
"type": [],
"base": false,
"resultBased": false,
"valueAlt": {
"multiplier": "prof",
"flatMultiplier": 1,
"dice": "d6",
"bonus": null,
"custom": {
"enabled": false,
"formula": ""
}
}
}
],
"includeBase": false
},
"target": {
"type": "any",
"amount": 1
},
"effects": [],
"target": {
"type": "self",
"amount": null
},
"name": "Spend Hope",
"img": "icons/creatures/abilities/fang-tooth-blood-red.webp",
"range": ""
"range": "melee"
}
},
"originItemType": null,
@ -116,12 +149,12 @@
"compendiumSource": null,
"duplicateSource": null,
"exportSource": null,
"coreVersion": "13.347",
"coreVersion": "13.350",
"systemId": "daggerheart",
"systemVersion": "1.0.5",
"systemVersion": "1.1.2",
"createdTime": 1754000611682,
"modifiedTime": 1755394557399,
"lastModifiedBy": "VZIeX2YDvX338Zvr"
"modifiedTime": 1761138569638,
"lastModifiedBy": "fBcTgyTzoARBvohY"
},
"_key": "!items!YhxD1ujZpftPu19w"
}