diff --git a/scripts/object/weapon/melee/2h_sword/2h_sword_maul_legendary.py b/scripts/object/weapon/melee/2h_sword/2h_sword_maul_legendary.py
index 41c35901..3671d32d 100644
--- a/scripts/object/weapon/melee/2h_sword/2h_sword_maul_legendary.py
+++ b/scripts/object/weapon/melee/2h_sword/2h_sword_maul_legendary.py
@@ -1,11 +1,11 @@
 import sys
 
 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 88)	
-	object.setAttackSpeed(1);
-	object.setMaxRange(5);
-	object.setDamageType("energy");
-	object.setMinDamage(900);
-	object.setMaxDamage(1350);
-	object.setWeaponType(5);
+	object.setIntAttribute('required_combat_level', 88)
+	object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 1)
+	object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy')
+	object.setStringAttribute('cat_wpn_damage.damage', '900-1350')
+	object.setStringAttribute('cat_wpn_damage.wpn_range', '0-5m')
+	object.setStringAttribute('cat_wpn_damage.wpn_category', '2-Handed')
+	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/melee/baton/baton_stun_legendary.py b/scripts/object/weapon/melee/baton/baton_stun_legendary.py
index f39d4049..1e877ed9 100644
--- a/scripts/object/weapon/melee/baton/baton_stun_legendary.py
+++ b/scripts/object/weapon/melee/baton/baton_stun_legendary.py
@@ -1,11 +1,11 @@
 import sys
 
 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 88)	
-	object.setAttackSpeed(1);
-	object.setMaxRange(5);
-	object.setDamageType("energy");
-	object.setMinDamage(600);
-	object.setMaxDamage(1300);
-	object.setWeaponType(4);
+	object.setIntAttribute('required_combat_level', 88)
+	object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 1)
+	object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy')
+	object.setStringAttribute('cat_wpn_damage.damage', '600-1300')
+	object.setStringAttribute('cat_wpn_damage.wpn_range', '0-5m')
+	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Baton')
+	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/melee/polearm/lance_nightsister_legendary.py b/scripts/object/weapon/melee/polearm/lance_nightsister_legendary.py
index aea190e3..577d14d6 100644
--- a/scripts/object/weapon/melee/polearm/lance_nightsister_legendary.py
+++ b/scripts/object/weapon/melee/polearm/lance_nightsister_legendary.py
@@ -1,11 +1,11 @@
 import sys
 
 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 88)	
-	object.setAttackSpeed(1);
-	object.setMaxRange(5);
-	object.setDamageType("energy");
-	object.setMinDamage(800);
-	object.setMaxDamage(1200);
-	object.setWeaponType(7);
+	object.setIntAttribute('required_combat_level', 88)
+	object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 1)
+	object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy')
+	object.setStringAttribute('cat_wpn_damage.damage', '800-1200')
+	object.setStringAttribute('cat_wpn_damage.wpn_range', '0-5m')
+	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Polearm')
+	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/carbine/carbine_e5_legend.py b/scripts/object/weapon/ranged/carbine/carbine_e5_legend.py
index 223f18e2..2f065180 100644
--- a/scripts/object/weapon/ranged/carbine/carbine_e5_legend.py
+++ b/scripts/object/weapon/ranged/carbine/carbine_e5_legend.py
@@ -1,11 +1,11 @@
 import sys
 
 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 88)	
-	object.setAttackSpeed(0.6);
-	object.setMaxRange(50);
-	object.setDamageType("energy");
-	object.setMinDamage(400);
-	object.setMaxDamage(850);
-	object.setWeaponType(1);
+	object.setIntAttribute('required_combat_level', 88)
+	object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.6)
+	object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy')
+	object.setStringAttribute('cat_wpn_damage.damage', '400-850')
+	object.setStringAttribute('cat_wpn_damage.wpn_range', '0-50m')
+	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Carbine')
+	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/pistol/pistol_fwg5_legendary.py b/scripts/object/weapon/ranged/pistol/pistol_fwg5_legendary.py
index 171833c5..5f4eff4f 100644
--- a/scripts/object/weapon/ranged/pistol/pistol_fwg5_legendary.py
+++ b/scripts/object/weapon/ranged/pistol/pistol_fwg5_legendary.py
@@ -1,11 +1,11 @@
 import sys
 
 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 88)	
-	object.setAttackSpeed(0.4);
-	object.setMaxRange(35);
-	object.setDamageType("energy");
-	object.setMinDamage(250);
-	object.setMaxDamage(500);
-	object.setWeaponType(2);
+	object.setIntAttribute('required_combat_level', 88)
+	object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.4)
+	object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy')
+	object.setStringAttribute('cat_wpn_damage.damage', '250-500')
+	object.setStringAttribute('cat_wpn_damage.wpn_range', '0-35m')
+	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Pistol')
+	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/rifle/rifle_t21_legendary.py b/scripts/object/weapon/ranged/rifle/rifle_t21_legendary.py
index 54feac4b..6f9f3ac0 100644
--- a/scripts/object/weapon/ranged/rifle/rifle_t21_legendary.py
+++ b/scripts/object/weapon/ranged/rifle/rifle_t21_legendary.py
@@ -1,11 +1,11 @@
 import sys
 
 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 88)	
-	object.setAttackSpeed(0.8);
-	object.setMaxRange(64);
-	object.setDamageType("energy");
-	object.setMinDamage(550);
-	object.setMaxDamage(1100);
-	object.setWeaponType(0);
+	object.setIntAttribute('required_combat_level', 88)
+	object.setFloatAttribute('cat_wpn_damage.wpn_attack_speed', 0.8)
+	object.setStringAttribute('cat_wpn_damage.wpn_damage_type', 'Energy')
+	object.setStringAttribute('cat_wpn_damage.damage', '550-1100')
+	object.setStringAttribute('cat_wpn_damage.wpn_range', '0-64m')
+	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Rifle')
+	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
 	return
\ No newline at end of file