Merge branch 'lefrique' of https://git.byroks.de/Byroks/foundry-vtt-system-midgard5 into lefrique
This commit is contained in:
commit
e71ba08a22
|
|
@ -177,10 +177,6 @@ export interface M5CharacterCalculatedData {
|
||||||
perceptionFW: number;
|
perceptionFW: number;
|
||||||
drinking: M5ModResult;
|
drinking: M5ModResult;
|
||||||
drinkingFW: number;
|
drinkingFW: number;
|
||||||
hoard: number;
|
|
||||||
hoardNext: number;
|
|
||||||
hoardMin: number;
|
|
||||||
wealth: number;
|
|
||||||
};
|
};
|
||||||
skillMods: {};
|
skillMods: {};
|
||||||
skills: {
|
skills: {
|
||||||
|
|
|
||||||
|
|
@ -143,10 +143,6 @@ export class M5Character extends Actor {
|
||||||
ret.stats.perceptionFW = 6;
|
ret.stats.perceptionFW = 6;
|
||||||
ret.stats.drinking = this.modResult(0);
|
ret.stats.drinking = this.modResult(0);
|
||||||
ret.stats.drinkingFW = Math.floor(ret.attributes.ko.value / 10);
|
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 = data.info.gold + data.info.silver/10 + data.info.copper/100 - (data.info.race === "Zwerg" ? (ret.stats.hoardMin) : 0);
|
|
||||||
ret.stats.hoard = ret.stats.wealth + (data.info.race === "Zwerg" ? (ret.stats.hoardMin) : 0);
|
|
||||||
|
|
||||||
if (!skip?.mods) {
|
if (!skip?.mods) {
|
||||||
const aggregate = new M5ModAggregate(data, ret);
|
const aggregate = new M5ModAggregate(data, ret);
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,10 @@
|
||||||
<tr height = 5px></tr>
|
<tr height = 5px></tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align: left;" colspan="4" rowspan="2"><img style="border: 0px solid black;" src="/systems/midgard5/assets/icons/logo/midgard.webp" alt="Midgard"></td>
|
<td style="text-align: left;" colspan="4" rowspan="2"><img style="border: 0px solid black;" src="/systems/midgard5/assets/icons/logo/midgard.webp" alt="Midgard"></td>
|
||||||
<td></td>
|
|
||||||
<td colspan="5" style="font-size: x-large; font-weigh: bold;"><input name="name" type="text" value="{{actor.name}}" data-dtype="String" /></td>
|
<td colspan="5" style="font-size: x-large; font-weigh: bold;"><input name="name" type="text" value="{{actor.name}}" data-dtype="String" /></td>
|
||||||
<td style="font-size: x-large; font-weigh: bold; text-align: center; text-align-vertical: middle;" ><div style="border: 2px solid black; border-radius: 10px; background-color: white;">{{data.calc.level}}</div></td>
|
<td style="font-size: x-large; font-weigh: bold; text-align: center; text-align-vertical: middle;" ><div style="border: 2px solid black; border-radius: 10px; background-color: white;">{{data.calc.level}}</div></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td></td>
|
|
||||||
<td colspan="5"><b>Name</b></td>
|
<td colspan="5"><b>Name</b></td>
|
||||||
<td style="text-align: center;"><b>Grad</b></td>
|
<td style="text-align: center;"><b>Grad</b></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue