Merge branch 'develop' into Situationsbedingte-Boni/Mali-#41
This commit is contained in:
@@ -46,8 +46,8 @@
|
||||
<tr>
|
||||
<td>{{localize "midgard5.luckPoints"}}</td>
|
||||
<td><input name="data.gp" type="text" value="{{data.gp}}" data-dtype="Number" /></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>{{localize "midgard5.valuable"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.wealth}}</td>
|
||||
</tr>
|
||||
<tr height = 10px></tr>
|
||||
</tbody>
|
||||
@@ -104,23 +104,43 @@
|
||||
<td class="fixed-value">{{data.calc.stats.resistanceBody.value}}</td>
|
||||
</tr>
|
||||
{{#if (eq data.info.race "Zwerg")}}
|
||||
<tr>
|
||||
<td>{{localize "midgard5.hoard"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.hoard}}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{localize "midgard5.hoardMin"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.hoardMin}}</td>
|
||||
<td>{{localize "midgard5.hoard-next"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.hoardNext}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{localize "midgard5.hoard"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.hoard}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{localize "midgard5.hoardMin"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.hoardMin}}</td>
|
||||
<td>{{localize "midgard5.hoard-next"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.hoardNext}}</td>
|
||||
</tr>
|
||||
{{/if}}
|
||||
|
||||
<tr height = 10px></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flexcolumn-1">
|
||||
<div class="flexpart">
|
||||
<div class="flexpart-header"><img src="icons/skills/wounds/injury-body-pain-gray.webp" class="flexpart-icon">{{localize "midgard5.deprivations"}} & {{localize "midgard5.deprivation"}}</div>
|
||||
<table>
|
||||
<tr height = 10px></tr>
|
||||
<tr>
|
||||
<td class="flexpart-img"><img src="/icons/consumables/food/plate-fish-bowl-bones-brown.webp" class="flexpart-icon"></td>
|
||||
<td class="padding highlight">{{localize "midgard5.deprivationFood"}}</td>
|
||||
<td class="center">{{data.calc.stats.deprivationFood.value}}</td>
|
||||
<td class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-deprivationFood-button"></button></td>
|
||||
<td class="flexpart-img"><img src="/icons/magic/fire/orb-lightning-sun.webp" class="flexpart-icon"></td>
|
||||
<td class="padding highlight">{{localize "midgard5.deprivationHeat"}}</td>
|
||||
<td class="center">{{ data.calc.stats.deprivationHeat.value}}</td>
|
||||
<td class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-deprivationHeat-button"></button></td>
|
||||
<td class="flexpart-img"><img src="/icons/magic/water/snowflake-ice-blue.webp" class="flexpart-icon"></td>
|
||||
<td class="padding highlight">{{localize "midgard5.deprivationCold"}}</td>
|
||||
<td class="center">{{data.calc.stats.deprivationCold.value}}</td>
|
||||
<td class="fixed-value"><button class="roll-button roll-deprivationCold-button"></button></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@@ -48,9 +48,9 @@
|
||||
<tr height = 10px></tr>
|
||||
<tr>
|
||||
<td class="fixed-value"><input type="number" disabled="true" name="data.info.load" value="{{data.calc.stats.load}}"></td>
|
||||
<td class="fixed-value"><input type="number" disabled="true" {{#if (gte data.calc.stats.encumbrance data.calc.stats.heavyLoad) }}style="background:#FF6666"{{/if}} name="data.info.heavyLoad" value="{{data.calc.stats.heavyLoad}}"></td>
|
||||
<td class="fixed-value"><input type="number" disabled="true" {{#if (gte data.calc.stats.encumbrance data.calc.stats.loadMax) }}style="background:#FF6666"{{/if}} name="data.info.loadMax" value="{{data.calc.stats.loadMax}}"></td>
|
||||
<td class="fixed-value"><input type="number" disabled="true" {{#if (gte data.calc.stats.encumbrance data.calc.stats.thrustLoad) }}style="background:#FF6666"{{/if}} name="data.info.thrustLoad" value="{{data.calc.stats.thrustLoad}}"></td>
|
||||
<td class="fixed-value"><input type="number" disabled="true" {{#if (gt data.calc.stats.encumbrance data.calc.stats.heavyLoad) }}style="background:#FF6666"{{/if}} name="data.info.heavyLoad" value="{{data.calc.stats.heavyLoad}}"></td>
|
||||
<td class="fixed-value"><input type="number" disabled="true" {{#if (gt data.calc.stats.encumbrance data.calc.stats.loadMax) }}style="background:#FF6666"{{/if}} name="data.info.loadMax" value="{{data.calc.stats.loadMax}}"></td>
|
||||
<td class="fixed-value"><input type="number" disabled="true" {{#if (gt data.calc.stats.encumbrance data.calc.stats.thrustLoad) }}style="background:#FF6666"{{/if}} name="data.info.thrustLoad" value="{{data.calc.stats.thrustLoad}}"></td>
|
||||
<td class="fixed-value"><input type="number" disabled="true" name="data.info.encumbrance" value="{{data.calc.stats.encumbrance}}"></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
@@ -231,6 +231,7 @@
|
||||
<th class="title">{{localize "TYPES.Item.container"}}</th>
|
||||
<th class="title center">{{localize "midgard5.item-value"}}</th>
|
||||
<th class="title center">{{localize "midgard5.item-weight"}}</th>
|
||||
<th class="title center">{{localize "midgard5.capacity"}}</th>
|
||||
<th class="title center"><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>
|
||||
<td><a class="title add-container"><i class="fa-regular fa-plus"></i></a></th>
|
||||
@@ -254,6 +255,11 @@
|
||||
<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}}
|
||||
</td>
|
||||
<td class="change-equipped">
|
||||
{{#if item.equipped}}
|
||||
<i class="fa-solid fa-circle-check"></i>
|
||||
|
||||
@@ -27,24 +27,6 @@
|
||||
<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
<tr data-item-id="{{itemId}}">
|
||||
<td class="flexpart-img"><img src="icons/skills/toxins/cup-goblet-poisoned-spilled.webp" class="flexpart-icon"></td>
|
||||
<td class="padding edit-item">{{localize "midgard5.drinking"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.drinkingFW}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.drinking.value}}</td>
|
||||
<td class="fixed-value">{{add data.calc.stats.drinking.value data.calc.stats.drinkingFW}}</td>
|
||||
<td><button class="roll-button roll-drinking-button"></button></td>
|
||||
<td class="fixed-value"></td>
|
||||
</tr>
|
||||
<tr data-item-id="{{itemId}}">
|
||||
<td class="flexpart-img"><img src="icons/magic/perception/eye-ringed-green.webp" class="flexpart-icon"></td>
|
||||
<td class="padding edit-item">{{localize "midgard5.perception"}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.perceptionFW}}</td>
|
||||
<td class="fixed-value">{{data.calc.stats.perception.value}}</td>
|
||||
<td class="fixed-value">{{add data.calc.stats.perception.value data.calc.stats.perceptionFW}}</td>
|
||||
<td><button class="roll-button roll-perception-button"></button></td>
|
||||
<td class="fixed-value"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<tr>
|
||||
<td bgcolor="#eaead7" class="padding edit-item highlight" >{{localize "midgard5.spellCasting"}}</td>
|
||||
<td bgcolor="#eaead7" class="center">{{data.calc.stats.spellCasting.value}}</td>
|
||||
<td bgcolor="#eaead7" class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-weapon-button" /></td>
|
||||
<td bgcolor="#eaead7" class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-cleanSpell-button" /></td>
|
||||
<td class="padding edit-item highlight">{{localize "midgard5.defense"}}</td>
|
||||
<td class="center">{{add data.calc.stats.defense.value data.calc.stats.defenseBonus.value}}</td>
|
||||
<td class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-defense-button"></button></td>
|
||||
@@ -72,8 +72,8 @@
|
||||
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
</tbody> </table>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
{{#each data.lernKostenZauber as |wert name|}}
|
||||
<span style="flex: 1 0 26%">
|
||||
<label for="data.lernKostenZauber.{{name}}">{{localize (m5concat "midgard5.spell-process-" name)}}</label>
|
||||
<input style="width:35px" name="data.lernKostenZauber.{{name}}" type="number" value={{wert.kosten}} data-dtype="Number" />
|
||||
<input style="width:35px" name="data.lernKostenZauber.{{name}}.kosten" type="number" value={{wert.kosten}} data-dtype="Number" />
|
||||
</span>
|
||||
{{/each}}
|
||||
</div>
|
||||
|
||||
@@ -26,6 +26,12 @@
|
||||
<input id="data.quantity" type="number" name="data.quantity" value="{{data.quantity}}">
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="flexrow">
|
||||
<span>{{localize "midgard5.capacity"}}</span>
|
||||
<input id="data.capacity" type="number" name="data.capacity" value="{{data.capacity}}">
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
@@ -42,6 +48,12 @@
|
||||
</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>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user