diff --git a/scripts/object/weapon/ranged/carbine/carbine_pvp.py b/scripts/object/weapon/ranged/carbine/carbine_pvp.py index df45159e..8931d99f 100644 --- a/scripts/object/weapon/ranged/carbine/carbine_pvp.py +++ b/scripts/object/weapon/ranged/carbine/carbine_pvp.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStringAttribute('tier', '6') @@ -12,7 +13,7 @@ def setup(core, object): object.setStringAttribute('faction_restriction', 'Rebel') object.setStringAttribute('required_skill', 'None') object.setDamageType("energy"); - object.setWeaponType(1); + object.setWeaponType(WeaponType.CARBINE); object.setAttackSpeed(0.6); object.setMinDamage(389); object.setMaxDamage(780); 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 f7369163..70eecf54 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 @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -14,5 +15,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(109); object.setMaxDamage(218); - object.setWeaponType(1); + object.setWeaponType(WeaponType.CARBINE); 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 d1940a77..eafe9b7d 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 @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -14,5 +15,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(109); object.setMaxDamage(218); - object.setWeaponType(1); + object.setWeaponType(WeaponType.CARBINE); 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 83d234f8..01956b11 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 @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -13,5 +14,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(195); object.setMaxDamage(392); - object.setWeaponType(1); + object.setWeaponType(WeaponType.CARBINE); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py index 600a05a8..4f49c8f6 100644 --- a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py +++ b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -12,5 +13,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(17); object.setMaxDamage(43); - object.setWeaponType(1); + object.setWeaponType(WeaponType.CARBINE); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py index bb153176..a1bfb367 100644 --- a/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py +++ b/scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -12,5 +13,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(17); object.setMaxDamage(43); - object.setWeaponType(1); + object.setWeaponType(WeaponType.CARBINE); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py b/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py index e707e4f4..ffeb530b 100644 --- a/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py +++ b/scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -12,5 +13,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(20); object.setMaxDamage(40); - object.setWeaponType(1); + object.setWeaponType(Weapon.Type.CARBINE); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/heavy/heavy_pvp.py b/scripts/object/weapon/ranged/heavy/heavy_pvp.py index 0bbf3010..d2511794 100644 --- a/scripts/object/weapon/ranged/heavy/heavy_pvp.py +++ b/scripts/object/weapon/ranged/heavy/heavy_pvp.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -9,10 +10,10 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 10) - object.setStringAttribute('healing_combat_level_required', '75') + object.setStringAttribute('required_combat_level', '75') object.setStringAttribute('required_skill', 'None') object.setDamageType("energy"); - object.setWeaponType(12); + object.setWeaponType(WeaponType.HEAVYWEAPON); object.setAttackSpeed(1); object.setMinDamage(850); object.setMaxDamage(1350); diff --git a/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py b/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py index b1c7fa0f..7e3aee0b 100644 --- a/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py +++ b/scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -12,5 +13,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(15); object.setMaxDamage(25); - object.setWeaponType(2); + object.setWeaponType(WeaponType.PISTOL); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py b/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py index baef2e0b..6aa08b78 100644 --- a/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py +++ b/scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -12,5 +13,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(13); object.setMaxDamage(27); - object.setWeaponType(2); + object.setWeaponType(WeaponType.PISTOL); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/pistol_pvp.py b/scripts/object/weapon/ranged/pistol/pistol_pvp.py index a4f22603..73989872 100644 --- a/scripts/object/weapon/ranged/pistol/pistol_pvp.py +++ b/scripts/object/weapon/ranged/pistol/pistol_pvp.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -9,10 +10,10 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 10) - object.setStringAttribute('healing_combat_level_required', '75') + object.setStringAttribute('required_combat_level', '75') object.setStringAttribute('required_skill', 'None') object.setDamageType("energy"); - object.setWeaponType(2); + object.setWeaponType(WeaponType.PISTOL); object.setAttackSpeed(0.4); object.setMinDamage(259); object.setMaxDamage(518); diff --git a/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py b/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py index 56169960..a96a4530 100644 --- a/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py +++ b/scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -12,5 +13,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(13); object.setMaxDamage(27); - object.setWeaponType(2); + object.setWeaponType(WeaponType.PISTOL); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/pistol/weapon_pistol_en_roadmap_01_02.py b/scripts/object/weapon/ranged/pistol/weapon_pistol_en_roadmap_01_02.py index 04b64dd7..2f5507c3 100644 --- a/scripts/object/weapon/ranged/pistol/weapon_pistol_en_roadmap_01_02.py +++ b/scripts/object/weapon/ranged/pistol/weapon_pistol_en_roadmap_01_02.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -13,5 +14,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(131); object.setMaxDamage(261); - object.setWeaponType(2); + object.setWeaponType(WeaponType.PISTOL); 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 e49dba23..d97f1f3b 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 @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -14,5 +15,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(73); object.setMaxDamage(145); - object.setWeaponType(2); + object.setWeaponType(WeaponType.PISTOL); 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 160019db..160c73dd 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 @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -12,5 +13,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(250); object.setMaxDamage(500); - object.setWeaponType(2); + object.setWeaponType(WeaponType.Pistol); return \ No newline at end of file diff --git a/scripts/object/weapon/ranged/rifle/rifle_pvp.py b/scripts/object/weapon/ranged/rifle/rifle_pvp.py index 2de5b766..75bc3fbf 100644 --- a/scripts/object/weapon/ranged/rifle/rifle_pvp.py +++ b/scripts/object/weapon/ranged/rifle/rifle_pvp.py @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -9,10 +10,10 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10) object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 10) - object.setStringAttribute('healing_combat_level_required', '75') + object.setStringAttribute('required_combat_level', '75') object.setStringAttribute('required_skill', 'None') object.setDamageType("energy"); - object.setWeaponType(0); + object.setWeaponType(WeaponType.RIFLE); object.setAttackSpeed(0.8); object.setMinDamage(518); object.setMaxDamage(1035); 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 b1c94181..da6eb1aa 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 @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -14,5 +15,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(261); object.setMaxDamage(522); - object.setWeaponType(2); + object.setWeaponType(WeaponType.RIFLE); 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 870f5639..915797f2 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 @@ -1,4 +1,5 @@ import sys +from resources.datatables import WeaponType def setup(core, object): object.setStfFilename('static_item_n') @@ -14,5 +15,5 @@ def setup(core, object): object.setDamageType("energy"); object.setMinDamage(261); object.setMaxDamage(522); - object.setWeaponType(2); + object.setWeaponType(WeaponType.RIFLE); return \ No newline at end of file