diff --git a/Unisystem-Buffy or Angel/Buffy_or_Angel.html b/Unisystem-Buffy or Angel/Buffy_or_Angel.html
index 3e3b6aaa5c..c5a0afb6cf 100644
--- a/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
+++ b/Unisystem-Buffy or Angel/Buffy_or_Angel.html	
@@ -1201,162 +1201,177 @@
                 <th></th>
             </tr>
             <tr>
-                <!-- Sword -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Sword_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Sword_attack_rating-1}+?{Modifiers|0}]] ]]*@{Sword_damage_Multiplier-1}+ @{Sword_damage_base-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
-                <td><input type="hidden" class="sheet-textbox" style="width:115px" value="Sword" disabled="true" name="attr_Sword_name-1"
-                    />&nbsp;&nbsp;&nbsp;Sword</td>
-                <th><input type="number" class="sheet-numberbox" name="attr_Sword_attack_rating-1" / value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
-                        disabled="true"></th>
-                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_Sword_damage_base-1" value="[[((@{base-Strength} + @{mod-Strength} +@{Sword_twohanded-1})*4)*(@{Sword_damage_Multiplier-1})]]"
+                <!-- Melee 1 -->
+                <th><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-1" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-1}-@{melee_weapon_attack_penalty-1}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-1}+ (@{melee_weapon_damage_base-1}*@{melee_weapon_damage_Multiplier-1})]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-1" /></td>
+                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-1" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_Sword_damage_Multiplier-1" value="@{Sword_damage_type-1}"
-                        disabled="true" /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Sword_damage_type-1" />
-		  <option value="1">Bash</option>
-                    <option value="2">Slash</option>
+                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-1" 
+                    /></th>
+	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-1" value="0" readonly /></th>
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-1" />
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
                     </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-1" value="0" />
+			
                 </th>
-                <th class="sheet-rb"><input type="checkbox" class="sheet-melee_toggle" name="attr_Sword_twohanded-1"
-                        value="1" /></th>
+                <th class="sheet-rb"></th>
                 <th class="sheet-lb"></th>
 
-                <!-- Sword Dec -->
-		<th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} treis to decapitate with @{Sword_name-2} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Sword_attack_rating-2}+?{Modifiers|0}]] ]]*@{Sword_damage_Multiplier-2}+ @{Sword_damage_base-2} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
-                <td><input type="hidden" class="sheet-textbox" style="width:115px" value="Sword" disabled="true" name="attr_Sword_name-2"
-                    />&nbsp;&nbsp;&nbsp;Sword Decapitate</td>
-                <th><input type="number" class="sheet-numberbox" name="attr_Sword_attack_rating-2" / value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}-5"
-                        disabled="true"></th>
-                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_Sword_damage_base-2" value="[[((@{base-Strength} + @{mod-Strength} +@{Sword_twohanded-2})*4)*(@{Sword_damage_Multiplier-2})]]"
+                <!-- Melee 2 -->
+                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-2" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-2} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-2}-@{melee_weapon_attack_penalty-2}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-2}+ (@{melee_weapon_damage_base-2}*@{melee_weapon_damage_Multiplier-2}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-2" /></td>
+                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-2" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_Sword_damage_Multiplier-2" value="@{Sword_damage_type-2}"
-                        disabled="true" /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Sword_damage_type-2" />
-		  <option value="1">Bash</option>
-                    <option value="5">Decapitate</option>
+                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-2" 
+                    /></th>
+ 		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-2" value="0" readonly /></th>
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-2" />
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
                     </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-2" value="0" />
                 </th>
-                <th><input type="checkbox" class="sheet-melee_toggle" name="attr_Sword_twohanded-2" value="1" /></th>
+                <th></th>
             </tr>
             <tr>
-		<!-- Baseball Bat-->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Basi_name-1} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Basi_attack_rating-1}?{Modifiers|0}]] ]]*@{Basi_damage_Multiplier-1}+ @{Basi_damage_base-1} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
-                <td><input type="hidden" class="sheet-textbox" style="width:115px" value="Baseball Bat" disabled="true" name="attr_Basi_name-1"
-                    />&nbsp;&nbsp;&nbsp;Baseball Bat</td>
-                <th><input type="number" class="sheet-numberbox" name="attr_Basi_attack_rating-1" / value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
-                        disabled="true"></th>
-                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_Basi_damage_base-1" value="[[((@{base-Strength} + @{mod-Strength} +@{Basi_twohanded-1})*4)*(@{Basi_damage_Multiplier-1})]]"
+                <!-- Melee 3 -->
+                <th><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-3" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-3} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-3}-@{melee_weapon_attack_penalty-3}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-3}+ (@{melee_weapon_damage_base-3}*@{melee_weapon_damage_Multiplier-3})]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-3" /></td>
+                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-3" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_Basi_damage_Multiplier-1" value="@{Basi_damage_type-1}"
-                        disabled="true" /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Basi_damage_type-1" />
-                    <option value="1">Bash</option>
+                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-3" 
+                    /></th>
+	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-3" value="0" readonly /></th>
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-3" />
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
                     </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-3" value="0" />
+			
                 </th>
-                <th class="sheet-rb"><input type="checkbox" class="sheet-melee_toggle" name="attr_Basi_twohanded-1"
-                        value="1" /></th>
+                <th class="sheet-rb"></th>
                 <th class="sheet-lb"></th>
 
-                <!-- Knife-->
-		<th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{Knife_name-2} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{Knife_attack_rating-2}?{Modifiers|0}]] ]]*@{Knife_damage_Multiplier-2}+ @{Knife_damage_base-2} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[3]]}}"></button>
-                <td><input type="hidden" class="sheet-textbox" style="width:115px" value="Knife" disabled="true" name="attr_Knife_name-2"
-                    />&nbsp;&nbsp;&nbsp;Knife</td>
-                <th><input type="number" class="sheet-numberbox" name="attr_Knife_attack_rating-2" / value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
-                        disabled="true"></th>
-                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_Knife_damage_base-2" value="[[((@{base-Strength}-1 + @{mod-Strength} +@{Knife_twohanded-2})*2)*(@{Knife_damage_Multiplier-2})]]"
+                <!-- Melee 4 -->
+                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-4" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-4} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-4}-@{melee_weapon_attack_penalty-4}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-4}+ (@{melee_weapon_damage_base-4}*@{melee_weapon_damage_Multiplier-4}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-4" /></td>
+                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-4" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_Knife_damage_Multiplier-2" value="@{Knife_damage_type-2}"
-                        disabled="true" /></th>
-                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_Knife_damage_type-2" />
-		  <option value="1">Bash</option>
-                    <option value="2">Slash</option>
+                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-4" 
+                    /></th>
+ 		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-4" value="0" readonly /></th>
+                <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-4" />
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
                     </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-4" value="0" />
                 </th>
-                <th><input type="checkbox" class="sheet-melee_toggle" name="attr_Knife_twohanded-2" value="1" /></th>
+                <th></th>
             </tr>
             <tr>
                 <!-- Melee 5 -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-5} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-5}?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-5}+ @{melee_weapon_damage_base-5} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-5" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-5} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-5}-@{melee_weapon_attack_penalty-5}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-5}+ (@{melee_weapon_damage_base-5}*@{melee_weapon_damage_Multiplier-5})]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-5" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-5" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-5" 
                     /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-5" value="@{melee_weapon_damage_type-5}"
-                        disabled="true" /></th>
+	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-5" value="0" readonly /></th>
                 <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-5" />
-                    <option value="1">Bash</option>
-                    <option value="2">Slash/Stab</option>
-                    <option value="4">Thru Heart</option>
-                    <option value="5">Vampire Heart</option>
-                    <option value="5">Decapitate</option>
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
                     </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-5" value="0" />
+			
                 </th>
                 <th class="sheet-rb"></th>
                 <th class="sheet-lb"></th>
 
                 <!-- Melee 6 -->
-                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-6} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-6}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-6}+ @{melee_weapon_damage_base-6} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-6" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-6} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-6}-@{melee_weapon_attack_penalty-6}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-6}+ (@{melee_weapon_damage_base-6}*@{melee_weapon_damage_Multiplier-6}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-6" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-6" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-6" 
                     /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-6" value="@{melee_weapon_damage_type-6}"
-                        disabled="true" /></th>
+ 		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-6" value="0" readonly /></th>
                 <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-6" />
-                    <option value="1">Bash</option>
-                    <option value="2">Slash/Stab</option>
-                    <option value="4">Thru Heart</option>
-                    <option value="5">Vampire Heart</option>
-                    <option value="5">Decapitate</option>
-                     </select>
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
+                    </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-6" value="0" />
                 </th>
                 <th></th>
             </tr>
             <tr>
                 <!-- Melee 7 -->
-                <th><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-7} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-7}?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-7}+ @{melee_weapon_damage_base-7} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-7" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-7} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-7}-@{melee_weapon_attack_penalty-7}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-7}+ (@{melee_weapon_damage_base-7}*@{melee_weapon_damage_Multiplier-7})]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-7" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-7" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
-                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-7"
+                <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-7" 
                     /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-7" value="@{melee_weapon_damage_type-7}"
-                        disabled="true" /></th>
+	<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-7" value="0" readonly /></th>
                 <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-7" />
-                    <option value="1">Bash</option>
-                    <option value="2">Slash/Stab</option>
-                    <option value="4">Thru Heart</option>
-                    <option value="5">Vampire Heart</option>
-                    <option value="5">Decapitate</option>
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
                     </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-7" value="0" />
+			
                 </th>
                 <th class="sheet-rb"></th>
                 <th class="sheet-lb"></th>
+
                 <!-- Melee 8 -->
-                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-8} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-8}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-8}+ @{melee_weapon_damage_base-8} ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
+                <th class="sheet-lb"><button type='roll' class="sheet-skillbutton" name="roll_melee_attack-8" value="&{template:default} {{name=@{character_name} attacks with @{melee_weapon_name-8} }} [[ [[{9,11,13,15,17,21,24,27,30}<[[1d10+@{melee_weapon_attack_rating-8}-@{melee_weapon_attack_penalty-8}+?{Modifiers|0}]] ]]*@{melee_weapon_damage_Multiplier-8}+ (@{melee_weapon_damage_base-8}*@{melee_weapon_damage_Multiplier-8}) ]] {{Roll=$[[0]]}} {{Levels=$[[1]]}} {{Damage=$[[2]]}}"></button>
                 <td><input type="text" class="sheet-textbox" style="width:115px" name="attr_melee_weapon_name-8" /></td>
                 <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_attack_rating-8" value="@{base-Dexterity} + @{mod-Dexterity} + @{Getting_Medieval_rating}"
                         disabled="true" /></th>
                 <th class="sheet-lb"><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_base-8" 
                     /></th>
-                <th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-8" value="@{melee_weapon_damage_type-8}"
-                        disabled="true" /></th>
+ 		<th><input type="number" class="sheet-numberbox" name="attr_melee_weapon_damage_Multiplier-8" value="0" readonly /></th>
                 <th class="sheet-rb"><select class="sheet-skill_select" name="attr_melee_weapon_damage_type-8" />
-                    <option value="1">Bash</option>
-                    <option value="2">Slash/Stab</option>
-                     <option value="3">Excalibur</option>
-                    <option value="4">Thru Heart</option>
-                    <option value="5">Vampire Heart</option>
-                    <option value="5">Decapitate</option>
+                    <option value="bash">Bash</option>
+                    <option value="slash">Slash/Stab</option>
+                    <option value="heart">Thru Heart</option>
+                    <option value="vampire">Vampire Heart</option>
+                    <option value="decapitate">Decapitate</option>
                     </select>
+                    <input type="hidden" name="attr_melee_weapon_attack_penalty-8" value="0" />
                 </th>
                 <th></th>
             </tr>
             <tr>
+       
+        </table>
+        <br>
         <!-- Medieval Ranged Weapons -->
-        <h3>Medieval Ranged Weapons</h3>
-        <table style="width:100%">
+ 		<h3>Medieval Ranged Weapons</h3>
+  
+               <table style="width:100%">
             <tr>
                 <td></td>
                 <td></td>
@@ -2177,4 +2192,22 @@ on("change:sheet_type1 sheet:opened", function() {
               }
     });
 });
+[ 1, 2, 3, 4, 5, 6,7, 8] .forEach(i => {
+    on(`change:melee_weapon_damage_type-${i}`, ()=> {
+        getAttrs([`melee_weapon_damage_type-${i}`], v => {
+            const type = v[`melee_weapon_damage_type-${i}`];
+            const modifiers = {
+                bash: {attack: 0, damage: 1},
+                slash: {attack: 0, damage: 2},
+                heart: {attack: 3, damage: 4},
+                vampire: {attack: 3, damage: 5},
+                decapitate: {attack: 5, damage: 5}
+            };
+            const output = {};
+            output[`melee_weapon_attack_penalty-${i}`] = modifiers[type].attack;
+            output[`melee_weapon_damage_Multiplier-${i}`] = modifiers[type].damage;
+            setAttrs(output);
+        });
+    });
+});
 </script>