Compare commits

..

No commits in common. "031a0dbc2f82138570ebc709fa120b21db7042c4" and "25252cb283c4fd1832082af5dbf7bf7fc30bff80" have entirely different histories.

6 changed files with 9 additions and 21 deletions

View File

@ -156,10 +156,6 @@
"beredsamkeit": "Beredsamkeit", "beredsamkeit": "Beredsamkeit",
"betaeuben": "Betäuben", "betaeuben": "Betäuben",
"betaeubungsgriff": "Betäubungsgriff", "betaeubungsgriff": "Betäubungsgriff",
"bildendeKuensteA": "Bildende Künste (Architektur)",
"bildendeKuensteB": "Bildende Künste (Bildhauerei)",
"bildendeKuensteG": "Bildende Künste (Grafik)",
"bildendeKuensteM": "Bildende Künste (Malerei)",
"bootfahren": "Bootfahren", "bootfahren": "Bootfahren",
"dickhaeuterLenken": "Dickhäuter lenken", "dickhaeuterLenken": "Dickhäuter lenken",
"ersteHilfe": "Erste Hilfe", "ersteHilfe": "Erste Hilfe",

View File

@ -1,6 +1,6 @@
{ {
"name": "foundry-system-midgard5", "name": "foundry-system-midgard5",
"version": "2.7.2", "version": "2.7.1",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -58,4 +58,4 @@
"dependencies": { "dependencies": {
"handlebars-helpers": "^0.10.0" "handlebars-helpers": "^0.10.0"
} }
} }

View File

@ -180,7 +180,7 @@ export class M5Character extends Actor {
ret.stats.movement = this.modResult(data.movement); ret.stats.movement = this.modResult(data.movement);
ret.stats.hoardMin = M5Character.levelThreshold.at(ret.level - 1) / 2; ret.stats.hoardMin = M5Character.levelThreshold.at(ret.level - 1) / 2;
ret.stats.hoardNext = M5Character.levelThreshold.at(ret.level) / 2; ret.stats.hoardNext = M5Character.levelThreshold.at(ret.level) / 2;
ret.stats.wealth = parseFloat((data.info.gold + data.info.silver / 10 + data.info.copper / 100).toPrecision(10)); ret.stats.wealth = parseFloat((data.info.gold + data.info.silver / 10 + data.info.copper / 100).toPrecision(3));
ret.stats.hoard = 0; ret.stats.hoard = 0;
ret.stats.encumbrance = 0; ret.stats.encumbrance = 0;

View File

@ -155,14 +155,14 @@ export class M5Roll {
async toMessage(toggleAutomatedRoll = false) { async toMessage(toggleAutomatedRoll = false) {
let automatedRoll = (game as Game).settings.get("midgard5", "automatedRoll"); let automatedRoll = (game as Game).settings.get("midgard5", "automatedRoll");
automatedRoll = toggleAutomatedRoll ? !automatedRoll : automatedRoll; automatedRoll = toggleAutomatedRoll ? !automatedRoll : automatedRoll;
let rMode = (game as Game).settings.get("core", "rollMode"); const rMode = (game as Game).settings.get("core", "rollMode");
if (!automatedRoll) { if (!automatedRoll) {
let checkOptions = await this.popUp({ isPW: this.data.rolls[0].label === (game as Game).i18n.localize("midgard5.pw") }); let checkOptions = await this.popUp({ isPW: this.data.rolls[0].label === (game as Game).i18n.localize("midgard5.pw") });
if (checkOptions["cancelled"]) { if (checkOptions["cancelled"]) {
return; return;
} else { } else {
rMode = checkOptions["rollMode"]; const rMode = checkOptions["rollMode"];
this.data.b = checkOptions; this.data.b = checkOptions;
} }
} else { } else {
@ -222,7 +222,7 @@ export class M5Roll {
rollData.rolls["0"] = { rollData.rolls["0"] = {
formula: "1d20 + @i.fw + @i.bonus", formula: "1d20 + @i.fw + @i.bonus",
enabled: true, enabled: true,
label: (game as Game).i18n.localize("midgard5.ew"), label: (game as Game).i18n.localize("midgard5.pw"),
result: "", result: "",
total: 0, total: 0,
totalStr: "", totalStr: "",

View File

@ -3,17 +3,13 @@
"name": "midgard5", "name": "midgard5",
"title": "Midgard 5. Edition", "title": "Midgard 5. Edition",
"description": "The German RPG Midgard 5. Edition", "description": "The German RPG Midgard 5. Edition",
"version": "2.7.2", "version": "2.7.1",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "10",
"verified": "11", "verified": "11",
"maximum": "11" "maximum": "11"
}, },
"authors": [ "authors": [{ "name": "Byroks" }, { "name": "Le-Frique" }, { "name": "Oskaloq" }],
{"name": "Byroks"},
{"name": "Le-Frique"},
{"name": "Oskaloq"}
],
"scripts": ["bundle.js"], "scripts": ["bundle.js"],
"styles": ["bundle.css"], "styles": ["bundle.css"],
"languages": [ "languages": [
@ -32,4 +28,4 @@
"download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/latest/midgard5.zip?token=2455375115b92bc8d87c93df7159eec232456f2d", "download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/latest/midgard5.zip?token=2455375115b92bc8d87c93df7159eec232456f2d",
"initiative": "@c.calc.attributes.gw.value", "initiative": "@c.calc.attributes.gw.value",
"license": "LICENSE.txt" "license": "LICENSE.txt"
} }

View File

@ -81,10 +81,6 @@
"bergreiten": { "fw": 0, "attribute": "gw", "initial": 12, "pp": 0 }, "bergreiten": { "fw": 0, "attribute": "gw", "initial": 12, "pp": 0 },
"betaeuben": { "fw": 6, "attribute": "gs", "initial": 8, "pp": 0 }, "betaeuben": { "fw": 6, "attribute": "gs", "initial": 8, "pp": 0 },
"betaeubungsgriff": { "fw": 0, "attribute": "in", "initial": 8, "pp": 0 }, "betaeubungsgriff": { "fw": 0, "attribute": "in", "initial": 8, "pp": 0 },
"bildendeKuensteA": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
"bildendeKuensteB": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
"bildendeKuensteG": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
"bildendeKuensteM": { "fw": 0, "attribute": "gs", "initial": 12, "pp": 0 },
"bootfahren": { "fw": 3, "attribute": "gs", "initial": 8, "pp": 0 }, "bootfahren": { "fw": 3, "attribute": "gs", "initial": 8, "pp": 0 },
"dickhaeuterLenken": { "fw": 0, "attribute": "gs", "initial": 8, "pp": 0 }, "dickhaeuterLenken": { "fw": 0, "attribute": "gs", "initial": 8, "pp": 0 },
"ersteHilfe": { "fw": 0, "attribute": "gs", "initial": 8, "pp": 0 }, "ersteHilfe": { "fw": 0, "attribute": "gs", "initial": 8, "pp": 0 },