diff --git a/SLA Industries 2ed/sla.css b/SLA Industries 2ed/sla.css
index a8071be9a1..18bc6c1f77 100644
--- a/SLA Industries 2ed/sla.css	
+++ b/SLA Industries 2ed/sla.css	
@@ -5718,7 +5718,7 @@
 	border-left:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-rangedweapon1skillscore input[type=text]
+.sheet-rangedweapon1skillscore select
 	{
 	color:black;
 	font-size:9.0pt;
@@ -5919,7 +5919,7 @@
 	border-left:.5pt solid white;
 	background:#E9F1FF;
 	}
-.sheet-rangedweapon2skillscore input[type=text]
+.sheet-rangedweapon2skillscore select
 	{
 	color:black;
 	font-size:9.0pt;
@@ -6120,7 +6120,7 @@
 	border-left:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-rangedweapon3skillscore input[type=text]
+.sheet-rangedweapon3skillscore select
 	{
 	color:black;
 	font-size:9.0pt;
@@ -6321,7 +6321,7 @@
 	border-left:.5pt solid white;
 	background:#E9F1FF;
 	}
-.sheet-rangedweapon4skillscore input[type=text]
+.sheet-rangedweapon4skillscore select
 	{
 	color:black;
 	font-size:9.0pt;
@@ -6522,7 +6522,7 @@
 	border-left:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-rangedweapon5skillscore input[type=text]
+.sheet-rangedweapon5skillscore select
 	{
 	color:black;
 	font-size:9.0pt;
@@ -6822,7 +6822,7 @@
 	border-left:.5pt solid white;
 	background:#E9F1FF;
 	}
-.sheet-meleeweapon1skillscore input[type=text]
+.sheet-meleeweapon1skillscore select
 	{
 	color:black;
 	font-size:8.0pt;
@@ -6978,7 +6978,7 @@
 	border-left:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-meleeweapon2skillscore input[type=text]
+.sheet-meleeweapon2skillscore select
 	{
 	color:black;
 	font-size:8.0pt;
@@ -7134,7 +7134,7 @@
 	border-left:.5pt solid white;
 	background:#E9F1FF;
 	}
-.sheet-meleeweapon3skillscore input[type=text]
+.sheet-meleeweapon3skillscore select
 	{
 	color:black;
 	font-size:8.0pt;
@@ -7290,7 +7290,7 @@
 	border-left:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-meleeweapon4skillscore input[type=text]
+.sheet-meleeweapon4skillscore select
 	{
 	color:black;
 	font-size:8.0pt;
diff --git a/SLA Industries 2ed/sla.html b/SLA Industries 2ed/sla.html
index dd6771875b..aaec0b6a31 100644
--- a/SLA Industries 2ed/sla.html	
+++ b/SLA Industries 2ed/sla.html	
@@ -266,7 +266,7 @@
 	<option>Throw</option>
 </datalist>
 <datalist id="meleeskilllist">
-	<option>Melee Weapons</option>
+	<option>MeleeWpns</option>
 	<option>Polearm</option>
 	<option>Shield Craft</option>
 	<option>Unarmed Combat</option>
@@ -288,9 +288,9 @@
   <div class="sheet-sclscore"><input name="attr_scl" type="text"></div>
   <div class="sheet-version">ver: 1.0a</div>
   
-  <div class="sheet-slaimage"><img width=119 height=155 src="https://github.com/Roll20/roll20-character-sheets/blob/master/SLA%20Industries%202ed/slalogo.png"></div>
+  <div class="sheet-slaimage"><img width=119 height=155 src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/SLA%20Industries%202ed/slalogo.png"></div>
   <div class="sheet-strtitle">STRENGTH</div>
-  <div class="sheet-strbasescore"><input name="attr_strengthbase" type="number"><input name="attr_strengthmax" type="hidden"><input name="attr_strengthebb" type="hidden"><input name="attr_strengtharmour" type="hidden"><input name="attr_strengthdrugs" type="hidden"></div>
+  <div class="sheet-strbasescore"><input name="attr_strengthbase" type="number"><input name="attr_strengthmax" type="hidden"><input name="attr_strengthebb" type="hidden"><input name="attr_strengtharmour" type="hidden"><input name="attr_strengthdrugs" type="hidden"><input name="attr_strengthdam" type="hidden"></div>
   <div class="sheet-strscore"><span name="attr_strength"></div>
   <div class="sheet-dextitle">DEXTERITY</div>
   <div class="sheet-dexbasescore"><input name="attr_dexteritybase" type="number"><input name="attr_dexteritymax" type="hidden"><input name="attr_dexterityebb" type="hidden"><input name="attr_dexterityarmour" type="hidden"><input name="attr_dexteritydrugs" type="hidden"></div>
@@ -305,7 +305,7 @@
   <div class="sheet-chabasescore"><input name="attr_charismabase" type="number"><input name="attr_charismamax" type="hidden"><input name="attr_charismaebb" type="hidden"><input name="attr_charismadrugs" type="hidden"></div>
   <div class="sheet-chascore"><span name="attr_charisma"></div>
   <div class="sheet-cootitle">COOL</div>
-  <div class="sheet-coobasescore"><input name="attr_cool" type="number"><input name="attr_coolmax" type="hidden"><input name="attr_cooldrugs" type="hidden"></div>
+  <div class="sheet-coobasescore"><input name="attr_coolbase" type="number"><input name="attr_coolmax" type="hidden"><input name="attr_cooldrugs" type="hidden"><input name="attr_coolarmour" type="hidden"></div>
   <div class="sheet-cooscore"><span name="attr_cool"></div>
   <div class="sheet-bodytitle">BODY</div>
   <div class="sheet-bodyscore"><input name="attr_body" type="number" min=0></div>
@@ -318,7 +318,7 @@
   <div class="sheet-lucktitle"><span name="attr_luckflux"/></div>
   <div class="sheet-luckmaxtitle">MAX</div>
   <div class="sheet-luckcurrtitle">CURRENT</div>
-  <div class="sheet-luckmaxscore"><input name="attr_luck" type="number" min=0 max=6><input name="attr_luckmax" type="hidden"></div>
+  <div class="sheet-luckmaxscore"><input name="attr_luck" type="number" min=0><input name="attr_luckmax" type="hidden"></div>
   <div class="sheet-luckcurrscore"><input name="attr_luckcurrent" type="number"></div>
   <div class="sheet-xptitle">XP</div>
   <div class="sheet-xpawardtitle">AWARD</div>
@@ -638,7 +638,18 @@
   <div class="sheet-rangedweaponequiptitle">EQUIP</div>
   <div class="sheet-rangedweaponrolltitle">ROLL</div>
   <div class="sheet-rangedweapon1score"><input type="text" list="rangedlist" name="attr_rangedweapon_1"></div>
-  <div class="sheet-rangedweapon1skillscore"><input type="text" list="rangedskilllist" name="attr_rangedweapon_skill_1"></div>
+  <div class="sheet-rangedweapon1skillscore">
+  	<select name="attr_rangedweapon_skill_1">
+		<option value=""></option>
+		<option value="Blast">Blast</option>
+		<option value="Pistol">Pistol</option>
+		<option value="Rifle">Rifle</option>
+		<option value="supportwpn">Support Weapons</option>
+		<option value="Telekinesis">Telekinesis</option>
+		<option value="Thermal">Thermal</option>
+		<option value="Throw">Throw</option>
+    </select>
+  </div>
   <div class="sheet-rangedweapon1rngscore"><input name="attr_rangedweapon_range_1" type="text"></div>
   <div class="sheet-rangedweapon1dmgscore"><input name="attr_rangedweapon_damage_1" type="text"></div>
   <div class="sheet-rangedweapon1mindmgscore"><input name="attr_rangedweapon_mindamage_1" type="number"></div>
@@ -648,7 +659,18 @@
   <div class="sheet-rangedweapon1equipscore"><input name="attr_rangedweapon_enc_1" type="text"></div>
   <div class="sheet-rangedweapon1rollscore"><button type="roll" name="attr_rangedweapon_roll_1">&nbsp;</button></div>
   <div class="sheet-rangedweapon2score"><input type="text" list="rangedlist" name="attr_rangedweapon_2"></div>
-  <div class="sheet-rangedweapon2skillscore"><input type="text" list="rangedskilllist" name="attr_rangedweapon_skill_2"></div>
+  <div class="sheet-rangedweapon2skillscore">  	
+    <select name="attr_rangedweapon_skill_2">
+		<option value=""></option>
+		<option value="Blast">Blast</option>
+		<option value="Pistol">Pistol</option>
+		<option value="Rifle">Rifle</option>
+		<option value="supportwpn">Support Weapons</option>
+		<option value="Telekinesis">Telekinesis</option>
+		<option value="Thermal">Thermal</option>
+		<option value="Throw">Throw</option>
+    </select>
+</div>
   <div class="sheet-rangedweapon2rngscore"><input name="attr_rangedweapon_range_2" type="text"></div>
   <div class="sheet-rangedweapon2dmgscore"><input name="attr_rangedweapon_damage_2" type="text"></div>
   <div class="sheet-rangedweapon2mindmgscore"><input name="attr_rangedweapon_mindamage_2" type="number"></div>
@@ -658,7 +680,18 @@
   <div class="sheet-rangedweapon2equipscore"><input name="attr_rangedweapon_enc_2" type="text"></div>
   <div class="sheet-rangedweapon2rollscore"><button type="roll" name="attr_rangedweapon_roll_2">&nbsp;</button></div>
   <div class="sheet-rangedweapon3score"><input type="text" list="rangedlist" name="attr_rangedweapon_3"></div>
-  <div class="sheet-rangedweapon3skillscore"><input type="text" list="rangedskilllist" name="attr_rangedweapon_skill_3"></div>
+  <div class="sheet-rangedweapon3skillscore">
+  	<select name="attr_rangedweapon_skill_3">
+		<option value=""></option>
+		<option value="Blast">Blast</option>
+		<option value="Pistol">Pistol</option>
+		<option value="Rifle">Rifle</option>
+		<option value="supportwpn">Support Weapons</option>
+		<option value="Telekinesis">Telekinesis</option>
+		<option value="Thermal">Thermal</option>
+		<option value="Throw">Throw</option>
+    </select>
+  </div>
   <div class="sheet-rangedweapon3rngscore"><input name="attr_rangedweapon_range_3" type="text"></div>
   <div class="sheet-rangedweapon3dmgscore"><input name="attr_rangedweapon_damage_3" type="text"></div>
   <div class="sheet-rangedweapon3mindmgscore"><input name="attr_rangedweapon_mindamage_3" type="number"></div>
@@ -668,7 +701,18 @@
   <div class="sheet-rangedweapon3equipscore"><input name="attr_rangedweapon_enc_3" type="text"></div>
   <div class="sheet-rangedweapon3rollscore"><button type="roll" name="attr_rangedweapon_roll_3">&nbsp;</button></div>
   <div class="sheet-rangedweapon4score"><input type="text" list="rangedlist" name="attr_rangedweapon_4"></div>
-  <div class="sheet-rangedweapon4skillscore"><input type="text" list="rangedskilllist" name="attr_rangedweapon_skill_4"></div>
+  <div class="sheet-rangedweapon4skillscore">
+  	<select name="attr_rangedweapon_skill_4">
+		<option value=""></option>
+		<option value="Blast">Blast</option>
+		<option value="Pistol">Pistol</option>
+		<option value="Rifle">Rifle</option>
+		<option value="supportwpn">Support Weapons</option>
+		<option value="Telekinesis">Telekinesis</option>
+		<option value="Thermal">Thermal</option>
+		<option value="Throw">Throw</option>
+    </select>
+  </div>
   <div class="sheet-rangedweapon4rngscore"><input name="attr_rangedweapon_range_4" type="text"></div>
   <div class="sheet-rangedweapon4dmgscore"><input name="attr_rangedweapon_damage_4" type="text"></div>
   <div class="sheet-rangedweapon4mindmgscore"><input name="attr_rangedweapon_mindamage_4" type="number"></div>
@@ -678,7 +722,18 @@
   <div class="sheet-rangedweapon4equipscore"><input name="attr_rangedweapon_enc_4" type="text"></div>
   <div class="sheet-rangedweapon4rollscore"><button type="roll" name="attr_rangedweapon_roll_4">&nbsp;</button></div>
   <div class="sheet-rangedweapon5score"><input type="text" list="rangedlist" name="attr_rangedweapon_5"></div>
-  <div class="sheet-rangedweapon5skillscore"><input type="text" list="rangedskilllist" name="attr_rangedweapon_skill_5"></div>
+  <div class="sheet-rangedweapon5skillscore">
+  	<select name="attr_rangedweapon_skill_5">
+		<option value=""></option>
+		<option value="Blast">Blast</option>
+		<option value="Pistol">Pistol</option>
+		<option value="Rifle">Rifle</option>
+		<option value="supportwpn">Support Weapons</option>
+		<option value="Telekinesis">Telekinesis</option>
+		<option value="Thermal">Thermal</option>
+		<option value="Throw">Throw</option>
+    </select>
+  </div>
   <div class="sheet-rangedweapon5rngscore"><input name="attr_rangedweapon_range_5" type="text"></div>
   <div class="sheet-rangedweapon5dmgscore"><input name="attr_rangedweapon_damage_5" type="text"></div>
   <div class="sheet-rangedweapon5mindmgscore"><input name="attr_rangedweapon_mindamage_5" type="number"></div>
@@ -697,7 +752,15 @@
   <div class="sheet-meleeweaponequiptitle">EQUIP</div>
   <div class="sheet-meleeweaponrolltitle">ROLL</div>
   <div class="sheet-meleeweapon1score"><input type="text" list="meleelist" name="attr_meleeweapon_1"></div>
-  <div class="sheet-meleeweapon1skillscore"><input type="text" list="meleeskilllist" name="attr_meleeweapon_skill_1"></div>
+  <div class="sheet-meleeweapon1skillscore">  	
+    <select name="attr_meleeweapon_skill_1">
+		<option value=""></option>
+		<option value="meleewpn">Melee Weapons</option>
+		<option value="polearm">Polearm</option>
+		<option value="ShieldCraft">Shield Craft</option>
+		<option value="Unarmed">Unarmed Combat</option>
+    </select>
+  </div>
   <div class="sheet-meleeweapon1dmgscore"><input name="attr_meleeweapon_damage_1" type="text"></div>
   <div class="sheet-meleeweapon1mindmgscore"><input name="attr_meleeweapon_mindamage_1" type="number"></div>
   <div class="sheet-meleeweapon1adscore"><input name="attr_meleeweapon_armourdamage_1" type="number"></div>
@@ -705,7 +768,15 @@
   <div class="sheet-meleeweapon1rollscore"><button type="roll" name="attr_meleeweapon_roll_1">&nbsp;</button></div>
   <div class="sheet-meleeweapon1equipscore"><input name="attr_meleeweapon_enc_1" type="text"></div>
   <div class="sheet-meleeweapon2score"><input type="text" list="meleelist" name="attr_meleeweapon_2"></div>
-  <div class="sheet-meleeweapon2skillscore"><input type="text" list="meleeskilllist" name="attr_meleeweapon_skill_2"></div>
+  <div class="sheet-meleeweapon2skillscore">  	
+    <select name="attr_meleeweapon_skill_2">
+		<option value=""></option>
+		<option value="meleewpn">Melee Weapons</option>
+		<option value="polearm">Polearm</option>
+		<option value="ShieldCraft">Shield Craft</option>
+		<option value="Unarmed">Unarmed Combat</option>
+    </select>
+  </div>
   <div class="sheet-meleeweapon2dmgscore"><input name="attr_meleeweapon_damage_2" type="text"></div>
   <div class="sheet-meleeweapon2mindmgscore"><input name="attr_meleeweapon_mindamage_2" type="number"></div>
   <div class="sheet-meleeweapon2adscore"><input name="attr_meleeweapon_armourdamage_2" type="number"></div>
@@ -713,7 +784,15 @@
   <div class="sheet-meleeweapon2rollscore"><button type="roll" name="attr_meleeweapon_roll_2">&nbsp;</button></div>
   <div class="sheet-meleeweapon2equipscore"><input name="attr_meleeweapon_enc_2" type="text"></div>
   <div class="sheet-meleeweapon3score"><input type="text" list="meleelist" name="attr_meleeweapon_3"></div>
-  <div class="sheet-meleeweapon3skillscore"><input type="text" list="meleeskilllist" name="attr_meleeweapon_skill_3"></div>
+  <div class="sheet-meleeweapon3skillscore">  	
+    <select name="attr_meleeweapon_skill_3">
+		<option value=""></option>
+		<option value="meleewpn">Melee Weapons</option>
+		<option value="polearm">Polearm</option>
+		<option value="ShieldCraft">Shield Craft</option>
+		<option value="Unarmed">Unarmed Combat</option>
+    </select>
+  </div>
   <div class="sheet-meleeweapon3dmgscore"><input name="attr_meleeweapon_damage_3" type="text"></div>
   <div class="sheet-meleeweapon3mindmgscore"><input name="attr_meleeweapon_mindamage_3" type="number"></div>
   <div class="sheet-meleeweapon3adscore"><input name="attr_meleeweapon_armourdamage_3" type="number"></div>
@@ -721,7 +800,15 @@
   <div class="sheet-meleeweapon3rollscore"><button type="roll" name="attr_meleeweapon_roll_3">&nbsp;</button></div>
   <div class="sheet-meleeweapon3equipscore"><input name="attr_meleeweapon_enc_3" type="text"></div>
   <div class="sheet-meleeweapon4score"><input type="text" list="meleelist" name="attr_meleeweapon_4"></div>
-  <div class="sheet-meleeweapon4skillscore"><input type="text" list="meleeskilllist" name="attr_meleeweapon_skill_4"></div>
+  <div class="sheet-meleeweapon4skillscore">  	
+    <select name="attr_meleeweapon_skill_4">
+		<option value=""></option>
+		<option value="meleewpn">Melee Weapons</option>
+		<option value="polearm">Polearm</option>
+		<option value="ShieldCraft">Shield Craft</option>
+		<option value="Unarmed">Unarmed Combat</option>
+    </select>
+  </div>
   <div class="sheet-meleeweapon4dmgscore"><input name="attr_meleeweapon_damage_4" type="text"></div>
   <div class="sheet-meleeweapon4mindmgscore"><input name="attr_meleeweapon_mindamage_4" type="number"></div>
   <div class="sheet-meleeweapon4adscore"><input name="attr_meleeweapon_armourdamage_4" type="number"></div>
@@ -949,9 +1036,9 @@ on('change:species', event => {
      const speciesdetails = {
         "Advanced Carrien":		{strengthbase: '3', strengthmax: '5', dexteritybase: '1', dexteritymax: '5', knowledgebase: '0', knowledgemax: '2', concentrationbase: '1', concentrationmax: '4', charismabase: '0', charismamax: '3', coolbase: '3', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '1', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '1', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'7', hpStarting:'23', species_ability_1:"FAMILIAR BREED", 	species_ability_2:"AGAINST ALL ODDS", 	luckflux:"LUCK"},
         "ADV": 					{strengthbase: '3', strengthmax: '5', dexteritybase: '1', dexteritymax: '5', knowledgebase: '0', knowledgemax: '2', concentrationbase: '1', concentrationmax: '4', charismabase: '0', charismamax: '3', coolbase: '3', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '1', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '1', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'7', hpStarting:'23', species_ability_1:"FAMILIAR_BREED", 	species_ability_2:"AGAINST ALL ODDS", 	luckflux:"LUCK"},
-        "Brain Waster": 		{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
-        "Eban": 				{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
-        "Ebon": 				{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
+        "Brain Waster": 		{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'1', communicate:'0', enhance:'0', heal:'0', protect:'1', realityfold:'0', senses:'0', telekinesis:'0', thermal:'1', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
+        "Eban": 				{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'1', communicate:'0', enhance:'0', heal:'0', protect:'1', realityfold:'0', senses:'0', telekinesis:'0', thermal:'1', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
+        "Ebon": 				{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'1', protect:'1', realityfold:'0', senses:'0', telekinesis:'0', thermal:'1', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
         "Frother": 				{strengthbase: '2', strengthmax: '4', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '1', concentrationmax: '3', charismabase: '0', charismamax: '4', coolbase: '1', coolmax: '5', luck: '1', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '1', oratory: '0', persuasion: '0', stealth: '0', streetwise: '1', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'17', species_ability_1:"DRUG ADDICT", 		species_ability_2:"FEEL NO PAIN", 		luckflux:"LUCK"},
         "Human": 				{strengthbase: '1', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '2', knowledgemax: '5', concentrationbase: '1', concentrationmax: '5', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '1', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '1', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'15', species_ability_1:"ADAPTABLE", 			species_ability_2:"SOCIABLE", 			luckflux:"LUCK"},
         "Neophron": 			{strengthbase: '0', strengthmax: '2', dexteritybase: '0', dexteritymax: '3', knowledgebase: '2', knowledgemax: '6', concentrationbase: '2', concentrationmax: '6', charismabase: '3', charismamax: '6', coolbase: '1', coolmax: '5', luck: '0', luckmax: '3', athletics: '0', bribery: '1', climbing: '0', detect: '0', diplomacy: '1', eduacad: '1', edunat: '1', intimidate: '0', langgristle: '0', langneo: '1', langshak: '0', langwraith: '0', leadership: '1', loresector: '0', meleewpn: '0', oratory: '1', persuasion: '1', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'11', species_ability_1:"CHARM OFFENSIVE", 	species_ability_2:"INQUISITIVE MIND",	luckflux:"LUCK"},
@@ -1079,7 +1166,13 @@ on("change:strengthbase change:strengtharmour change:strengthdrugs change:streng
 	  if (strengthbase > strengthmax) { strengthbase = strengthmax;}
 	  if (strengthbase < strengthmin) { strengthbase = strengthmin;}
 	  
-	 var strength = strengthbase + strengtharmour + strengthdrugs + strengthebb;
+	  var strength = strengthbase + strengtharmour + strengthdrugs + strengthebb;
+	  
+	  var strengthdam = 0;
+	  
+	  if (strength == 5) {strengthdam = 1;}
+	  if (strength == 6) {strengthdam = 2;}
+	  if (strength > 6) {strengthdam = 4;}
 
       var climbing = parseInt(values["climbing"])||0;
       var meleewpn = parseInt(values["meleewpn"])||0;
@@ -1109,6 +1202,7 @@ on("change:strengthbase change:strengtharmour change:strengthdrugs change:streng
         "throw_total": throwtotal,
         "unarmed_total": unarmedtotal,
 		"hpStarting": hpbase + strength,
+		"strengthdam": strengthdam,
       });
   });
 }); 
@@ -1362,8 +1456,8 @@ on("change:charismabase change:charismadrugs change:charismaebb", function() {
       });
   });
 });
-on("change:coolbase change:cooldrugs", function() {
-  getAttrs(["coolbase","species","bribery","gambling","interrogate","intimidate","survival","torture","cooldrugs"], function(values) {
+on("change:coolbase change:cooldrugs change:coolarmour", function() {
+  getAttrs(["coolbase","species","bribery","gambling","interrogate","intimidate","survival","torture","cooldrugs","coolarmour"], function(values) {
      const speciesdetails = {
         "Advanced Carrien":		{coolbase: '3', coolmax: '6'},
         "ADV": 					{coolbase: '3', coolmax: '6'},
@@ -1380,6 +1474,7 @@ on("change:coolbase change:cooldrugs", function() {
     };
       var coolbase = parseInt(values["coolbase"])||0;
       var cooldrugs = parseInt(values["cooldrugs"])||0;
+      var coolarmour = parseInt(values["coolarmour"])||0;
 	  var species = values["species"]||"";
 
       var coolmin = parseInt(speciesdetails[species]["coolbase"])||0;
@@ -1388,7 +1483,7 @@ on("change:coolbase change:cooldrugs", function() {
 	  if (coolbase > coolmax) { coolbase = coolmax;}
 	  if (coolbase < coolmin) { coolbase = coolmin;}
 	  
-	  cool = coolbase + cooldrugs;
+	  cool = coolbase + cooldrugs + coolarmour;
 
       var bribery = parseInt(values["bribery"])||0;
       var gambling = parseInt(values["gambling"])||0;
@@ -1415,13 +1510,13 @@ on("change:coolbase change:cooldrugs", function() {
   });
 });
 on("change:luck", function() {
-  getAttrs(["luck","species"], function(values) {
+  getAttrs(["luck","species","protect"], function(values) {
      const speciesdetails = {
         "Advanced Carrien":		{luck: '0', luckmax: '3'},
-        "ADV": 					{luck: '0', luckmax: '6'},
+        "ADV": 					{luck: '0', luckmax: '3'},
         "Brain Waster": 		{luck: '2', luckmax: '6'},
         "Eban": 				{luck: '2', luckmax: '6'},
-        "Ebon": 				{luck: '2', luckmax: '3'},
+        "Ebon": 				{luck: '2', luckmax: '6'},
         "Frother": 				{luck: '1', luckmax: '3'},
         "Human": 				{luck: '1', luckmax: '6'},
         "Neophron": 			{luck: '0', luckmax: '3'},
@@ -1431,11 +1526,13 @@ on("change:luck", function() {
         "Wraithen": 			{luck: '1', luckmax: '4'},
     };
       var luck = parseInt(values["luck"])||0;
+      var protect = parseInt(values["protect"])||0;
 	  var species = values["species"]||"";
 
       var luckmin = parseInt(speciesdetails[species]["luck"])||0;
       var luckmax = parseInt(speciesdetails[species]["luckmax"])||20;
 	  
+	  if (protect > 2) {luckmax = luckmax + 2;}
 	  if (luck > luckmax) { luck = luckmax;}
 	  if (luck < luckmin) { luck = luckmin;}
 
@@ -2317,42 +2414,42 @@ on("change:thermal", function() {
 });
 on('change:armour_1', event => {
      const armourdetails = {
-		"AETHER ARMOUR":					{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'4', dexterityarmour: '-1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"BASTION":							{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"BLITZKRIEG":						{armour_pv_1:'11',	armour_resistance_1:'30',	armour_enc_1:'0', dexterityarmour: '1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"CAF PADQUIL":						{armour_pv_1:'2',	armour_resistance_1:'8',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DEATHSUIT-1":						{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DEATHSUIT-2":						{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DEATHSUIT-4":						{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DN COMMANDANT":					{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DN GUNNER":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DN SPECIALIST":					{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"EBB TK SHIELD":					{armour_pv_1:'2',	armour_resistance_1:'10',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"EBB TK ADVANCED SHIELD":			{armour_pv_1:'4',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"KRELL ABLATIVE":					{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"MAL MODULAR":						{armour_pv_1:'7',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"MODIFIED ROBOCHIH MINING":			{armour_pv_1:'12',	armour_resistance_1:'60',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP10 HARD":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP13 EXO MK2":						{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'1', dexterityarmour: '-1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP55 SUPER HARD":					{armour_pv_1:'7',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP70 POWERCELL":					{armour_pv_1:'8',	armour_resistance_1:'24',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP100 CRACKSHOT":					{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP104 DOGEYBONE":					{armour_pv_1:'12',	armour_resistance_1:'36',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '2', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP112D SILVERBACK":				{armour_pv_1:'6',	armour_resistance_1:'18',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '0', initiativearmour: '0'},
-		"PP664.2 BODY BLOCKER":				{armour_pv_1:'4',	armour_resistance_1:'12',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_1:'5',	armour_resistance_1:'14',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP949 BREACHER SHIELD":			{armour_pv_1:'2',	armour_resistance_1:'12',	armour_enc_1:'4', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-1":					{armour_pv_1:'1',	armour_resistance_1:'8',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-2":					{armour_pv_1:'2',	armour_resistance_1:'7',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-3":					{armour_pv_1:'3',	armour_resistance_1:'14',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-4":					{armour_pv_1:'4',	armour_resistance_1:'10',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-6":					{armour_pv_1:'6',	armour_resistance_1:'24',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SINNER MK.III BATTLE SUIT":		{armour_pv_1:'14',	armour_resistance_1:'40',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '0'},
-		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_1:'1',	armour_resistance_1:'6',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"THREASER ENDEAVER TH.0001":		{armour_pv_1:'6',	armour_resistance_1:'22',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '2'},
-		"THREASER SARGE TH.0005":			{armour_pv_1:'16',	armour_resistance_1:'50',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '4', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '4'},
-		"WIDOWKISS BATTLESUIT":				{armour_pv_1:'14',	armour_resistance_1:'100',	armour_enc_1:'0', dexterityarmour: '2', strengtharmour: '3', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"XENOS SKIN":						{armour_pv_1:'5',	armour_resistance_1:'999',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"AETHER ARMOUR":					{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'4', dexterityarmour: '-1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"BASTION":							{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"BLITZKRIEG":						{armour_pv_1:'11',	armour_resistance_1:'30',	armour_enc_1:'0', dexterityarmour: '1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"CAF PADQUIL":						{armour_pv_1:'2',	armour_resistance_1:'8',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DEATHSUIT-1":						{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DEATHSUIT-2":						{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '1'},
+		"DEATHSUIT-4":						{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '1'},
+		"DN COMMANDANT":					{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DN GUNNER":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DN SPECIALIST":					{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"EBB TK SHIELD":					{armour_pv_1:'2',	armour_resistance_1:'10',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"EBB TK ADVANCED SHIELD":			{armour_pv_1:'4',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"KRELL ABLATIVE":					{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"MAL MODULAR":						{armour_pv_1:'7',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"MODIFIED ROBOCHIH MINING":			{armour_pv_1:'12',	armour_resistance_1:'60',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP10 HARD":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP13 EXO MK2":						{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'1', dexterityarmour: '-1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP55 SUPER HARD":					{armour_pv_1:'7',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP70 POWERCELL":					{armour_pv_1:'8',	armour_resistance_1:'24',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP100 CRACKSHOT":					{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP104 DOGEYBONE":					{armour_pv_1:'12',	armour_resistance_1:'36',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '2', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP112D SILVERBACK":				{armour_pv_1:'6',	armour_resistance_1:'18',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP664.2 BODY BLOCKER":				{armour_pv_1:'4',	armour_resistance_1:'12',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_1:'5',	armour_resistance_1:'14',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP949 BREACHER SHIELD":			{armour_pv_1:'2',	armour_resistance_1:'12',	armour_enc_1:'4', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-1":					{armour_pv_1:'1',	armour_resistance_1:'8',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-2":					{armour_pv_1:'2',	armour_resistance_1:'7',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-3":					{armour_pv_1:'3',	armour_resistance_1:'14',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-4":					{armour_pv_1:'4',	armour_resistance_1:'10',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-6":					{armour_pv_1:'6',	armour_resistance_1:'24',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SINNER MK.III BATTLE SUIT":		{armour_pv_1:'14',	armour_resistance_1:'40',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '0', coolarmour: '0'},
+		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_1:'1',	armour_resistance_1:'6',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"THREASER ENDEAVER TH.0001":		{armour_pv_1:'6',	armour_resistance_1:'22',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '2', coolarmour: '0'},
+		"THREASER SARGE TH.0005":			{armour_pv_1:'16',	armour_resistance_1:'50',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '4', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '4', coolarmour: '0'},
+		"WIDOWKISS BATTLESUIT":				{armour_pv_1:'14',	armour_resistance_1:'100',	armour_enc_1:'0', dexterityarmour: '2', strengtharmour: '3', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"XENOS SKIN":						{armour_pv_1:'5',	armour_resistance_1:'999',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
 	}
     getAttrs(['armour_1'], values => {
         let name = values.armour_1;
@@ -2362,42 +2459,42 @@ on('change:armour_1', event => {
 });
 on('change:armour_2', event => {
      const armourdetails = {
-		"AETHER ARMOUR":					{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'4', dexterityarmour: '-1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"BASTION":							{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"BLITZKRIEG":						{armour_pv_2:'11',	armour_resistance_2:'30',	armour_enc_2:'0', dexterityarmour: '1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"CAF PADQUIL":						{armour_pv_2:'2',	armour_resistance_2:'8',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DEATHSUIT-1":						{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DEATHSUIT-2":						{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DEATHSUIT-4":						{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DN COMMANDANT":					{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DN GUNNER":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"DN SPECIALIST":					{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"EBB TK SHIELD":					{armour_pv_2:'2',	armour_resistance_2:'10',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"EBB TK ADVANCED SHIELD":			{armour_pv_2:'4',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"KRELL ABLATIVE":					{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"MAL MODULAR":						{armour_pv_2:'7',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"MODIFIED ROBOCHIH MINING":			{armour_pv_2:'12',	armour_resistance_2:'60',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP10 HARD":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP13 EXO MK2":						{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'1', dexterityarmour: '-1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP55 SUPER HARD":					{armour_pv_2:'7',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP70 POWERCELL":					{armour_pv_2:'8',	armour_resistance_2:'24',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP100 CRACKSHOT":					{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP104 DOGEYBONE":					{armour_pv_2:'12',	armour_resistance_2:'36',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '2', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP112D SILVERBACK":				{armour_pv_2:'6',	armour_resistance_2:'18',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '0', initiativearmour: '0'},
-		"PP664.2 BODY BLOCKER":				{armour_pv_2:'4',	armour_resistance_2:'12',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_2:'5',	armour_resistance_2:'14',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"PP949 BREACHER SHIELD":			{armour_pv_2:'2',	armour_resistance_2:'12',	armour_enc_2:'4', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-1":					{armour_pv_2:'1',	armour_resistance_2:'8',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-2":					{armour_pv_2:'2',	armour_resistance_2:'7',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-3":					{armour_pv_2:'3',	armour_resistance_2:'14',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-4":					{armour_pv_2:'4',	armour_resistance_2:'10',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SCRAP ARMOUR-6":					{armour_pv_2:'6',	armour_resistance_2:'24',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"SINNER MK.III BATTLE SUIT":		{armour_pv_2:'14',	armour_resistance_2:'40',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '0'},
-		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_2:'1',	armour_resistance_2:'6',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"THREASER ENDEAVER TH.0001":		{armour_pv_2:'6',	armour_resistance_2:'22',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '2'},
-		"THREASER SARGE TH.0005":			{armour_pv_2:'16',	armour_resistance_2:'50',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '4', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '4'},
-		"WIDOWKISS BATTLESUIT":				{armour_pv_2:'14',	armour_resistance_2:'100',	armour_enc_2:'0', dexterityarmour: '2', strengtharmour: '3', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
-		"XENOS SKIN":						{armour_pv_2:'5',	armour_resistance_2:'999',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"AETHER ARMOUR":					{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'4', dexterityarmour: '-1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"BASTION":							{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"BLITZKRIEG":						{armour_pv_2:'11',	armour_resistance_2:'30',	armour_enc_2:'0', dexterityarmour: '1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"CAF PADQUIL":						{armour_pv_2:'2',	armour_resistance_2:'8',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DEATHSUIT-1":						{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DEATHSUIT-2":						{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '1'},
+		"DEATHSUIT-4":						{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '1'},
+		"DN COMMANDANT":					{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DN GUNNER":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"DN SPECIALIST":					{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"EBB TK SHIELD":					{armour_pv_2:'2',	armour_resistance_2:'10',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"EBB TK ADVANCED SHIELD":			{armour_pv_2:'4',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"KRELL ABLATIVE":					{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"MAL MODULAR":						{armour_pv_2:'7',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"MODIFIED ROBOCHIH MINING":			{armour_pv_2:'12',	armour_resistance_2:'60',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP10 HARD":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP13 EXO MK2":						{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'1', dexterityarmour: '-1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP55 SUPER HARD":					{armour_pv_2:'7',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP70 POWERCELL":					{armour_pv_2:'8',	armour_resistance_2:'24',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP100 CRACKSHOT":					{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP104 DOGEYBONE":					{armour_pv_2:'12',	armour_resistance_2:'36',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '2', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP112D SILVERBACK":				{armour_pv_2:'6',	armour_resistance_2:'18',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP664.2 BODY BLOCKER":				{armour_pv_2:'4',	armour_resistance_2:'12',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_2:'5',	armour_resistance_2:'14',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"PP949 BREACHER SHIELD":			{armour_pv_2:'2',	armour_resistance_2:'12',	armour_enc_2:'4', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-1":					{armour_pv_2:'1',	armour_resistance_2:'8',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-2":					{armour_pv_2:'2',	armour_resistance_2:'7',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-3":					{armour_pv_2:'3',	armour_resistance_2:'14',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-4":					{armour_pv_2:'4',	armour_resistance_2:'10',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SCRAP ARMOUR-6":					{armour_pv_2:'6',	armour_resistance_2:'24',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"SINNER MK.III BATTLE SUIT":		{armour_pv_2:'14',	armour_resistance_2:'40',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '0', coolarmour: '0'},
+		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_2:'1',	armour_resistance_2:'6',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"THREASER ENDEAVER TH.0001":		{armour_pv_2:'6',	armour_resistance_2:'22',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '2', coolarmour: '0'},
+		"THREASER SARGE TH.0005":			{armour_pv_2:'16',	armour_resistance_2:'50',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '4', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '4', coolarmour: '0'},
+		"WIDOWKISS BATTLESUIT":				{armour_pv_2:'14',	armour_resistance_2:'100',	armour_enc_2:'0', dexterityarmour: '2', strengtharmour: '3', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
+		"XENOS SKIN":						{armour_pv_2:'5',	armour_resistance_2:'999',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0', coolarmour: '0'},
 	}
     getAttrs(['armour_2'], values => {
         let name = values.armour_2;
@@ -3054,12 +3151,13 @@ on('change:meleeweapon_1', event => {
         if(output) setAttrs(output);
     });
 });
-on("change:meleeweapon_1 change:meleeweapon_skill_1 change:meleeweapon_damage_1 change:meleeweapon_mindamage_1 change:meleeweapon_armourdamage_1", function() {
-  getAttrs(["meleeweapon_1","meleeweapon_skill_1","meleeweapon_damage_1","meleeweapon_mindamage_1","meleeweapon_armourdamage_1"], function(values) {
+on("change:meleeweapon_1 change:meleeweapon_skill_1 change:meleeweapon_damage_1 change:meleeweapon_mindamage_1 change:meleeweapon_armourdamage_1 change:strengthdam", function() {
+  getAttrs(["meleeweapon_1","meleeweapon_skill_1","meleeweapon_damage_1","meleeweapon_mindamage_1","meleeweapon_armourdamage_1","strengthdam"], function(values) {
+	  var strengthdam = parseInt(values["strengthdam"])||0;
       var setweaponname = values["meleeweapon_1"]||"";
       var setweaponskill = values["meleeweapon_skill_1"]||"";
-      var setweapondmg = values["meleeweapon_damage_1"]||"";
-      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_1"])||0;
+      var setweapondmg = values["meleeweapon_damage_1"]+"+"+strengthdam||"";
+      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_1"])+strengthdam||0;
       var setweaponad = parseInt(values["meleeweapon_armourdamage_1"])||0;
 	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}";
       setAttrs({
@@ -3120,12 +3218,13 @@ on('change:meleeweapon_2', event => {
         if(output) setAttrs(output);
     });
 });
-on("change:meleeweapon_2 change:meleeweapon_skill_2 change:meleeweapon_damage_2 change:meleeweapon_mindamage_2 change:meleeweapon_armourdamage_2", function() {
-  getAttrs(["meleeweapon_2","meleeweapon_skill_2","meleeweapon_damage_2","meleeweapon_mindamage_2","meleeweapon_armourdamage_2"], function(values) {
+on("change:meleeweapon_2 change:meleeweapon_skill_2 change:meleeweapon_damage_2 change:meleeweapon_mindamage_2 change:meleeweapon_armourdamage_2 change:strengthdam", function() {
+  getAttrs(["meleeweapon_2","meleeweapon_skill_2","meleeweapon_damage_2","meleeweapon_mindamage_2","meleeweapon_armourdamage_2","strengthdam"], function(values) {
+	  var strengthdam = parseInt(values["strengthdam"])||0;
       var setweaponname = values["meleeweapon_2"]||"";
       var setweaponskill = values["meleeweapon_skill_2"]||"";
-      var setweapondmg = values["meleeweapon_damage_2"]||"";
-      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_2"])||0;
+      var setweapondmg = values["meleeweapon_damage_2"]+"+"+strengthdam||"";
+      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_2"])+strengthdam||0;
       var setweaponad = parseInt(values["meleeweapon_armourdamage_2"])||0;
 	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}";
       setAttrs({
@@ -3186,12 +3285,13 @@ on('change:meleeweapon_3', event => {
         if(output) setAttrs(output);
     });
 });
-on("change:meleeweapon_3 change:meleeweapon_skill_3 change:meleeweapon_damage_3 change:meleeweapon_mindamage_3 change:meleeweapon_armourdamage_3", function() {
-  getAttrs(["meleeweapon_3","meleeweapon_skill_3","meleeweapon_damage_3","meleeweapon_mindamage_3","meleeweapon_armourdamage_3"], function(values) {
+on("change:meleeweapon_3 change:meleeweapon_skill_3 change:meleeweapon_damage_3 change:meleeweapon_mindamage_3 change:meleeweapon_armourdamage_3 change:strengthdam", function() {
+  getAttrs(["meleeweapon_3","meleeweapon_skill_3","meleeweapon_damage_3","meleeweapon_mindamage_3","meleeweapon_armourdamage_3","strengthdam"], function(values) {
+	  var strengthdam = parseInt(values["strengthdam"])||0;
       var setweaponname = values["meleeweapon_3"]||"";
       var setweaponskill = values["meleeweapon_skill_3"]||"";
-      var setweapondmg = values["meleeweapon_damage_3"]||"";
-      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_3"])||0;
+      var setweapondmg = values["meleeweapon_damage_3"]+"+"+strengthdam||"";
+      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_3"])+strengthdam||0;
       var setweaponad = parseInt(values["meleeweapon_armourdamage_3"])||0;
 	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}";
       setAttrs({
@@ -3252,12 +3352,13 @@ on('change:meleeweapon_4', event => {
         if(output) setAttrs(output);
     });
 });
-on("change:meleeweapon_4 change:meleeweapon_skill_4 change:meleeweapon_damage_4 change:meleeweapon_mindamage_4 change:meleeweapon_armourdamage_4", function() {
-  getAttrs(["meleeweapon_4","meleeweapon_skill_4","meleeweapon_damage_4","meleeweapon_mindamage_4","meleeweapon_armourdamage_4"], function(values) {
+on("change:meleeweapon_4 change:meleeweapon_skill_4 change:meleeweapon_damage_4 change:meleeweapon_mindamage_4 change:meleeweapon_armourdamage_4 change:strengthdam", function() {
+  getAttrs(["meleeweapon_4","meleeweapon_skill_4","meleeweapon_damage_4","meleeweapon_mindamage_4","meleeweapon_armourdamage_4","strengthdam"], function(values) {
+	  var strengthdam = parseInt(values["strengthdam"])||0;
       var setweaponname = values["meleeweapon_4"]||"";
       var setweaponskill = values["meleeweapon_skill_4"]||"";
-      var setweapondmg = values["meleeweapon_damage_4"]||"";
-      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_4"])||0;
+      var setweapondmg = values["meleeweapon_damage_4"]+"+"+strengthdam||"";
+      var setweaponmindmg = parseInt(values["meleeweapon_mindamage_4"])+strengthdam||0;
       var setweaponad = parseInt(values["meleeweapon_armourdamage_4"])||0;
 	  var setweaponroll = "&{template:weapon} !?{Target Number|10|9|8|7|6|5|4|11|12|13|14|15|16|17|18} ?{Success Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} ?{Skill Dice Modifier|0|-1|-2|-3|-4|-5|-6|-7|-8|-9|1|2|3|4|5|6|7|8|9} {{name="+setweaponname+":"+setweaponskill+"}}{{success=[[{1d10+@{"+setweaponskill+"_total}+?{Success Dice Modifier}}>?{Target Number}]]}}{{skill=[[{[[@{"+setweaponskill+"}+1]]d10+@{"+setweaponskill+"_total}+?{Skill Dice Modifier}}>?{Target Number}]]}}{{damage=[["+setweapondmg+"]]}}{{mindmg=[["+setweaponmindmg+"]]}}{{ad=[["+setweaponad+"]]}}";
       setAttrs({