Merge pull request #3262 from SilverRahl/patch-6

Update
This commit is contained in:
wing-it
2018-01-01 20:25:33 -05:00
committed by GitHub
+16 -16
View File
@@ -571,13 +571,13 @@
<td><input type="number" class="sheet-number" name="attr_damage_resistance_base-normal" value="0" /></td>
</tr>
<tr>
<td>Explosion</td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_explosion" value="@{damage_threshold_mod-explosion} + @{damage_threshold_base-explosion}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_explosion" value="@{damage_resistance_mod-explosion} + @{damage_resistance_base-explosion}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_mod-explosion" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_mod-explosion" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_base-explosion" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_base-explosion" value="0" /></td>
<td>Laser</td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_laser" value="@{damage_threshold_mod-laser} + @{damage_threshold_base-laser}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_laser" value="@{damage_resistance_mod-laser} + @{damage_resistance_base-laser}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_mod-laser" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_mod-laser" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_base-laser" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_base-laser" value="0" /></td>
</tr>
<tr>
<td>Fire</td>
@@ -588,15 +588,6 @@
<td><input type="number" class="sheet-number" name="attr_damage_threshold_base-fire" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_base-fire" value="0" /></td>
</tr>
<tr>
<td>Laser</td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_laser" value="@{damage_threshold_mod-laser} + @{damage_threshold_base-laser}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_laser" value="@{damage_resistance_mod-laser} + @{damage_resistance_base-laser}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_mod-laser" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_mod-laser" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_base-laser" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_base-laser" value="0" /></td>
</tr>
<tr>
<td>Plasma</td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_plasma" value="@{damage_threshold_mod-plasma} + @{damage_threshold_base-plasma}" disabled="true"/></td>
@@ -606,6 +597,15 @@
<td><input type="number" class="sheet-number" name="attr_damage_threshold_base-plasma" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_base-plasma" value="0" /></td>
</tr>
<tr>
<td>Explosion</td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_explosion" value="@{damage_threshold_mod-explosion} + @{damage_threshold_base-explosion}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_explosion" value="@{damage_resistance_mod-explosion} + @{damage_resistance_base-explosion}" disabled="true"/></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_mod-explosion" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_mod-explosion" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_threshold_base-explosion" value="0" /></td>
<td><input type="number" class="sheet-number" name="attr_damage_resistance_base-explosion" value="0" /></td>
</tr>
<tr>
<td>Condition</td>
<td colspan="6">