Fixing Branch Update

+ Merged develop and solved merge conflicts
+ Added missing weight after update
+ Cleaned up not neaded parseFloat
This commit is contained in:
2024-02-23 17:37:42 +01:00
parent 1888e201e5
commit 17936bcd83
2 changed files with 31 additions and 104 deletions
+3 -3
View File
@@ -204,7 +204,7 @@ export class M5Character extends Actor {
ret.stats.heavyLoad = M5Character.heavyLoadValue(data.attributes.st);
ret.stats.loadMax = M5Character.maxLoadValue(data.attributes.st);
ret.stats.thrustLoad = M5Character.thrustLoadValue(data.attributes.st);
ret.stats.encumbrance = parseFloat((0).toPrecision(4));
ret.stats.encumbrance = 0;
if (!skip?.mods) {
const aggregate = new M5ModAggregate(data, ret);
@@ -472,9 +472,9 @@ export class M5Character extends Actor {
const item = context.items.filter((x) => x.name === "Höchstlast");
if (ret.stats.encumbrance > ret.stats.loadMax) {
if (item.length === 0) {
let messageContent = `Höchstlast von ${M5Character.name} überschritten: 1 AP Schaden durch Belastung alle 10 Minuten abziehen!`;
let messageContent = `Höchstlast wurde überschritten: 1 AP Schaden durch Belastung alle 10 Minuten abziehen!`;
let chatData = {
speaker: ChatMessage.getSpeaker({actor: M5Character.name}),
speaker: ChatMessage.getSpeaker({actor: Actor.name}),
content: messageContent,
};
ChatMessage.create(chatData, {});