parent
f91c64f91f
commit
ae3381b3d1
|
|
@ -20,6 +20,8 @@
|
|||
"midgard5.fw": "FW",
|
||||
"midgard5.bonus": "Bonus",
|
||||
"midgard5.ew": "EW",
|
||||
"midgard5.pp-short": "PP",
|
||||
"midgard5.pp": "Praxispunkte",
|
||||
|
||||
"midgard5.item-value": "Wert",
|
||||
"midgard5.item-quantity": "Menge",
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import { BooleanField } from "@league-of-foundry-developers/foundry-vtt-types/sr
|
|||
export interface M5Skill {
|
||||
fw: number
|
||||
attribute: string
|
||||
pp: number
|
||||
}
|
||||
|
||||
export interface M5SkillUnlearned extends M5Skill {
|
||||
|
|
|
|||
|
|
@ -136,7 +136,6 @@ export class M5Character extends Actor {
|
|||
})
|
||||
|
||||
ret.skillMods = aggregate.calculate()
|
||||
// TODO apply attribute and stat calculation to ret.
|
||||
}
|
||||
|
||||
if (!skip?.items) {
|
||||
|
|
@ -164,6 +163,7 @@ export class M5Character extends Actor {
|
|||
label: item.name,
|
||||
fw: item.system.fw,
|
||||
attribute: item.system.attribute,
|
||||
pp: item.system.pp,
|
||||
calc: item.system.calc
|
||||
} as M5SkillCalculated
|
||||
})
|
||||
|
|
@ -244,6 +244,7 @@ export class M5Character extends Actor {
|
|||
}
|
||||
|
||||
prepareDerivedData() {
|
||||
console.log("M5Character", "prepareDerivedData")
|
||||
const data = (this as any).system
|
||||
data.calc = this.derivedData({})
|
||||
}
|
||||
|
|
@ -295,9 +296,8 @@ export class M5Character extends Actor {
|
|||
}
|
||||
|
||||
skillBonus(skill: M5Skill, skillName?: string) {
|
||||
const attribute = this.attribute(skill.attribute)
|
||||
let ret = attribute ? M5Character.attributeBonus(attribute) : 0
|
||||
return ret
|
||||
const data = (this as any).system
|
||||
return data.calc?.attributes[skill.attribute]?.bonus ?? 0
|
||||
}
|
||||
|
||||
skillEw(skill: M5Skill, skillName?: string) {
|
||||
|
|
|
|||
|
|
@ -236,17 +236,17 @@ export class M5Item extends Item {
|
|||
return (this as any).getEmbeddedDocument("Item", itemId)
|
||||
}
|
||||
|
||||
override migrateSystemData(): any {
|
||||
const item = (this as any)
|
||||
const data = item.system
|
||||
// migrateSystemData(): any {
|
||||
// const item = (this as any)
|
||||
// const data = item.system
|
||||
|
||||
if (item.type === "spell") {
|
||||
if (typeof data.ap !== "string") {
|
||||
data.ap = Number.isFinite(data.ap) ? "" + data.ap : ""
|
||||
}
|
||||
}
|
||||
// if (item.type === "spell") {
|
||||
// if (typeof data.ap !== "string") {
|
||||
// data.ap = Number.isFinite(data.ap) ? "" + data.ap : ""
|
||||
// }
|
||||
// }
|
||||
|
||||
return super.migrateSystemData()
|
||||
}
|
||||
// return super.migrateSystemData()
|
||||
// }
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ export class M5ItemSheet extends ItemSheet {
|
|||
|
||||
static get defaultOptions() {
|
||||
return mergeObject(super.defaultOptions, {
|
||||
width: 420,
|
||||
height: 240,
|
||||
width: 640,
|
||||
height: 480,
|
||||
classes: ["midgard5", "sheet", "item"]
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
<th>{{localize "midgard5.fw"}}</th>
|
||||
<th>{{localize "midgard5.bonus"}}</th>
|
||||
<th>{{localize "midgard5.ew"}}</th>
|
||||
<th>{{localize "midgard5.pp-short"}}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
|
|
@ -16,6 +17,7 @@
|
|||
<td class="fixed-value">{{skill.fw}}</td>
|
||||
<td class="fixed-value">{{skill.calc.bonus}}</td>
|
||||
<td class="fixed-value">{{skill.calc.ew}}</td>
|
||||
<td class="fixed-value">{{skill.pp}}</td>
|
||||
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td>
|
||||
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
|
||||
</tr>
|
||||
|
|
@ -30,6 +32,7 @@
|
|||
<th>{{localize "midgard5.fw"}}</th>
|
||||
<th>{{localize "midgard5.bonus"}}</th>
|
||||
<th>{{localize "midgard5.ew"}}</th>
|
||||
<th>{{localize "midgard5.pp-short"}}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
|
|
@ -41,6 +44,7 @@
|
|||
<td class="fixed-value">{{skill.fw}}</td>
|
||||
<td class="fixed-value">{{skill.calc.bonus}}</td>
|
||||
<td class="fixed-value">{{skill.calc.ew}}</td>
|
||||
<td class="fixed-value">{{skill.pp}}</td>
|
||||
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td>
|
||||
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
|
||||
</tr>
|
||||
|
|
@ -80,6 +84,7 @@
|
|||
<th>{{localize "midgard5.fw"}}</th>
|
||||
<th>{{localize "midgard5.bonus"}}</th>
|
||||
<th>{{localize "midgard5.ew"}}</th>
|
||||
<th>{{localize "midgard5.pp-short"}}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
|
|
@ -91,6 +96,7 @@
|
|||
<td class="fixed-value">{{skill.fw}}</td>
|
||||
<td class="fixed-value">{{skill.calc.bonus}}</td>
|
||||
<td class="fixed-value">{{skill.calc.ew}}</td>
|
||||
<td class="fixed-value">{{skill.pp}}</td>
|
||||
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td>
|
||||
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
|
||||
</tr>
|
||||
|
|
@ -106,18 +112,20 @@
|
|||
<th>{{localize "midgard5.fw"}}</th>
|
||||
<th>{{localize "midgard5.bonus"}}</th>
|
||||
<th>{{localize "midgard5.ew"}}</th>
|
||||
<th>{{localize "midgard5.pp-short"}}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#each actor.system.skills.general as |skill key|}}
|
||||
{{#each data.skills.general as |skill key|}}
|
||||
<tr data-skill="{{key}}">
|
||||
<td><button class="learn-button">{{localize "midgard5.learn"}}</button></td>
|
||||
<td class="padding">{{localizeMidgard key}}</td>
|
||||
<td class="fixed-value">{{skill.fw}}</td>
|
||||
<td class="fixed-value">{{skillBonus ../actor._id skill}}</td>
|
||||
<td class="fixed-value">{{skillEw ../actor._id skill}}</td>
|
||||
<td class="fixed-value"><input name="data.skills.general.{{key}}.pp" type="text" value="{{skill.pp}}" data-dtype="Number" /></td>
|
||||
<td class="fixed-value"><button class="roll-button roll-general-button"></button></td>
|
||||
<td class="fixed-value"></td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form class="{{cssClass}}" autocomplete="off">
|
||||
<form class="item-sheet {{cssClass}}" autocomplete="off">
|
||||
<header class="sheet-header">
|
||||
<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
|
||||
<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form class="{{cssClass}}" autocomplete="off">
|
||||
<form class="item-sheet {{cssClass}}" autocomplete="off">
|
||||
<header class="sheet-header">
|
||||
<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
|
||||
<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form class="{{cssClass}} m5item-item" autocomplete="off">
|
||||
<form class="item-sheet {{cssClass}} m5item-item" autocomplete="off">
|
||||
<header class="sheet-header">
|
||||
<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
|
||||
<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form class="{{cssClass}}" autocomplete="off">
|
||||
<form class="item-sheet {{cssClass}}" autocomplete="off">
|
||||
<header class="sheet-header">
|
||||
<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
|
||||
<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form class="{{cssClass}}" autocomplete="off">
|
||||
<form class="item-sheet {{cssClass}}" autocomplete="off">
|
||||
<header class="sheet-header">
|
||||
<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
|
||||
<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
|
||||
|
|
@ -26,6 +26,11 @@
|
|||
</td>
|
||||
</tr>
|
||||
{{/unless}}
|
||||
|
||||
<tr>
|
||||
<td>{{localize "midgard5.pp"}}</td>
|
||||
<td><input name="data.pp" type="text" value="{{data.pp}}" data-dtype="Number" /></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form class="{{cssClass}}" autocomplete="off">
|
||||
<form class="item-sheet {{cssClass}}" autocomplete="off">
|
||||
<header class="sheet-header">
|
||||
<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
|
||||
<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form class="{{cssClass}}" autocomplete="off">
|
||||
<form class="item-sheet {{cssClass}}" autocomplete="off">
|
||||
<header class="sheet-header">
|
||||
<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
|
||||
<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
|
||||
|
|
|
|||
Loading…
Reference in New Issue