Merge branch 'develop' into Vereinfachter-NPC/Kreaturen-Bogen

lang/de.json

@@ -61,6 +61,8 @@
 		"item-ismagic": "Ist Magisch",
 		"item-wealth": "Vermögenswert",
 		"item-weight": "Gewicht",
+		"item-abw": "ABW",
+		"item-abw-long": "Ausbrennwahrscheinlichkeit",
 
 		"actor-lp": "Lebenspunkte",
 		"actor-lp-short": "LP",
@@ -133,7 +135,7 @@
 		"heavy-load": "Schwere Last",
 		"thrust-load": "Schublast",
 		"load-max": "Höchstlast",
-		"load-capacity": "Tragkraft",
+		"capacity": "Tragkraft",
 
 		"exp-overall": "Erfahrungsschatz",
 		"exp-available": "Erfahrungspunkte",
@@ -356,12 +358,13 @@
 		"spell-agens": "Agens",
 		"spell-reagens": "Reagens",
 		"spell-material": "Zaubermaterial",
+		"spell-rank": "Stufe",
 
 		"kampfkunst-type": "Form",
 		"kampfkunst-variante": "Variante",
 		"kampfkunst-variante-short": "Var",
 		"kampfkunst-ep": "Erfahrungspunkte",
-		"kampfkunst-rank": "Stufe",
+		"kampfkunst-rank": "Stufe der Technik",
 		"kampfkunst-weapon": "Waffengruppe",
 		"kampfkunst-enemy": "Einschränkungen durch Art der Gegner",
 
@@ -385,6 +388,10 @@
 		"kido-variante": "KiDo Variante",
 		"kido-color": "Kampfstilfarbe",
 		"kido-style": "Art der Technik",
+		"kido-rank": "Stufe der Technik",
+		"kido-grade": "Ausbildungsgrad",
+		"kido-enemy": "Einschränkungen durch Art der Gegner",
+		"kido-weapon": "Waffengruppe",
 
 		"kido-type-angriff": "Kido Angriff",
 		"kido-type-verteidigung": "Kido Verteidigung",
@@ -399,6 +406,7 @@
 		"kido-variante-blockieren": "Blockieren",
 		"kido-variante-bewegen": "Bewegen",
 		"kido-variante-kontrollieren": "Kontrollieren",
+		"kido-variante-finte": "Finte",
 
 		"mod-operation-add100": "Addieren (max 100)",
 		"mod-operation-roll": "Wurf Modifikation",
@@ -444,9 +452,9 @@
 			"reroll": "Neuwürfeln",
 
 			"options": {
-				"modifier": "Modifikator",
+				"modifier": "Wurfmodifikator",
-				"difficulty": "Schwellenwert",
+				"difficulty": "Erfolg",
-				"rollMode": "Würfel Modus"
+				"rollMode": "Würfelmodus"
 			}
 		}
 	}

source/module/actors/M5Character.ts

@@ -280,6 +280,7 @@ export class M5Character extends Actor {
 
 					if (!!item.system.containerId) {
 						ret.gear.containers[item.system.containerId].weight += parseFloat((item.system.weight * item.system.quantity).toPrecision(4));
+						ret.gear.containers[item.system.containerId].value += parseFloat(this.calculateValue(item.system.value * item.system.quantity, item.system.currency).toPrecision(3));
 						if (ret.gear.containers[item.system.containerId].equipped) {
 							ret.stats.encumbrance += item.system.weight * item.system.quantity;
 						}
@@ -302,6 +303,7 @@ export class M5Character extends Actor {
 						label: label,
 						icon: icon,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						calc: item.system.calc,
 						equipped: item.system?.equipped,
 						valuable: item.system?.valuable,
@@ -352,6 +354,7 @@ export class M5Character extends Actor {
 						icon: item.img,
 						skillId: item.system.skillId,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						valuable: item.system?.valuable,
 						hoarded: item.system?.hoarded,
 						value: item.system.value || 0,
@@ -395,6 +398,7 @@ export class M5Character extends Actor {
 						icon: item.img,
 						skillId: item.system.skillId,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						valuable: item.system?.valuable,
 						hoarded: item.system?.hoarded,
 						value: item.system.value || 0,
@@ -438,6 +442,7 @@ export class M5Character extends Actor {
 						label: label,
 						icon: item.img,
 						magic: item.system.magic,
+						abw: item.system.abw || 0,
 						valuable: item.system?.valuable,
 						hoarded: item.system?.hoarded,
 						value: item.system.value || 0,

source/module/items/M5Item.ts

@@ -343,7 +343,13 @@ export class M5Item extends Item {
 
 			if (item.type === "spell" || item.type === "kampfkunst") {
 				if (this.actor["system"].ap.value >= item.system.ap) {
-					this.actor["system"].ap.value -= item.system.ap;
+					this.actor["update"]({
+						data: {
+							ap: {
+								value: this.actor["system"].ap.value - item.system.ap,
+							},
+						},
+					});
 				}
 			}
 

source/template.json

@@ -236,7 +236,8 @@
 				"weight": 0,
 				"capacity": 0,
 				"containerId": "",
-				"magic": false
+				"magic": false,
+				"abw": 0
 			},
 			"durationSelection": {
 				"durationSelection": {
@@ -326,7 +327,8 @@
 					"ausweichen": "midgard5.kido-variante-ausweichen",
 					"blockieren": "midgard5.kido-variante-blockieren",
 					"bewegen": "midgard5.kido-variante-bewegen",
-					"kontrollieren": "midgard5.kido-variante-kontrollieren"
+					"kontrollieren": "midgard5.kido-variante-kontrollieren",
+					"finte": "midgard5.kido-variante-finte"
 				}
 			}
 		},
@@ -451,6 +453,7 @@
 			"agens": "",
 			"reagens": "",
 			"material": "",
+			"rank": 0,
 			"rolls": {
 				"formulas": {
 					"0": {
@@ -472,10 +475,11 @@
 			"ap": "",
 			"weapon": "",
 			"ep": "",
-			"rank": "",
+			"rank": 0,
 			"enemy": "",
 			"color": "",
 			"style": "",
+			"grade": "",
 			"rolls": {
 				"formulas": {
 					"0": {

templates/chat/roll-m5.hbs

@@ -94,31 +94,29 @@
 							<td class="roll-spell-details">{{i.ep}}</td>
 						</tr>
 						<tr>
-							<td>{{localize "midgard5.kampfkunst-color"}}</td>
+							<td>{{localize "midgard5.kido-color"}}</td>
 							<td class="roll-spell-details">{{i.color}}</td>
 						</tr>
 						<tr>
-							<td>{{localize "midgard5.kampfkunst-style"}}</td>
+							<td>{{localize "midgard5.kido-style"}}</td>
 							<td class="roll-spell-details">{{i.style}}</td>
 						</tr>
 						<tr>
 							<td>{{localize "midgard5.kido-type"}}</td>
 							<td class="roll-spell-details">{{localize (m5concat "midgard5.kido-type-" i.type)}}</td>
 						</tr>
-						{{#if (eq i.type "angriff")}}
 							<tr>
 								<td>{{localize "midgard5.kido-variante"}}</td>
 								<td class="roll-spell-details">{{localize (m5concat "midgard5.kido-variante-" i.variante)}}</td>
 							</tr>
 						<tr>
-							<td>{{localize "midgard5.kampfkunst-enemy"}}</td>
+							<td>{{localize "midgard5.kido-enemy"}}</td>
 							<td class="roll-spell-details">{{i.enemy}}</td>
 						</tr>
 						<tr>
-							<td>{{localize "midgard5.kampfkunst-weapon"}}</td>
+							<td>{{localize "midgard5.kido-weapon"}}</td>
 							<td class="roll-spell-details">{{i.weapon}}</td>
 						</tr>
-						{{/if}}
 					{{/unless}}
 				{{/if}}
 

templates/sheets/character/gear.hbs

@@ -251,13 +251,13 @@
 								{{/unless}}
 							</td>
 							<td style="text-align: start">
-								{{#unless (or (eq item.weight "") (eq item.equipped?))}}
+								{{#unless (or (eq item.weight 0) (eq item.equipped?))}}
-								<span class="spell-process">{{item.weight}} kg</span>
+								<span class="spell-process">{{item.weight}}kg</span>
 								{{/unless}}
 							</td>
 							<td style="text-align: start">
-								{{#unless (eq item.capacity "")}}
+								{{#unless (eq item.capacity 0)}}
-								<span class="spell-process">{{item.capacity}} kg</span>
+								<span class="spell-process"{{#if (gt item.weight item.capacity) }}style="background:#FF6666"{{/if}}>{{item.capacity}}kg</span>
 								{{/unless}}
 							</td>
 							<td class="change-equipped">

templates/sheets/item/armor.hbs

@@ -51,7 +51,13 @@
 					<td>
 						<div class="flexrow">
 							<span>{{localize "midgard5.item-weight"}}</span>
-								<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}">
+								<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}kg">
+						</div>
+					</td>
+				<td>
+					<div class="flexrow">
+						<span>{{localize "midgard5.item-abw"}}</span>
+						<input id="data.abw" type="number" name="data.abw" value="{{data.abw}}">
 					</div>
 				</td>
 				</tr>

templates/sheets/item/container.hbs

@@ -18,6 +18,12 @@
 						</span>
 					</div>
 				</td>
+				<td>
+					<div class="flexrow">
+						<span>{{localize "midgard5.item-abw"}}</span>
+						<input id="data.abw" type="number" name="data.abw" value="{{data.abw}}">
+					</div>
+				</td>
 			</tr>
 			<tr>
 				<td>

templates/sheets/item/defensiveWeapon.hbs

@@ -55,7 +55,13 @@
 					<td>
 						<div class="flexrow">
 							<span>{{localize "midgard5.item-weight"}}</span>
-								<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}">
+								<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}kg">
+						</div>
+					</td>
+				<td>
+					<div class="flexrow">
+						<span>{{localize "midgard5.item-abw"}}</span>
+						<input id="data.abw" type="number" name="data.abw" value="{{data.abw}}">
 					</div>
 				</td>
 				</tr>

templates/sheets/item/item.hbs

@@ -37,8 +37,6 @@
 						<input id="data.quantity" type="number" name="data.quantity" value="{{data.quantity}}">
 					</div>
 				</td>
-			</tr>
-			<tr>
 				<td colspan="4">
 					<div class="flexrow">
 						<span>{{localize "midgard5.item-value"}}</span>
@@ -53,6 +51,18 @@
 					</select>
 					</div>
 				</td>
+				<td>
+					<div class="flexrow">
+						<span>{{localize "midgard5.item-weight"}}</span>
+							<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}">
+					</div>
+				</td>
+				<td>
+					<div class="flexrow">
+						<span>{{localize "midgard5.item-abw"}}</span>
+						<input id="data.abw" type="number" name="data.abw" value="{{data.abw}}">
+					</div>
+				</td>
 			</tr>
 
 			<tr>
@@ -73,12 +83,6 @@
 						{{/if}}
 					</div>
 				</td>
-				<td>
-					<div class="flexrow">
-						<span>{{localize "midgard5.item-weight"}}</span>
-							<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}">
-					</div>
-				</td>
 			</tr>
 		</table>
 

templates/sheets/item/kampfkunst.hbs

@@ -25,8 +25,10 @@
 				<tr>
 					<td>{{localize "midgard5.kampfkunst-ep"}}</td>
 					<td><input name="data.ep" type="text" value="{{data.ep}}" data-dtype="String" /></td>
+					{{#unless item.system.isKido}}
 					<td>{{localize "midgard5.kampfkunst-rank"}}</td>
-					<td><input name="data.rank" type="text" value="{{data.rank}}" data-dtype="String" /></td>
+					<td><input name="data.rank" type="number" value="{{data.rank}}" data-dtype="Number" /></td>
+					{{/unless}}
 				</tr>
 				<tr>
 					<td>{{localize "midgard5.kampfkunst-weapon"}}</td>
@@ -83,6 +85,20 @@
 						</td>
 						{{/unless}}
 					{{/unless}}
+				{{#if item.system.isKido}}
+				<tr>
+					<td>{{localize "midgard5.kido-color"}}</td>
+					<td><input name="data.color" type="text" value="{{data.color}}" data-dtype="String" /></td>
+					<td>{{localize "midgard5.kido-style"}}</td>
+					<td><input name="data.style" type="text" value="{{data.style}}" data-dtype="String" /></td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.kido-grade"}}</td>
+					<td><input name="data.grade" type="text" value="{{data.grade}}" data-dtype="String" /></td>
+					<td>{{localize "midgard5.kido-rank"}}</td>
+					<td><input name="data.rank" type="number" value="{{data.rank}}" data-dtype="Number" /></td>
+				</tr>
+				{{/if}}
 				</tr>
 				<td>{{localize "midgard5.skill"}}</td>
 					<td>

templates/sheets/item/weapon.hbs

@@ -60,7 +60,13 @@
 					<td>
 						<div class="flexrow">
 							<span>{{localize "midgard5.item-weight"}}</span>
-								<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}">
+								<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}kg">
+						</div>
+					</td>
+				<td>
+					<div class="flexrow">
+						<span>{{localize "midgard5.item-abw"}}</span>
+						<input id="data.abw" type="number" name="data.abw" value="{{data.abw}}">
 					</div>
 				</td>
 				</tr>