diff --git a/scripts/object/weapon/ranged/carbine/weapon_acidbeam_commando_roadmap_01_02.py b/scripts/object/weapon/ranged/carbine/weapon_acidbeam_commando_roadmap_01_02.py
index 8fd46b6d..b0cf2fc2 100644
--- a/scripts/object/weapon/ranged/carbine/weapon_acidbeam_commando_roadmap_01_02.py
+++ b/scripts/object/weapon/ranged/carbine/weapon_acidbeam_commando_roadmap_01_02.py
@@ -7,11 +7,11 @@ def setup(core, object):
 	object.setDetailName('weapon_acidbeam_commando_roadmap_01_02')
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 5)
 	object.setStringAttribute('class_required', 'Commando')
-	object.setIntAttribute('required_combat_level', 30)
-	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', '109-218')
-	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())
+	object.setIntAttribute('required_combat_level', 30)	
+	object.setAttackSpeed(0.6);
+	object.setMaxRange(50);
+	object.setDamageType("energy");
+	object.setMinDamage(109);
+	object.setMaxDamage(218);
+	object.setWeaponType(1);
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/carbine/weapon_carbine_bh_roadmap_01_02.py b/scripts/object/weapon/ranged/carbine/weapon_carbine_bh_roadmap_01_02.py
index eede7b59..0b8e2f34 100644
--- a/scripts/object/weapon/ranged/carbine/weapon_carbine_bh_roadmap_01_02.py
+++ b/scripts/object/weapon/ranged/carbine/weapon_carbine_bh_roadmap_01_02.py
@@ -7,11 +7,11 @@ def setup(core, object):
 	object.setDetailName('weapon_carbine_bh_roadmap_01_02')
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 5)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
-	object.setIntAttribute('required_combat_level', 30)
-	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', '109-218')
-	object.setStringAttribute('cat_wpn_damage.wpn_range', '0-55m')
-	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Carbine')
-	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
+	object.setIntAttribute('required_combat_level', 30)	
+	object.setAttackSpeed(0.6);
+	object.setMaxRange(55);
+	object.setDamageType("energy");
+	object.setMinDamage(109);
+	object.setMaxDamage(218);
+	object.setWeaponType(1);
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/carbine/weapon_carbine_sp_roadmap_01_02.py b/scripts/object/weapon/ranged/carbine/weapon_carbine_sp_roadmap_01_02.py
index b8697c39..7dc750ef 100644
--- a/scripts/object/weapon/ranged/carbine/weapon_carbine_sp_roadmap_01_02.py
+++ b/scripts/object/weapon/ranged/carbine/weapon_carbine_sp_roadmap_01_02.py
@@ -5,13 +5,12 @@ def setup(core, object):
 	object.setStfName('weapon_carbine_sp_roadmap_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('weapon_carbine_sp_roadmap_01_02')
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 5)
 	object.setStringAttribute('class_required', 'Spy')
-	object.setIntAttribute('required_combat_level', 50)
-	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', '195-392')
-	object.setStringAttribute('cat_wpn_damage.range', '0-55m')
-	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Carbine')
-	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
-	return
+	object.setIntAttribute('required_combat_level', 50)	
+	object.setAttackSpeed(0.6);
+	object.setMaxRange(55);
+	object.setDamageType("energy");
+	object.setMinDamage(195);
+	object.setMaxDamage(392);
+	object.setWeaponType(1);
+	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/pistol/weapon_pistol_sp_roadmap_01_02.py b/scripts/object/weapon/ranged/pistol/weapon_pistol_sp_roadmap_01_02.py
index 5951524c..48ea9736 100644
--- a/scripts/object/weapon/ranged/pistol/weapon_pistol_sp_roadmap_01_02.py
+++ b/scripts/object/weapon/ranged/pistol/weapon_pistol_sp_roadmap_01_02.py
@@ -7,11 +7,11 @@ def setup(core, object):
 	object.setDetailName('weapon_pistol_sp_roadmap_01_02')
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 5)
 	object.setStringAttribute('class_required', 'Spy')
-	object.setIntAttribute('required_combat_level', 30)
-	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', '73-145')
-	object.setStringAttribute('cat_wpn_damage.range', '0-35m')
-	object.setStringAttribute('cat_wpn_damage.wpn_category', 'Pistol')
-	object.setIntAttribute('cat_wpn_damage.dps', object.getDamagePerSecond())
-	return
+	object.setIntAttribute('required_combat_level', 30)	
+	object.setAttackSpeed(0.4);
+	object.setMaxRange(35);
+	object.setDamageType("energy");
+	object.setMinDamage(73);
+	object.setMaxDamage(145);
+	object.setWeaponType(2);
+	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/pistol/weapon_pistol_trader_roadmap_01_02.py b/scripts/object/weapon/ranged/pistol/weapon_pistol_trader_roadmap_01_02.py
index 9feea0cd..160019db 100644
--- a/scripts/object/weapon/ranged/pistol/weapon_pistol_trader_roadmap_01_02.py
+++ b/scripts/object/weapon/ranged/pistol/weapon_pistol_trader_roadmap_01_02.py
@@ -6,11 +6,11 @@ def setup(core, object):
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('weapon_pistol_trader_roadmap_01_02')
 	object.setStringAttribute('class_required', 'Trader')
-	object.setIntAttribute('required_combat_level', 62)
-	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())
+	object.setIntAttribute('required_combat_level', 62)	
+	object.setAttackSpeed(0.4);
+	object.setMaxRange(35);
+	object.setDamageType("energy");
+	object.setMinDamage(250);
+	object.setMaxDamage(500);
+	object.setWeaponType(2);
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/rifle/weapon_lightningbeam_commando_roadmap_01_02.py b/scripts/object/weapon/ranged/rifle/weapon_lightningbeam_commando_roadmap_01_02.py
index 03768d96..de45af3a 100644
--- a/scripts/object/weapon/ranged/rifle/weapon_lightningbeam_commando_roadmap_01_02.py
+++ b/scripts/object/weapon/ranged/rifle/weapon_lightningbeam_commando_roadmap_01_02.py
@@ -6,12 +6,12 @@ def setup(core, object):
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('weapon_lightningbeam_commando_roadmap_01_02')
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 5)
-	object.setStringAttribute('class_required', 'Commando')
-	object.setIntAttribute('required_combat_level', 30)
-	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', '261-522')
-	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())
+	object.setStringAttribute('class_required', 'commando')
+	object.setIntAttribute('required_combat_level', 30)	
+	object.setAttackSpeed(0.8);
+	object.setMaxRange(64);
+	object.setDamageType("energy");
+	object.setMinDamage(261);
+	object.setMaxDamage(522);
+	object.setWeaponType(2);
 	return
\ No newline at end of file
diff --git a/scripts/object/weapon/ranged/rifle/weapon_rifle_bh_roadmap_01_02.py b/scripts/object/weapon/ranged/rifle/weapon_rifle_bh_roadmap_01_02.py
index 33825f81..98980b19 100644
--- a/scripts/object/weapon/ranged/rifle/weapon_rifle_bh_roadmap_01_02.py
+++ b/scripts/object/weapon/ranged/rifle/weapon_rifle_bh_roadmap_01_02.py
@@ -7,11 +7,11 @@ def setup(core, object):
 	object.setDetailName('weapon_rifle_bh_roadmap_01_02')
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 5)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
-	object.setIntAttribute('required_combat_level', 50)
-	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', '261-522')
-	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())
+	object.setIntAttribute('required_combat_level', 50)	
+	object.setAttackSpeed(0.8);
+	object.setMaxRange(64);
+	object.setDamageType("energy");
+	object.setMinDamage(261);
+	object.setMaxDamage(522);
+	object.setWeaponType(2);
 	return
\ No newline at end of file