Merge branch 'develop' into Vereinfachter-NPC/Kreaturen-Bogen
This commit is contained in:
@@ -251,13 +251,13 @@
|
||||
{{/unless}}
|
||||
</td>
|
||||
<td style="text-align: start">
|
||||
{{#unless (or (eq item.weight "") (eq item.equipped?))}}
|
||||
<span class="spell-process">{{item.weight}} kg</span>
|
||||
{{#unless (or (eq item.weight 0) (eq item.equipped?))}}
|
||||
<span class="spell-process">{{item.weight}}kg</span>
|
||||
{{/unless}}
|
||||
</td>
|
||||
<td style="text-align: start">
|
||||
{{#unless (eq item.capacity "")}}
|
||||
<span class="spell-process">{{item.capacity}} kg</span>
|
||||
{{#unless (eq item.capacity 0)}}
|
||||
<span class="spell-process"{{#if (gt item.weight item.capacity) }}style="background:#FF6666"{{/if}}>{{item.capacity}}kg</span>
|
||||
{{/unless}}
|
||||
</td>
|
||||
<td class="change-equipped">
|
||||
|
||||
@@ -51,9 +51,15 @@
|
||||
<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>
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -55,9 +55,15 @@
|
||||
<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>
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -60,9 +60,15 @@
|
||||
<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>
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
Reference in New Issue
Block a user