mirror of
https://github.com/SWG-Source/dsrc.git
synced 2026-01-17 00:05:07 -05:00
Merge pull request #299 from BloodCommando/master
Fixed Ithorian Backpack Issue #275 and Imperial Command Hat Issue #160. Added GU 17.6 All Restuss Weapons Can Now Be Deconstructed.
This commit is contained in:
@@ -263,14 +263,14 @@ weapon_borvo_carbine_03_01 1 1000 93 186 0 electric 12 60 1 100 0 50 lvl 25
|
||||
weapon_borvo_rifle_03_01 1 1000 124 248 0 electric 15 80 1 100 0 64 lvl 25 233 233
|
||||
weapon_content_pistol_lvl33_02_01 1 1000 87 173 0 40 1 100 0 35 precision_modified=12 lvl 35 content 325 325
|
||||
weapon_mandalorian_lightsaber_04_01 1 1000 700 1400 0 100 1 100 0 5 "strength_modified=10,constitution_modified=5" "int:jedi.saber.base_stats.min_dmg=700,int:jedi.saber.base_stats.max_dmg=1400,float:jedi.saber.base_stats.speed=1.00,float:jedi.saber.base_stats.wound=1.0,int:jedi.saber.base_stats.attack_cost=100,float:jedi.saber.base_stats.damage=0.0" hec 1050 1050
|
||||
weapon_mandalorian_sword_04_01 1 1000 750 1350 0 kinetic 100 1 100 0 5 "strength_modified=10,constitution_modified=5" hec 1050 1050
|
||||
weapon_mandalorian_pistol_04_01 1 1000 270 510 0 40 1 100 0 35 "precision_modified=10,constitution_modified=5" hec 975 975
|
||||
weapon_mandalorian_carbine_04_01 1 1000 415 755 0 60 1 100 0 50 "precision_modified=10,constitution_modified=5" hec 975 975
|
||||
weapon_mandalorian_rifle_04_01 1 1000 530 1030 0 80 1 100 0 64 "precision_modified=10,constitution_modified=5" hec 975 975
|
||||
weapon_mandalorian_sword_04_01 1 1000 750 1350 0 kinetic 100 1 100 0 5 "strength_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 1050 1050
|
||||
weapon_mandalorian_pistol_04_01 1 1000 270 510 0 40 1 100 0 35 "precision_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 975 975
|
||||
weapon_mandalorian_carbine_04_01 1 1000 415 755 0 60 1 100 0 50 "precision_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 975 975
|
||||
weapon_mandalorian_rifle_04_01 1 1000 530 1030 0 80 1 100 0 64 "precision_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 975 975
|
||||
weapon_mandalorian_heavy_04_01 1 1000 800 1300 0 kinetic electric 50 100 1 100 0 64 "precision_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 1050 1050
|
||||
weapon_rebel_sword_04_01 1 1000 600 1500 0 kinetic 100 1 100 0 5 "strength_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 1050 1050
|
||||
weapon_rebel_pistol_04_01 1 1000 290 450 0 cold 20 40 1 100 0 35 "precision_modified=10,constitution_modified=5" hec 975 925
|
||||
weapon_rebel_rifle_04_01 1 1000 560 960 0 cold 20 80 1 100 0 64 "precision_modified=10,constitution_modified=5" hec 975 950
|
||||
weapon_rebel_pistol_04_01 1 1000 290 450 0 cold 20 40 1 100 0 35 "precision_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 975 925
|
||||
weapon_rebel_rifle_04_01 1 1000 560 960 0 cold 20 80 1 100 0 64 "precision_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 975 950
|
||||
weapon_rebel_heavy_04_01 1 1000 800 1300 0 kinetic kinetic 50 100 1 100 0 64 "precision_modified=10,constitution_modified=5" int:wp.canBeDisMantled=1 hec 1050 1050
|
||||
weapon_content_carbine_talus_selonian_04_01 1 1000 150 307 0 kinetic electric 10 60 1 100 0 50 precision_modified=10 lvl40 381 381
|
||||
weapon_content_pistol_talus_slaver_04_01 1 1000 85 220 0 cold 10 40 1 100 0 35 precision_modified=10 lvl30 381 381
|
||||
|
||||
@@ -138,7 +138,7 @@ shared_armor_marauder_s06_bracer_r appearance/armor_marauder_s06_bracer_r_m.sat
|
||||
shared_armor_marauder_s06_chest_plate appearance/armor_marauder_s06_chest_plate_m.sat appearance/armor_marauder_s06_chest_plate_f.sat :default :default :default :default :block :block :default :default :default :default :default :default :default :default :block :block :default :default
|
||||
shared_armor_marauder_s06_helmet appearance/armor_marauder_s06_helmet_m.sat appearance/armor_marauder_s06_helmet_f.sat :block :block :block :block :block :block :block :block :block :block :default :default :block :block :block :block :block :block
|
||||
shared_armor_marauder_s06_leggings appearance/armor_marauder_s06_leggings_m.sat appearance/armor_marauder_s06_leggings_f.sat :default :default :default :default :block :block :default :default :default :default :default :default :default :default :block :block :default :default
|
||||
shared_armor_marine_backpack appearance/armor_marine_backpack_m.sat appearance/armor_marine_backpack_f.sat :default :default :default :default :block :block :default :default :default :default :default :default :default :default :block :block :default :default
|
||||
shared_armor_marine_backpack appearance/armor_marine_backpack_m.sat appearance/armor_marine_backpack_f.sat :default :default :default :default :block :block :default :default :default :default :default :default :default :default :default :default :default :default
|
||||
shared_armor_marine_bicep_l appearance/armor_marine_bicep_l_m.sat appearance/armor_marine_bicep_l_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default :block :block :default :default
|
||||
shared_armor_marine_bicep_r appearance/armor_marine_bicep_r_m.sat appearance/armor_marine_bicep_r_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default :block :block :default :default
|
||||
shared_armor_marine_bracer_l appearance/armor_marine_bracer_l_m.sat appearance/armor_marine_bracer_l_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default :block :block :default :default
|
||||
@@ -323,7 +323,7 @@ shared_backpack_s01 appearance/backpack_s01_m.sat appearance/backpack_s01_f.sat
|
||||
shared_backpack_s02 appearance/backpack_s02_m.sat appearance/backpack_s02_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default :block :block :default :default
|
||||
shared_backpack_s03 appearance/backpack_s03_m.sat appearance/backpack_s03_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/ith_backpack_s03_m.sat appearance/ith_backpack_s03_f.sat :default :default
|
||||
shared_backpack_s03_quest appearance/backpack_s03_m.sat appearance/backpack_s03_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/ith_backpack_s03_m.sat appearance/ith_backpack_s03_f.sat :default :default
|
||||
shared_backpack_s04 appearance/backpack_s04_m.sat appearance/backpack_s04_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default :hide :hide :default :default
|
||||
shared_backpack_s04 appearance/backpack_s04_m.sat appearance/backpack_s04_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default
|
||||
shared_backpack_s05 appearance/backpack_s05_m.sat appearance/backpack_s05_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/ith_backpack_s05_m.sat appearance/ith_backpack_s05_f.sat :default :default
|
||||
shared_backpack_s06 appearance/backpack_s06_m.sat appearance/backpack_s06_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/ith_backpack_s06_m.sat appearance/ith_backpack_s06_f.sat :default :default
|
||||
shared_backpack_s06_quest appearance/backpack_s06_m.sat appearance/backpack_s06_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/ith_backpack_s06_m.sat appearance/ith_backpack_s06_f.sat :default :default
|
||||
@@ -541,7 +541,6 @@ shared_goggles_s02 appearance/goggles_s02_m.sat appearance/goggles_s02_f.sat app
|
||||
shared_goggles_s03 appearance/goggles_s03_m.sat appearance/goggles_s03_f.sat appearance/goggles_s03_rod_m.sat appearance/goggles_s03_rod_f.sat appearance/goggles_s03_mon_m.sat appearance/goggles_s03_mon_f.sat appearance/goggles_s03_wke_m.sat appearance/goggles_s03_wke_f.sat :default :default appearance/goggles_s03_trn_m.sat appearance/goggles_s03_trn_f.sat :default :default appearance/goggles_s03_bth_m.sat appearance/goggles_s03_bth_f.sat appearance/ith_goggles_s03_m.sat appearance/ith_goggles_s03_f.sat appearance/goggles_s03_sul_m.sat appearance/goggles_s03_sul_f.sat
|
||||
shared_hat_chef_s01 appearance/hat_chef_s01_m.sat appearance/hat_chef_s01_f.sat appearance/hat_chef_s01_rod_m.sat appearance/hat_chef_s01_rod_f.sat appearance/hat_chef_s01_mon_m.sat appearance/hat_chef_s01_mon_f.sat appearance/hat_chef_s01_wke_m.sat appearance/hat_chef_s01_wke_f.sat appearance/hat_chef_s01_twk_m.sat appearance/hat_chef_s01_twk_f.sat appearance/hat_chef_s01_trn_m.sat appearance/hat_chef_s01_trn_f.sat :default :default appearance/hat_chef_s01_bth_m.sat appearance/hat_chef_s01_bth_f.sat :block :block appearance/hat_chef_s01_sul_m.sat appearance/hat_chef_s01_sul_f.sat
|
||||
shared_hat_chef_s02 appearance/hat_chef_s02_m.sat appearance/hat_chef_s02_f.sat appearance/hat_chef_s02_rod_m.sat appearance/hat_chef_s02_rod_f.sat appearance/hat_chef_s02_mon_m.sat appearance/hat_chef_s02_mon_f.sat appearance/hat_chef_s02_wke_m.sat appearance/hat_chef_s02_wke_f.sat appearance/hat_chef_s02_twk_m.sat appearance/hat_chef_s02_twk_f.sat appearance/hat_chef_s02_trn_m.sat appearance/hat_chef_s02_trn_f.sat :default :default appearance/hat_chef_s02_bth_m.sat appearance/hat_chef_s02_bth_f.sat :block :block appearance/hat_chef_s02_sul_m.sat appearance/hat_chef_s02_sul_f.sat
|
||||
shared_hat_imp_s01 appearance/hat_imperial_s01_m.sat :block :block :block :block :block :block :block :block :block :block :block :default :block :block :block :block :block :block :block
|
||||
shared_hat_s01 appearance/hat_s01_m.sat appearance/hat_s01_f.sat :block :block :block :block :block :block :block :block :block :block :default :default :block :block :block :block :block :block
|
||||
shared_hat_s02 appearance/hat_s02_m.sat appearance/hat_s02_f.sat appearance/hat_s02_rod_m.sat appearance/hat_s02_rod_f.sat appearance/hat_s02_mon_m.sat appearance/hat_s02_mon_f.sat :block :block :block :block appearance/hat_s02_trn_m.sat appearance/hat_s02_trn_f.sat :default :default appearance/hat_s02_bth_m.sat appearance/hat_s02_bth_f.sat :block :block appearance/hat_s02_sul_m.sat appearance/hat_s02_sul_f.sat
|
||||
shared_hat_s03 appearance/hat_s03_m.sat appearance/hat_s03_f.sat :block :block :block :block :block :block :block :block :block :block :default :default :block :block :block :block :block :block
|
||||
@@ -1244,7 +1243,7 @@ shared_armor_rebel_snow_helmet appearance/armor_rebel_snow_soldier_helmet_m.sat
|
||||
shared_armor_rebel_snow_gloves appearance/armor_rebel_snow_soldier_s01_gloves_m.sat appearance/armor_rebel_snow_soldier_s01_gloves_f.sat :default :default :default :default :hide :hide :default :default :hide :hide :default :default :default :default appearance/ith_armor_s02_gloves_m.sat appearance/ith_armor_s02_gloves_f.sat :default :default
|
||||
shared_armor_rebel_snow_leggings appearance/armor_rebel_snow_soldier_leggings_m.sat appearance/armor_rebel_snow_soldier_leggings_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default appearance/ith_armor_s02_leggings_m.sat appearance/ith_armor_s02_leggings_f.sat :default :default
|
||||
shared_armor_rebel_snow_belt appearance/armor_rebel_snow_soldier_belt_m.sat appearance/armor_rebel_snow_soldier_belt_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default :hide :hide :default :default
|
||||
shared_armor_snowtrooper_backpack appearance/armor_snowtrooper_backpack_m.sat appearance/armor_snowtrooper_backpack_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default :hide :hide :default :default
|
||||
shared_armor_snowtrooper_backpack appearance/armor_snowtrooper_backpack_m.sat appearance/armor_snowtrooper_backpack_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default :default :default :default :default
|
||||
shared_armor_snowtrooper_bicep_l appearance/armor_snow_trooper_bicep_l_m.sat appearance/armor_snow_trooper_bicep_l_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default appearance/ith_armor_s01_bicep_l_m.sat appearance/ith_armor_s01_bicep_l_f.sat :default :default
|
||||
shared_armor_snowtrooper_bicep_r appearance/armor_snow_trooper_bicep_r_m.sat appearance/armor_snow_trooper_bicep_r_f.sat :default :default :default :default :hide :hide :default :default :default :default :default :default :default :default appearance/ith_armor_s01_bicep_r_m.sat appearance/ith_armor_s01_bicep_r_f.sat :default :default
|
||||
shared_armor_snowtrooper_boots appearance/armor_snow_trooper_boots_m.sat appearance/armor_snow_trooper_boots_f.sat :default :default :default :default :hide :hide :default :default :hide :hide :default :default :default :default appearance/ith_armor_s01_boots_m.sat appearance/ith_armor_s01_boots_f.sat :default :default
|
||||
@@ -1423,8 +1422,8 @@ shared_back_love_day_10_pink_wings appearance/loveday_wings_backpack_s02_m.sat a
|
||||
shared_back_love_day_10_blue_wings appearance/loveday_wings_backpack_s03_m.sat appearance/loveday_wings_backpack_s03_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default
|
||||
shared_back_love_day_10_golden_wings appearance/loveday_wings_backpack_s04_m.sat appearance/loveday_wings_backpack_s04_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default
|
||||
shared_hat_loveday_halo_01 appearance/loveday_halo_s01_m.sat appearance/loveday_halo_s01_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/loveday_halo_s01_ith_m.sat appearance/loveday_halo_s01_ith_f.sat :default :default
|
||||
shared_wearable_backpack_recon appearance/tcg_back_pack_01_m.sat appearance/tcg_back_pack_01_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default
|
||||
shared_wearable_backpack_armored appearance/tcg_back_pack_02_m.sat appearance/tcg_back_pack_02_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default :default
|
||||
shared_wearable_backpack_recon appearance/tcg_back_pack_01_m.sat appearance/tcg_back_pack_01_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/ith_tcg_back_pack_01_m.sat appearance/ith_tcg_back_pack_01_f.sat :default :default
|
||||
shared_wearable_backpack_armored appearance/tcg_back_pack_02_m.sat appearance/tcg_back_pack_02_f.sat :default :default :default :default :default :default :default :default :default :default :default :default :default :default appearance/ith_tcg_back_pack_02_m.sat appearance/ith_tcg_back_pack_02_f.sat :default :default
|
||||
shared_wearable_purple_cape appearance/cape_tcg_prpl_m.sat appearance/cape_tcg_prpl_f.sat :default :default :default :default appearance/cape_tcg_prpl_wke_m.sat appearance/cape_tcg_prpl_wke_f.sat :default :default :default :default :default :default :default :default appearance/cape_tcg_prpl_ith_m.sat appearance/cape_tcg_prpl_ith_f.sat :default :default
|
||||
shared_wearable_gold_cape appearance/cape_tcg_gold_m.sat appearance/cape_tcg_gold_f.sat :default :default :default :default appearance/cape_tcg_gold_wke_m.sat appearance/cape_tcg_gold_wke_f.sat :default :default :default :default :default :default :default :default appearance/cape_tcg_gold_ith_m.sat appearance/cape_tcg_gold_ith_f.sat :default :default
|
||||
shared_wearable_sash_handmade appearance/sash_01_m.sat appearance/sash_01_f.sat :default :default :default :default appearance/sash_01_wke_m.sat appearance/sash_01_wke_f.sat :default :default :default :default :default :default :default :default appearance/sash_01_ith_m.sat appearance/sash_01_ith_f.sat :default :default
|
||||
|
||||
Reference in New Issue
Block a user