From 30eca09ae27ac3804ecf34818bca0b41c7004b0f Mon Sep 17 00:00:00 2001 From: LeFrique Date: Sat, 30 Dec 2023 19:19:54 +0100 Subject: [PATCH] Zwergenhort revised --- foundryconfig.json | 3 ++- source/module/actors/M5Character.ts | 9 ++++---- source/style/Character-sheet.less | 3 ++- source/system.json | 34 +++++++++++++++++++++-------- templates/sheets/character/main.hbs | 6 ++--- 5 files changed, 37 insertions(+), 18 deletions(-) diff --git a/foundryconfig.json b/foundryconfig.json index 709c890..0b75816 100644 --- a/foundryconfig.json +++ b/foundryconfig.json @@ -1,4 +1,5 @@ { "moduleName": "Midgard 5. Edition", - "repository": "https://git.byroks.de/Byroks/foundry-vtt-system-midgard5" + "repository": "https://github.com/Byroks/foundry-vtt-system-midgard5", + "rawURL": "https://raw.githubusercontent.com/Byroks/foundry-vtt-system-midgard5" } diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index 412e1d9..5316239 100644 --- a/source/module/actors/M5Character.ts +++ b/source/module/actors/M5Character.ts @@ -1,4 +1,3 @@ -import { valueInArray } from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/validators.mjs"; import { M5Item } from "../items/M5Item"; import { M5Attribute, M5CharacterCalculatedData, M5ItemMod, M5ModOperation, M5ModResult, M5RollData, M5Skill, M5SkillCalculated, M5SkillLearned } from "../M5Base"; import M5ModAggregate from "./M5ModAggregate"; @@ -100,7 +99,7 @@ export class M5Character extends Actor { if (!data) return null; ret.level = M5Character.levelFromExp(data.es); - + ret.attributes.st.value = M5Character.attributeMinMax(data.attributes.st); // TODO item effects ret.attributes.gs.value = M5Character.attributeMinMax(data.attributes.gs); ret.attributes.gw.value = M5Character.attributeMinMax(data.attributes.gw); @@ -147,7 +146,7 @@ export class M5Character extends Actor { ret.stats.drinkingFW = Math.floor(ret.attributes.ko.value / 10); ret.stats.hoard = M5Character.hoardFromExp(data.es); ret.stats.hoardNext = M5Character.hoardNextFromExp(data.es); - + if (!skip?.mods) { const aggregate = new M5ModAggregate(data, ret); @@ -375,11 +374,13 @@ export class M5Character extends Actor { const ret = M5Character.levelThreshold.findIndex((val) => val > exp); return ret === -1 ? M5Character.levelThreshold.length : ret; } + static hoardFromExp(exp: number): number { const ret = M5Character.levelThreshold.findIndex((val) => val > exp); const hoard = Math.floor(exp / 2) return hoard; } + static hoardNextFromExp(exp: number): number { const ret = M5Character.levelThreshold.findIndex((val) => val > exp); const currentLevel = ret === -1 ? M5Character.levelThreshold.length : ret; @@ -387,7 +388,7 @@ export class M5Character extends Actor { const hoardNext = (nextLevelExp /2); return hoardNext; } - + static readonly defenseThreshold: Array<[number, number]> = [ [30, 18], [25, 17], diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less index b660ab7..4f5a0f0 100644 --- a/source/style/Character-sheet.less +++ b/source/style/Character-sheet.less @@ -65,9 +65,10 @@ text-align: right; font-weight: bold; } + .hoard { text-align: center; - color: rgb(255, 230, 0); + color: rgb(255, 255, 0); font-weight: bold; font-size: larger; } diff --git a/source/system.json b/source/system.json index 94fdfb1..27c4125 100644 --- a/source/system.json +++ b/source/system.json @@ -9,7 +9,7 @@ "verified": "11", "maximum": "11" }, - "authors": [{ "name": "Byroks" }], + "authors": [{"name": "Byroks"}], "scripts": ["bundle.js"], "styles": ["bundle.css"], "packs": [ @@ -103,25 +103,41 @@ "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" + ] } ] } @@ -137,9 +153,9 @@ "gridUnits": "m", "primaryTokenAttribute": "lp", "secondaryTokenAttribute": "ap", - "url": "https://git.byroks.de/Byroks/foundry-vtt-system-midgard5", - "manifest": "https://git.byroks.de/Byroks/foundry-vtt-system-midgard5/releases/download/v2.3.1/system.json", - "download": "https://git.byroks.de/Byroks/foundry-vtt-system-midgard5/releases/download/v2.3.1/midgard5-v2.3.1.zip", + "url": "https://github.com/Byroks/foundry-vtt-system-midgard5", + "manifest": "https://github.com/Byroks/foundry-vtt-system-midgard5/releases/download/v2.3.1/system.json", + "download": "https://github.com/Byroks/foundry-vtt-system-midgard5/releases/download/v2.3.1/midgard5-v2.3.1.zip", "initiative": "@c.calc.attributes.gw.value", "license": "LICENSE.txt" -} +} \ No newline at end of file diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs index dd7c90b..be68643 100644 --- a/templates/sheets/character/main.hbs +++ b/templates/sheets/character/main.hbs @@ -10,17 +10,17 @@
{{data.calc.stats.hoard}} GS
- Hort für nächsten Grad: {{data.calc.stats.hoardNext}} GS + Hort für nächsten Grad:
{{data.calc.stats.hoardNext}} GS
{{/if}} Name - Grad + Grad {{#if (eq data.info.race "Zwerg")}} Hort - {{/if}} + {{/if}}