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

Converted lots of document access to V10.

Browse Source
This commit is contained in:
mstein
2023-01-02 23:34:00 +01:00
parent c0dd5b584a
commit b104480a48
7 changed files with 123 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/module/actors/M5Character.ts
+55 -55
View File
@@ -77,11 +77,11 @@ export class M5Character extends Actor {
spells: {}
} as M5CharacterCalculatedData
const context = (this as any).data
const context = (this as any)
if (!context)
return null
const data = context.data
const data = (this as any).system
if (!data)
return null
@@ -126,12 +126,12 @@ export class M5Character extends Actor {
if (!skip.mods) {
const aggregate = new M5ModAggregate(data, ret)
context.items?.filter(item => item.data.type === "item").forEach(item => {
const mods = item.data.data.mods
context.items?.filter(item => item.type === "item").forEach(item => {
const mods = item.system.mods
//console.log("Actor item mods", mods)
Object.keys(mods).forEach(modIndex => {
const mod = mods[modIndex] as M5ItemMod
aggregate.push(mod, item.data.name)
aggregate.push(mod, item.name)
})
})
@@ -139,102 +139,102 @@ export class M5Character extends Actor {
}
if (!skip.items) {
context.items?.filter(item => item.data.type === "item").forEach(item => {
context.items?.filter(item => item.type === "item").forEach(item => {
item.prepareDerivedData()
let label = item.data.name
if (item.data.data.magic) {
let label = item.name
if (item.system.magic) {
label += "*"
}
ret.gear.items[item.data._id] = {
ret.gear.items[item.id] = {
label: label,
magic: item.data.data.magic,
calc: item.data.data.calc
magic: item.system.magic,
calc: item.system.calc
}
})
}
if (!skip.skills) {
context.items?.filter(item => item.data.type === "skill").forEach(item => {
context.items?.filter(item => item.type === "skill").forEach(item => {
item.prepareDerivedData()
const skillMap = ret.skills[item.data.data.type]
skillMap[item.data._id] = {
label: item.data.name,
fw: item.data.data.fw,
attribute: item.data.data.attribute,
calc: item.data.data.calc
const skillMap = ret.skills[item.system.type]
skillMap[item.id] = {
label: item.name,
fw: item.system.fw,
attribute: item.system.attribute,
calc: item.system.calc
} as M5SkillCalculated
})
}
if (!skip.weapons) {
context.items?.filter(item => item.data.type === "weapon").forEach(item => {
context.items?.filter(item => item.type === "weapon").forEach(item => {
item.prepareDerivedData()
let label = item.data.name
if (item.data.data.magic) {
let label = item.name
if (item.system.magic) {
label += "*("
+ (item.data.data.stats.attackBonus < 0 ? "" : "+")
+ item.data.data.stats.attackBonus + "/"
+ (item.data.data.stats.damageBonus < 0 ? "" : "+")
+ item.data.data.stats.damageBonus + ")"
+ (item.system.stats.attackBonus < 0 ? "" : "+")
+ item.system.stats.attackBonus + "/"
+ (item.system.stats.damageBonus < 0 ? "" : "+")
+ item.system.stats.damageBonus + ")"
}
ret.gear.weapons[item.data._id] = {
ret.gear.weapons[item.id] = {
label: label,
skillId: item.data.data.skillId,
magic: item.data.data.magic,
calc: item.data.data.calc
skillId: item.system.skillId,
magic: item.system.magic,
calc: item.system.calc
}
})
}
if (!skip.defensiveWeapons) {
context.items?.filter(item => item.data.type === "defensiveWeapon").forEach(item => {
context.items?.filter(item => item.type === "defensiveWeapon").forEach(item => {
item.prepareDerivedData()
let label = item.data.name
if (item.data.data.magic) {
let label = item.name
if (item.system.magic) {
label += "*("
+ (item.data.data.stats.defenseBonus < 0 ? "" : "+")
+ item.data.data.stats.defenseBonus + ")"
+ (item.system.stats.defenseBonus < 0 ? "" : "+")
+ item.system.stats.defenseBonus + ")"
}
ret.gear.defensiveWeapons[item.data._id] = {
ret.gear.defensiveWeapons[item.id] = {
label: label,
skillId: item.data.data.skillId,
magic: item.data.data.magic,
calc: item.data.data.calc
skillId: item.system.skillId,
magic: item.system.magic,
calc: item.system.calc
}
})
}
if (!skip.armor) {
context.items?.filter(item => item.data.type === "armor").forEach(item => {
context.items?.filter(item => item.type === "armor").forEach(item => {
item.prepareDerivedData()
let label = item.data.name
if (item.data.data.magic) {
let label = item.name
if (item.system.magic) {
label += "*"
}
ret.gear.armor[item.data._id] = {
ret.gear.armor[item.id] = {
label: label,
magic: item.data.data.magic,
calc: item.data.data.calc
magic: item.system.magic,
calc: item.system.calc
}
})
}
if (!skip.spells) {
context.items?.filter(item => item.data.type === "spell").forEach(item => {
context.items?.filter(item => item.type === "spell").forEach(item => {
item.prepareDerivedData()
ret.spells[item.data._id] = {
label: item.data.name,
process: "midgard5.spell-process-" + item.data.data.process,
calc: item.data.data.calc
ret.spells[item.id] = {
label: item.name,
process: "midgard5.spell-process-" + item.system.process,
calc: item.system.calc
}
})
}
@@ -243,13 +243,13 @@ export class M5Character extends Actor {
}
prepareDerivedData() {
const context = (this as any).data
context.data.calc = this.derivedData({})
const data = (this as any).system
data.calc = this.derivedData({})
}
override getRollData(): any {
return {
c: (this as any).data.data,
c: (this as any).system,
i: null,
iType: null,
rolls: {},
@@ -305,8 +305,8 @@ export class M5Character extends Actor {
}
attribute(name: string): M5Attribute {
const context = (this as any).data
return context?.data?.attributes[name]
const data = (this as any).system
return data?.attributes[name]
}
createSkill(skillName: string): Promise<M5Item> {
@@ -322,7 +322,7 @@ export class M5Character extends Actor {
}
getItem(itemId: string): any {
if (!(this as any).data?.items)
if (!(this as any).items)
return null
return (this as any).getEmbeddedDocument("Item", itemId)
}