Revert "Merge branch 'develop' into lasten"
This reverts commit365f06575e, reversing changes made to60c7a97ffe.
This commit is contained in:
@@ -90,16 +90,6 @@ Hooks.once("init", async () => {
|
||||
return label.toLowerCase().includes(contains.toLowerCase());
|
||||
});
|
||||
|
||||
Handlebars.registerHelper("count", (object: any) => {
|
||||
var length = 0;
|
||||
for( var key in object ) {
|
||||
if( object.hasOwnProperty(key) ) {
|
||||
++length;
|
||||
}
|
||||
}
|
||||
return length;
|
||||
});
|
||||
|
||||
// Default Sheet für Items definieren und das Standardsheet deaktivieren
|
||||
Items.unregisterSheet("core", ItemSheet);
|
||||
Items.registerSheet("midgard5", M5ItemSheet, { makeDefault: true });
|
||||
|
||||
@@ -240,51 +240,6 @@ export class M5Character extends Actor {
|
||||
ret.skillMods = aggregate.calculate();
|
||||
}
|
||||
|
||||
if (!skip?.items) {
|
||||
context.items
|
||||
?.filter((item) => item.type === "item")
|
||||
.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 icon = item.img;
|
||||
let rollable = false;
|
||||
|
||||
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,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
if (!skip?.containers) {
|
||||
context.items
|
||||
?.filter((item) => item.type === "container")
|
||||
@@ -393,10 +348,10 @@ export class M5Character extends Actor {
|
||||
")";
|
||||
}
|
||||
if (item.system.valuable) {
|
||||
ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
|
||||
ret.stats.wealth += this.calculateValue(item.system.value, item.system.currency);
|
||||
}
|
||||
if (item.system.hoarded) {
|
||||
ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
|
||||
ret.stats.hoard += item.system.value || 0;
|
||||
}
|
||||
if (!!item.system.containerId) {
|
||||
ret.gear.containers[item.system.containerId].weight += item.system.weight;
|
||||
@@ -414,7 +369,6 @@ export class M5Character extends Actor {
|
||||
valuable: item.system?.valuable,
|
||||
hoarded: item.system?.hoarded,
|
||||
value: item.system.value || 0,
|
||||
currency: item.system.currency || "",
|
||||
calc: item.system.calc,
|
||||
special: item.system.special,
|
||||
damageBase: item.system.damageBase,
|
||||
@@ -433,12 +387,20 @@ export class M5Character extends Actor {
|
||||
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);
|
||||
ret.stats.wealth += this.calculateValue(item.system.value, item.system.currency);
|
||||
}
|
||||
if (item.system.hoarded) {
|
||||
ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
|
||||
ret.stats.hoard += item.system.value || 0;
|
||||
}
|
||||
|
||||
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,
|
||||
@@ -446,7 +408,6 @@ export class M5Character extends Actor {
|
||||
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,
|
||||
@@ -464,10 +425,10 @@ export class M5Character extends Actor {
|
||||
label += "*";
|
||||
}
|
||||
if (item.system.valuable) {
|
||||
ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
|
||||
ret.stats.wealth += this.calculateValue(item.system.value, item.system.currency);
|
||||
}
|
||||
if (item.system.hoarded) {
|
||||
ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
|
||||
ret.stats.hoard += item.system.value || 0;
|
||||
}
|
||||
if (!!item.system.containerId) {
|
||||
ret.gear.containers[item.system.containerId].weight += item.system.weight;
|
||||
@@ -486,7 +447,6 @@ export class M5Character extends Actor {
|
||||
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,
|
||||
|
||||
@@ -11,41 +11,38 @@
|
||||
|
||||
.flexcolumn {
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.flexcolumn-1 {
|
||||
flex-basis: 100%;
|
||||
flex: 100%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-2 {
|
||||
flex-basis: 50%;
|
||||
flex: 50%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-3 {
|
||||
flex-basis: 33%;
|
||||
flex: 33%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-4 {
|
||||
flex-basis: 25%;
|
||||
flex: 25%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-5 {
|
||||
flex-basis: 20%;
|
||||
flex: 20%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexpart {
|
||||
gap: 0;
|
||||
padding: 0;
|
||||
margin: 2px;
|
||||
margin: 5px;
|
||||
background-color: beige;
|
||||
border-collapse: separate;
|
||||
border-radius: 10px;
|
||||
border: 2px solid black;
|
||||
}
|
||||
|
||||
@@ -68,15 +65,10 @@
|
||||
|
||||
h3 {
|
||||
padding: 0.5rem 0.5rem 0.5rem 0.5rem;
|
||||
margin-top: 0.5rem;
|
||||
margin-bottom: 0;
|
||||
text-align: left;
|
||||
font-weight: bold;
|
||||
background-color: #eeede0;
|
||||
color: black;
|
||||
border-collapse: separate;
|
||||
border: 2px solid black;
|
||||
border-radius: 10px;
|
||||
background-color: dimgray;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.profile-img {
|
||||
@@ -254,8 +246,7 @@
|
||||
padding: 1px;
|
||||
//align-items: stretch;
|
||||
|
||||
input,
|
||||
.max-value {
|
||||
input {
|
||||
flex: 0 0 2rem;
|
||||
text-align: center;
|
||||
height: 100%;
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@
|
||||
"name": "midgard5",
|
||||
"title": "Midgard 5. Edition",
|
||||
"description": "The German RPG Midgard 5. Edition",
|
||||
"version": "2.4.2",
|
||||
"version": "2.4.0",
|
||||
"compatibility": {
|
||||
"minimum": "10",
|
||||
"verified": "11",
|
||||
@@ -158,8 +158,8 @@
|
||||
"primaryTokenAttribute": "lp",
|
||||
"secondaryTokenAttribute": "ap",
|
||||
"url": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5",
|
||||
"manifest": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.2/system.json",
|
||||
"download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.2/midgard5-v2.4.2.zip",
|
||||
"manifest": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.0/system.json",
|
||||
"download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.0/midgard5-v2.4.0.zip",
|
||||
"initiative": "@c.calc.attributes.gw.value",
|
||||
"license": "LICENSE.txt"
|
||||
}
|
||||
Reference in New Issue
Block a user