diff --git a/Heavy Gear 4e/HeavyGear4e.html b/Heavy Gear 4e/HeavyGear4e.html
index d8dc9906e2..2d5893640d 100644
--- a/Heavy Gear 4e/HeavyGear4e.html	
+++ b/Heavy Gear 4e/HeavyGear4e.html	
@@ -160,6 +160,7 @@
                     </div>
                 </fieldset>
                 <span>Add Damage type: <select name="attr_damage_type_add">
+                        <option disabled style="font-weight: bold;">&nbsp; DAMAGE RESULTS </option>
                         <option value="Anger">Anger</option>
                         <option value="Bleeding">Bleeding</option>
                         <option value="Blinded">Blinded</option>
@@ -169,11 +170,50 @@
                         <option value="Concussion">Concussion</option>
                         <option value="Deafened">Deafened</option>
                         <option value="Dehydrated">Dehydrated</option>
-
-
-
-
-
+                        <option value="Encumbered">Encumbered</option>
+                        <option value="Fear">Fear</option>
+                        <option value="Fractured/Broken Bones">Fractured/Broken Bones</option>
+                        <option value="Frozen">Frozen</option>
+                        <option value="Guilt">Guilt</option>
+                        <option value="Hallucinations">Hallucinations</option>
+                        <option value="Internal Bleeding">Internal Bleeding</option>
+                        <option value="Intoxicated">Intoxicated</option>
+                        <option value="Knocked Out">Knocked Out</option>
+                        <option value="Limb Crippled">Limb Crippled</option>
+                        <option value="On Fire">On Fire</option>
+                        <option value="Rattled">Rattled</option>
+                        <option value="Paranoid">Paranoid</option>
+                        <option value="Poisoned">Poisoned</option>
+                        <option value="Prone">Prone</option>
+                        <option value="Ruptured Organ">Ruptured Organ</option>
+                        <option value="Shock">Shock</option>
+                        <option value="Slowed">Slowed</option>
+                        <option value="Snapped">Snapped</option>
+                        <option value="Starving">Starving</option>
+                        <option value="Stunned">Stunned</option>
+                        <option value="The Shakes">The Shakes</option>
+                        <option value="Terrified">Terrified</option>
+                        <option value="Wounded">Wounded</option>
+                        <option disabled style="font-weight: bold;">&nbsp; VEHICLE DAMAGE RESULTS </option>                        
+                        <option value="Catastrophic Limb Damage">Catastrophic Limb Damage</option>
+                        <option value="Catastrophic System Damage">Catastrophic System Damage</option>
+                        <option value="Drive System Crippled">Drive System Crippled</option>
+                        <option value="Drive System Damaged">Drive System Damaged</option>
+                        <option value="Engine Hit">Engine Hit</option>
+                        <option value="Hull Breach">Hull Breach</option>
+                        <option value="It's Gonna Blow">It's Gonna Blow</option>
+                        <option value="Jammed">Jammed</option> 
+                        <option value="Knocked Down">Knocked Down</option>
+                        <option value="Major Limb Damage">Major Limb Damage</option>
+                        <option value="Major System Damage">Major System Damage</option>
+                        <option value="Major Weapon Destroyed">Major Weapon Destroyed</option>
+                        <option value="Minor Limb Damage">Minor Limb Damage</option>
+                        <option value="Minor System Damage">Minor System Damage</option>
+                        <option value="Minor Weapon Destroyed">Minor Weapon Destroyed</option>
+                        <option value="On Fire (Vehicle)">On Fire (Vehicle)</option>
+                        <option value="Secondary Explosion">Secondary Explosion</option>
+                        <option value="Sensor Malfunction">Sensor Malfunction</option>
+                        <option value="Unstable">Unstable</option>
                     </select> lv: <input type="number" name="attr_damage_lvl" class="digit" min="0">
                     <button type="action" name="act_damage_stat">Add New Damage</button> </span>
                 <h4>Damage Notes</h4> <textarea class="inputarea" name="attr_damage_desc" rows="3"></textarea>
@@ -2259,6 +2299,7 @@
             <h3> Damage results </h3>
             <span>Hull Integrity(<span type="number" name="attr_gear_hi"></span>/<span type="number" name="attr_gear_hi_max"></span>) </span>
             <div>
+                <h4>Damage</h4>
                 <fieldset class="repeating_gear-damage">
                     <span> <input type="text" class="infoused" name="attr_gear_damage_name">
                         -<input type="number" class="digit" name="attr_gear_damage_level" value="0" min="0" style="width: 2em;">d6
@@ -2271,6 +2312,66 @@
                         </div>
                     </span>
                 </fieldset>
+                <span> Add damage type: <select name="attr_gear_damage_type_add">
+                    <option disabled style="font-weight: bold;">&nbsp; VEHICLE DAMAGE RESULTS </option>                        
+                    <option value="Catastrophic Limb Damage">Catastrophic Limb Damage</option>
+                    <option value="Catastrophic System Damage">Catastrophic System Damage</option>
+                    <option value="Drive System Crippled">Drive System Crippled</option>
+                    <option value="Drive System Damaged">Drive System Damaged</option>
+                    <option value="Engine Hit">Engine Hit</option>
+                    <option value="Hull Breach">Hull Breach</option>
+                    <option value="It's Gonna Blow">It's Gonna Blow</option>
+                    <option value="Jammed">Jammed</option> 
+                    <option value="Knocked Down">Knocked Down</option>
+                    <option value="Major Limb Damage">Major Limb Damage</option>
+                    <option value="Major System Damage">Major System Damage</option>
+                    <option value="Major Weapon Destroyed">Major Weapon Destroyed</option>
+                    <option value="Minor Limb Damage">Minor Limb Damage</option>
+                    <option value="Minor System Damage">Minor System Damage</option>
+                    <option value="Minor Weapon Destroyed">Minor Weapon Destroyed</option>
+                    <option value="On Fire (Vehicle)">On Fire (Vehicle)</option>
+                    <option value="Secondary Explosion">Secondary Explosion</option>
+                    <option value="Sensor Malfunction">Sensor Malfunction</option>
+                    <option value="Unstable">Unstable</option>
+                    <option disabled style="font-weight: bold;">&nbsp; DAMAGE RESULTS </option>
+                    <option value="Anger">Anger</option>
+                    <option value="Bleeding">Bleeding</option>
+                    <option value="Blinded">Blinded</option>
+                    <option value="Brain Injury">Brain Injury</option>
+                    <option value="Burned">Burned</option>
+                    <option value="Combat Fatigue">Combat Fatigue</option>
+                    <option value="Concussion">Concussion</option>
+                    <option value="Deafened">Deafened</option>
+                    <option value="Dehydrated">Dehydrated</option>
+                    <option value="Encumbered">Encumbered</option>
+                    <option value="Fear">Fear</option>
+                    <option value="Fractured/Broken Bones">Fractured/Broken Bones</option>
+                    <option value="Frozen">Frozen</option>
+                    <option value="Guilt">Guilt</option>
+                    <option value="Hallucinations">Hallucinations</option>
+                    <option value="Internal Bleeding">Internal Bleeding</option>
+                    <option value="Intoxicated">Intoxicated</option>
+                    <option value="Knocked Out">Knocked Out</option>
+                    <option value="Limb Crippled">Limb Crippled</option>
+                    <option value="On Fire">On Fire</option>
+                    <option value="Rattled">Rattled</option>
+                    <option value="Paranoid">Paranoid</option>
+                    <option value="Poisoned">Poisoned</option>
+                    <option value="Prone">Prone</option>
+                    <option value="Ruptured Organ">Ruptured Organ</option>
+                    <option value="Shock">Shock</option>
+                    <option value="Slowed">Slowed</option>
+                    <option value="Snapped">Snapped</option>
+                    <option value="Starving">Starving</option>
+                    <option value="Stunned">Stunned</option>
+                    <option value="The Shakes">The Shakes</option>
+                    <option value="Terrified">Terrified</option>
+                    <option value="Wounded">Wounded</option>
+                </select> lv: <input type="number" name="attr_gear_damage_lvl" class="digit" min="0">
+                <button type="action" name="act_gear_damage_stat">Add New Damage</button> </span>
+                </select>
+
+                </span>
 
             </div>
             <h4>Gear Damage Notes</h4> <textarea class="inputarea" name="attr_gear_damage_desc" rows="3"></textarea>
@@ -3645,23 +3746,64 @@
                         </div>
                     </span>
                 </fieldset>
-                <span>Add Damage type: <select name="attr_gear_damage_type_add">
-                        <option value="Anger">Anger</option>
-                        <option value="Bleeding">Bleeding</option>
-                        <option value="Blinded">Blinded</option>
-                        <option value="Brain Injury">Brain Injury</option>
-                        <option value="Burned">Burned</option>
-                        <option value="Combat Fatigue">Combat Fatigue</option>
-                        <option value="Concussion">Concussion</option>
-                        <option value="Deafened">Deafened</option>
-                        <option value="Dehydrated">Dehydrated</option>
+                <span>Add Damage type: <select name="attr_npcgear_damage_type_add">
+                    <option disabled style="font-weight: bold;">&nbsp; VEHICLE DAMAGE RESULTS </option>                        
+                    <option value="Catastrophic Limb Damage">Catastrophic Limb Damage</option>
+                    <option value="Catastrophic System Damage">Catastrophic System Damage</option>
+                    <option value="Drive System Crippled">Drive System Crippled</option>
+                    <option value="Drive System Damaged">Drive System Damaged</option>
+                    <option value="Engine Hit">Engine Hit</option>
+                    <option value="Hull Breach">Hull Breach</option>
+                    <option value="It's Gonna Blow">It's Gonna Blow</option>
+                    <option value="Jammed">Jammed</option> 
+                    <option value="Knocked Down">Knocked Down</option>
+                    <option value="Major Limb Damage">Major Limb Damage</option>
+                    <option value="Major System Damage">Major System Damage</option>
+                    <option value="Major Weapon Destroyed">Major Weapon Destroyed</option>
+                    <option value="Minor Limb Damage">Minor Limb Damage</option>
+                    <option value="Minor System Damage">Minor System Damage</option>
+                    <option value="Minor Weapon Destroyed">Minor Weapon Destroyed</option>
+                    <option value="On Fire (Vehicle)">On Fire (Vehicle)</option>
+                    <option value="Secondary Explosion">Secondary Explosion</option>
+                    <option value="Sensor Malfunction">Sensor Malfunction</option>
+                    <option value="Unstable">Unstable</option>
+                    <option disabled style="font-weight: bold;">&nbsp; DAMAGE RESULTS </option>
+                    <option value="Anger">Anger</option>
+                    <option value="Bleeding">Bleeding</option>
+                    <option value="Blinded">Blinded</option>
+                    <option value="Brain Injury">Brain Injury</option>
+                    <option value="Burned">Burned</option>
+                    <option value="Combat Fatigue">Combat Fatigue</option>
+                    <option value="Concussion">Concussion</option>
+                    <option value="Deafened">Deafened</option>
+                    <option value="Dehydrated">Dehydrated</option>
+                    <option value="Encumbered">Encumbered</option>
+                    <option value="Fear">Fear</option>
+                    <option value="Fractured/Broken Bones">Fractured/Broken Bones</option>
+                    <option value="Frozen">Frozen</option>
+                    <option value="Guilt">Guilt</option>
+                    <option value="Hallucinations">Hallucinations</option>
+                    <option value="Internal Bleeding">Internal Bleeding</option>
+                    <option value="Intoxicated">Intoxicated</option>
+                    <option value="Knocked Out">Knocked Out</option>
+                    <option value="Limb Crippled">Limb Crippled</option>
+                    <option value="On Fire">On Fire</option>
+                    <option value="Rattled">Rattled</option>
+                    <option value="Paranoid">Paranoid</option>
+                    <option value="Poisoned">Poisoned</option>
+                    <option value="Prone">Prone</option>
+                    <option value="Ruptured Organ">Ruptured Organ</option>
+                    <option value="Shock">Shock</option>
+                    <option value="Slowed">Slowed</option>
+                    <option value="Snapped">Snapped</option>
+                    <option value="Starving">Starving</option>
+                    <option value="Stunned">Stunned</option>
+                    <option value="The Shakes">The Shakes</option>
+                    <option value="Terrified">Terrified</option>
+                    <option value="Wounded">Wounded</option>
 
-
-
-
-
-                    </select> lv: <input type="number" name="attr_gear_damage_lvl" class="digit" min="0" value="0">
-                    <button type="action" name="act_gear_damage_stat">Add New Damage</button> </span>
+                    </select> lv: <input type="number" name="attr_npcgear_damage_lvl" class="digit" min="0" value="0">
+                    <button type="action" name="act_npcgear_damage_stat">Add New Damage</button> </span>
             </div>
             <h4>Gear Damage Notes</h4> <textarea class="inputarea" name="attr_gear_damage_desc" rows="3"></textarea>
         </div>
@@ -4318,23 +4460,63 @@
                         </div>
                     </div>
                 </fieldset>
-                <span>Add Damage type: <select name="attr_damage_type_add">
-                        <option value="Anger">Anger</option>
-                        <option value="Bleeding">Bleeding</option>
-                        <option value="Blinded">Blinded</option>
-                        <option value="Brain Injury">Brain Injury</option>
-                        <option value="Burned">Burned</option>
-                        <option value="Combat Fatigue">Combat Fatigue</option>
-                        <option value="Concussion">Concussion</option>
-                        <option value="Deafened">Deafened</option>
-                        <option value="Dehydrated">Dehydrated</option>
-
-
-
-
-
-                    </select> lv: <input type="number" name="attr_damage_lvl" class="digit" min="0">
-                    <button type="action" name="act_damage_stat">Add New Damage</button> </span>
+                <span>Add Damage type: <select name="attr_npc_damage_type_add">
+                    <option disabled style="font-weight: bold;">&nbsp; DAMAGE RESULTS </option>
+                    <option value="Anger">Anger</option>
+                    <option value="Bleeding">Bleeding</option>
+                    <option value="Blinded">Blinded</option>
+                    <option value="Brain Injury">Brain Injury</option>
+                    <option value="Burned">Burned</option>
+                    <option value="Combat Fatigue">Combat Fatigue</option>
+                    <option value="Concussion">Concussion</option>
+                    <option value="Deafened">Deafened</option>
+                    <option value="Dehydrated">Dehydrated</option>
+                    <option value="Encumbered">Encumbered</option>
+                    <option value="Fear">Fear</option>
+                    <option value="Fractured/Broken Bones">Fractured/Broken Bones</option>
+                    <option value="Frozen">Frozen</option>
+                    <option value="Guilt">Guilt</option>
+                    <option value="Hallucinations">Hallucinations</option>
+                    <option value="Internal Bleeding">Internal Bleeding</option>
+                    <option value="Intoxicated">Intoxicated</option>
+                    <option value="Knocked Out">Knocked Out</option>
+                    <option value="Limb Crippled">Limb Crippled</option>
+                    <option value="On Fire">On Fire</option>
+                    <option value="Rattled">Rattled</option>
+                    <option value="Paranoid">Paranoid</option>
+                    <option value="Poisoned">Poisoned</option>
+                    <option value="Prone">Prone</option>
+                    <option value="Ruptured Organ">Ruptured Organ</option>
+                    <option value="Shock">Shock</option>
+                    <option value="Slowed">Slowed</option>
+                    <option value="Snapped">Snapped</option>
+                    <option value="Starving">Starving</option>
+                    <option value="Stunned">Stunned</option>
+                    <option value="The Shakes">The Shakes</option>
+                    <option value="Terrified">Terrified</option>
+                    <option value="Wounded">Wounded</option>
+                    <option disabled style="font-weight: bold;">&nbsp; VEHICLE DAMAGE RESULTS </option>                        
+                    <option value="Catastrophic Limb Damage">Catastrophic Limb Damage</option>
+                    <option value="Catastrophic System Damage">Catastrophic System Damage</option>
+                    <option value="Drive System Crippled">Drive System Crippled</option>
+                    <option value="Drive System Damaged">Drive System Damaged</option>
+                    <option value="Engine Hit">Engine Hit</option>
+                    <option value="Hull Breach">Hull Breach</option>
+                    <option value="It's Gonna Blow">It's Gonna Blow</option>
+                    <option value="Jammed">Jammed</option> 
+                    <option value="Knocked Down">Knocked Down</option>
+                    <option value="Major Limb Damage">Major Limb Damage</option>
+                    <option value="Major System Damage">Major System Damage</option>
+                    <option value="Major Weapon Destroyed">Major Weapon Destroyed</option>
+                    <option value="Minor Limb Damage">Minor Limb Damage</option>
+                    <option value="Minor System Damage">Minor System Damage</option>
+                    <option value="Minor Weapon Destroyed">Minor Weapon Destroyed</option>
+                    <option value="On Fire (Vehicle)">On Fire (Vehicle)</option>
+                    <option value="Secondary Explosion">Secondary Explosion</option>
+                    <option value="Sensor Malfunction">Sensor Malfunction</option>
+                    <option value="Unstable">Unstable</option>
+                </select> lv: <input type="number" name="attr_npc_damage_lvl" class="digit" min="0">
+                <button type="action" name="act_npc_damage_stat">Add New Damage</button> </span>
                 <h4>Damage Notes</h4> <textarea class="inputarea" name="attr_damage_desc" rows="3"></textarea>
             </div>
             <div>
@@ -5232,23 +5414,64 @@
                         </div>
                     </div>
                 </fieldset>
-                <span>Add Damage type: <select name="attr_damage_type_add">
-                        <option value="Anger">Anger</option>
-                        <option value="Bleeding">Bleeding</option>
-                        <option value="Blinded">Blinded</option>
-                        <option value="Brain Injury">Brain Injury</option>
-                        <option value="Burned">Burned</option>
-                        <option value="Combat Fatigue">Combat Fatigue</option>
-                        <option value="Concussion">Concussion</option>
-                        <option value="Deafened">Deafened</option>
-                        <option value="Dehydrated">Dehydrated</option>
-
-
-
-
-
-                    </select> lv: <input type="number" name="attr_damage_lvl" class="digit" min="0" value="0">
-                    <button type="action" name="act_damage_stat">Add New Damage</button> </span>
+                <span>Add Damage type: <select name="attr_creature_damage_type_add">
+                    <option disabled style="font-weight: bold;">&nbsp; DAMAGE RESULTS </option>
+                    <option value="Anger">Anger</option>
+                    <option value="Bleeding">Bleeding</option>
+                    <option value="Blinded">Blinded</option>
+                    <option value="Brain Injury">Brain Injury</option>
+                    <option value="Burned">Burned</option>
+                    <option value="Combat Fatigue">Combat Fatigue</option>
+                    <option value="Concussion">Concussion</option>
+                    <option value="Deafened">Deafened</option>
+                    <option value="Dehydrated">Dehydrated</option>
+                    <option value="Encumbered">Encumbered</option>
+                    <option value="Fear">Fear</option>
+                    <option value="Fractured/Broken Bones">Fractured/Broken Bones</option>
+                    <option value="Frozen">Frozen</option>
+                    <option value="Guilt">Guilt</option>
+                    <option value="Hallucinations">Hallucinations</option>
+                    <option value="Internal Bleeding">Internal Bleeding</option>
+                    <option value="Intoxicated">Intoxicated</option>
+                    <option value="Knocked Out">Knocked Out</option>
+                    <option value="Limb Crippled">Limb Crippled</option>
+                    <option value="On Fire">On Fire</option>
+                    <option value="Rattled">Rattled</option>
+                    <option value="Paranoid">Paranoid</option>
+                    <option value="Poisoned">Poisoned</option>
+                    <option value="Prone">Prone</option>
+                    <option value="Ruptured Organ">Ruptured Organ</option>
+                    <option value="Shock">Shock</option>
+                    <option value="Slowed">Slowed</option>
+                    <option value="Snapped">Snapped</option>
+                    <option value="Starving">Starving</option>
+                    <option value="Stunned">Stunned</option>
+                    <option value="The Shakes">The Shakes</option>
+                    <option value="Terrified">Terrified</option>
+                    <option value="Wounded">Wounded</option>
+                    <option disabled style="font-weight: bold;">&nbsp; VEHICLE DAMAGE RESULTS </option>                        
+                    <option value="Catastrophic Limb Damage">Catastrophic Limb Damage</option>
+                    <option value="Catastrophic System Damage">Catastrophic System Damage</option>
+                    <option value="Drive System Crippled">Drive System Crippled</option>
+                    <option value="Drive System Damaged">Drive System Damaged</option>
+                    <option value="Engine Hit">Engine Hit</option>
+                    <option value="Hull Breach">Hull Breach</option>
+                    <option value="It's Gonna Blow">It's Gonna Blow</option>
+                    <option value="Jammed">Jammed</option> 
+                    <option value="Knocked Down">Knocked Down</option>
+                    <option value="Major Limb Damage">Major Limb Damage</option>
+                    <option value="Major System Damage">Major System Damage</option>
+                    <option value="Major Weapon Destroyed">Major Weapon Destroyed</option>
+                    <option value="Minor Limb Damage">Minor Limb Damage</option>
+                    <option value="Minor System Damage">Minor System Damage</option>
+                    <option value="Minor Weapon Destroyed">Minor Weapon Destroyed</option>
+                    <option value="On Fire (Vehicle)">On Fire (Vehicle)</option>
+                    <option value="Secondary Explosion">Secondary Explosion</option>
+                    <option value="Sensor Malfunction">Sensor Malfunction</option>
+                    <option value="Unstable">Unstable</option>
+                </select> lv: <input type="number" name="attr_creature_damage_lvl" class="digit" min="0">
+                <button type="action" name="act_creature_damage_stat">Add New Damage</button> </span>
+                
                 <h4>Damage Notes</h4> <textarea class="inputarea" name="attr_damage_desc" rows="3"></textarea>
             </div>
         </div>
@@ -5896,13 +6119,6 @@
                 <option value="shell">Shell</option>
                 <option value="system">System</option>
             </select>
-            <input type="number" name="attr_damage_value" value="1" >
-            <select name="attr_damage_type">
-                <option value="character">Character</option>
-                <option value="vehicle">Vehicle</option>
-                <option value="shell">Shell</option>
-                <option value="system">System</option>
-            </select>
 
 
         </div>
@@ -5912,420 +6128,8 @@
             <span> Wiki: https://wiki.roll20.net/Heavy_Gear_4th_Edition </span>
         <div>
             <h3>Sheet is still in development. It is recomended you create a copy of your game after each session, as some data may be lost </h3>
-            If data is missing, check below, it may be there.
-            <h3>Personal Weapons</h3>
-            <fieldset class="repeating_weapon">
-                <div><span name="attr_weapon_size"></span>
-                    <span>
-                        <input type="checkbox" name="attr_weapon_frame_check" class="frame-check" hidden>
-                        <span class="no-frame" name="attr_weapon_name">
-                        </span>
-                        <span class="frame" name="attr_frame_weapon_type"></span>
-                        i:<input type="checkbox" name="attr_weapon_hide" class="sheet-toggle-show" checked>
-                    </span>
-                    <span class="pull-right"> <input type="number" class="digit" name="attr_weapon_ammo" value="1">/<span name="attr_weapon_ammo_max"></span></span>
-                    <button type="action" name="act_tumble">roll</button>
-                </div>
-
-                <input type="checkbox" name="attr_weapon_hide" class="sheet-toggle-show" hidden>
-                <div class="sheet-body">
-                    Damage: <input type="number" name="attr_weapon_damage" value="0">
-                    <span class="pull-right">Burden: <input class="digit" type="number" name="attr_weapon_burden" step="0.25"></span>
-                    <span>
-                        <select name="attr_weapon_size" class="size">
-                            <option value="Light" selected>Light</option>
-                            <option value="Medium">Medium</option>
-                            <option value="Heavy">Heavy</option>
-                        </select>
-                        <input type="checkbox" name="attr_weapon_frame_check" class="frame-check" hidden>
-                        <span class="no-frame"> <input class="infoused" type="text" name="attr_weapon_name" value="weapon">
-                        </span>
-                        <span class="frame">
-                            <select name="attr_frame_weapon_type" class="size">
-                                <option value="Assault Rifle">Assault Rifle</option>
-                                <option value="Auto Shotgun">Auto Shotgun</option>
-                                <option value="Carbine">Carbine</option>
-                                <option value="Rifle">Rifle</option>
-                                <option value="Machine Pistol">Machine Pistol</option>
-                                <option value="Pistol/Revolver">Pistol/Revolver</option>
-                                <option value="Shotgun">Shotgun</option>
-                                <option value="Sniper Rifle">Sniper Rifle</option>
-                            </select>
-                        </span>
-                    </span>
-
-                    <p>Range: <input class="emcalc" style="--index: -11;" type="text" name="attr_weapon_range">
-                        <span class="pull-right">Ammo:<input type="number" name="attr_weapon_ammo_max" class="digit" value="0"></span>
-                    </p>
-                    Frame:<input type="checkbox" name="attr_weapon_frame_check" class="frame-check">
-                    Cumbersome:<input type="checkbox" name="attr_weapon_cumbersome">
-                    PL: <input type="number" name="attr_weapon_pl" class="digit" value="0">
-                    <div>
-
-                        Traits <input type="text" name="attr_inf_weapon_traits" value="">
-                        <input type="checkbox" name="attr_inf_weapon_traits_show" class="sheet-toggle-show" />
-                        <div class="sheet-body">
-                            <span class="trait-box">
-                                <span class="trait-item">
-                                    Mode:<input type="checkbox" name="attr_inf_weapon_traits_mode" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <span type="text" name="attr_inf_weapon_traits_selector_2"> </span> OR
-                                        <span type="text" name="attr_inf_weapon_traits_selector_3"> </span>
-                                    </span>
-                                </span>
-                                <span class="trait-item">
-                                    Advanced:
-                                    <input type="checkbox" name="attr_inf_weapon_traits_advanced" value="1">
-
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_advanced_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_advanced_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_advanced_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Blast <input type="checkbox" name="attr_inf_weapon_traits_blast" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_blast_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_blast_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_blast_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Brace <input type="checkbox" name="attr_inf_weapon_traits_Brace" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_brace_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_brace_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_brace_selector">
-                                    </span>
-                                </span>
-                                <span class="trait-item">
-                                    Corrosion <input type="checkbox" name="attr_inf_weapon_traits_corrosion" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_corrosion_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_corrosion_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_corrosion_selector">
-                                    </span>
-                                </span>
-                                <span class="trait-item">
-                                    Frag <input type="checkbox" name="attr_inf_weapon_traits_frag" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_frag_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_frag_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_frag_selector">
-                                    </span>
-                                </span>
-
-
-                                <span class="trait-item">
-                                    Haywire <input type="checkbox" name="attr_inf_weapon_traits_haywire" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_haywire_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_haywire_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_haywire_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Indirect <input type="checkbox" name="attr_inf_weapon_traits_indirect" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_indirect_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_indirect_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_indirect_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Missile <input type="checkbox" name="attr_inf_weapon_traits_missile" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_missile_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_missile_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_missile_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Muscle Powered <input type="checkbox" name="attr_inf_weapon_traits_musclepowered" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_musclepowered_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_musclepowered_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_musclepowered_selector">
-                                    </span>
-                                </span>
-
-
-                                <span class="trait-item">
-                                    Non-Lethal <input type="checkbox" name="attr_inf_weapon_traits_nonlethal" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_nonlethal_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_nonlethal_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_nonlethal_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Poison <input type="checkbox" name="attr_inf_weapon_traits_poison" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_poison_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_poison_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_poison_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Placed <input type="checkbox" name="attr_inf_weapon_traits_placed" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_placed_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_placed_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_placed_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Precise <input type="checkbox" name="attr_inf_weapon_traits_precise" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_precise_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_precise_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_precise_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Reach <input type="checkbox" name="attr_inf_weapon_traits_reach" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_reach_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_reach_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_reach_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Silent <input type="checkbox" name="attr_inf_weapon_traits_silent" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_silent_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_silent_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_silent_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Slashing <input type="checkbox" name="attr_inf_weapon_traits_slashing" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_silent_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_slashing_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_slashing_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Shot <input type="checkbox" name="attr_inf_weapon_traits_shot" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_shot_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_shot_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_shot_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Shock <input type="checkbox" name="attr_inf_weapon_traits_shock" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_shock_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_shock_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_shock_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Smoke <input type="checkbox" name="attr_inf_weapon_traits_smoke" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_smoke_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_smoke_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_smoke_selector">
-                                    </span>
-                                </span>
-                                <span class="trait-item">
-                                    Spray <input type="checkbox" name="attr_inf_weapon_traits_spray" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_spray_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_spray_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_spray_selector">
-                                    </span>
-                                </span>
-
-
-                                <span class="trait-item">
-                                    Stun <input type="checkbox" name="attr_inf_weapon_traits_stun" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_silent_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_stun_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_stun_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Thrown <input type="checkbox" name="attr_inf_weapon_traits_thrown" value="1">
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_silent_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_thrown_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_thrown_selector">
-                                    </span>
-                                </span>
-
-                            </span>
-
-                            <div class="trait-box">
-                                <span class="trait-item">
-                                    AoE: <input type="number" name="attr_inf_weapon_traits_aoe" class="digit" value="0" min="0">m
-                                    <span> <input type="checkbox" name="attr_inf_weapon_traits_single" class="sheet-toggle-show-span" hidden />
-                                        <span class="sheet-body">
-                                            -(<input type="number" name="attr_inf_weapon_traits_aoe_l" class="digit" value="0">m/
-                                            <input type="number" name="attr_inf_weapon_traits_aoe_m" class="digit" value="0">m/
-                                            <input type="number" name="attr_inf_weapon_traits_aoe_h" class="digit" value="0">m)
-                                        </span> </span>
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_aoe_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_aoe_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_aoe_selector">
-                                    </span>
-                                </span>
-                                <span class="trait-item">
-                                    AP:<input type="number" name="attr_inf_weapon_traits_ap" class="digit" value="0">
-                                    <span> <input type="checkbox" name="attr_inf_weapon_traits_single" class="sheet-toggle-show-span" hidden />
-                                        <span class="sheet-body">
-                                            -<input type="number" name="attr_inf_weapon_traits_ap_l" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_ap_m" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_ap_h" class="digit" value="0">
-                                        </span></span>
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_ap_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_ap_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_ap_selector">
-                                    </span>
-                                </span>
-
-                                <span class="trait-item">
-                                    Burst:<input type="number" name="attr_inf_weapon_traits_burst" class="digit" value="0" min="0">
-                                    <span>
-                                        <input type="checkbox" name="attr_inf_weapon_traits_single" class="sheet-toggle-show-span" hidden />
-                                        <span class="sheet-body">
-                                            -<input type="number" name="attr_inf_weapon_traits_burst_l" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_burst_m" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_burst_h" class="digit" value="0">
-                                        </span></span>
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_burst_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_burst_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_burst_selector">
-                                    </span>
-                                </span>
-                                <span class="trait-item">
-                                    Demo:<input type="number" name="attr_inf_weapon_traits_demo" class="digit" value="0">
-                                    <span> <input type="checkbox" name="attr_inf_weapon_traits_single" class="sheet-toggle-show-span" hidden />
-                                        <span class="sheet-body">
-                                            -<input type="number" name="attr_inf_weapon_traits_demo_l" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_demo_m" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_demo_h" class="digit" value="0">
-                                        </span>
-                                    </span>
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_demo_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_demo_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_demo_selector">
-                                    </span>
-                                </span>
-                                <span class="trait-item">
-                                    Fire:<input type="number" name="attr_inf_weapon_traits_fire" class="digit" value="0" min="0">
-                                    <span> <input type="checkbox" name="attr_inf_weapon_traits_single" class="sheet-toggle-show-span" hidden />
-                                        <span class="sheet-body">
-                                            -<input type="number" name="attr_inf_weapon_traits_fire_l" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_fire_m" class="digit" value="0">/
-                                            <input type="number" name="attr_inf_weapon_traits_fire_h" class="digit" value="0">
-                                        </span>
-                                    </span>
-                                    <input type="checkbox" name="attr_inf_weapon_traits_mode" value="1" class="sheet-toggle-show-span" hidden />
-                                    <span class="sheet-body">
-                                        <input type="radio" value="1" name="attr_inf_weapon_traits_fire_selector" checked>|
-                                        <input type="radio" value="2" name="attr_inf_weapon_traits_fire_selector">
-                                        <input type="radio" value="3" name="attr_inf_weapon_traits_fire_selector">
-                                    </span>
-                                </span>
-                            </div>
-                            <div>
-                                <p>
-                                    See Desc <input type="checkbox" name="attr_inf_weapon_traits_see_desc" value="1">
-                                    <input type="text" name="attr_inf_weapon_traits_desc" value="">
-                                </p>
-                                <p>
-                                    Other: <input type="text" name="attr_inf_weapon_traits_other" value="">
-                                </p>
-                                Old Traits: <input class="infoused" type="text" name="attr_weapon_trait">
-                            </div>
-                        </div>
-                    </div>
-                    <span>
-                        <select name="attr_weapon_domain">
-                            <option value="1">Athletics</option>
-                            <option value="2">Awareness</option>
-                            <option value="3">Business</option>
-                            <option value="4">Craft</option>
-                            <option value="5">Culture</option>
-                            <option value="6">Electronic Warfare</option>
-                            <option value="7">Electronics</option>
-                            <option value="8">Gunnery</option>
-                            <option value="9">Hard Science</option>
-                            <option value="10">Influence</option>
-                            <option value="11">Institutions</option>
-                            <option value="12">Investigation</option>
-                            <option value="13">Mechanics</option>
-                            <option value="14">Medicine</option>
-                            <option value="15">Melee</option>
-                            <option value="16">Pilot</option>
-                            <option value="17">Showmanship</option>
-                            <option value="18">Socialscience</option>
-                            <option value="19">Survival</option>
-                            <option value="20">Tactics</option>
-                        </select>
-                        <span type="number" name="attr_weapon_expertise" value="0"></span>
-                    </span>
-                    <span>Skill:<input type="number" name="attr_skill_level" class="digit" value="0" min="0" max="5">(<input type="checkbox" name="attr_skill_familiar" value="1">F)
-
-                    </span>
-                    <textarea class="inputarea" name="attr_weapon_mods"> </textarea>
-
-
-                </div>
-    </span>
-    </fieldset>
-</div>
+            
+        </div>
 </div>
 
 <datalist id="archetypelist">
@@ -6472,7 +6276,19 @@
             </span>
         </div>
         {{#traits}}<div class="sheet-traits">{{traits}}</div>{{/traits}}
-
+</rolltemplate>
+<rolltemplate class="sheet-rolltemplate-custom">
+    <div class="sheet-container sheet-color-{{color}}">
+        <div class="sheet-header">
+            {{#title}}<div class="sheet-title">{{title}}</div>{{/title}}
+            {{#subtitle}}<div class="sheet-subtitle">{{subtitle}}</div>{{/subtitle}}
+        </div>
+        <div class="sheet-content">
+            <span>Damage </span><span>{{computed::damage}}</span>
+            <span>Vehicle </span><span>{{computed::vehicle}} </span>
+            <span>Character </span><span>{{computed::character}} </span>
+        </div>
+    </div>
 </rolltemplate>
 
 <script type="text/worker">
@@ -7768,14 +7584,45 @@ on('clicked:damage_stat', function() {
     });
 }); 
 
+on('clicked:npc_damage_stat', function() {
+    getAttrs(["npc_damage_type_add","npc_damage_lvl"], function(v) {
+        let input = v["npc_damage_type_add"];
+        let lvl = parseInt(v["npc_damage_lvl"]);
+        statDamage(input,lvl);
+    });
+});
+
+on('clicked:creature_damage_stat', function() {
+    console.log("clicked:creature_damage_stat");
+    getAttrs(["creature_damage_type_add","creature_damage_lvl"], function(v) {
+        let input = v["creature_damage_type_add"];
+        let lvl = parseInt(v["creature_damage_lvl"]);
+        console.log("input "+input+" lvl "+lvl);
+        statDamage(input,lvl);
+    });
+});
+
 on('clicked:gear_damage_stat', function() {
+    console.log("clicked:gear_damage_stat");
     getAttrs(["gear_damage_type_add","gear_damage_lvl"], function(v) {
         let input = v["gear_damage_type_add"];
         let lvl = parseInt(v["gear_damage_lvl"]);
+        console.log("input "+input+" lvl "+lvl);
         statGearDamage(input,lvl);
     });
 }); 
 
+on('clicked:npcgear_damage_stat', function() {
+    console.log("clicked:npcgear_damage_stat");
+    getAttrs(["npcgear_damage_type_add","npcgear_damage_lvl"], function(v) {
+        let input = v["npcgear_damage_type_add"];
+        let lvl = parseInt(v["npcgear_damage_lvl"]);
+        console.log("input "+input+" lvl "+lvl);
+        statGearDamage(input,lvl);
+    });
+});
+
+
 const statDamage = (input,lvl) => {
     let damage = damageLookup(input);
     var newrowid = generateRowID();
@@ -7787,12 +7634,16 @@ const statDamage = (input,lvl) => {
     newrowattrs["repeating_damage_" + newrowid + "_damage_fix"] = damage.fix;
     if (damage.type == "SYSTEM") {
         newrowattrs["repeating_damage_" + newrowid + "_damage_system_check"] = 1;
-    } else if (damage.type == "SHELL") {
+    } 
+    if (damage.type == "SHELL") {
         newrowattrs["repeating_damage_" + newrowid + "_damage_shell_check"] = 1;
     }
     setAttrs(newrowattrs);
 }
+
+
 const statGearDamage = (input,lvl) => {
+    console.log("statGearDamage "+input+" "+lvl);
     let damage = damageLookup(input);
     var newrowid = generateRowID();
     var newrowattrs = {};
@@ -7802,13 +7653,15 @@ const statGearDamage = (input,lvl) => {
     newrowattrs["repeating_gear-damage_" + newrowid + "_gear_damage_deterioration"] = damage.deterioration;
     newrowattrs["repeating_gear-damage_" + newrowid + "_gear_damage_fix"] = damage.fix;
     if (damage.type == "NONE") {
-        newrowattrs["repeating_damage_" + newrowid + "_gear_damage_integrity"] = 0;
+        newrowattrs["repeating_gear-damage_" + newrowid + "_gear_damage_integrity"] = 0;
     } else {
-        newrowattrs["repeating_damage_" + newrowid + "_gear_damage_integrity"] = 1;
+        newrowattrs["repeating_gear-damage_" + newrowid + "_gear_damage_integrity"] = 1;
     }
     setAttrs(newrowattrs);
 }
 
+
+
 const damageLookup = (input) => {
     let damage = {};
     switch (input) {
@@ -7875,48 +7728,313 @@ const damageLookup = (input) => {
         fix:"Hydrate with water or other liquid. Each liter taken (slowly) will remove one dice of penalty. At -4d6 the character will need intravenous fluids to recover."};
         break;
 
-        case "ENCUMBURED":
-        damage = {name:"ENCUMBURED",type:"SYSTEM",
-        penalty: "",
+        case "Encumbered":
+        damage = {name:"Encumbered",type:"SYSTEM",
+        penalty: "The character suffers -1d6 to athletic or acrobatic actions when they try to carry too much, or heft something awkward and beyond their strength limits. Usually this happens not from damage but from going over their burden limit (see Chapter 9). For each full 25% of burden points over their burden limit the character suffers another -1d6. At -2d6, the character’s MR is cut in half. At -4d6, they collapse. For situations heavily affected by weight, such as swimming or balancing on a narrow ledge, each die also adds TP:1",
+        deterioration:"Failing athletic, acrobatic, or endurance based skill checks while encumbered can lead to the Dehydrated or Wounded results. It can also result in unexpectedly going Prone",
+        fix:"Removing extra burden points will reduce or remove the penalty. Securing the load might sometimes help."};
+        break;
+
+        case "Fear":
+        damage = {name:"Fear",type:"SHELL",
+        penalty: "Each activation, the character counts as already having used a number of actions equal to this damage penalty result.",
+        deterioration:"Unless consoled or removed from the situation, the fear will get worse at a rate of 1d6 per minute.",
+        fix:"A character can, as an action, calm themselves or calm down someone suffering this condition. This reduces the effect by 1d6 each time it is done"};
+        break;
+
+        case "Fractured/Broken Bones":
+        damage = {name:"Fractured/Broken Bones*",type:"SYSTEM",
+        penalty: "The character suffers -1d6 to skills using the limb for each point of damage inflicted. Some breaks such as in the chest, can also come with internal bleeding as their ribs puncture lungs or organs. Pain medication can patch this kind of injury. Further damage caused by broken bones includes internal bleeding and wounded.",
+        deterioration:"Unless splinted or otherwise restrained the fracture will Deteriorate once every full hour of heavy activity",
+        fix:"Modern medicine means most fractures heal quickly. It takes 1 day of treatment to reduce the penalty by 1d6"};
+        break;
+
+        case "Frozen":
+        damage = {name:"Frozen",type:"SHELL",
+        penalty: "The character cannot perform any voluntary actions, but may still resist actions by others",
+        deterioration:"",
+        fix:"At the start of each activation, reduce this damage result by 1d6. A friend or ally can console them as a full round action if they are within 2 meters. This reduces the action penalty by 1d6."};
+        break;
+
+        case "Guilt":
+        damage = {name:"Guilt",type:"SHELL",
+        penalty: "Haunted by something they did (or didn’t) do, the character’s doubt, disgust, and disappointment hound them. Characters that are feeling guilty suffer a -2d6 penalty to decision making and actions around that caused this result. If the character continues to do the thing that triggered their shame such as fleeing battle, breaking the terms of a relationship, hiding an addiction or crime - then each time they take another -1d6 penalty along with the original damage",
+        deterioration:"If others face consequences for the character’s actions, and they do not confess, they will suffer a further -1d6 to this result.",
+        fix:"A character feeling guilt can confess this to those they feel they wronged. This will fix guilt, but may have other consequences. They can also compensate with stimulants or penitent behavior (such as risking their life in a conflict because they fled an earlier one) or by acting out when they reach -4d6. This will patch all penalty for guilt for that scene and the next. Other characters can also calm them with a successful skill roll, reducing -1d6 of penalty (down to a minimum of -1d6). The only way to permanently remove guilt is by confessing or getting counseling during the intermission."};
+        break;
+
+        case "Hallucinations":
+        damage = {name:"Hallucinations",type:"SHELL",
+        penalty: "This can be caused by major traumatic events, drugs, or toxins, not just damage. While affected by this damage result the character sees and/or hears things that are not there. They must make a skill test (typically an Awareness skill) to determine if what they see/hear is real",
+        deterioration:"",
+        fix:"This will fix at a rate of 1d6 per hour."};
+        break;
+        
+        case "Internal Bleeding":
+        damage = {name:"Internal Bleeding*",type:"SYSTEM",
+        penalty: "The character suffers a penalty to all skill tests due to blood loss. Whether as a byproduct of the Wounded damage result, or the result of a blunt force trauma, these injuries need to be addressed or they will continue to create problems. Often the only solution is surgery or specialized medicines",
+        deterioration:"Every 30 minutes the bleeding is not addressed, this damage result increases by -1d6 unless coagulant drugs are applied or the bleeding is stopped.",
+        fix:"Surgery or specialized drugs are needed to address these injuries. Pain medication will help in the short term to numb the pain"};
+        break;
+
+        case "Intoxicated":
+        damage = {name:"Intoxicated",type:"SYSTEM/SHELL",
+        penalty: "he character suffers a penalty to all mental processes. Depending on the drug, this can manifest as a sedative, stimulant, or hallucinogen, and the skills affected could be different. The Director will decide based on the drug whether there is danger to the character’s life (in which case these penalties count as System Shock) or if they will just pass out if they have too much (in which case these penalties are Shell Shock). Intoxicated can be used to patch damage. In the case of pain, usually each -1d6 of Intoxicated patches -1d6 of pain. For Shell Shock, you can use the rules for getting support from a teammate (in this case, the drug).",
+        deterioration:"",
+        fix:"Rest and recuperation for 1 hour per -1d6, cumulatively. Each period of rest will remove -1d6. So if a character has -3d6 in penalties they will have to rest for 3 hours to go down to -2d6, 2 more hours to drop to -1d6, and a final hour for the last -1d6. At Director discretion. other stimulants or sedatives might lower these numbers (or put you in a worse position than you started). Hospital detox lowers the process to 1 hour per die"};
+        break;
+
+        case "Knocked Out":
+        damage = {name:"Knocked Out",type:"SYSTEM",
+        penalty: "A character that is knocked out can take no actions of any kind that require them to be awake. They will remain knocked out for a number of rounds equal to the MoS of the thing that knocked them out.",
+        deterioration:"",
+        fix:"This result expires when the the character wakes up. If they are awoken before the knocked out rounds are up, they are Rattled (1d6"};
+        break;
+
+        case "Limb Crippled":
+        damage = {name:"Limb Crippled*",type:"SYSTEM",
+        penalty: "Select left or right arm or leg. The action penalty for this damage results applies to any action requiring the use of the selected limb. A -1d6 penatly represents a fracture, -2d6 is a broken bone, and -3d6 is a serious trauma that may require amputation",
         deterioration:"",
         fix:""};
         break;
 
-        case "default":
-        damage = {name:"",type:"",
-        penalty: "",
+        case "On Fire":
+        damage = {name:"On Fire",type:"SYSTEM",
+        penalty: "At the start of each of its activations the actor must roll a d6. On a 4+, increase the damage penalty of this result by -1d6 and suffer a -1d6 Fear Shell Shock damage result. Further damage becomes the burned result.",
+        deterioration:"",
+        fix:"Stop, Drop, and Roll! The character must brace and spend a full round action putting out the flames. This removes -1d6 of On Fire. A fire extinguisher, bucket of water, or full immersion in water will remove on fire as a standard action. Other characters can contribute an action to help stamp the flames out, removing them on a successful normal roll. Napalm must be scraped off or put out with a chemical extinguisher. Scraping it off will require an action and a successful roll with difficulty 6+. Failure by a comrade could result in them also gaining the On Fire damage result."};
+        break;
+
+        case "Rattled":
+        damage = {name:"Rattled",type:"SHELL",
+        penalty: "After a bad mishap, watching a traumatic event, or a near death experience the character can be rattled and suffer a -2d6 penalty to all skill tests. Rattled can also be caused by an opponent startling them in situations like a duel or contest. If an opponent caused Rattled once and defeated or otherwise humiliated the character, they can cause it again at TB:1, until the character beats them or otherwise restores a sense of control.",
+        deterioration:"",
+        fix:"assing an affected skill test will remove the condition by restoring a sense of control and self- confidence to the character. Otherwise they will need a full Scene without conflict or heavy stress to catch their breath, which will remove the penalty. Friends can sometimes spend an action to talk the character down and patch the penalty"};
+        break;
+
+        case "Paranoid":
+        damage = {name:"Paranoid",type:"SHELL",
+        penalty: "Paranoid happens when a character thought they were safe and suddenly realizes they are not. It inflicts a penalty to actions that require concentration and trust.",
+        deterioration:"If the character deals with the event that caused the Paranoid damage and has the same thing happen again, their penalty will increase by -1d6",
+        fix:"he character will need a full scene without conflict or stress to catch their breath. This will remove -1d6 of penalty for each scene. Additionally, they can spend a full uninterrupted action and pass an independent roll at difficulty 4 to patch the penalty for a scene. Another character can try to help and Numb the damage, but failure will instead add a die to the damage. If Paranoid reaches -3d6 or greater, then it will never drop below -1d6 unless the character gets help during an intermission."};
+        break;
+
+        case "Poisoned":
+        damage = {name:"Poisoned",type:"SYSTEM",
+        penalty: "This action penalty is applied to all skill tests. The character must test their health each hour to see if the poison progresses. Example Difs for the health rolls are: typical animal venom is Dif:6, highly venomous animals and homemade poisons are Dif:8 and military grade chemical weapons are Dif:14",
+        deterioration:"Each hour after this result is applied, the character or a character providing assistance may make an independent medicine skill test to check the health of the character suffering this result. If that test is passed, for every 2 points of MoS, the Dif of the test drops by 1 to a minimum of 1 and the poison does not progress. If the test is failed, the Dif is increased by 1 for every 2 points of MoF to a minimum of 1 and this damage result worsens by 1d6",
+        fix:"This damage result is removed after the Dif is reduced to 1 or less not counting the effects of any anti-venom or it is treated in a hospital."};
+        break;
+
+        case "Prone":
+        damage = {name:"Prone",type:"SYSTEM",
+        penalty: "While prone, the character moves at 1/4th speed and cannot defend themselves against melee attacks.",
+        deterioration:"",
+        fix:"Use an action to stand up, cannot be a reaction."};
+        break;
+
+        case "Ruptured Organ": 
+        damage = {name:"Ruptured Organ*",type:"SYSTEM",
+        penalty: "The character has taken a significant hit and will suffer the action penalty to all skill tests. This type of injury cannot be healed without specialized tools.",
+        deterioration:"Every 5 minutes without treatment causes this to deteriorate by -1d6",
+        fix:"Immediate medical intervention by a trained surgeon, emergency specialist, or skilled first responder."};
+        break;
+
+        case "Shock":
+        damage = {name:"Shock",type:"SHELL",
+        penalty: "The character suffers a penalty to their thinking and information processing equal to the action penalty.",
+        deterioration:"",
+        fix:"The character needs a moment to catch their breath. They can spend an action to remove this damage result"};
+        break;
+
+        case "Slowed":
+        damage = {name:"Slowed",type:"SHELL",
+        penalty: "The character suffers this penalty to their next action.",
         deterioration:"",
         fix:""};
         break;
 
-        case "default":
-        damage = {name:"",type:"",
-        penalty: "",
-        deterioration:"",
-        fix:""};
+        case "Snapped":
+        damage = {name:"Snapped",type:"SHELL",
+        penalty: "The character suffers this penalty to all skill tests they take and cannot perform any task requiring anything more than muscle memory, such as dodging attacks",
+        deterioration:"If not treated, this will turn into a full mental breakdown after 1 week, increasing its action penalty to -4d6",
+        fix:"The character needs immediate help from their comrades. A friend or ally can console them as a full round action if they are within 2 meters. This reduces the action penalty by 1d6."};
         break;
 
-        case "default":
-        damage = {name:"",type:"",
-        penalty: "",
-        deterioration:"",
-        fix:""};
+        case "Starving":
+        damage = {name:"Starving",type:"SYSTEM",
+        penalty: "After two Terra Novan days without food, the character will take this penalty to all actions. Until one week without food, a character can shake this penalty for a scene by passing an independent Roll at difficulty 4",
+        deterioration:"Each week after the first penalty is accrued will increase the penalty by -1d6 until the character dies.",
+        fix:"Calorie intake is needed. Characters that reach -3d6 or more in penalties will often require a hospital stay or supplements fully recover"};
         break;
-
-        case "default":
-        damage = {name:"",type:"",
-        penalty: "",
+        
+        case "Stunned":
+        damage = {name:"Stunned",type:"SHELL",
+        penalty: "The character takes -1d6 per point of MoS of the action that stunned them. This applies to all actions while stunned. They cannot move All-Out during this time and will not be able to use any skill requiring concentration and deep thought. This can be caused by things other than combat.",
         deterioration:"",
-        fix:""};
+        fix:"Stunned automatically improves at a rate of -1d6 per round"};
         break;
-
-        case "default":
-        damage = {name:"",type:"",
-        penalty: "",
+        
+        case "The Shakes":
+        damage = {name:"The Shakes",type:"SHELL",
+        penalty: "The character suffers a penalty to anything involving the use of their hands This can be caused by things other than combat such as emotional trauma from seeing a town destroyed",
+        deterioration:"",
+        fix:"he character can calm down as a full round action and if they do not chose All Out or Top Speed posture. An ally can attempt to console them as well. This counts as an action and removes -1d6 of penalty. The ally must be within 2 meters."};
+        break;
+        
+        case "Terrified":
+        damage = {name:"Terrified",type:"SHELL",
+        penalty: "A trigger event is causing the character to function on fight, flight, or freeze behavior. Regardless of what they do, their actions will not be very useful. The character takes this penalty to any actions that do not actively remove them from the situation that is scaring them. For example, if attacked by a GREL with a flamethrower the character would take a -3d6 to attempts to fight someone else in the scene, to talk the GREL into a cease fire, or hack a computer. They would take no penalty to dodging when trying to flee, attacking the GREL, or trying to hide",
+        deterioration:"Each time the stimulus occurs, Terrified will also get -1d6 worse. For example, a GREL with a flamethrower inflicts -1d6 on the character, catching them near the blast but focusing on their teammate. The character ignores them and stays on mission but next round the GREL turns towards them directly. This will cause an additional -1d6 until the character takes some fight, flight, or freeze response. Terrified can be patched by a teammate providing emotional support.",
+        fix:"eaving the area that terrified them will cause all but -1d6 of terrified to pass. The character will have to make an independent roll to calm down and remove the final -1d6. Another character can also talk them down with an appropriate skill roll and remove -1d6 of Terrified per round spent doing so"};
+        break;
+        
+        case "Wounded":
+        damage = {name:"Wounded",type:"SYSTEM",
+        penalty: "The character has sustained a significant injury. Whether or not it is a flesh wound or something more serious, they will suffer the action penalty to all actions.",
+        deterioration:"Depending on the source of the damage the character may be losing blood, and they will Deteriorate unless they can stop the bleeding by putting pressure on the wound or dressing it. If the action penalty is -2d6 it worsens every half hour, and -3d6 or higher it worsens every minute. Wounds from bruising do not deteriorate, and are capped at -1d6",
+        fix:"Pain medication will help in the short term. For bleeding wounds, medical dressings can stop the bleeding, and pressure on the wound can be used in a pinch to keep someone alive a few minutes for help to arrive. Lacerations will require bandages or stitches, and surgery may be required to seal up internal injuries or remove shrapnel or bullets. Transfusions, IV’s, or synthetic blood products may also be needed to treat blood loss."};
+        break;
+        
+        case "Catastrophic Limb Damage":
+        damage = {name:"Catastrophic Limb Damage*",type:"",
+        penalty: "Select a limb (left or right leg, left or right arm). Any action requiring use of that limb suffers a -3d6 penalty. Legs also suffer -3 movement",
         deterioration:"",
         fix:""};
         break;
         
+        case "Catastrophic System Damage":
+        damage = {name:"Catastrophic System Damage*",type:"",
+        penalty: "Select between optics, sensors, cooling, fire control, motive control, or communications. Any action that uses that system suffers this penalty",
+        deterioration:"",
+        fix:""};
+        break;
+        
+        case "Drive System Crippled":
+        damage = {name:"Drive System Crippled*",type:"",
+        penalty: "The vehicle can no longer move. Ranged attacks against it are resolved as independent rolls. Attempts to dodge melee attacks suffer this penalty.",
+        deterioration:"",
+        fix:""};
+        break;
+        
+        case "Drive System Damaged":
+        damage = {name:"Drive System Damaged",type:"",
+        penalty: "The vehicle cannot declare Top Speed or All Out posture and can only turn once up to 90 degrees during its activation.",
+        deterioration:"",
+        fix:""};
+        break;
+
+        case "Engine Hit": 
+        damage = {name:"Engine Hit",type:"",
+        penalty: "This vehicle suffers this damage penalty to any actions involving its motive system, as well as attempts to dodge attacks, and make melee attacks",
+        deterioration:"",
+        fix:""};
+        break;
+
+        
+        case "Hull Breach":
+        damage = {name:"Hull Breach",type:"",
+        penalty: "This damage result imposes no penalties as the shot simply blows a hole in the vehicle. The vehicle is now open if it was sealed, and may flood if underwater or be vulnerable to chemical attacks.",
+        deterioration:"",
+        fix:""};
+        break;
+
+        
+        case "It's Gonna Blow":
+        damage = {name:"It's Gonna Blow",type:"",
+        penalty: "The Director secretly rolls 1d6, halves it (rounded up) and keeps track of the result. At the end of that many rounds, the vehicle explodes and any crew that are still in it are killed. Until then, the vehicle is still operational and can act as normal",
+        deterioration:"",
+        fix:""};
+        break;
+
+        
+        case "Jammed":
+        damage = {name:"Jammed",type:"NONE",
+        penalty: "All communication hardware is disabled, and the vehicle’s GU, PI and EW rolls suffer TP:2. Multiple instances of this do not stack TP. See Jammed in Chapter 12.",
+        deterioration:"",
+        fix:"All Jammed damage results clear after a number of rounds equal to total -d6 of Jammed damage results. A character or actor may attempt an Electronic Warfare skill test to clear the jam at Dif: 5. For every point of MoS, remove 1d6 of Jammed"};
+        break;
+
+        
+        case "Knocked Down":
+        damage = {name:"Knocked Down",type:"",
+        penalty: "The vehicle takes this penalty to attempts to dodge attacks and can stand up as an action. If it does so, reduce its movement by 2 on the activation it stood up",
+        deterioration:"",
+        fix:""};
+        break;
+
+        
+        case "Major Limb Damage":
+        damage = {name:"Major Limb Damage",type:"",
+        penalty: "Select a limb (left or right leg, left or right arm). Any action requiring use of that limb suffers this penalty. Legs also suffer -2 movement",
+        deterioration:"",
+        fix:""};
+        break;
+
+        
+        case "Major System Damage":
+        damage = {name:"Major System Damage",type:"",
+        penalty: "Select between optics, sensors, cooling, fire control, motive control, or communications. Any action that uses that system suffers this penalty",
+        deterioration:"",
+        fix:""};
+        break;
+
+        
+        case "Major Weapon Destroyed":
+        damage = {name:"Major Weapon Destroyed*",type:"",
+        penalty: "Select a weapon, it is destroyed. The selected weapon must be at least Heavy size or greater than Damage 7",
+        deterioration:"",
+        fix:""};
+        break;
+
+        case "Minor Limb Damage":
+        damage = {name:"Minor Limb Damage",type:"",
+        penalty: "Select a limb (left or right leg, left or right arm). Any action requiring use of that limb suffers this penalty. Legs also suffer -1 movement.",
+        deterioration:"",
+        fix:""};
+        break;
+
+        case "Minor System Damage":
+        damage = {name:"Minor System Damage",type:"",
+        penalty: "Select between optics, sensors, cooling, fire control, motive control, or communications. Any action that uses that system suffers this penalty",
+        deterioration:"",
+        fix:""};
+        break;
+
+        case "Minor Weapon Destroyed*":
+        damage = {name:"Minor Weapon Destroyed",type:"",
+        penalty: "Select a weapon, it is destroyed. The selected weapon must be Damage 7 or less.",
+        deterioration:"",
+        fix:""};
+        break;
+
+        case "On Fire (Vehicle)":
+        damage = {name:"On Fire (Vehicle)",type:"",
+        penalty: "At the start of each of its activations, the vehicle must roll a d6. On a 4+, increase the damage penalty of this result by -1d6 and the crew suffers a 1d6 Fear Shell Shock damage result. The vehicle cannot hide.",
+        deterioration:"",
+        fix:"Extinguish with fire fighting equipment or other means"};
+        break;
+
+        case "Secondary Explosion":
+        damage = {name:"Secondary Explosion",type:"",
+        penalty: "The vehicle suffers 1 additional point of damage on a roll of a 4+. Repeat until the vehicle does not suffer additional damage. Each time it takes damage, the roll needed to damage it worsens by 1 (so a 4+ becomes a 5+) to a maximum of 6+. Afterwards this is treated as a Hull Breach",
+        deterioration:"",
+        fix:""};
+        break;
+
+        case "Sensor Malfunction":
+        damage = {name:"Sensor Malfunction",type:"",
+        penalty: "The vehicles sensor range is reduced by half until the end of the next round. The ability to identify vehicle types, variants and affiliations is lost until then",
+        deterioration:"",
+        fix:""};
+        break;
+
+        case "Unstable":
+        damage = {name:"Unstable",type:"",
+        penalty: "The vehicle suffers -1d6 to all actions until the end of the next round",
+        deterioration:"",
+        fix:""};
+        break;
 
         case "default":
         damage = {name:"",type:"",
@@ -7924,6 +8042,7 @@ const damageLookup = (input) => {
         deterioration:"",
         fix:""};
         break;
+
     }
     return damage;
 }
@@ -8423,6 +8542,13 @@ const rollArray = (whisper = "" ,names,expertise,dice,tnArray,reliabledice, ...e
         tn = 6;
         console.log("tn reduced due to tn over 6. bonus:", bonus, tn);
     };
+
+    if (tn < 2) { //tn under 2 is converted to bonus dice at 1:2
+        bonus = bonus + Math.floor((2 - tn)/2);
+        tn = 2;
+        console.log("tn increased due to tn under 2. bonus:", bonus, tn);
+
+    };
     
     if (skilllevel == 0) {
         bonus--;
@@ -9019,6 +9145,12 @@ const rollArrayInfWeapon = (whisper = "" ,names,expertise,dice,tnArray,reliabled
         tn = 6;
         console.log("tn reduced due to tn over 6. bonus:", bonus, tn);
     };
+    if (tn < 2) { //tn under 2 is converted to bonus dice at 1:2
+        bonus = bonus + Math.floor((2 - tn)/2);
+        tn = 2;
+        console.log("tn increased due to tn under 2. bonus:", bonus, tn);
+
+    };
     
     if (skilllevel == 0) {
         bonus--;
@@ -9562,6 +9694,12 @@ const rollArrayGearWeapon = (whisper = "" ,names,expertise,dice,tnArray,reliable
         tn = 6;
         console.log("tn reduced due to tn over 6. bonus:", bonus, tn);
     };
+    if (tn < 2) { //tn under 2 is converted to bonus dice at 1:2
+        bonus = bonus + Math.floor((2 - tn)/2);
+        tn = 2;
+        console.log("tn increased due to tn under 2. bonus:", bonus, tn);
+
+    };
     
     if (skilllevel == 0) {
         bonus--;
@@ -9763,6 +9901,39 @@ on("clicked:initiative_start", function () { //
             });
         });
     });
+}); 
+on("clicked:damage_roll", function () { //
+    console.log("damage button");
+    getAttrs(["damage_value","damage_type","whisper"] , (values) => {
+        let damage = parseInt(values["damage_value"]);
+        console.log("damage_value:"+damage);
+        startRoll(values["whisper"]+"&{template:custom} {{title=@{character_name} }} {{damage=[["+damage+"]]}} {{vehicle=[[1d"+(damage+1)+"]]}} {{character=[[1d"+(damage+1)+"]]}} {{char= [[1]]}}", (diceroll) => {
+            console.log(diceroll);
+            const total = diceroll.results.damage.result;
+            let rolledDamageVehicle = diceroll.results.vehicle.result;
+            let rolledDamageCharacter = diceroll.results.character.result;
+            let damageVehicle = 0;
+            let damageCharacter = 0;
+            if (damage_type = "vehicle"){
+                damageVehicle = rolledDamageVehicle-1;
+                damageCharacter =  damage - damageVehicle;
+                console.log("damageVehicle:"+damageVehicle);
+                console.log("damageCharacter:"+damageCharacter);
+            }
+            if (damage_type = "character"){
+                damageCharacter = rolledDamageCharacter-1;
+                console.log("damageVehicle:"+damageVehicle);
+                console.log("damageCharacter:"+damageCharacter);
+            }
+            console.log("total:"+total);
+            finishRoll(diceroll.rollId, {
+                damage: damage,
+                vehicle: damageVehicle,
+                character: damageCharacter
+
+            });
+        });
+    });
 });