Adds gear and spells as items.

Adds custom roll logic, inclusing chat message.

templates/sheets/character/base_values.hbs

@@ -35,34 +35,49 @@
 			<td>{{localize "midgard5.actor-st-long"}}</td>
 			<td><input name="data.attributes.st.value" type="text" value="{{data.attributes.st.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.st.bonus" type="text" value="{{data.attributes.st.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="st" /></td>
+			
 			<td>{{localize "midgard5.actor-gs-long"}}</td>
 			<td><input name="data.attributes.gs.value" type="text" value="{{data.attributes.gs.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.gs.bonus" type="text" value="{{data.attributes.gs.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="gs" /></td>
+			
 			<td>{{localize "midgard5.actor-gw-long"}}</td>
 			<td><input name="data.attributes.gw.value" type="text" value="{{data.attributes.gw.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.gw.bonus" type="text" value="{{data.attributes.gw.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="gw" /></td>
 		</tr>
 		<tr>
 			<td>{{localize "midgard5.actor-ko-long"}}</td>
 			<td><input name="data.attributes.ko.value" type="text" value="{{data.attributes.ko.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.ko.bonus" type="text" value="{{data.attributes.ko.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="ko" /></td>
+			
 			<td>{{localize "midgard5.actor-in-long"}}</td>
 			<td><input name="data.attributes.in.value" type="text" value="{{data.attributes.in.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.in.bonus" type="text" value="{{data.attributes.in.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="in" /></td>
+			
 			<td>{{localize "midgard5.actor-zt-long"}}</td>
 			<td><input name="data.attributes.zt.value" type="text" value="{{data.attributes.zt.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.zt.bonus" type="text" value="{{data.attributes.zt.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="zt" /></td>
 		</tr>
 		<tr>
 			<td>{{localize "midgard5.actor-au-long"}}</td>
 			<td><input name="data.attributes.au.value" type="text" value="{{data.attributes.au.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.au.bonus" type="text" value="{{data.attributes.au.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="au" /></td>
+			
 			<td>{{localize "midgard5.actor-pa-long"}}</td>
 			<td><input name="data.attributes.pa.value" type="text" value="{{data.attributes.pa.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.pa.bonus" type="text" value="{{data.attributes.pa.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="pa" /></td>
+			
 			<td>{{localize "midgard5.actor-wk-long"}}</td>
 			<td><input name="data.attributes.wk.value" type="text" value="{{data.attributes.wk.value}}" data-dtype="Number" /></td>
 			<td><input name="data.attributes.wk.bonus" type="text" value="{{data.attributes.wk.bonus}}" data-dtype="Number" placeholder="Bonus" /></td>
+			<td><button class="roll-button roll-attribute-button" data-attribute="wk" /></td>
 		</tr>
 	</tbody>
 </table>

templates/sheets/character/gear.hbs

@@ -7,12 +7,64 @@
 		</tr>
 	</thead>
 	<tbody>
-		{{#each data.calc.gear.weapons as |weapon itemId|}}
+		{{#each data.calc.gear.weapons as |item itemId|}}
 			<tr data-item="{{itemId}}">
-				<td class="padding edit-item">{{weapon.label}}</td>
-				<td class="center">{{weapon.calc.ew}}</td>
+				<td class="padding edit-item">{{item.label}}</td>
+				<td class="center">{{item.calc.ew}}</td>
+				<td><button class="roll-weapon-button">{{localize "midgard5.roll"}}</button></td>
+			</tr>
+		{{/each}}
+
+		<tr data-item="{{itemId}}">
+			<td class="padding edit-item">{{localize "midgard5.brawl"}}</td>
+			<td class="center">{{data.calc.stats.brawlEw}}</td>
+			<td><button class="roll-brawl-button">{{localize "midgard5.roll"}}</button></td>
+		</tr>
+	</tbody>
+</table>
+
+<table>
+	<thead>
+		<tr>
+			<th>{{localize "ITEM.TypeDefensiveWeapon"}}</th>
+			<th>{{localize "midgard5.ew"}}</th>
+			<th></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 class="center">{{item.calc.ew}}</td>
 				<td><button class="roll-weapon-button">{{localize "midgard5.roll"}}</button></td>
 			</tr>
 		{{/each}}
 	</tbody>
 </table>
+
+<table>
+	<thead>
+		<tr>
+			<th>{{localize "ITEM.TypeArmor"}}</th>
+			<th>{{localize "midgard5.actor-lp-short"}}</th>
+			<th>{{localize "midgard5.actor-ap-short"}}</th>
+			<th>{{localize "midgard5.attackBonus-short"}}</th>
+			<th>{{localize "midgard5.defenseBonus-short"}}</th>
+			<th>B</th>
+			<th>Gw</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 class="center">{{actorItemValue ../actor._id itemId "lpProtection"}}</td>
+				<td class="center">{{actorItemValue ../actor._id itemId "apProtection"}}</td>
+				<td class="center">{{actorItemValue ../actor._id itemId "stats.attackBonus"}}</td>
+				<td class="center">{{actorItemValue ../actor._id itemId "stats.defenseBonus"}}</td>
+				<td class="center">{{actorItemValue ../actor._id itemId "stats.movementBonus"}}</td>
+				<td class="center">{{actorItemValue ../actor._id itemId "attributeMod.gw"}}</td>
+			</tr>
+		{{/each}}
+	</tbody>
+</table>

templates/sheets/character/main.hbs

@@ -26,5 +26,9 @@
 			{{> "systems/midgard5/templates/sheets/character/gear.hbs"}}
 		</div>
 
+		<div class="tab base_values flexcol" data-group="primary" data-tab="spells">
+			{{> "systems/midgard5/templates/sheets/character/spells.hbs"}}
+		</div>
+
 	</section>
 </form>

templates/sheets/character/skills.hbs

@@ -18,14 +18,6 @@
 				<td><button class="roll-learned-button">{{localize "midgard5.roll"}}</button></td>
 			</tr>
 		{{/each}}
-
-		<tr class="new-skill">
-			<td class="padding">{{localize "midgard5.new-skill"}}</td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td><button data-skilltype="general" class="create-skill-button">{{localize "midgard5.learn"}}</button></td>
-		</tr>
 	</tbody>
 </table>
 
@@ -49,14 +41,29 @@
 				<td><button class="roll-learned-button">{{localize "midgard5.roll"}}</button></td>
 			</tr>
 		{{/each}}
+	</tbody>
+</table>
 
-		<tr class="new-skill">
-			<td class="padding">{{localize "midgard5.new-skill"}}</td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td><button data-skilltype="language" class="create-skill-button">{{localize "midgard5.learn"}}</button></td>
+<table>
+	<thead>
+		<tr>
+			<th>{{localize "midgard5.innate-ability"}}</th>
+			<th>{{localize "midgard5.fw"}}</th>
+			<th>{{localize "midgard5.bonus"}}</th>
+			<th>{{localize "midgard5.ew"}}</th>
+			<th></th>
 		</tr>
+	</thead>
+	<tbody>
+		{{#each data.calc.skills.innate as |skill skillId|}}
+			<tr data-item="{{skillId}}">
+				<td class="padding edit-item">{{skill.label}}</td>
+				<td class="center">{{skill.fw}}</td>
+				<td class="center">{{skill.calc.bonus}}</td>
+				<td class="center">{{skill.calc.ew}}</td>
+				<td><button class="roll-learned-button">{{localize "midgard5.roll"}}</button></td>
+			</tr>
+		{{/each}}
 	</tbody>
 </table>
 
@@ -64,7 +71,6 @@
 	<thead>
 		<tr>
 			<th>{{localize "midgard5.weapon-skill"}}</th>
-			<th>{{localize "midgard5.special"}}</th>
 			<th>{{localize "midgard5.fw"}}</th>
 			<th>{{localize "midgard5.bonus"}}</th>
 			<th>{{localize "midgard5.ew"}}</th>
@@ -75,28 +81,12 @@
 		{{#each data.calc.skills.combat as |skill skillId|}}
 			<tr data-item="{{skillId}}">
 				<td class="padding edit-item">{{skill.label}}</td>
-				<td class="center">
-					{{#if (eq skillId ../data.skills.preferredCombatSkill)}}
-						<input type="checkbox" checked />
-					{{else}}
-						<input type="checkbox" class="change-special-combat-skill" />
-					{{/if}}
-				</td>
 				<td class="center">{{skill.fw}}</td>
 				<td class="center">{{skill.calc.bonus}}</td>
 				<td class="center">{{skill.calc.ew}}</td>
 				<td><button class="roll-learned-button">{{localize "midgard5.roll"}}</button></td>
 			</tr>
 		{{/each}}
-
-		<tr class="new-skill">
-			<td class="padding">{{localize "midgard5.new-skill"}}</td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td><button data-skilltype="combat" class="create-skill-button">{{localize "midgard5.learn"}}</button></td>
-		</tr>
 	</tbody>
 </table>
 

templates/sheets/character/spells.hbs

@@ -0,0 +1,21 @@
+<table>
+	<thead>
+		<tr>
+			<th>{{localize "ITEM.TypeSpell"}}</th>
+			<th>{{localize "midgard5.ew"}}</th>
+			<th></th>
+		</tr>
+	</thead>
+	<tbody>
+		{{#each data.calc.spells as |item itemId|}}
+			<tr data-item="{{itemId}}">
+				<td class="padding edit-item">
+					<span>{{item.label}}</span>
+					<span class="spell-process">{{localize item.process}}</span>
+				</td>
+				<td class="center">{{item.calc.ew}}</td>
+				<td><button class="roll-weapon-button">{{localize "midgard5.roll"}}</button></td>
+			</tr>
+		{{/each}}
+	</tbody>
+</table>

templates/sheets/item/armor.hbs

@@ -0,0 +1,37 @@
+<form class="{{cssClass}}" autocomplete="off">
+	<header class="sheet-header">
+		<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+		<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
+	</header>
+	<div class="sheet-content">
+		<table>
+			<tbody>
+				<tr>
+					<td>{{localize "midgard5.actor-lp"}}</td>
+					<td><input name="data.lpProtection" type="text" value="{{data.lpProtection}}" data-dtype="Number" /></td>
+					
+					<td>{{localize "midgard5.actor-ap"}}</td>
+					<td><input name="data.apProtection" type="text" value="{{data.apProtection}}" data-dtype="Number" /></td>
+				</tr>
+
+				<tr>
+					<td>{{localize "midgard5.attackBonus"}}</td>
+					<td><input name="data.stats.attackBonus" type="text" value="{{data.stats.attackBonus}}" data-dtype="Number" /></td>
+					
+					<td>{{localize "midgard5.defenseBonus"}}</td>
+					<td><input name="data.stats.defenseBonus" type="text" value="{{data.stats.defenseBonus}}" data-dtype="Number" /></td>
+				</tr>
+				
+				<tr>
+					<td>{{localize "midgard5.movementRange"}}</td>
+					<td><input name="data.stats.movementBonus" type="text" value="{{data.stats.movementBonus}}" data-dtype="Number" /></td>
+					
+					<td>{{localize "midgard5.actor-gw-long"}}</td>
+					<td><input name="data.attributeMod.gw" type="text" value="{{data.attributeMod.gw}}" data-dtype="Number" /></td>
+				</tr>
+			</tbody>
+		</table>
+
+		{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+	</div>
+</form>

templates/sheets/item/defensiveWeapon.hbs

@@ -0,0 +1,48 @@
+<form class="{{cssClass}}" autocomplete="off">
+	<header class="sheet-header">
+		<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+		<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
+	</header>
+	<div class="sheet-content">
+		<table>
+			<tbody>
+				<tr>
+					<td colspan=4>
+						<div class="flexrow">
+							<span>
+								<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}}>
+								<label for="data.magic">{{localize "midgard5.magic"}}</label>
+							</span>
+
+							<span>
+								<input id="data.special" type="checkbox" name="data.special" {{checked data.special}}>
+								<label for="data.special">{{localize "midgard5.special"}}</label>
+							</span>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.defenseBonus"}}</td>
+					<td><input name="data.stats.defenseBonus" type="text" value="{{data.stats.defenseBonus}}" data-dtype="Number" /></td>
+					
+					<td>{{localize "midgard5.weapon-skill"}}</td>
+					<td>
+						{{#if data.calc.combatSkills}}
+							<select class="select-skill" name="data.skillId" data-type="String">
+								{{#select data.skillId}}
+									<option value="">{{localize "midgard5.no-skill"}}</option>
+									{{#each data.calc.combatSkills as |skill key|}}
+										<option value="{{key}}">{{skill.label}}</option>
+									{{/each}}
+								{{/select}}
+							</select>
+						{{else}}
+							<span>Assign item to character to select weapon skill</span>
+						{{/if}}
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+	</div>
+</form>

templates/sheets/item/skill.hbs

@@ -17,6 +17,7 @@
 					<td>
 						<select class="select-attribute" name="data.attribute" data-type="String">
 							{{#select data.attribute}}
+								<option value="">{{localize "midgard5.no-skill"}}</option>
 								{{#each data.attributes as |attribute key|}}
 									<option value="{{key}}">{{localize attribute.long}}</option>
 								{{/each}}

templates/sheets/item/spell.hbs

@@ -0,0 +1,67 @@
+<form class="{{cssClass}}" autocomplete="off">
+	<header class="sheet-header">
+		<img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+		<h1><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
+	</header>
+	<div class="sheet-content">
+		<table>
+			<tbody>
+				<tr>
+					<td>{{localize "midgard5.bonus"}}</td>
+					<td><input name="data.bonus" type="text" value="{{data.bonus}}" data-dtype="Number" /></td>
+					<td>{{localize "midgard5.actor-ap"}}</td>
+					<td><input name="data.ap" type="text" value="{{data.ap}}" data-dtype="Number" /></td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.spell-castDuration"}}</td>
+					<td><input name="data.castDuration" type="text" value="{{data.castDuration}}" data-dtype="String" /></td>
+					<td>{{localize "midgard5.spell-range"}}</td>
+					<td><input name="data.range" type="text" value="{{data.range}}" data-dtype="String" /></td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.spell-effectTarget"}}</td>
+					<td>
+						<select class="select-effectTarget" name="data.effectTarget" data-type="String">
+							{{#select data.effectTarget}}
+								{{#each data.spellTargetSelection as |label key|}}
+									<option value="{{key}}">{{localize label}}</option>
+								{{/each}}
+							{{/select}}
+						</select>
+					</td>
+					<td>{{localize "midgard5.spell-effectArea"}}</td>
+					<td><input name="data.effectArea" type="text" value="{{data.effectArea}}" data-dtype="String" /></td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.spell-effectDuration"}}</td>
+					<td><input name="data.effectDuration" type="text" value="{{data.effectDuration}}" data-dtype="String" /></td>
+					<td>{{localize "midgard5.spell-origin"}}</td>
+					<td><input name="data.origin" type="text" value="{{data.origin}}" data-dtype="String" /></td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.spell-type"}}</td>
+					<td>
+						<select class="select-type" name="data.type" data-type="String">
+							{{#select data.type}}
+								{{#each data.spellTypeSelection as |label key|}}
+									<option value="{{key}}">{{localize label}}</option>
+								{{/each}}
+							{{/select}}
+						</select>
+					</td>
+					<td>{{localize "midgard5.spell-process"}}</td>
+					<td>
+						<select class="select-process" name="data.process" data-type="String">
+							{{#select data.process}}
+								{{#each data.spellProcessSelection as |label key|}}
+									<option value="{{key}}">{{localize label}}</option>
+								{{/each}}
+							{{/select}}
+						</select>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+	</div>
+</form>

templates/sheets/item/weapon.hbs

@@ -7,17 +7,23 @@
 		<table>
 			<tbody>
 				<tr>
-					<td colspan=2>
-						<input id="data.defensive" type="checkbox" name="data.defensive" {{checked data.defensive}}>
-						<label for="data.defensive">{{localize "midgard5.defensive-weapon"}}</label>
-					</td>
-					<td>
-						<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}}>
-						<label for="data.magic">{{localize "midgard5.magic"}}</label>
-					</td>
-					<td>
-						<input id="data.ranged" type="checkbox" name="data.ranged" {{checked data.ranged}}>
-						<label for="data.ranged">{{localize "midgard5.rangedWeapon"}}</label>
+					<td colspan=4>
+						<div class="flexrow">
+							<span>
+								<input id="data.magic" type="checkbox" name="data.magic" {{checked data.magic}}>
+								<label for="data.magic">{{localize "midgard5.magic"}}</label>
+							</span>
+
+							<span>
+								<input id="data.ranged" type="checkbox" name="data.ranged" {{checked data.ranged}}>
+								<label for="data.ranged">{{localize "midgard5.rangedWeapon"}}</label>
+							</span>
+
+							<span>
+								<input id="data.special" type="checkbox" name="data.special" {{checked data.special}}>
+								<label for="data.special">{{localize "midgard5.special"}}</label>
+							</span>
+						</div>
 					</td>
 				</tr>
 				<tr>