Fixes to the Perform Skill and Damage

Fixed an issue found in the Perform skill
Negative Damage Bonus was not appropriately included into the final output.
This commit is contained in:
KPhan1212
2021-09-13 10:22:32 -07:00
committed by GitHub
parent 9257b7bbc0
commit 077747bc82
+6 -6
View File
@@ -500,7 +500,7 @@
<td><input type="checkbox" name="attr_Success-Perform" /></td>
<td><input type="text" name="attr_PerformSkill" class="sheet-skillname"/></td>
<td><input type="number" style="width:105%" value="5" name="attr_Perform" /></td>
<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Perform}*{Multipler}+{Mods|0})/20)+1]]}} {{special=[[ceil((@{Perform}*@{Multiplier}+@{Mods})/5)+1]]}} {{success=[[ceil(@{Perform}*@{Multiplier}+@{Mods})]]}} {{roll=[[1d100]]}} {{skillname=@{PerformSkill}}}"/></td>
<td><button type="roll" value="&{template:skillRoll} {{name=@{Name}}} {{skillvalue=@{Perform}}} {{fumble=[[ceil(95+(@{Perform}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Perform}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Perform}*@{Multiplier}+@{Mods})/5)+1]]}} {{success=[[ceil(@{Perform}*@{Multiplier}+@{Mods})]]}} {{roll=[[1d100]]}} {{skillname=@{PerformSkill}}}"/></td>
</fieldset>
<table style="width: 100%;">
<tr>
@@ -1370,7 +1370,7 @@
<option value="0">None</option>
</select>
</td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Brawl-Damage}+(ceil(@{Damage_Bonus}*@{weapon_typeB}))]]}} {{success=[[ceil(@{Brawl}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Brawl}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Brawl}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Brawl}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Brawl}}} {{roll=[[1d100]]}} {{skillname=Brawl}}" /></td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[ceil(@{Brawl-Damage}+@{Damage_Bonus}*@{weapon_typeB})]]}} {{success=[[ceil(@{Brawl}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Brawl}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Brawl}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Brawl}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Brawl}}} {{roll=[[1d100]]}} {{skillname=Brawl}}" /></td>
</tr>
<tr>
@@ -1412,7 +1412,7 @@
<option value="0">None</option>
</select>
</td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Grapple-Damage}+(ceil(@{Damage_Bonus}*@{weapon_typeG}))]]}} {{success=[[ceil(@{Grapple}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Grapple}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Grapple}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Grapple}*@{Multiplier}+@{Mods})/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Grapple}}" /></td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[ceil(@{Grapple-Damage}+@{Damage_Bonus}*@{weapon_typeG})]]}} {{success=[[ceil(@{Grapple}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Grapple}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Grapple}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Grapple}*@{Multiplier}+@{Mods})/5)+1]]}} {{roll=[[1d100]]}} {{skillname=Grapple}}" /></td>
</tr>
</tbody>
@@ -1455,7 +1455,7 @@
<option value="0">None</option>
</select>
</td>
<td><button type="roll" value="&{template:melee-roll} {{name=@{Name}}}{{tot=[[@{Damagex}+(ceil(@{Damage_Bonus}*@{weapon_type}))]]}} {{success=[[ceil(@{Score}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Score}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Score}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Score}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Score}}} {{roll=[[1d100]]}} {{skillname=@{Attack-Weapon}}}" /></td>
<td><button type="roll" value="&{template:melee-roll} {{name=@{Name}}}{{tot=[[ceil(@{Damagex}+@{Damage_Bonus}*@{weapon_type})]]}} {{success=[[ceil(@{Score}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Score}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Score}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Score}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Score}}} {{roll=[[1d100]]}} {{skillname=@{Attack-Weapon}}}" /></td>
</tr>
</tbody>
</table>
@@ -1489,7 +1489,7 @@
<option value="0.5">Yes</option>
</select>
</td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Damage1}+(ceil(@{Damage_Bonus}*@{weapon_type1}))]]}} {{success=[[ceil(@{Score1}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Score1}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Score1}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Score1}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Score1}}} {{roll=[[1d100]]}} {{skillname=@{Firearm1}}}" /></td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[ceil(@{Damage1}+@{Damage_Bonus}*@{weapon_type1})]]}} {{success=[[ceil(@{Score1}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Score1}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Score1}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Score1}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Score1}}} {{roll=[[1d100]]}} {{skillname=@{Firearm1}}}" /></td>
</tr>
</tbody>
</table>
@@ -1510,7 +1510,7 @@
<option value="0.5">Yes</option>
</select>
</td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[@{Damage}+(ceil(@{Damage_Bonus}*@{weapon_type}))]]}} {{success=[[ceil(@{Score}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Score}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Score}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Score}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Score}}} {{roll=[[1d100]]}} {{skillname=@{Firearm}}}" /></td>
<td><button type="roll" value="&{template:melee-roll} {{tot=[[ceil(@{Damage}+@{Damage_Bonus}*@{weapon_type})]]}} {{success=[[ceil(@{Score}*@{Multiplier}+@{Mods})]]}} {{fumble=[[ceil(95+(@{Score}*@{Multiplier}+@{Mods})/20))]]}} {{crit=[[ceil((@{Score}*@{Multiplier}+@{Mods})/20)+1]]}} {{special=[[ceil((@{Score}*@{Multiplier}+@{Mods})/5)+1]]}} {{skillvalue=@{Score}}} {{roll=[[1d100]]}} {{skillname=@{Firearm}}}" /></td>
</tr>
</table>
</fieldset>