#2507 Unarmed Attack Damage Miscalculation

This commit is contained in:
Kevin Searle
2017-04-06 22:59:11 -05:00
parent f40c9fd7f0
commit 309953f3be
3 changed files with 17 additions and 13 deletions
+1
View File
@@ -36,6 +36,7 @@ Report any problems, suggestions, or features by [creating an issue](https://git
* Style tweaks to roll templates
* Fixed error with attacks/skills/init using old attr mod name
* Link to QA campaign
* Fixed issue with Combat/Unarmed not being applied to damage rolls
#### 0.1.5
@@ -185,10 +185,11 @@ div.sheet-tab-input
width: 140px;
padding: 0;
margin: 0;
font-weight: bold;
font-weight: normal;
font-size: smaller;
}
.sheet-weapons-wrapper label.sheet-weapons-short {
width: 95px;
/*width: 90px;*/
}
.sheet-languages {
margin-top: 15px;
+13 -11
View File
@@ -1141,17 +1141,18 @@
</div>
<div class="sheet-weapons-wrapper">
<label>Weapon</label>
<label class="sheet-weapons-short">Weapon AB</label>
<label class="sheet-weapons-short">Skill</label>
<label class="sheet-weapons-short">Attribute</label>
<label class="sheet-weapons-short">Damage</label>
<label>Range</label>
<label class="sheet-weapons-short">Ammo</label>
<label style="width: 140px">Weapon</label>
<label class="sheet-weapons-short" style="width: 55px">Weapon AB</label>
<label class="sheet-weapons-short" style="width: 95px">Skill</label>
<label class="sheet-weapons-short" style="width: 95px">Attribute</label>
<label class="sheet-weapons-short" style="width: 85px">Damage</label>
<label class="sheet-weapons-short" style="width: 50px">Unarmed</label>
<label style="width: 140px">Range</label>
<label class="sheet-weapons-short" style="width: 55px">Ammo</label>
<br>
<fieldset class="repeating_weapons">
<input type="text" name="attr_weapon_name" style="width: 140px">
<input type="number" name="attr_weapon_attack" value="0" style="width: 95px">
<input type="number" name="attr_weapon_attack" value="0" style="width: 55px">
<select class="inputbox" name="attr_weapon_skill_bonus" style="width: 95px; height: 25px">
<option value="@{skill_combat_energy}">Energy</option>
<option value="@{skill_combat_gunnery}">Gunnery</option>
@@ -1168,10 +1169,11 @@
<option value="@{wis_bonus}">WIS</option>
<option value="@{cha_bonus}">CHA</option>
</select>
<input type="text" name="attr_weapon_damage" style="width: 95px">
<input type="text" name="attr_weapon_damage" style="width: 85px">
<input type="checkbox" name="attr_is_unarmed" value="@{skill_unarmed}" style="width: 50px;">
<input type="text" name="attr_weapon_range" style="width: 140px">
<input type="number" name="attr_weapon_ammo" style="width: 95px">
<button type="roll" name="roll_weapon_to_hit" value="/me &{template:attack} {{characterName=@{name}}} {{name=@{weapon_name}}} {{rollValue=[[1d20 + ?{AC|0}[AC] + @{attack_bonus}[AB] + @{weapon_attack}[Weapon AB] + @{weapon_skill_bonus}[Skill] + @{attribute_mod}[Attribute] + ?{Other Modifier|0}[Modifier]]]}} {{damage=[[@{weapon_damage} + @{attribute_mod}]]}}" ></button>
<input type="number" name="attr_weapon_ammo" style="width: 55px">
<button type="roll" name="roll_weapon_to_hit" value="/me &{template:attack} {{characterName=@{name}}} {{name=@{weapon_name}}} {{rollValue=[[1d20 + ?{AC|0}[AC] + @{attack_bonus}[AB] + @{weapon_attack}[Weapon AB] + @{weapon_skill_bonus}[Skill] + @{attribute_mod}[Attribute] + ?{Other Modifier|0}[Modifier]]]}} {{damage=[[@{weapon_damage} + @{attribute_mod} + @{is_unarmed}]]}}" ></button>
</fieldset>
</div>