Merge branch 'develop' into #49-draggable-items

This commit is contained in:
2024-02-24 20:54:06 +01:00
272 changed files with 1868 additions and 9742 deletions
+75 -67
View File
@@ -1,4 +1,4 @@
import { BooleanField } from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/fields.mjs";
import { BooleanField } from '@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/fields.mjs';
export interface M5Skill {
fw: number;
@@ -50,89 +50,94 @@ export interface M5RollResult extends M5RollTemplate {
}
export enum M5ItemType {
SKILL = "skill",
ITEM = "item",
WEAPON = "weapon",
DEFENSIVE_WEAPON = "defensiveWeapon",
ARMOR = "armor",
CONTAINER = "container",
SPELL = "spell",
KAMPFKUNST = "kampfkunst",
EFFECT = "effect",
SKILL = 'skill',
ITEM = 'item',
WEAPON = 'weapon',
DEFENSIVE_WEAPON = 'defensiveWeapon',
ARMOR = 'armor',
CONTAINER = 'container',
SPELL = 'spell',
KAMPFKUNST = 'kampfkunst',
EFFECT = 'effect',
}
export enum M5SkillType {
INNATE = "innate",
GENERAL = "general",
LANGUAGE = "language",
COMBAT = "combat",
INNATE = 'innate',
GENERAL = 'general',
LANGUAGE = 'language',
COMBAT = 'combat',
}
export enum M5EwResult {
TBD = "",
FUMBLE = "roll-ew-result-fumble",
CRITICAL = "roll-ew-result-critical",
HIGH = "roll-ew-result-high",
FAIL = "roll-ew-result-fail",
PASS = "roll-ew-result-pass",
TBD = '',
FUMBLE = 'roll-ew-result-fumble',
CRITICAL = 'roll-ew-result-critical',
HIGH = 'roll-ew-result-high',
FAIL = 'roll-ew-result-fail',
PASS = 'roll-ew-result-pass',
}
export enum M5Attributes {
ST = "st",
GW = "gw",
GS = "gs",
KO = "ko",
IN = "in",
ZT = "zt",
AU = "au",
PA = "pa",
WK = "wk",
ST = 'st',
GW = 'gw',
GS = 'gs',
KO = 'ko',
IN = 'in',
ZT = 'zt',
AU = 'au',
PA = 'pa',
WK = 'wk',
}
export enum M5Stats {
DEFENSE = "defenseBonus",
ATTACK = "attackBonus",
DAMAGE = "damageBonus",
MOVEMENT = "movement",
RESISTANCE_MIND = "resistanceMind",
RESISTANCE_BODY = "resistanceBody",
SPELL_CASTING = "spellCasting",
BRAWL = "brawl",
POISON_RESISTANCE = "poisonResistance",
LP = "lp",
AP = "ap",
PROTECTION_LP = "lpProtection",
PROTECTION_AP = "apProtection",
PERCEPTION = "perception",
DRINKING = "drinking",
HOARD = "hoard",
HOARD_NEXT = "hoardNext",
HOARD_MIN = "hoardMin",
WEALTH = "wealth",
DEFENSE = 'defenseBonus',
ATTACK = 'attackBonus',
DAMAGE = 'damageBonus',
MOVEMENT = 'movement',
RESISTANCE_MIND = 'resistanceMind',
RESISTANCE_BODY = 'resistanceBody',
SPELL_CASTING = 'spellCasting',
BRAWL = 'brawl',
POISON_RESISTANCE = 'poisonResistance',
LP = 'lp',
AP = 'ap',
PROTECTION_LP = 'lpProtection',
PROTECTION_AP = 'apProtection',
PERCEPTION = 'perception',
DRINKING = 'drinking',
HOARD = 'hoard',
HOARD_NEXT = 'hoardNext',
HOARD_MIN = 'hoardMin',
WEALTH = 'wealth',
LOAD = 'load',
HEAVY_LOAD = 'heavyLoad',
LOAD_MAX = 'loadMax',
THRUST_LOAD = 'thrustLoad',
ENCUMBRANCE = 'encumbrance',
}
export enum M5ModType {
ATTRIBUTE = "attribute",
STAT = "stat",
SKILL = "skill",
ATTRIBUTE = 'attribute',
STAT = 'stat',
SKILL = 'skill',
}
export enum M5ModOperation {
ADD_100 = "add100",
ROLL = "roll",
ADD = "add",
SET = "set",
FIXED = "fixed",
MULTIPLY = "multiply",
SUBTRACT = "subtract",
DIVISION = "division",
ADD_100 = 'add100',
ROLL = 'roll',
ADD = 'add',
SET = 'set',
FIXED = 'fixed',
MULTIPLY = 'multiply',
SUBTRACT = 'subtract',
DIVISION = 'division',
}
export enum M5TimeUnit {
ROUND = "round",
MINUTE = "minute",
HOUR = "hour",
LIMITLESS = "limitless",
ROUND = 'round',
MINUTE = 'minute',
HOUR = 'hour',
LIMITLESS = 'limitless',
}
export interface M5ItemMod {
@@ -200,6 +205,11 @@ export interface M5CharacterCalculatedData {
hoardNext: number;
hoardMin: number;
wealth: number;
load: number;
heavyLoad: number;
loadMax: number;
thrustLoad: number;
encumbrance: number;
};
skillMods: {};
skills: {
@@ -221,8 +231,6 @@ export interface M5CharacterCalculatedData {
kampfkuenste: {};
}
export function enumKeys<O extends object, K extends keyof O = keyof O>(
obj: O,
): K[] {
return Object.keys(obj).filter((k) => Number.isNaN(+k)) as K[];
export function enumKeys<O extends object, K extends keyof O = keyof O>(obj: O): K[] {
return Object.keys(obj).filter(k => Number.isNaN(+k)) as K[];
}
+360 -154
View File
@@ -104,6 +104,78 @@ export class M5Character extends Actor {
spells: {},
kampfkuenste: {},
} as M5CharacterCalculatedData;
derivedData(
skip: {
mods?: boolean;
skills?: boolean;
items?: boolean;
spells?: boolean;
effects?: boolean;
containers?: boolean;
kampfkuenste?: boolean;
encumbrance?: boolean;
} = {}
): M5CharacterCalculatedData {
let ret: M5CharacterCalculatedData = {
level: 0,
attributes: {
st: { value: 0, bonus: 0, mods: [] },
gs: { value: 0, bonus: 0, mods: [] },
gw: { value: 0, bonus: 0, mods: [] },
ko: { value: 0, bonus: 0, mods: [] },
in: { value: 0, bonus: 0, mods: [] },
zt: { value: 0, bonus: 0, mods: [] },
au: { value: 0, bonus: 0, mods: [] },
pa: { value: 0, bonus: 0, mods: [] },
wk: { value: 0, bonus: 0, mods: [] },
},
stats: {
lp: { value: 0, mods: [] },
ap: { value: 0, mods: [] },
lpProtection: { value: 0, mods: [] },
apProtection: { value: 0, mods: [] },
defense: { value: 0, mods: [] },
damageBonus: { value: 0, mods: [] },
attackBonus: { value: 0, mods: [] },
defenseBonus: { value: 0, mods: [] },
movement: { value: 0, mods: [] },
resistanceMind: { value: 0, mods: [] },
resistanceBody: { value: 0, mods: [] },
spellCasting: { value: 0, mods: [] },
brawl: { value: 0, mods: [] },
brawlFw: 0,
poisonResistance: { value: 0, mods: [] },
enduranceBonus: 0,
perception: { value: 0, mods: [] },
perceptionFW: 0,
drinking: { value: 0, mods: [] },
drinkingFW: 0,
hoard: 0,
encumbrance: 0,
load: 0,
heavyLoad: 0,
thrustLoad: 0,
loadMax: 0,
},
skillMods: {},
skills: {
innate: {},
general: {},
combat: {},
language: {},
custom: {},
},
gear: {
weapons: {},
defensiveWeapons: {},
armor: {},
items: {},
containers: {},
effects: {},
},
spells: {},
kampfkuenste: {},
} as M5CharacterCalculatedData;
const context = this as any;
if (!context) return null;
@@ -137,65 +209,39 @@ export class M5Character extends Actor {
ret.attributes.pa.bonus = M5Character.attributeBonus(data.attributes.pa);
ret.attributes.wk.bonus = M5Character.attributeBonus(data.attributes.wk);
ret.stats.lp = this.modResult(data.lp);
ret.stats.ap = this.modResult(data.ap);
ret.stats.lpProtection = this.modResult(0);
ret.stats.apProtection = this.modResult(0);
ret.stats.defense = this.modResult(M5Character.defenseFromLevel(ret.level));
ret.stats.damageBonus = this.modResult(
Math.floor(ret.attributes.st.value / 20) +
Math.floor(ret.attributes.gs.value / 30) -
3,
);
ret.stats.attackBonus = this.modResult(ret.attributes.gs.bonus);
ret.stats.defenseBonus = this.modResult(ret.attributes.gw.bonus);
ret.stats.movement = this.modResult(data.movement);
ret.stats.resistanceMind = this.modResult(
(data.info.magicUsing ? 2 : 0) +
ret.stats.defense.value +
(data.info.race === "Mensch"
? ret.attributes.in.bonus
: this.raceBonus(data.info.race)),
);
ret.stats.resistanceBody = this.modResult(
(data.info.magicUsing ? 2 : 1) +
ret.stats.defense.value +
(data.info.race === "Mensch"
? ret.attributes.ko.bonus
: this.raceBonus(data.info.race)),
);
ret.stats.spellCasting = this.modResult(
(data.info.magicUsing
? M5Character.spellCastingFromLevel(ret.level)
: 3) + ret.attributes.zt.bonus,
);
ret.stats.brawl = this.modResult(
Math.floor((ret.attributes.st.value + ret.attributes.gw.value) / 20),
);
ret.stats.brawlFw =
ret.stats.brawl.value +
ret.stats.attackBonus.value +
(data.info.race === "Zwerg" ? 1 : 0);
ret.stats.poisonResistance = this.modResult(
30 + Math.floor(ret.attributes.ko.value / 2),
);
ret.stats.enduranceBonus =
Math.floor(ret.attributes.ko.value / 10) +
Math.floor(ret.attributes.st.value / 20);
ret.stats.perception = this.modResult(0);
ret.stats.perceptionFW = 6;
ret.stats.drinking = this.modResult(0);
ret.stats.drinkingFW = Math.floor(ret.attributes.ko.value / 10);
ret.stats.hoardMin = M5Character.levelThreshold.at(ret.level - 1) / 2;
ret.stats.hoardNext = M5Character.levelThreshold.at(ret.level) / 2;
ret.stats.wealth = parseFloat(
(
data.info.gold +
data.info.silver / 10 +
data.info.copper / 100
).toPrecision(3),
);
ret.stats.hoard = 0;
ret.stats.lp = this.modResult(data.lp);
ret.stats.ap = this.modResult(data.ap);
ret.stats.lpProtection = this.modResult(0);
ret.stats.apProtection = this.modResult(0);
ret.stats.defense = this.modResult(M5Character.defenseFromLevel(ret.level));
ret.stats.damageBonus = this.modResult(Math.floor(ret.attributes.st.value / 20) + Math.floor(ret.attributes.gs.value / 30) - 3);
ret.stats.attackBonus = this.modResult(ret.attributes.gs.bonus);
ret.stats.defenseBonus = this.modResult(ret.attributes.gw.bonus);
ret.stats.movement = this.modResult(data.movement);
ret.stats.resistanceMind = this.modResult(
(data.info.magicUsing ? 2 : 0) + ret.stats.defense.value + (data.info.race === "Mensch" ? ret.attributes.in.bonus : this.raceBonus(data.info.race))
);
ret.stats.resistanceBody = this.modResult(
(data.info.magicUsing ? 2 : 1) + ret.stats.defense.value + (data.info.race === "Mensch" ? ret.attributes.ko.bonus : this.raceBonus(data.info.race))
);
ret.stats.spellCasting = this.modResult((data.info.magicUsing ? M5Character.spellCastingFromLevel(ret.level) : 3) + ret.attributes.zt.bonus);
ret.stats.brawl = this.modResult(Math.floor((ret.attributes.st.value + ret.attributes.gw.value) / 20));
ret.stats.brawlFw = ret.stats.brawl.value + ret.stats.attackBonus.value + (data.info.race === "Zwerg" ? 1 : 0);
ret.stats.poisonResistance = this.modResult(30 + Math.floor(ret.attributes.ko.value / 2));
ret.stats.enduranceBonus = Math.floor(ret.attributes.ko.value / 10) + Math.floor(ret.attributes.st.value / 20);
ret.stats.perception = this.modResult(0);
ret.stats.perceptionFW = 6;
ret.stats.drinking = this.modResult(0);
ret.stats.drinkingFW = Math.floor(ret.attributes.ko.value / 10);
ret.stats.hoardMin = M5Character.levelThreshold.at(ret.level - 1) / 2;
ret.stats.hoardNext = M5Character.levelThreshold.at(ret.level) / 2;
ret.stats.wealth = parseFloat((data.info.gold + data.info.silver / 10 + data.info.copper / 100).toPrecision(3));
ret.stats.hoard = 0;
ret.stats.load = M5Character.loadValue(data.attributes.st);
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 = 0;
if (!skip?.mods) {
const aggregate = new M5ModAggregate(data, ret);
@@ -355,30 +401,85 @@ export class M5Character extends Actor {
.sort((a, b) => a?.sort - b?.sort)
.forEach((item) => {
item.prepareDerivedData();
let label = item.name;
if (item.system.magic) {
label += "*";
}
if (item.system.valuable) {
ret.stats.wealth += parseFloat(this.calculateValue(item.system.value * item.system.quantity, item.system.currency).toPrecision(3));
}
if (item.system.hoarded) {
ret.stats.hoard += parseFloat(this.calculateValue(item.system.value * item.system.quantity, item.system.currency).toPrecision(3));
}
let label = item.name;
if (item.system.magic) {
label +=
"*(" +
(item.system.stats.attackBonus < 0 ? "" : "+") +
item.system.stats.attackBonus +
"/" +
(item.system.stats.damageBonus < 0 ? "" : "+") +
item.system.stats.damageBonus +
")";
}
if (item.system.valuable) {
ret.stats.wealth += this.calculateValue(
item.system.value * item.system.quantity,
item.system.currency,
);
}
if (item.system.hoarded) {
ret.stats.hoard += this.calculateValue(
item.system.value * item.system.quantity,
item.system.currency,
);
}
if (!!item.system.containerId) {
ret.gear.containers[item.system.containerId].weight += parseFloat((item.system.weight * item.system.quantity).toPrecision(4));
if (ret.gear.containers[item.system.containerId].equipped) {
ret.stats.encumbrance += (item.system.weight * item.system.quantity);
}
} else if (item.system.equipped) {
ret.stats.encumbrance += (item.system.weight * item.system.quantity);
}
let icon = item.img;
let rollable = false;
// console.log(item.system.rolls.formulas.map((p) => p.enabled));
for (let key in item.system.rolls.formulas) {
rollable = item.system.rolls.formulas[key]?.enabled;
if (rollable) {
break;
}
}
ret.gear.items[item.id] = {
label: label,
icon: icon,
magic: item.system.magic,
calc: item.system.calc,
equipped: item.system?.equipped,
valuable: item.system?.valuable,
hoarded: item.system?.hoarded,
weight: item.system.weight || 0,
containerId: item.system.containerId || "",
value: item.system.value || 0,
currency: item.system.currency || "",
quantity: item.system.quantity || 0,
rollExist: rollable,
};
});
context.items
?.filter((item) => item.type === "weapon")
.sort((a, b) => a?.sort - b?.sort)
.forEach((item) => {
item.prepareDerivedData();
let label = item.name;
if (item.system.magic) {
label +=
"*(" +
(item.system.stats.attackBonus < 0 ? "" : "+") +
item.system.stats.attackBonus +
"/" +
(item.system.stats.damageBonus < 0 ? "" : "+") +
item.system.stats.damageBonus +
")";
}
if (item.system.valuable) {
ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
}
if (item.system.hoarded) {
ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
}
if (!!item.system.containerId) {
ret.gear.containers[item.system.containerId].weight += item.system.weight;
if (ret.gear.containers[item.system.containerId].equipped) {
ret.stats.encumbrance += item.system.weight;
}
} else if (item.system.equipped) {
ret.stats.encumbrance += item.system.weight || 0;
}
ret.gear.weapons[item.id] = {
label: label,
@@ -404,42 +505,40 @@ export class M5Character extends Actor {
.forEach((item) => {
item.prepareDerivedData();
let label = item.name;
if (item.system.magic) {
label +=
"*(" +
(item.system.stats.defenseBonus < 0 ? "" : "+") +
item.system.stats.defenseBonus +
")";
}
if (item.system.valuable) {
ret.stats.wealth += this.calculateValue(
item.system.value * item.system.quantity,
item.system.currency,
);
}
if (item.system.hoarded) {
ret.stats.hoard += this.calculateValue(
item.system.value * item.system.quantity,
item.system.currency,
);
}
let label = item.name;
if (item.system.magic) {
label += "*(" + (item.system.stats.defenseBonus < 0 ? "" : "+") + item.system.stats.defenseBonus + ")";
}
if (item.system.valuable) {
ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
}
if (item.system.hoarded) {
ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
}
if (!!item.system.containerId) {
ret.gear.containers[item.system.containerId].weight += item.system.weight;
if (ret.gear.containers[item.system.containerId].equipped) {
ret.stats.encumbrance += item.system.weight;
}
} else if (item.system.equipped) {
ret.stats.encumbrance += item.system.weight || 0;
}
ret.gear.defensiveWeapons[item.id] = {
label: label,
skillId: item.system.skillId,
magic: item.system.magic,
valuable: item.system?.valuable,
hoarded: item.system?.hoarded,
value: item.system.value || 0,
currency: item.system.currency || "",
defenseBonus: item.system.stats.defenseBonus,
calc: item.system.calc,
equipped: item.system?.equipped,
containerId: item.system.containerId || "",
};
});
}
ret.gear.defensiveWeapons[item.id] = {
label: label,
skillId: item.system.skillId,
magic: item.system.magic,
valuable: item.system?.valuable,
hoarded: item.system?.hoarded,
value: item.system.value || 0,
currency: item.system.currency || "",
defenseBonus: item.system.stats.defenseBonus,
calc: item.system.calc,
equipped: item.system?.equipped,
weight: item.system.weight || 0,
containerId: item.system.containerId || "",
};
});
if (!skip?.armor) {
context.items
@@ -448,37 +547,132 @@ export class M5Character extends Actor {
.forEach((item) => {
item.prepareDerivedData();
let label = item.name;
if (item.system.magic) {
label += "*";
}
if (item.system.valuable) {
ret.stats.wealth += this.calculateValue(
item.system.value * item.system.quantity,
item.system.currency,
);
}
if (item.system.hoarded) {
ret.stats.hoard += this.calculateValue(
item.system.value * item.system.quantity,
item.system.currency,
);
}
let label = item.name;
if (item.system.magic) {
label += "*";
}
if (item.system.valuable) {
ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
}
if (item.system.hoarded) {
ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
}
if (!!item.system.containerId) {
ret.gear.containers[item.system.containerId].weight += item.system.weight;
if (ret.gear.containers[item.system.containerId].equipped) {
ret.stats.encumbrance += item.system.weight;
}
} else if (item.system.equipped) {
ret.stats.encumbrance += 0;
} else {
ret.stats.encumbrance += item.system.weight || 0;
}
ret.gear.armor[item.id] = {
label: label,
magic: item.system.magic,
valuable: item.system?.valuable,
hoarded: item.system?.hoarded,
value: item.system.value || 0,
currency: item.system.currency || "",
lpProtection: item.system.lpProtection,
calc: item.system.calc,
equipped: item.system?.equipped,
containerId: item.system.containerId || "",
};
});
}
ret.gear.armor[item.id] = {
label: label,
magic: item.system.magic,
valuable: item.system?.valuable,
hoarded: item.system?.hoarded,
value: item.system.value || 0,
currency: item.system.currency || "",
lpProtection: item.system.lpProtection,
calc: item.system.calc,
equipped: item.system?.equipped,
weight: item.system.weight || 0,
containerId: item.system.containerId || "",
};
});
if (!skip?.encumbrance) {
const item = context.items.filter((x) => x.name === "Belastung");
if (ret.stats.encumbrance > ret.stats.heavyLoad) {
if (item.length === 0) {
this.createEffect("Belastung", [{ id: "movement", operation: M5ModOperation.DIVISION, type: M5ModType.STAT, value: 2 }]);
} else if (item.length === 1) {
item[0].update({
data: {
equipped: true,
},
});
} else if (item.length === 2) {
item[1]?.delete();
}
} else if (ret.stats.encumbrance <= ret.stats.heavyLoad) {
if (item.length === 1) {
item[0].update({
data: {
equipped: false,
},
});
}
}
}
if (!skip?.encumbrance) {
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 wurde überschritten: 1 AP Schaden durch Belastung alle 10 Minuten abziehen!`;
let chatData = {
speaker: ChatMessage.getSpeaker({actor: Actor.name}),
content: messageContent,
};
ChatMessage.create(chatData, {});
ui.notifications.warn(messageContent);
this.createEffect("Höchstlast", [{ id: "ap", operation: M5ModOperation.SUBTRACT, type: M5ModType.STAT, value: 1 }]);
} else if (item.length === 2) {
item[1]?.delete();
} else if (item.length === 1) {
item[0].update({
data: {
equipped: true,
},
});
}
} else if (ret.stats.encumbrance < ret.stats.loadMax) {
if (item.length === 1) {
item[0]?.delete();
}
}
}
}
if (!skip?.effects) {
context.items
?.filter((item) => item.type === "effect")
.forEach((item) => {
item.prepareDerivedData();
let label = item.name;
if (item.system.magic) {
label += "*";
}
ret.gear.effects[item.id] = {
label: label,
magic: item.system.magic,
calc: item.system.calc,
equipped: item.system?.equipped || false,
duration: item.system?.duration || { time: 0, unit: "" },
};
});
}
if (!skip?.skills) {
context.items
?.filter((item) => item.type === "skill")
.forEach((item) => {
item.prepareDerivedData();
const skillMap = ret.skills[item.system.type];
skillMap[item.id] = {
label: item.name,
fw: item.system.fw,
attribute: item.system.attribute,
pp: item.system.pp,
calc: item.system.calc,
} as M5SkillCalculated;
});
}
if (!skip?.spells) {
context.items
@@ -639,13 +833,25 @@ export class M5Character extends Actor {
data: options,
};
return (this as any)
.createEmbeddedDocuments("Item", [itemData])
.then((docs) => {
const item = docs[0];
return item;
});
}
return (this as any).createEmbeddedDocuments("Item", [itemData]).then((docs) => {
const item = docs[0];
return item;
});
}
async createEffect(itemName: string, mods: M5ItemMod[]): Promise<M5Item> {
const itemData = {
name: itemName,
type: "effect",
system: { mods: mods, equipped: true },
};
return (this as any).createEmbeddedDocuments("Item", [itemData]).then((docs) => {
const item = docs[0];
return item;
});
}
getItem(itemId: string): any {
if (!(this as any).items) return null;
+123 -192
View File
@@ -1,26 +1,21 @@
import Logger from "../../utils/Logger";
import { M5Character } from "../actors/M5Character";
import { M5Item } from "../items/M5Item";
import {
M5ItemType,
M5SkillLearned,
M5SkillType,
M5SkillUnlearned,
} from "../M5Base";
import { M5Roll } from "../rolls/M5Roll";
import Logger from '../../utils/Logger';
import { M5Character } from '../actors/M5Character';
import { M5Item } from '../items/M5Item';
import { M5ItemType, M5SkillLearned, M5SkillType, M5SkillUnlearned } from '../M5Base';
import { M5Roll } from '../rolls/M5Roll';
export default class M5CharacterSheet extends ActorSheet {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
template: "systems/midgard5/templates/sheets/character/main.hbs",
template: 'systems/midgard5/templates/sheets/character/main.hbs',
width: 1000,
height: 800,
classes: ["midgard5", "sheet", "character"],
classes: ['midgard5', 'sheet', 'character'],
tabs: [
{
navSelector: ".sheet-navigation",
contentSelector: ".sheet-content",
initial: "base_values",
navSelector: '.sheet-navigation',
contentSelector: '.sheet-content',
initial: 'base_values',
},
],
});
@@ -31,13 +26,11 @@ export default class M5CharacterSheet extends ActorSheet {
// }Options extends ActorSheet.Options = ActorSheet.Options, Data extends object = ActorSheet.Data<Options>
override getData(
options?: Partial<ActorSheet.Options>,
):
| ActorSheet.Data<ActorSheet.Options>
| Promise<ActorSheet.Data<ActorSheet.Options>> {
options?: Partial<ActorSheet.Options>
): ActorSheet.Data<ActorSheet.Options> | Promise<ActorSheet.Data<ActorSheet.Options>> {
const actor = this.actor as M5Character;
//console.log("Sheet getData", (actor as any).data)
return Promise.resolve(super.getData(options)).then((context) => {
return Promise.resolve(super.getData(options)).then(context => {
actor.prepareDerivedData();
context.actor = (actor as any).toObject(false);
@@ -50,16 +43,16 @@ export default class M5CharacterSheet extends ActorSheet {
override setPosition(options = {}) {
const position = super.setPosition(options);
const fillerWidth = this.element.find(".attributes .filler:first").width();
this.element.find(".attributes .attribute-filler-fixed").width(fillerWidth);
const fillerWidth = this.element.find('.attributes .filler:first').width();
this.element.find('.attributes .attribute-filler-fixed').width(fillerWidth);
return position;
}
override activateListeners(html: JQuery) {
super.activateListeners(html);
html.find(".update-lp").on("click", async (event) => {
const valueStr = event.target.dataset["value"];
html.find('.update-lp').on('click', async event => {
const valueStr = event.target.dataset['value'];
const value = parseInt(valueStr);
this.actor.update({
data: {
@@ -70,8 +63,8 @@ export default class M5CharacterSheet extends ActorSheet {
});
});
html.find(".update-ap").on("click", async (event) => {
const valueStr = event.target.dataset["value"];
html.find('.update-ap').on('click', async event => {
const valueStr = event.target.dataset['value'];
const value = parseInt(valueStr);
this.actor.update({
data: {
@@ -82,31 +75,27 @@ export default class M5CharacterSheet extends ActorSheet {
});
});
html.find(".roll-attribute-button").on("click", async (event) => {
let target = event.target.closest("[data-attribute]") as HTMLElement;
html.find('.roll-attribute-button').on('click', async event => {
let target = event.target.closest('[data-attribute]') as HTMLElement;
let attributeValue = target ? parseInt(target.dataset.value) : null;
let attributeStr = target ? target.dataset.attribute : null;
const roll = M5Roll.fromAttributeValue(
this.actor,
attributeStr,
attributeValue,
);
const roll = M5Roll.fromAttributeValue(this.actor, attributeStr, attributeValue);
await roll.toMessage();
});
html.find(".edit-item").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.edit-item').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let itemId = target ? target.dataset.itemId : null;
const context = this.actor as any;
const item = context.items.get(itemId);
console.log("edit-item", item);
console.log('edit-item', item);
item.sheet.render(true);
});
html.find(".quantity-increase").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.quantity-increase').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let itemId = target ? target.dataset.itemId : null;
const context = this.actor as any;
@@ -122,8 +111,8 @@ export default class M5CharacterSheet extends ActorSheet {
this.render();
});
html.find(".quantity-decrease").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.quantity-decrease').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let itemId = target ? target.dataset.itemId : null;
const context = this.actor as any;
@@ -138,8 +127,8 @@ export default class M5CharacterSheet extends ActorSheet {
this.render();
});
html.find(".roll-consumable-item").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.roll-consumable-item').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let itemId = target ? target.dataset.itemId : null;
const context = this.actor as any;
@@ -156,8 +145,8 @@ export default class M5CharacterSheet extends ActorSheet {
this.render();
});
html.find(".item-delete").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.item-delete').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let itemId = target ? target.dataset.itemId : null;
const context = this.actor as any;
@@ -166,8 +155,8 @@ export default class M5CharacterSheet extends ActorSheet {
this.render(false);
});
html.find(".roll-learned-button").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.roll-learned-button').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let skillId = target ? target.dataset.itemId : null;
const actor = this.actor as any;
@@ -175,46 +164,40 @@ export default class M5CharacterSheet extends ActorSheet {
await item.roll();
});
html.find(".roll-general-button").on("click", async (event) => {
let target = event.target.closest("[data-skill]") as HTMLElement;
html.find('.roll-general-button').on('click', async event => {
let target = event.target.closest('[data-skill]') as HTMLElement;
let skillName = target ? target.dataset.itemId : null;
const data = this.actor.system;
const unlearnedSkill = data.skills.general[skillName] as M5SkillUnlearned;
const roll = M5Roll.fromUnlearnedSkill(
this.actor,
unlearnedSkill,
skillName,
);
const roll = M5Roll.fromUnlearnedSkill(this.actor, unlearnedSkill, skillName);
await roll.toMessage();
});
html.find(".learn-button").on("click", async (event) => {
let target = event.target.closest("[data-skill]") as HTMLElement;
html.find('.learn-button').on('click', async event => {
let target = event.target.closest('[data-skill]') as HTMLElement;
let skillName = target ? target.dataset.itemId : null;
const data = this.actor.system;
const unlearnedSkill = data.skills.general[skillName] as M5SkillUnlearned;
const character = this.actor as M5Character;
character
.createSkill((game as Game).i18n.localize("midgard5." + skillName))
.then((skill) => {
const item = skill as any;
item.update({
data: {
fw: unlearnedSkill.initial,
attribute: unlearnedSkill.attribute,
skill: skillName,
type: "general",
},
});
character.createSkill((game as Game).i18n.localize('midgard5.' + skillName)).then(skill => {
const item = skill as any;
item.update({
data: {
fw: unlearnedSkill.initial,
attribute: unlearnedSkill.attribute,
skill: skillName,
type: 'general',
},
});
});
});
html.find(".roll-weapon-button").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.roll-weapon-button').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let itemId = target ? target.dataset.itemId : null;
const context = this.actor as any;
@@ -223,38 +206,38 @@ export default class M5CharacterSheet extends ActorSheet {
this.render();
});
html.find(".roll-brawl-button").on("click", async (event) => {
html.find('.roll-brawl-button').on('click', async event => {
const roll = M5Roll.brawl(this.actor);
await roll.toMessage();
});
html.find(".roll-perception-button").on("click", async (event) => {
html.find('.roll-perception-button').on('click', async event => {
const roll = M5Roll.perception(this.actor);
await roll.toMessage();
});
html.find(".roll-drinking-button").on("click", async (event) => {
html.find('.roll-drinking-button').on('click', async event => {
const roll = M5Roll.drinking(this.actor);
await roll.toMessage();
});
html.find(".roll-defense-button").on("click", async (event) => {
html.find('.roll-defense-button').on('click', async event => {
const roll = M5Roll.defense(this.actor);
await roll.toMessage();
});
html.find(".roll-resistanceMind-button").on("click", async (event) => {
html.find('.roll-resistanceMind-button').on('click', async event => {
const roll = M5Roll.resistanceMind(this.actor);
await roll.toMessage();
});
html.find(".roll-resistanceBody-button").on("click", async (event) => {
html.find('.roll-resistanceBody-button').on('click', async event => {
const roll = M5Roll.resistanceBody(this.actor);
await roll.toMessage();
});
html.find(".change-equipped").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement;
html.find('.change-equipped').on('click', async event => {
let target = event.target.closest('[data-item-id]') as HTMLElement;
let itemId = target ? target.dataset.itemId : null;
const context = this.actor as any;
@@ -268,145 +251,107 @@ export default class M5CharacterSheet extends ActorSheet {
this.render();
});
html.find(".add-item").on("click", async (event) => {
html.find('.add-item').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.item"),
M5ItemType.ITEM,
{ quantity: 1 },
);
character.createItem((game as Game).i18n.localize('TYPES.Item.item'), M5ItemType.ITEM, { quantity: 1 });
});
html.find(".add-weapon").on("click", async (event) => {
html.find('.add-weapon').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.weapon"),
M5ItemType.WEAPON,
);
character.createItem((game as Game).i18n.localize('TYPES.Item.weapon'), M5ItemType.WEAPON);
});
html.find(".add-defensiveWeapon").on("click", async (event) => {
html.find('.add-defensiveWeapon').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.defensiveWeapon"),
M5ItemType.DEFENSIVE_WEAPON,
);
character.createItem((game as Game).i18n.localize('TYPES.Item.defensiveWeapon'), M5ItemType.DEFENSIVE_WEAPON);
});
html.find(".add-armor").on("click", async (event) => {
html.find('.add-armor').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.armor"),
M5ItemType.ARMOR,
);
character.createItem((game as Game).i18n.localize('TYPES.Item.armor'), M5ItemType.ARMOR);
});
html.find(".add-container").on("click", async (event) => {
html.find('.add-container').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.container"),
M5ItemType.CONTAINER,
{ quantity: 1 },
);
character.createItem((game as Game).i18n.localize('TYPES.Item.container'), M5ItemType.CONTAINER, { quantity: 1 });
});
html.find(".add-innate-skill").on("click", async (event) => {
html.find('.add-innate-skill').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("midgard5.innate-ability"),
M5ItemType.SKILL,
{ type: M5SkillType.INNATE },
);
character.createItem((game as Game).i18n.localize('midgard5.innate-ability'), M5ItemType.SKILL, {
type: M5SkillType.INNATE,
});
});
html.find(".add-general-skill").on("click", async (event) => {
html.find('.add-general-skill').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.skill"),
M5ItemType.SKILL,
{ type: M5SkillType.GENERAL },
);
character.createItem((game as Game).i18n.localize('TYPES.Item.skill'), M5ItemType.SKILL, {
type: M5SkillType.GENERAL,
});
});
html.find(".add-combat-skill").on("click", async (event) => {
html.find('.add-combat-skill').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("midgard5.weapon-skill"),
M5ItemType.SKILL,
{ type: M5SkillType.COMBAT },
);
character.createItem((game as Game).i18n.localize('midgard5.weapon-skill'), M5ItemType.SKILL, {
type: M5SkillType.COMBAT,
});
});
html.find(".add-language-skill").on("click", async (event) => {
html.find('.add-language-skill').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("midgard5.language"),
M5ItemType.SKILL,
{ type: M5SkillType.LANGUAGE },
);
character.createItem((game as Game).i18n.localize('midgard5.language'), M5ItemType.SKILL, {
type: M5SkillType.LANGUAGE,
});
});
html.find(".add-spell").on("click", async (event) => {
html.find('.add-spell').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.spell"),
M5ItemType.SPELL,
{ process: "none" },
);
character.createItem((game as Game).i18n.localize('TYPES.Item.spell'), M5ItemType.SPELL, { process: 'none' });
});
html.find(".add-kampfkunst").on("click", async (event) => {
html.find('.add-kampfkunst').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.kampfkunst"),
M5ItemType.KAMPFKUNST,
{
type: "angriff",
variante: "anstuermen",
},
);
character.createItem((game as Game).i18n.localize('TYPES.Item.kampfkunst'), M5ItemType.KAMPFKUNST, {
type: 'angriff',
variante: 'anstuermen',
});
});
html.find(".add-effect").on("click", async (event) => {
html.find('.add-effect').on('click', async event => {
const data = this.actor.system;
const character = this.actor as M5Character;
character.createItem(
(game as Game).i18n.localize("TYPES.Item.effect"),
M5ItemType.EFFECT,
);
character.createItem((game as Game).i18n.localize('TYPES.Item.effect'), M5ItemType.EFFECT);
});
html.find(".join-combat").on("click", async (event) => {
if (!!game["combat"]) {
let combatant = game["combat"].getCombatantByActor(this.actor._id);
html.find('.join-combat').on('click', async event => {
if (!!game['combat']) {
let combatant = game['combat'].getCombatantByActor(this.actor._id);
if (!combatant) {
await game["combat"].createEmbeddedDocuments("Combatant", [
{ actorId: this.actor._id },
]);
combatant = game["combat"].getCombatantByActor(this.actor._id);
await game['combat'].createEmbeddedDocuments('Combatant', [{ actorId: this.actor._id }]);
combatant = game['combat'].getCombatantByActor(this.actor._id);
}
const initiatives = {
@@ -414,20 +359,16 @@ export default class M5CharacterSheet extends ActorSheet {
initiative: this.actor.system.calc.attributes.gw.value,
};
await game["combat"].updateEmbeddedDocuments("Combatant", [
initiatives,
]);
await game['combat'].updateEmbeddedDocuments('Combatant', [initiatives]);
}
});
html.find(".ranged-combat").on("click", async (event) => {
if (!!game["combat"]) {
let combatant = game["combat"].getCombatantByActor(this.actor._id);
html.find('.ranged-combat').on('click', async event => {
if (!!game['combat']) {
let combatant = game['combat'].getCombatantByActor(this.actor._id);
if (!combatant) {
await game["combat"].createEmbeddedDocuments("Combatant", [
{ actorId: this.actor._id },
]);
combatant = game["combat"].getCombatantByActor(this.actor._id);
await game['combat'].createEmbeddedDocuments('Combatant', [{ actorId: this.actor._id }]);
combatant = game['combat'].getCombatantByActor(this.actor._id);
}
const initiatives = {
@@ -435,20 +376,16 @@ export default class M5CharacterSheet extends ActorSheet {
initiative: 0.01 * this.actor.system.calc.attributes.gw.value,
};
await game["combat"].updateEmbeddedDocuments("Combatant", [
initiatives,
]);
await game['combat'].updateEmbeddedDocuments('Combatant', [initiatives]);
}
});
html.find(".spell-combat").on("click", async (event) => {
if (!!game["combat"]) {
let combatant = game["combat"].getCombatantByActor(this.actor._id);
html.find('.spell-combat').on('click', async event => {
if (!!game['combat']) {
let combatant = game['combat'].getCombatantByActor(this.actor._id);
if (!combatant) {
await game["combat"].createEmbeddedDocuments("Combatant", [
{ actorId: this.actor._id },
]);
combatant = game["combat"].getCombatantByActor(this.actor._id);
await game['combat'].createEmbeddedDocuments('Combatant', [{ actorId: this.actor._id }]);
combatant = game['combat'].getCombatantByActor(this.actor._id);
}
const initiatives = {
@@ -456,15 +393,13 @@ export default class M5CharacterSheet extends ActorSheet {
initiative: 0.001 * this.actor.system.calc.attributes.gw.value,
};
await game["combat"].updateEmbeddedDocuments("Combatant", [
initiatives,
]);
await game['combat'].updateEmbeddedDocuments('Combatant', [initiatives]);
}
});
// Drag & Drop
const dragDrop = new DragDrop({
dragSelector: ".items-list .item",
dragSelector: '.items-list .item',
dropSelector: null,
permissions: {
dragstart: this._canDragStart.bind(this),
@@ -488,12 +423,12 @@ export default class M5CharacterSheet extends ActorSheet {
_onTransferItemDragStart(event) {
const li = event.target;
$(event.target).attr("data-item-actorid", this.actor.id);
$(event.target).attr('data-item-actorid', this.actor.id);
const item = this.actor.items.get(li.dataset.itemId);
console.log(item);
const dragData = {
type: "Transfer",
type: 'Transfer',
actorId: this.actor.id,
data: item.toObject(false),
tokenId: null,
@@ -501,15 +436,15 @@ export default class M5CharacterSheet extends ActorSheet {
if (this.actor.isToken) dragData.tokenId = this.actor.token.id;
event.dataTransfer.setData("text/plain", JSON.stringify(dragData));
event.dataTransfer.setData('text/plain', JSON.stringify(dragData));
}
async _onTransferItemDrop(event) {
// Try to extract the data
let data = null;
try {
data = JSON.parse(event.dataTransfer.getData("text/plain"));
if (data.type !== "Transfer") return false;
data = JSON.parse(event.dataTransfer.getData('text/plain'));
if (data.type !== 'Transfer') return false;
} catch (err) {
return false;
}
@@ -521,21 +456,17 @@ export default class M5CharacterSheet extends ActorSheet {
}
// limit transfer on personal weapons/armour/gear
if (
["item", "weapon", "defensiveWeapon", "armor", "container"].includes(
data.data.type,
)
) {
if (['item', 'weapon', 'defensiveWeapon', 'armor', 'container'].includes(data.data.type)) {
try {
this.actor.createEmbeddedDocuments("Item", [duplicate(data.data)]); // Create a new Item
this.actor.createEmbeddedDocuments('Item', [duplicate(data.data)]); // Create a new Item
const actor = (game as any).actors.get(data.actorId);
await actor.items.get(data.data._id)?.delete(); // Delete originating item from other actor
} catch (e) {
console.error("Error transfering item between actors", e);
console.error('Error transfering item between actors', e);
return false;
}
} else {
ui.notifications.warn("Nur Gegenstände können übertragen werden.");
ui.notifications.warn('Nur Gegenstände können übertragen werden.');
return false;
}
+1 -5
View File
@@ -9,11 +9,7 @@
"verified": "11",
"maximum": "11"
},
"authors": [
{ "name": "Byroks" },
{ "name": "Le-Frique" },
{ "name": "Oskaloq" }
],
"authors": [{ "name": "Byroks" }, { "name": "Le-Frique" }, { "name": "Oskaloq" }],
"scripts": ["bundle.js"],
"styles": ["bundle.css"],
"packs": [