Merge branch 'develop'
This commit is contained in:
@@ -90,6 +90,16 @@ 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 });
|
||||
|
||||
@@ -187,9 +187,8 @@ export class M5Character extends Actor {
|
||||
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;
|
||||
rollable = item.system.rolls.formulas[key]?.enabled;
|
||||
if (rollable) {
|
||||
break;
|
||||
}
|
||||
@@ -226,9 +225,8 @@ export class M5Character extends Actor {
|
||||
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;
|
||||
rollable = item.system.rolls.formulas[key]?.enabled;
|
||||
if (rollable) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -11,38 +11,41 @@
|
||||
|
||||
.flexcolumn {
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.flexcolumn-1 {
|
||||
flex: 100%;
|
||||
flex-basis: 100%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-2 {
|
||||
flex: 50%;
|
||||
flex-basis: 50%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-3 {
|
||||
flex: 33%;
|
||||
flex-basis: 33%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-4 {
|
||||
flex: 25%;
|
||||
flex-basis: 25%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexcolumn-5 {
|
||||
flex: 20%;
|
||||
flex-basis: 20%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.flexpart {
|
||||
gap: 0;
|
||||
padding: 0;
|
||||
margin: 5px;
|
||||
margin: 2px;
|
||||
background-color: beige;
|
||||
border-collapse: separate;
|
||||
border-radius: 10px;
|
||||
border: 2px solid black;
|
||||
}
|
||||
|
||||
@@ -65,10 +68,24 @@
|
||||
|
||||
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: dimgray;
|
||||
color: white;
|
||||
background-color: #eeede0;
|
||||
color: black;
|
||||
border-collapse: separate;
|
||||
border: 2px solid black;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.profile-img {
|
||||
display: block;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
height: 100%;
|
||||
width: auto;
|
||||
border: 0px solid black;
|
||||
}
|
||||
|
||||
.profile-img {
|
||||
@@ -246,7 +263,8 @@
|
||||
padding: 1px;
|
||||
//align-items: stretch;
|
||||
|
||||
input {
|
||||
input,
|
||||
.max-value {
|
||||
flex: 0 0 2rem;
|
||||
text-align: center;
|
||||
height: 100%;
|
||||
|
||||
+9
-29
@@ -3,17 +3,13 @@
|
||||
"name": "midgard5",
|
||||
"title": "Midgard 5. Edition",
|
||||
"description": "The German RPG Midgard 5. Edition",
|
||||
"version": "2.4.0",
|
||||
"version": "2.4.1",
|
||||
"compatibility": {
|
||||
"minimum": "10",
|
||||
"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": [
|
||||
@@ -107,41 +103,25 @@
|
||||
"name": "Midgard 5",
|
||||
"sorting": "a",
|
||||
"color": "#0000FF",
|
||||
"packs": [
|
||||
"blaupause-spielfiguren",
|
||||
"tabellen-kritische-ereignisse",
|
||||
"makros-kritische-ereignisse",
|
||||
"makros-standardwurfel"
|
||||
],
|
||||
"packs": ["blaupause-spielfiguren", "tabellen-kritische-ereignisse", "makros-kritische-ereignisse", "makros-standardwurfel"],
|
||||
"folders": [
|
||||
{
|
||||
"name": "Ausrüstung",
|
||||
"sorting": "a",
|
||||
"color": "#008000",
|
||||
"packs": [
|
||||
"ausruestung",
|
||||
"ruestkammer",
|
||||
"waffenkammer"
|
||||
]
|
||||
"packs": ["ausruestung", "ruestkammer", "waffenkammer"]
|
||||
},
|
||||
{
|
||||
"name": "Effekte",
|
||||
"sorting": "a",
|
||||
"color": "#800080",
|
||||
"packs": [
|
||||
"kampfzustaende",
|
||||
"verletzungen",
|
||||
"zauberwirkungen"
|
||||
]
|
||||
"packs": ["kampfzustaende", "verletzungen", "zauberwirkungen"]
|
||||
},
|
||||
{
|
||||
"name": "Fähigkeiten",
|
||||
"sorting": "a",
|
||||
"color": "#800000",
|
||||
"packs": [
|
||||
"fertigkeiten",
|
||||
"kampf"
|
||||
]
|
||||
"packs": ["fertigkeiten", "kampf"]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -158,8 +138,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.0/system.json",
|
||||
"download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.0/midgard5-v2.4.0.zip",
|
||||
"manifest": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.1/system.json",
|
||||
"download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.1/midgard5-v2.4.1.zip",
|
||||
"initiative": "@c.calc.attributes.gw.value",
|
||||
"license": "LICENSE.txt"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user