MidgardVTT-Entwicklung
/
foundry-vtt-system-midgard5
7
0
Fork 0
Code Issues 16 Pull Requests Actions Projects 1 Releases 8 Wiki Activity

Merge branch 'develop' into 24-injuries-as-effects-and-adding-them-to-macros

This commit is contained in:
LeFrique 2023-12-01 21:22:03 +01:00 committed by GitHub
parent 8eba0a4652 6ff4f16f9d
commit b3e43bc6cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/de.json
View File

@ -275,6 +275,10 @@
"midgard5.mod-operation-add": "Addieren",
"midgard5.mod-operation-set": "Basiswert",
"midgard5.mod-operation-fixed": "Fester Wert",
"midgard5.mod-operation-subtract": "Subtrahieren",
"midgard5.mod-operation-multiply": "Multiplizieren",
"midgard5.mod-operation-division": "Dividieren",
"midgard5.mod-stat-defenseBonus": "Abwehrbonus",
"midgard5.mod-stat-attackBonus": "Angriffsbonus",

2
packs/items/kampfzustaende/angeschlagen.json
View File

@ -1,7 +1,7 @@
{
"name": "Angeschlagen",
"type": "effect",
"img": "icons/skills/wounds/injury-pain-body-orange.web",
"img": "icons/skills/wounds/injury-pain-body-orange.webp",
"system": {
"description": "",
"equippable": false,

2
packs/items/kampfzustaende/verwirrt.json
View File

@ -1,5 +1,5 @@
{
"name": "Lahm",
"name": "Verwirrt",
"type": "effect",
"img": "icons/magic/control/silhouette-grow-shrink-blue.webp",
"system": {

12
source/module/actors/M5ModAggregate.ts
View File

@ -130,22 +130,22 @@ export default class M5ModAggregate {
mods = arr.filter((pair) => pair.mod.operation === M5ModOperation.SUBTRACT);
if (mods.length !== 0) {
ret.mods = ret.mods.concat(mods.map(this.pairAsSource));
const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a - b, 0);
ret.value = Math.max(0, ret.value + bonus);
const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0);
ret.value = Math.max(0, ret.value - bonus);
}
mods = arr.filter((pair) => pair.mod.operation === M5ModOperation.MULTIPLY);
if (mods.length !== 0) {
ret.mods = ret.mods.concat(mods.map(this.pairAsSource));
const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a * b, 0);
ret.value = Math.max(0, ret.value + bonus);
const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0);
ret.value = Math.max(0, ret.value * bonus);
}
mods = arr.filter((pair) => pair.mod.operation === M5ModOperation.DIVISION);
if (mods.length !== 0) {
ret.mods = ret.mods.concat(mods.map(this.pairAsSource));
const bonus = mods.map((p) => p.mod.value).reduce((a, b) => Math.floor(a / b), 0);
ret.value = Math.max(0, ret.value + bonus);
const bonus = mods.map((p) => p.mod.value).reduce((a, b) => a + b, 0);
ret.value = Math.max(0, Math.floor(ret.value / bonus));
}
}

3
templates/sheets/partial/mod.hbs
View File

@ -40,6 +40,9 @@
<option value="add">{{localize "midgard5.mod-operation-add"}}</option>
<option value="set">{{localize "midgard5.mod-operation-set"}}</option>
<option value="fixed">{{localize "midgard5.mod-operation-fixed"}}</option>
<option value="subtract">{{localize "midgard5.mod-operation-subtract"}}</option>
<option value="multiply">{{localize "midgard5.mod-operation-multiply"}}</option>
<option value="division">{{localize "midgard5.mod-operation-division"}}</option>
{{/select}}
</select>
</td>