Merge branch 'develop'

v2.4.2
HotFix nicht öffenbare Charaktere
2024-02-05 13:30:41 +01:00 · 2024-02-05 13:30:20 +01:00 · 2024-02-05 13:29:29 +01:00 · 2024-02-05 10:35:31 +01:00 · 2024-02-05 10:28:46 +01:00 · 2024-01-31 18:31:32 +01:00
10 changed files with 368 additions and 240 deletions
@@ -17,6 +17,7 @@
 	"midgard5.phase-movement": "Bewegungsphase",
 	"midgard5.no-encounter": "Kein Kampf",
 	"midgard5.encounter-not-started": "Kein aktiver Kampf",
+	"midgard5.initiative": "Initiative",

 	"midgard5.time-duration": "Dauer",
 	"midgard5.time-round": "Runde(n)",
@@ -254,6 +255,11 @@
 	"midgard5.active": "Aktiv",
 	"midgard5.rangedWeapon": "Schusswaffe",
 	"midgard5.assignItemToCharacter": "Füge Gegenstand einem Charakter hinzu, um hier etwas auswählen zu können",
+	"midgard5.showAll": "Alle anzeigen",
+	"midgard5.wealthAndContainers": "Vermögen und Aufbewahrung",
+	"midgard5.itemsInContainers": "Gegenstände in Aufbewahrung",
+	"midgard5.allItems": "Alle Gegenstände",
+

 	"midgard5.pw": "Prüfwurf",
 	"midgard5.attack": "Angriff",
@@ -1,6 +1,6 @@
 {
 	"name": "foundry-system-midgard5",
-	"version": "2.4.0",
+	"version": "2.4.2",
 	"description": "",
 	"main": "index.js",
 	"scripts": {
@@ -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 });
@@ -178,18 +178,17 @@ export class M5Character extends Actor {
 						label += "*";
 					}
 					if (item.system.valuable) {
-						ret.stats.wealth += this.calculateValue(item.system.value, item.system.currency);
+						ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}
 					if (item.system.hoarded) {
-						ret.stats.hoard += item.system.value || 0;
+						ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}

 					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;
 						}
@@ -305,10 +303,10 @@ export class M5Character extends Actor {
 							")";
 					}
 					if (item.system.valuable) {
-						ret.stats.wealth += this.calculateValue(item.system.value, item.system.currency);
+						ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}
 					if (item.system.hoarded) {
-						ret.stats.hoard += item.system.value || 0;
+						ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}

 					ret.gear.weapons[item.id] = {
@@ -318,6 +316,7 @@ 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,
@@ -338,10 +337,10 @@ 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.currency);
+						ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}
 					if (item.system.hoarded) {
-						ret.stats.hoard += item.system.value || 0;
+						ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}

 					ret.gear.defensiveWeapons[item.id] = {
@@ -351,6 +350,7 @@ 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,
@@ -370,10 +370,10 @@ export class M5Character extends Actor {
 						label += "*";
 					}
 					if (item.system.valuable) {
-						ret.stats.wealth += this.calculateValue(item.system.value, item.system.currency);
+						ret.stats.wealth += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}
 					if (item.system.hoarded) {
-						ret.stats.hoard += item.system.value || 0;
+						ret.stats.hoard += this.calculateValue(item.system.value * item.system.quantity, item.system.currency);
 					}

 					ret.gear.armor[item.id] = {
@@ -382,6 +382,7 @@ 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,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%;
@@ -3,17 +3,13 @@
 	"name": "midgard5",
 	"title": "Midgard 5. Edition",
 	"description": "The German RPG Midgard 5. Edition",
-	"version": "2.4.0",
+	"version": "2.4.2",
 	"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.2/system.json",
+	"download": "https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/releases/download/v2.4.2/midgard5-v2.4.2.zip",
 	"initiative": "@c.calc.attributes.gw.value",
 	"license": "LICENSE.txt"
-}
+}
@@ -67,6 +67,12 @@
 						<td>{{localize "midgard5.movementRange"}}</td>
 						<td><input name="data.movement" type="text" value="{{data.movement}}" data-dtype="Number" /></td>
 					</tr>
+					<tr>
+						<td>{{localize "midgard5.actor-lp-short"}}</td>
+						<td><input name="data.lp.max" type="text" value="{{data.lp.max}}" data-dtype="Number" /></td>
+						<td>{{localize "midgard5.actor-ap-short"}}</td>
+						<td><input name="data.ap.max" type="text" value="{{data.ap.max}}" data-dtype="Number" /></td>
+					</tr>
 					<tr>
 						<td>{{localize "midgard5.brawl"}}</td>
 						<td class="fixed-value">{{data.calc.stats.brawl.value}}</td>
@@ -1,5 +1,32 @@
 <div class="flexbox">
-	<div class="flexcolumn-3">
+
+	<div class="flexcolumn-1">
+		<div class="flexpart">
+			<div class="flexpart-header"><img src="icons/magic/time/arrows-circling-pink.webp" class="flexpart-icon">{{localize "midgard5.calculated-values"}}</div>
+			<table>
+				<tr height = 10px></tr>
+				<tr>
+					<td>{{localize "midgard5.movementRange"}}</td>
+					<td class="fixed-value">{{data.calc.stats.movement.value}}</td>
+					<td></td>
+					<td class="fixed-value"></td>
+				</tr>
+					<td>{{localize "midgard5.defense"}}</td>
+					<td class="fixed-value">{{data.calc.stats.defense.value}}</td>
+					<td>{{localize "midgard5.defenseBonus"}}</td>
+					<td class="fixed-value">{{data.calc.stats.defenseBonus.value}}</td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.attackBonus"}}</td>
+					<td class="fixed-value">{{data.calc.stats.attackBonus.value}}</td>
+					<td>{{localize "midgard5.damageBonus"}}</td>
+					<td class="fixed-value">{{data.calc.stats.damageBonus.value}}</td>
+				</tr>
+			</table>
+		</div>
+	</div>
+
+	<div class="flexcolumn-2">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/skills/melee/hand-grip-sword-white-brown.webp" class="flexpart-icon">{{localize "midgard5.attack"}}</div>
 			<table>
@@ -78,33 +105,7 @@
 		</div>
 	</div>

-	<div class="flexcolumn-3">
-		<div class="flexpart">
-			<div class="flexpart-header"><img src="icons/magic/time/arrows-circling-pink.webp" class="flexpart-icon">{{localize "midgard5.calculated-values"}}</div>
-			<table>
-				<tr height = 10px></tr>
-				<tr>
-					<td>{{localize "midgard5.movementRange"}}</td>
-					<td class="fixed-value">{{data.calc.stats.movement.value}}</td>
-					<td>&nbsp;</td>
-					<td class="fixed-value">&nbsp;</td>
-				</tr>
-					<td>{{localize "midgard5.defense"}}</td>
-					<td class="fixed-value">{{data.calc.stats.defense.value}}</td>
-					<td>{{localize "midgard5.defenseBonus"}}</td>
-					<td class="fixed-value">{{data.calc.stats.defenseBonus.value}}</td>
-				</tr>
-				<tr>
-					<td>{{localize "midgard5.damageBonus"}}</td>
-					<td class="fixed-value">{{data.calc.stats.damageBonus.value}}</td>
-					<td>{{localize "midgard5.attackBonus"}}</td>
-					<td class="fixed-value">{{data.calc.stats.attackBonus.value}}</td>
-				</tr>
-			</table>
-		</div>
-	</div>
-
-	<div class="flexcolumn-3">
+	<div class="flexcolumn-2">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/skills/melee/shield-block-gray-orange.webp" class="flexpart-icon">{{localize "midgard5.defense"}}</div>
 			<table>
@@ -1,6 +1,7 @@
+<h3>{{localize "midgard5.wealthAndContainers"}}</h3>
 <div class="flexbox">
-	<div class="flexcolumn-2">

+	<div class="flexcolumn-2">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/commodities/currency/coins-assorted-mix-copper-silver-gold.webp" class="flexpart-icon">{{localize "midgard5.currency"}}</div>
 			<table>
@@ -29,165 +30,9 @@
 				</tbody>
 			</table>
 		</div>
-
-		<div class="flexpart">
-			<div class="flexpart-header">
-				<img src="icons/tools/hand/scale-balances-merchant-brown.webp" class="flexpart-icon">
-				{{localize "midgard5.gear"}}
-				(alle <input id="data.info.showAllItems" class="checkbox" type="checkbox" name="data.info.showAllItems" {{checked data.info.showAllItems}}>)
-			</div>
-			<table>
-				<thead class="theader">
-					<tr>
-						<th class="title">{{localize "TYPES.Item.item"}}</th>
-						<th class="title center">{{localize "midgard5.item-quantity"}}</th>
-						<th class="title center">{{localize "midgard5.item-value"}}</th>
-						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
-						<th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th></th>
-						<th class="title add-item"><i class="fa-regular fa-plus"></i></th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr height = 10px></tr>
-					</tr>
-					{{#each data.calc.gear.items as |item itemId|}}
-					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
-						<tr data-item="{{itemId}}">
-							<td class="padding">
-								<span class="edit-item">{{item.label}}</span>
-							</td>
-							<td>
-								<i class="fa fa-minus-circle quantity-decrease" style="cursor: pointer"></i>
-								<span>{{item.quantity}}</span>
-								<i class="fa fa-plus-circle quantity-increase" style="cursor: pointer"></i>
-							</td>
-							<td style="text-align: start">
-								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
-								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
-								{{/unless}}
-							</td>
-							<td class="change-equipped">
-								{{#if item.equipped}}
-									<i class="fa-solid fa-circle-check"></i>
-								{{else}}
-									<i class="fa-regular fa-circle"></i>
-								{{/if}}
-							</td>
-							<td>{{#if item.rollExist}}<button class="roll-button roll-consumable-item"></button>{{/if}}</td>
-							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
-						</tr>
-						{{/if}}
-					{{/each}}
-				</tbody>
-			</table>
-		</div>
-
-		<div class="flexpart">
-			<div class="flexpart-header"><img src="icons/weapons/swords/sword-guard-engraved-worn.webp" class="flexpart-icon">{{localize "midgard5.weapons"}}</div>
-			<table>
-				<thead>
-					<tr>
-						<th class="title">{{localize "TYPES.Item.weapon"}}</th>
-						<th class="title center">{{localize "midgard5.item-value"}}</th>
-						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
-						<th class="title add-weapon"><i class="fa-regular fa-plus"></i></th>
-
-					</tr>
-				</thead>
-				<tbody>
-					{{#each data.calc.gear.weapons as |item itemId|}}
-						<tr data-item="{{itemId}}">
-							<td class="padding edit-item">{{item.label}}</td>
-							<td style="text-align: start">
-								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
-								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
-								{{/unless}}
-							</td>
-							<td class="change-equipped">
-								{{#if item.equipped}}
-									<i class="fa-solid fa-circle-check"></i>
-								{{else}}
-									<i class="fa-regular fa-circle"></i>
-								{{/if}}
-							</td>
-							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
-						</tr>
-					{{/each}}
-				</tbody>
-			</table>
-		</div>
-
-		<div class="flexpart">
-			<div class="flexpart-header"><img src="icons/equipment/shield/heater-wooden-brown-axe.webp" class="flexpart-icon">{{localize "midgard5.defensive-weapons"}}</div>
-			<table>
-				<thead>
-					<tr>
-						<th class="title">{{localize "TYPES.Item.defensiveWeapon"}}</th>
-						<th class="title center">{{localize "midgard5.item-value"}}</th>
-						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
-						<th class="title add-defensiveWeapon"><i class="fa-regular fa-plus"></i></th>
-					</tr>
-				</thead>
-				<tbody>
-					{{#each data.calc.gear.defensiveWeapons as |item itemId|}}
-						<tr data-item="{{itemId}}">
-							<td class="padding edit-item">{{item.label}}</td>
-							<td style="text-align: start">
-								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
-								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
-								{{/unless}}
-							</td>
-							<td class="change-equipped">
-								{{#if item.equipped}}
-									<i class="fa-solid fa-circle-check"></i>
-								{{else}}
-									<i class="fa-regular fa-circle"></i>
-								{{/if}}
-							</td>
-							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
-						</tr>
-					{{/each}}
-				</tbody>
-			</table>
-		</div>
-
-		<div class="flexpart">
-			<div class="flexpart-header"><img src="icons/equipment/hand/gauntlet-armored-steel-grey.webp" class="flexpart-icon">{{localize "midgard5.armor"}}</div>
-			<table>
-				<thead>
-					<tr>
-						<th class="title">{{localize "TYPES.Item.armor"}}</th>
-						<th class="title center">{{localize "midgard5.item-value"}}</th>
-						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
-						<th class="title add-armor"><i class="fa-regular fa-plus"></i></th>
-					</tr>
-				</thead>
-				<tbody>
-					{{#each data.calc.gear.armor as |item itemId|}}
-						<tr data-item="{{itemId}}">
-							<td class="padding edit-item">{{item.label}}</td>
-							<td style="text-align: start">
-								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
-								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
-								{{/unless}}
-							</td>
-							<td class="change-equipped">
-								{{#if item.equipped}}
-									<i class="fa-solid fa-circle-check"></i>
-								{{else}}
-									<i class="fa-regular fa-circle"></i>
-								{{/if}}
-							</td>
-							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
-						</tr>
-					{{/each}}
-				</tbody>
-			</table>
-		</div>
 	</div>

 	<div class="flexcolumn-2">
-
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/containers/chest/chest-simple-box-brown.webp" class="flexpart-icon">{{localize "TYPES.Item.container"}}</div>
 			<table>
@@ -226,8 +71,13 @@
 				</tbody>
 			</table>
 		</div>
+	</div>
+</div>

-		{{#each data.calc.gear.containers as |container containerId|}}	
+<h3>{{localize "midgard5.itemsInContainers"}}</h3>
+<div class="flexbox">
+	{{#each data.calc.gear.containers as |container containerId|}}
+	<div class="flexcolumn-2">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="{{container.icon}}" class="flexpart-icon">{{container.label}}</div>
 			<table>
@@ -271,9 +121,265 @@
 						</tr>
 						{{/if}}	
 					{{/each}}
+					{{#each ../data.calc.gear.weapons as |item itemId|}}
+						{{#if (eq item.containerId containerId)}}	
+						<tr data-item="{{itemId}}">
+							<td class="padding">
+								<span class="edit-item">{{item.label}}</span>
+							</td>
+							<td></td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td class="change-equipped">
+								{{#if item.equipped}}
+									<i class="fa-solid fa-circle-check"></i>
+								{{else}}
+									<i class="fa-regular fa-circle"></i>
+								{{/if}}
+							</td>
+							<td>{{#if item.rollExist}}<button class="roll-button roll-consumable-item"></button>{{/if}}</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+						{{/if}}	
+					{{/each}}
+					{{#each ../data.calc.gear.defensiveWeapons as |item itemId|}}
+						{{#if (eq item.containerId containerId)}}	
+						<tr data-item="{{itemId}}">
+							<td class="padding">
+								<span class="edit-item">{{item.label}}</span>
+							</td>
+							<td></td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td class="change-equipped">
+								{{#if item.equipped}}
+									<i class="fa-solid fa-circle-check"></i>
+								{{else}}
+									<i class="fa-regular fa-circle"></i>
+								{{/if}}
+							</td>
+							<td>{{#if item.rollExist}}<button class="roll-button roll-consumable-item"></button>{{/if}}</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+						{{/if}}	
+					{{/each}}
+					{{#each ../data.calc.gear.armor as |item itemId|}}
+						{{#if (eq item.containerId containerId)}}	
+						<tr data-item="{{itemId}}">
+							<td class="padding">
+								<span class="edit-item">{{item.label}}</span>
+							</td>
+							<td></td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td class="change-equipped">
+								{{#if item.equipped}}
+									<i class="fa-solid fa-circle-check"></i>
+								{{else}}
+									<i class="fa-regular fa-circle"></i>
+								{{/if}}
+							</td>
+							<td>{{#if item.rollExist}}<button class="roll-button roll-consumable-item"></button>{{/if}}</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+						{{/if}}	
+					{{/each}}
 				</tbody>
 			</table>
 		</div>
-		{{/each}}	
 	</div>
+	{{/each}}
+</div>
+
+<h3>
+	{{localize "midgard5.allItems"}}
+	<input id="data.info.showAllItems" class="checkbox" type="checkbox" name="data.info.showAllItems" {{checked data.info.showAllItems}} style="float: right;">
+	<label for="data.info.showAllItems" style="font-size: normal; font-weight: normal; font-style: italic; float: right;">{{localize "midgard5.showAll"}}&nbsp;</label>
+</h3>
+<div class="flexbox">
+	{{#unless (eq (count data.calc.gear.items) 0)}}	
+	<div class="flexcolumn-2">
+		<div class="flexpart">
+			<div class="flexpart-header"><img src="icons/tools/hand/scale-balances-merchant-brown.webp" class="flexpart-icon">{{localize "midgard5.gear"}}</div>
+			<table>
+				<thead class="theader">
+					<tr>
+						<th class="title">{{localize "TYPES.Item.item"}}</th>
+						<th class="title center">{{localize "midgard5.item-quantity"}}</th>
+						<th class="title center">{{localize "midgard5.item-value"}}</th>
+						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
+						<th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th></th>
+						<th class="title add-item"><i class="fa-regular fa-plus"></i></th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr height = 10px></tr>
+					</tr>
+					{{#each data.calc.gear.items as |item itemId|}}
+					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
+						<tr data-item="{{itemId}}">
+							<td class="padding">
+								<span class="edit-item">{{item.label}}</span>
+							</td>
+							<td>
+								<i class="fa fa-minus-circle quantity-decrease" style="cursor: pointer"></i>
+								<span>{{item.quantity}}</span>
+								<i class="fa fa-plus-circle quantity-increase" style="cursor: pointer"></i>
+							</td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td class="change-equipped">
+								{{#if item.equipped}}
+									<i class="fa-solid fa-circle-check"></i>
+								{{else}}
+									<i class="fa-regular fa-circle"></i>
+								{{/if}}
+							</td>
+							<td>{{#if item.rollExist}}<button class="roll-button roll-consumable-item"></button>{{/if}}</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+					{{/if}}
+					{{/each}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+	{{/unless}}
+
+	{{#unless (eq (count data.calc.gear.weapons) 0)}}
+	<div class="flexcolumn-2">
+		<div class="flexpart">
+			<div class="flexpart-header">
+				<img src="icons/weapons/swords/sword-guard-engraved-worn.webp" class="flexpart-icon">{{localize "midgard5.weapons"}}</div>
+			<table>
+				<thead>
+					<tr>
+						<th class="title">{{localize "TYPES.Item.weapon"}}</th>
+						<th class="title center">{{localize "midgard5.item-value"}}</th>
+						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
+						<th class="title add-weapon"><i class="fa-regular fa-plus"></i></th>
+
+					</tr>
+				</thead>
+				<tbody>
+					{{#each data.calc.gear.weapons as |item itemId|}}
+					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
+						<tr data-item="{{itemId}}">
+							<td class="padding edit-item">{{item.label}}</td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td class="change-equipped">
+								{{#if item.equipped}}
+									<i class="fa-solid fa-circle-check"></i>
+								{{else}}
+									<i class="fa-regular fa-circle"></i>
+								{{/if}}
+							</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+					{{/if}}	
+					{{/each}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+	{{/unless}}
+
+	{{#unless (eq (count data.calc.gear.defensiveWeapons) 0)}}
+	<div class="flexcolumn-2">
+		<div class="flexpart">
+			<div class="flexpart-header"><img src="icons/equipment/shield/heater-wooden-brown-axe.webp" class="flexpart-icon">{{localize "midgard5.defensive-weapons"}}</div>
+			<table>
+				<thead>
+					<tr>
+						<th class="title">{{localize "TYPES.Item.defensiveWeapon"}}</th>
+						<th class="title center">{{localize "midgard5.item-value"}}</th>
+						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
+						<th class="title add-defensiveWeapon"><i class="fa-regular fa-plus"></i></th>
+					</tr>
+				</thead>
+				<tbody>
+					{{#each data.calc.gear.defensiveWeapons as |item itemId|}}
+					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
+						<tr data-item="{{itemId}}">
+							<td class="padding edit-item">{{item.label}}</td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td class="change-equipped">
+								{{#if item.equipped}}
+									<i class="fa-solid fa-circle-check"></i>
+								{{else}}
+									<i class="fa-regular fa-circle"></i>
+								{{/if}}
+							</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+					{{/if}}	
+					{{/each}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+	{{/unless}}
+
+	{{#unless (eq (count data.calc.gear.armor) 0)}}
+	<div class="flexcolumn-2">
+		<div class="flexpart">
+			<div class="flexpart-header"><img src="icons/equipment/hand/gauntlet-armored-steel-grey.webp" class="flexpart-icon">{{localize "midgard5.armor"}}</div>
+			<table>
+				<thead>
+					<tr>
+						<th class="title">{{localize "TYPES.Item.armor"}}</th>
+						<th class="title center">{{localize "midgard5.item-value"}}</th>
+						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
+						<th class="title add-armor"><i class="fa-regular fa-plus"></i></th>
+					</tr>
+				</thead>
+				<tbody>
+					{{#each data.calc.gear.armor as |item itemId|}}
+					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
+						<tr data-item="{{itemId}}">
+							<td class="padding edit-item">{{item.label}}</td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td class="change-equipped">
+								{{#if item.equipped}}
+									<i class="fa-solid fa-circle-check"></i>
+								{{else}}
+									<i class="fa-regular fa-circle"></i>
+								{{/if}}
+							</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+					{{/if}}	
+					{{/each}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+	{{/unless}}
+
+
+
 </div>
@@ -89,7 +89,7 @@
 									<div class="lp-bar-item-empty update-lp" data-value="{{this}}"></div>
 								{{/if}}
 							{{/times}}
-							<input name="data.lp.max" type="text" value="{{data.lp.max}}" data-dtype="Number" />
+							<div class="max-value">{{data.lp.max}}</div>
 						</div>
 					</td>
 				</tr>
@@ -105,7 +105,7 @@
 									<div class="ap-bar-item-empty update-ap" data-value="{{this}}"></div>
 								{{/if}}
 							{{/times}}
-							<input name="data.ap.max" type="text" value="{{data.ap.max}}" data-dtype="Number" />
+							<div class="max-value">{{data.ap.max}}</div>
 						</div>
 					</td>
 				</tr>
Author	SHA1	Message	Date
Byroks	c0dced6fe6	Merge branch 'develop'	2024-02-05 13:30:41 +01:00
Byroks	c2aa466ce1	v2.4.2	2024-02-05 13:30:20 +01:00
Byroks	24426bb248	HotFix nicht öffenbare Charaktere Changes: + Currency hat bei (fast) allen Items gefehlt weswegen das Charakterblatt nicht mehr öffenbar war, nachdem man Wert und Currency eingetragen hat. + Beachte Menge für Vermögensrechnung + Hort rechnung beachtet jetzt Currency	2024-02-05 13:29:29 +01:00
Byroks	5a41c4bb56	Merge branch 'develop'	2024-02-05 10:35:31 +01:00
Byroks	26b2bddc2d	v2.4.1	2024-02-05 10:28:46 +01:00
oskaloq Byroks Ender	9f1334da4f	- Container behavior for Weapons, Def. Weapons and Armor is now the same as for items (#53 ) - Fixed some Bugs Co-authored-by: Ender <harald@drueppels.de> Co-authored-by: Byroks <byroks@gmail.com> Reviewed-on: #53 Reviewed-by: Byroks <byroks@gmail.com> Co-authored-by: oskaloq <os_ka_loq@gmx.de> Co-committed-by: oskaloq <os_ka_loq@gmx.de>	2024-01-31 18:31:32 +01:00
Byroks	454982906f	Hotfix - can't open charaktersheet Problem: +sometimes items had a null formula which blocked opening the sheet Changes: + add ? to catch nulls	2024-01-22 22:24:12 +01:00
Byroks	33c65735bd	v2.4.0	2024-01-20 15:31:35 +01:00
Byroks	2bfd3a7d6a	#46-problems-with-character-description-editor (#50 ) Changes: + adjust height and width of the editor WIP for #46 Closes #44 Reviewed-on: #50	2024-01-20 13:58:22 +01:00
Byroks	03b87f2df0	update url	2024-01-20 13:44:06 +01:00
Byroks	9d72b31d5f	Add Items on Character Sheet Changes: + add button to add all different kind of items directly onto the character sheet + fix #1 by correctly updating the item	2024-01-20 12:37:05 +01:00
oskaloqandEnder	c13fef5103	Zusammenführung-von-Fertigkeiten,-Waffen-und-Rüstungen-im-Kampf-Tab-#15 (#48 ) - Created character description tab - Redesigned skill, gear and combat tab - Weapons, defense weapons and armor is still in the gear tab. If you equip them (now directly possible via click on the equip icon), they appear in the combat tab. Reason: This holds the combat tab clean for combat stuff. Co-authored-by: Ender <harald@drueppels.de> Reviewed-on: #48 Reviewed-by: Byroks <byroks@gmail.com>	2024-01-16 11:25:39 +01:00
Byroks	abf8077131	#33 Wrong wealth calculation (#34 ) Changes: + add function to adjust item value depending on currency Co-authored-by: Simon Gustavs <simon.gustavs@bms-cs.de> Reviewed-on: #34 Reviewed-by: oskaloq <os_ka_loq@gmx.de>	2024-01-16 08:29:14 +01:00
Byroks	b5b75aa2c6	#18 Remove ContainerId from containers (#29 ) Changes + remove containerId variable from containers as it's not needed Reviewed-on: #29 Reviewed-by: oskaloq <os_ka_loq@gmx.de>	2024-01-15 14:15:30 +01:00
Byroks	7368673ba3	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 20:42:22 +01:00
Byroks	a606750b23	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 20:41:15 +01:00
Byroks	7358b67da2	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 20:41:05 +01:00
Byroks	2a36b8eaa1	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 20:38:50 +01:00
Byroks	f38ef8aa6d	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 16:16:04 +01:00
Byroks	2ac8a6bba4	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 16:09:13 +01:00
Byroks	41fb1a8879	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 16:02:37 +01:00
Byroks	ff74871a0c	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 12:56:49 +01:00
Byroks	f8b65c030f	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 12:39:39 +01:00
Byroks	31a4ccfda1	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 12:37:43 +01:00
Byroks	c24e2b7af2	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-08 12:28:41 +01:00
oskaloq Ender Byroks	cfdba0ee75	Anpassung-des-Character-Sheet-Headers-#13 (#28 ) - Made character sheet header more responsive - Changed Logo - Changed "all gear items" container, that it shows items not in dedicated containers ( unless "Alle" checkbox is set) Co-authored-by: Ender <harald@drueppels.de> Co-authored-by: Byroks <byroks@gmail.com> Reviewed-on: #28 Reviewed-by: Byroks <byroks@gmail.com>	2024-01-07 22:53:16 +01:00
Byroks	d67de1b064	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 16:47:12 +01:00
Byroks	718f1eab99	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 16:38:35 +01:00
Byroks	47fd5b7763	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 16:37:27 +01:00
Byroks	ad884994dd	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 16:17:20 +01:00
Byroks	b08bd195c7	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 15:45:46 +01:00
Byroks	c83cd8f079	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 15:40:56 +01:00
Byroks	b1ef88235f	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 15:37:37 +01:00
Byroks	da1ae4e16e	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 15:35:54 +01:00
Byroks	840a7c1dc4	Update .gitea/workflows/add-issue-to-project.yaml	2024-01-07 15:33:26 +01:00
Byroks	4825166f87	Add .gitea/workflows/add-issue-to-project.yaml	2024-01-07 15:06:01 +01:00
Le-FriqueandByroks	b8e873537c	Zwergenhort (#4 ) Mein Geschenk zu Weihnachten: Implementierung des Zwergenhort gem. KOD S. 167 mit Angabe aktueller Mindesthort für aktuellen Grad und benötigtem Hort für nächsten Grad bei Zwergen. Der Hort erscheint nur bei ausgewählter Rasse Zwerg und wird bei allen anderen Rassen versteckt. Die Anrechnung von Gold oder Gegenständen wie auch im KOD erwähnt erfordert die Implementierung eines Goldmanagements und am besten auch eine Neustrukturierung des Charakterbogens (s. weitere Issues). Frohe Weihnachten ;) Co-authored-by: Byroks <byroks@gmail.com> Reviewed-on: #4 Co-authored-by: LeFrique <lefrique@live.de> Co-committed-by: LeFrique <lefrique@live.de>	2024-01-07 14:31:20 +01:00
Byroks	975bcd1e15	#10 Kampfkunst nicht öffenbar (#11 ) Änderungen: + auskommentierte if Bedingung wieder drin + if Bedingung angepasst Reviewed-on: #11 Reviewed-by: Le-Frique <lefrique@live.de>	2024-01-07 14:29:39 +01:00
oskaloq Ender Byroks	b945f22710	Charakterbogen anpassen #7 (#9 ) - Use of flexboxes in two columns for better display - Introduction of item containers for the different storage of items Co-authored-by: Ender <harald@drueppels.de> Co-authored-by: Byroks <byroks@gmail.com> Reviewed-on: Byroks/foundry-vtt-system-midgard5#9 Reviewed-by: Byroks <byroks@gmail.com>	2024-01-03 15:57:15 +01:00
Byroks	6baf9a0269	Change git Path (#3 ) Changes: + change github urls to git.byroks Reviewed-on: Byroks/foundry-vtt-system-midgard5#3 Reviewed-by: Le-Frique <lefrique@live.de>	2023-12-18 19:53:37 +01:00