diff --git a/lib/PSWGCommon.jar b/lib/PSWGCommon.jar index bf500304b..aaa60b6d8 100644 Binary files a/lib/PSWGCommon.jar and b/lib/PSWGCommon.jar differ diff --git a/serverdata/items/weapon.sdb b/serverdata/items/weapon.sdb index 8a58a11c5..7859ac4a0 100644 --- a/serverdata/items/weapon.sdb +++ b/serverdata/items/weapon.sdb @@ -118,7 +118,7 @@ weapon_npe_carbine_spy_03_01 object/weapon/ranged/carbine/carbine_dh17_black_npe weapon_npe_commando_carbine_03_01 object/weapon/ranged/carbine/carbine_dh17_black_npe.iff weapon Commando Carbine 1 1000 20 40 ranged_weapon CARBINE energy none 0 60 100 0 35 - 50 50 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 1 commando 1 1 1 1 1 0 0 0 0 0 - 0 250 0 0 3 1 level 1 npe NOTE these dps are higher than average - weapon_npe_d44_quest_reward_01_01 object/weapon/ranged/pistol/pistol_dl44_metal_static.iff weapon Alliance DL44 1 1000 24 49 ranged_weapon PISTOL energy none 0 40 100 0 35 - 91 91 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 7 - 1 1 1 1 1 0 0 0 0 0 - 0 400 0 0 2 1 Quest reward for a GCW quest in the NPE - weapon_npe_e11_quest_reward_01_01 object/weapon/ranged/carbine/carbine_e11_static.iff weapon Imperial Issue Carbine 1 1000 37 73 ranged_weapon CARBINE energy none 0 60 100 0 35 - 91 92 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 7 - 1 1 1 1 1 0 0 0 0 0 - 0 400 0 0 2 1 Quest reward for a GCW quest in the NPE - -weapon_npe_grenade_frag_02_01 object/weapon/ranged/grenade/grenade_fragmentation_generic.iff weapon Fragmentation Grenade 1 1000 80 160 ranged_weapon THROWN kinetic none 0 100 100 0 35 - 120 120 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 1 - 1 1 1 1 1 0 0 0 0 0 - 0 0 0 5 2 1 level 12 int:reuseTimer=5,string:effect_class=fragmentation +weapon_npe_grenade_frag_02_01 object/weapon/ranged/grenade/grenade_fragmentation_generic.iff weapon Fragmentation Grenade 1 1000 80 160 ranged_weapon THROWN kinetic none 0 1000 100 0 35 - 120 120 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 1 - 1 1 1 1 1 0 0 0 0 0 - 0 0 0 5 2 1 level 12 int:reuseTimer=5,string:effect_class=fragmentation weapon_npe_knuckler_fs_03_01 object/weapon/melee/special/vibroknuckler_npe.iff weapon Rydel's Knuckler 1 1000 32 99 melee_weapon UNARMED kinetic none 0 100 100 0 5 - 66 66 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 3 - 1 1 1 1 1 0 0 0 0 0 - 0 250 0 0 3 1 level 1 npe NOTE these dps are higher than average - weapon_npe_lightsaber_02_01 object/weapon/melee/sword/crafted_saber/generic_sword_lightsaber_one_handed_gen1.iff weapon First Generation Lightsaber 1 1000 100 200 melee_weapon ONE_HANDED_SABER energy none 0 100 100 0 5 - 405 150 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 29 force_sensitive 1 1 1 1 1 0 0 0 0 0 - 0 0 0 0 2 1 - int:jedi.saber.base_stats.min_dmg=200,int:jedi.saber.base_stats.max_dmg=400,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 weapon_npe_lightsaber_02_02 object/weapon/melee/sword/crafted_saber/generic_sword_lightsaber_training.iff weapon Training Lightsaber 1 1000 167 333 melee_weapon ONE_HANDED_SABER energy none 0 100 100 0 5 - 250 250 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 26 force_sensitive 1 1 1 1 1 0 0 0 0 0 - 0 0 0 0 2 1 lvl 26 int:jedi.saber.base_stats.min_dmg=167,int:jedi.saber.base_stats.max_dmg=333,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 @@ -317,4 +317,51 @@ weapon_tow_sword_junti_04_01 object/weapon/melee/sword/sword_mace_junti_generic. weapon_tow_sword_rsf_04_01 object/weapon/melee/sword/sword_rsf_generic.iff weapon OR-5's Sword 1 1000 683 1366 melee_weapon ONE_HANDED_MELEE kinetic none 0 100 100 0 5 - 1000 1025 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 88 - 1 1 1 1 1 0 0 0 0 0 - 0 6500 0 0 4 1 ToW expansion - weapon_unarmed_04_01 object/weapon/melee/special/vibroknuckler_npe.iff weapon Modified Vibroblade 1 1000 85 170 melee_weapon UNARMED kinetic none 0 100 100 0 5 - 128 128 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 13 - 1 1 1 1 1 0 0 0 0 0 - 0 400 0 0 4 1 level 13 npe - weapon_westar_pistol_04_01 object/weapon/ranged/pistol/pistol_westar_34.iff weapon WESTAR-34 Blaster Pistol 1 1000 215 425 ranged_weapon PISTOL energy heat 20 40 100 0 35 - 900 900 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 75 - 1 1 1 1 1 0 0 0 0 0 - 0 1000 0 0 4 1 pvp BF reward - -weapon_westar_rifle_04_01 object/weapon/ranged/rifle/rifle_westar_m5.iff weapon WESTAR-M5 Blaster Rifle 1 1000 425 945 ranged_weapon RIFLE energy cold 20 80 100 0 64 - 900 906 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 75 - 1 1 1 1 1 0 0 0 0 0 - 0 1000 0 0 4 1 pvp BF reward - \ No newline at end of file +weapon_westar_rifle_04_01 object/weapon/ranged/rifle/rifle_westar_m5.iff weapon WESTAR-M5 Blaster Rifle 1 1000 425 945 ranged_weapon RIFLE energy cold 20 80 100 0 64 - 900 906 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 75 - 1 1 1 1 1 0 0 0 0 0 - 0 1000 0 0 4 1 pvp BF reward - +sword_2h_avatar_wke_toothpick object/weapon/melee/2h_sword/2h_sword_avatar_wke_toothpick.iff weapon Wookiee Toothpick 1 1000 597 1193 melee_weapon TWO_HANDED_MELEE kinetic none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_executer object/weapon/melee/2h_sword/ep3_loot_executer.iff weapon N-K Executer 1 1000 597 1193 melee_weapon TWO_HANDED_MELEE kinetic none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_lifeblood object/weapon/melee/2h_sword/ep3_loot_lifeblood.iff weapon Lifeblood Cleaver 1 1000 458 915 melee_weapon TWO_HANDED_MELEE kinetic none 0 100 100 0 4 - 687 687 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_sickle object/weapon/melee/2h_sword/ep3_loot_sickle.iff weapon Darstai'is Sickle 1 1000 527 1054 melee_weapon TWO_HANDED_MELEE kinetic none 0 100 100 0 4 - 791 791 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +baton_avatar_trando_stun_stick object/weapon/melee/baton/baton_avatar_trando_stun_stick.iff weapon Blackscale Stun Stick 1 1000 597 1193 melee_weapon ONE_HANDED_MELEE kinetic none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_blackbane object/weapon/melee/knife/ep3_loot_blackbane.iff weapon Blackbane Nail 1 1000 458 915 melee_weapon ONE_HANDED_MELEE kinetic none 0 100 100 0 4 - 687 687 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_pestilence object/weapon/melee/polearm/ep3_loot_pestilence.iff weapon Pestilence 1 1000 527 1054 melee_weapon POLEARM_MELEE kinetic none 0 100 100 0 4 - 791 791 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_poisonspike object/weapon/melee/polearm/ep3_loot_poisonspike.iff weapon Poisonspike 1 1000 597 1193 melee_weapon POLEARM_MELEE kinetic none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_strike object/weapon/melee/polearm/ep3_loot_strike.iff weapon Strike Assault Lance 1 1000 458 915 melee_weapon POLEARM_MELEE kinetic none 0 100 100 0 4 - 687 687 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +lance_avatar_wke_heartlance object/weapon/melee/polearm/lance_avatar_wke_heartlance.iff weapon Wookiee Heartlance 1 1000 597 1193 melee_weapon POLEARM_MELEE energy none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_heartstriker object/weapon/melee/special/ep3_loot_heartstriker.iff weapon Sayormi Heartstriker 1 1000 458 915 melee_weapon UNARMED kinetic none 0 100 100 0 4 - 687 687 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_necrosis object/weapon/melee/special/ep3_loot_necrosis.iff weapon Necrosis Nightblade 1 1000 597 1193 melee_weapon UNARMED kinetic none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_soulstinger object/weapon/melee/special/ep3_loot_soulstinger.iff weapon Sayormi Soulstinger 1 1000 527 1054 melee_weapon UNARMED energy none 0 100 100 0 4 - 791 791 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_eventide object/weapon/melee/sword/ep3_loot_eventide.iff weapon Eventide Smasher 1 1000 527 1054 melee_weapon UNARMED kinetic none 0 100 100 0 4 - 791 791 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_ripper object/weapon/melee/sword/ep3_loot_ripper.iff weapon Bloodshot Ripper 1 1000 597 1193 melee_weapon UNARMED kinetic none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +sword_avatar_wke_spiritblade object/weapon/melee/sword/sword_avatar_wke_spiritblade.iff weapon Kashyyyk Spiritblade 1 1000 597 1193 melee_weapon ONE_HANDED_MELEE kinetic none 0 100 100 0 4 - 895 895 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +carbine_avatar_trando object/weapon/ranged/carbine/carbine_avatar_trando.iff weapon Blackscale "Hall Sweeper" Carbine 1 1000 338 676 ranged_weapon CARBINE kinetic cold 35 60 100 0 50 - 507 507 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_corestrike object/weapon/ranged/carbine/ep3_loot_corestrike.iff weapon Corestrike Rancor 1 1000 300 600 ranged_weapon CARBINE energy none 0 60 100 0 35 - 450 450 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_firestar object/weapon/ranged/carbine/ep3_loot_firestar.iff weapon Firestar 10-K 1 1000 300 600 ranged_weapon CARBINE energy none 0 60 100 0 60 - 450 450 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_grievance object/weapon/ranged/carbine/ep3_loot_grievance.iff weapon Grievance Striker 1 1000 338 675 ranged_weapon CARBINE energy none 0 60 100 0 35 - 507 507 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_mark object/weapon/ranged/carbine/ep3_loot_mark.iff weapon Exemplar's Mark 1 1000 300 600 ranged_weapon CARBINE energy none 0 60 100 0 35 - 450 450 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_retribution object/weapon/ranged/carbine/ep3_loot_retribution.iff weapon Retribution 1 1000 300 600 ranged_weapon CARBINE energy none 0 60 100 0 35 - 450 450 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_rilctur object/weapon/ranged/carbine/ep3_loot_rilctur.iff weapon Rilctur Carbine 1 1000 263 525 ranged_weapon CARBINE energy none 0 60 100 0 35 - 394 394 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +grenade_imperial_detonator object/weapon/ranged/grenade/grenade_imperial_detonator.iff weapon Imperial Detonator 1 1000 721 1442 ranged_weapon THROWN energy none 0 1000 100 0 40 - 108 108 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_corellian object/weapon/ranged/heavy/ep3_loot_corellian.iff weapon Corellian Destroyer 1 1000 450 900 ranged_weapon DIRECTIONAL_TARGET_WEAPON energy none 0 80 100 0 55 - 675 675 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_void object/weapon/ranged/heavy/ep3_loot_void.iff weapon The Void 1 1000 515 1030 ranged_weapon DIRECTIONAL_TARGET_WEAPON kinetic none 0 80 100 0 64 - 773 773 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +heavy_acid_beam object/weapon/ranged/heavy/heavy_acid_beam.iff weapon Acid Stream Launcher 1 1000 290 580 ranged_weapon DIRECTIONAL_TARGET_WEAPON kinetic acid 242 80 100 0 64 - 435 435 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +heavy_avatar_acid_beam object/weapon/ranged/heavy/heavy_avatar_acid_beam.iff weapon Blackscale Acid Launcher 1 1000 356 711 ranged_weapon DIRECTIONAL_TARGET_WEAPON kinetic acid 242 80 100 0 64 - 534 534 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_blackhand object/weapon/ranged/pistol/ep3_loot_blackhand.iff weapon Blackhand Annihilator 1 1000 200 400 ranged_weapon PISTOL kinetic none 0 40 100 0 35 - 300 300 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_calibrated object/weapon/ranged/pistol/ep3_loot_calibrated.iff weapon Perfectly-Calibrated Pistol 1 1000 205 410 ranged_weapon PISTOL energy none 0 40 100 0 25 - 770 769 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_deathrain object/weapon/ranged/pistol/ep3_loot_deathrain.iff weapon Deathrain D-50 1 1000 225 450 ranged_weapon PISTOL energy none 0 40 100 0 35 - 338 338 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_dragoneye object/weapon/ranged/pistol/ep3_loot_dragoneye.iff weapon C-10 "Dragoneye Reaper" 1 1000 175 350 ranged_weapon PISTOL energy none 0 40 100 0 25 - 263 263 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_hydra object/weapon/ranged/pistol/ep3_loot_hydra.iff weapon Red Hydra Z-5 1 1000 175 350 ranged_weapon PISTOL energy none 0 40 100 0 25 - 263 263 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_liquidsilver object/weapon/ranged/pistol/ep3_loot_liquidsilver.iff weapon Liquidsilver L7 1 1000 175 350 ranged_weapon PISTOL energy none 0 40 100 0 25 - 263 263 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_quicktrigger object/weapon/ranged/pistol/ep3_loot_quicktrigger.iff weapon Quicktrigger Countermand 1 1000 200 400 ranged_weapon PISTOL energy none 0 40 100 0 25 - 300 300 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_rhiss object/weapon/ranged/pistol/ep3_loot_rhiss.iff weapon Rhiss Mark-20 1 1000 175 350 ranged_weapon PISTOL energy none 0 40 100 0 25 - 263 263 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_silencer object/weapon/ranged/pistol/ep3_loot_silencer.iff weapon The Silencer 1 1000 200 400 ranged_weapon PISTOL kinetic none 0 40 100 0 25 - 300 300 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +pistol_avatar_trando_special object/weapon/ranged/pistol/pistol_avatar_trando_special.iff weapon DL44 "Dosh Special" Pistol 1 1000 225 450 ranged_weapon PISTOL energy none 0 40 100 0 35 - 338 338 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 72 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_darksting object/weapon/ranged/rifle/ep3_loot_darksting.iff weapon Darksting Assassin 1 1000 225 450 ranged_weapon RIFLE energy none 0 80 100 0 25 - 338 338 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_dawnsorrow object/weapon/ranged/rifle/ep3_loot_dawnsorrow.iff weapon Dawnsorrow Rifle 1 1000 450 900 ranged_weapon RIFLE energy none 0 80 100 0 60 - 675 675 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_nullifier object/weapon/ranged/rifle/ep3_loot_nullifier.iff weapon Nullifier X 1 1000 581 1161 ranged_weapon RIFLE energy none 0 80 100 0 55 - 871 871 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_retaliation object/weapon/ranged/rifle/ep3_loot_retaliation.iff weapon Covert Retaliation 1 1000 450 900 ranged_weapon RIFLE energy none 0 80 100 0 60 - 675 675 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +ep3_loot_sharpshooter object/weapon/ranged/rifle/ep3_loot_sharpshooter.iff weapon Vershyi Sharpshooter 1 1000 350 700 ranged_weapon RIFLE energy none 0 80 100 0 60 - 525 525 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 64 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +rifle_naktra_crystal object/weapon/ranged/rifle/ep3/rifle_naktra_crystal.iff weapon Nak'tra Crystal Rifle 1 1000 450 900 ranged_weapon RIFLE energy none 0 80 100 0 64 - 675 675 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +rifle_avatar_laser_trando object/weapon/ranged/rifle/rifle_avatar_laser_trando.iff weapon Trandoshan Laser Rifle 1 1000 450 900 ranged_weapon RIFLE energy none 0 80 100 0 64 - 675 675 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +rifle_proton object/weapon/ranged/rifle/rifle_proton.iff weapon Proton Rifle 1 1000 450 900 ranged_weapon RIFLE energy none 0 80 100 0 64 - 675 675 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - +rifle_t21 object/weapon/ranged/rifle/rifle_t21.iff weapon T21 Rifle 1 1000 450 900 ranged_weapon RIFLE energy none 0 80 100 0 64 - 675 675 0 - 0 - 0 0 - - - 0 - - - - - - - - - - 0 0 - - - 0 - 80 - 1 1 1 1 1 0 0 0 1 0 - 0 1000 0 0 4 1 - - \ No newline at end of file diff --git a/serverdata/loot/loot_table.sdb b/serverdata/loot/loot_table.sdb index 7698e0c7d..08dd4d99e 100644 --- a/serverdata/loot/loot_table.sdb +++ b/serverdata/loot/loot_table.sdb @@ -1,11 +1,11 @@ loot_id comment_group_1 items_group_1 chance_group_1 comment_group_2 items_group_2 chance_group_2 comment_group_3 items_group_3 chance_group_3 comment_group_4 items_group_4 chance_group_4 comment_group_5 items_group_5 chance_group_5 comment_group_6 items_group_6 chance_group_6 comment_group_7 items_group_7 chance_group_7 comment_group_8 items_group_8 chance_group_8 comment_group_9 items_group_9 chance_group_9 comment_group_10 items_group_10 chance_group_10 comment_group_11 items_group_11 chance_group_11 comment_group_12 items_group_12 chance_group_12 comment_group_13 items_group_13 chance_group_13 comment_group_14 items_group_14 chance_group_14 comment_group_15 items_group_15 chance_group_15 comment_group_16 items_group_16 chance_group_16 TEXT KEY TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER TEXT TEXT INTEGER -avatar_commando wke_commando object/weapon/melee/2h_sword/2h_sword_avatar_wke_toothpick.iff;object/weapon/melee/polearm/lance_avatar_wke_heartlance.iff;object/weapon/melee/sword/sword_avatar_wke_spiritblade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -avatar_harwakokok wke_harwakokok object/weapon/melee/2h_sword/2h_sword_avatar_wke_toothpick.iff;object/weapon/melee/polearm/lance_avatar_wke_heartlance.iff;object/weapon/melee/sword/sword_avatar_wke_spiritblade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -avatar_trando trando_fighters object/weapon/ranged/carbine/carbine_avatar_trando.iff;object/weapon/ranged/pistol/pistol_avatar_trando_special.iff;object/weapon/ranged/rifle/rifle_avatar_laser_trando.iff;object/weapon/melee/baton/baton_avatar_trando_stun_stick.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -avatar_trando_cmd trando_cmd object/weapon/ranged/carbine/carbine_avatar_trando.iff;object/weapon/ranged/heavy/heavy_avatar_acid_beam.iff;object/weapon/ranged/pistol/pistol_avatar_trando_special.iff;object/weapon/ranged/rifle/rifle_avatar_laser_trando.iff;object/weapon/melee/baton/baton_avatar_trando_stun_stick.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -avatar_trando_scale trando_scale object/weapon/ranged/carbine/carbine_avatar_trando.iff;object/weapon/ranged/heavy/heavy_avatar_acid_beam.iff;object/weapon/ranged/pistol/pistol_avatar_trando_special.iff;object/weapon/ranged/rifle/rifle_avatar_laser_trando.iff;object/weapon/melee/baton/baton_avatar_trando_stun_stick.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -avatar_wke wke_fighters object/weapon/melee/polearm/lance_avatar_wke_heartlance.iff;object/weapon/melee/sword/sword_avatar_wke_spiritblade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +avatar_commando wke_commando sword_2h_avatar_wke_toothpick;lance_avatar_wke_heartlance;sword_avatar_wke_spiritblade;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +avatar_harwakokok wke_harwakokok sword_2h_avatar_wke_toothpick;lance_avatar_wke_heartlance;sword_avatar_wke_spiritblade;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +avatar_trando trando_fighters carbine_avatar_trando;pistol_avatar_trando_special;rifle_avatar_laser_trando;baton_avatar_trando_stun_stick;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_collar.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_slaver_brazier.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +avatar_trando_cmd trando_cmd carbine_avatar_trando;heavy_avatar_acid_beam;pistol_avatar_trando_special;rifle_avatar_laser_trando;baton_avatar_trando_stun_stick;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +avatar_trando_scale trando_scale carbine_avatar_trando;heavy_avatar_acid_beam;pistol_avatar_trando_special;rifle_avatar_laser_trando;baton_avatar_trando_stun_stick;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/furniture/ep3_rewards/avatar_hologram_squid.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff;object/tangible/component/weapon/blaster_rifle_avatar_loot_barrel.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +avatar_wke wke_fighters lance_avatar_wke_heartlance;sword_avatar_wke_spiritblade;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff;object/tangible/loot/creature_loot/kashyyyk_loot/avatar_worklight.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 axkva axkva item_heroic_schematic_nightsister_hat_01_01;item_heroic_schematic_nightsister_hat_01_01;item_heroic_schematic_saber_03_01;item_heroic_schematic_saber_03_01;item_heroic_random_ring_01_01;item_heroic_random_ring_01_01;item_heroic_random_ring_01_02;item_heroic_random_ring_01_02;item_heroic_random_ring_01_03;item_heroic_random_ring_01_03;item_heroic_random_ring_01_04;item_heroic_random_ring_01_04;item_limited_use_schematic_commando_ice_gun_04_01;object/tangible/loot/quest/lance_nightsister_schematic.iff;item_heroic_axkva_min_claw;item_heroic_axkva_min_claw_light;item_heroic_axkva_min_crystal_s01;item_heroic_axkva_min_crystal_s02;item_heroic_axkva_min_crystal_s03 66 wp_comp_heroic object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s18.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s18.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 bantha_bonecracker_loot creature_cash_loot_21_30 item_junk_creature_21thru30_01_01;item_junk_creature_21thru30_01_02;item_junk_creature_21thru30_01_03;item_junk_creature_21thru30_01_04;item_junk_creature_21thru30_01_05 76 simple_consumables_21_30 item_consumable_drop_agi_lvl20_01_02;item_consumable_drop_sta_lvl20_01_02;item_consumable_drop_con_lvl20_01_02;item_consumable_drop_str_lvl20_01_02;item_consumable_drop_pre_lvl20_01_02;item_consumable_drop_lck_lvl20_01_02 92 ranged_21_30 weapon_pistol_drop_lvl20_02_01;weapon_carbine_drop_lvl20_02_01;weapon_rifle_drop_lvl20_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 borvo_acklay npc_cash_loot_21_30 item_junk_npc_21thru25_01_01;item_junk_npc_21thru25_01_02;item_junk_npc_21thru25_01_03;item_junk_npc_21thru25_01_04;item_junk_npc_21thru25_01_05;item_junk_npc_26thru30_01_01;item_junk_npc_26thru30_01_02;item_junk_npc_26thru30_01_03;item_junk_npc_26thru30_01_04;item_junk_npc_26thru30_01_05 50 borvo_acklay object/tangible/quest/quest_start/borvo_acklay_armor.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -27,8 +27,8 @@ bounty_elite dynamic_armor_standard dynamic_armor_standard 43 dynamic_clothing_s bounty_low dynamic_armor_standard dynamic_armor_standard 68 dynamic_clothing_standard dynamic_clothing_standard 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 bounty_medium dynamic_armor_standard dynamic_armor_standard 75 dynamic_clothing_standard dynamic_clothing_standard 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 bull_rancor_81_90 dynamic_clothing_standard dynamic_clothing_standard 24 dynamic_armor_standard dynamic_armor_standard 48 dynamic_armor_boss dynamic_armor_boss 60 dynamic_clothing_boss dynamic_clothing_boss 72 dynamic_armor_jedi_standard dynamic_armor_jedi_standard 84 power_crystals_medium item_power_crystal_04_06;item_power_crystal_04_06;item_power_crystal_04_06;item_power_crystal_04_06;item_power_crystal_04_06;item_power_crystal_04_06;item_power_crystal_04_07;item_power_crystal_04_07;item_power_crystal_04_07;item_power_crystal_04_07;item_power_crystal_04_07;item_power_crystal_04_08;item_power_crystal_04_08;item_power_crystal_04_08;item_power_crystal_04_08;item_power_crystal_04_09;item_power_crystal_04_09;item_power_crystal_04_09;item_power_crystal_04_10;item_power_crystal_04_10;item_power_crystal_04_11;item_power_crystal_04_11 92 jedi_robes_high item_jedi_robe_light_03_03;item_jedi_robe_dark_03_03 100 0 0 0 0 0 0 0 0 0 -binayre_pirates_lvl4 object/weapon/ranged/rifle/rifle_t21.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -binayre_pirates_lvl5 object/weapon/ranged/grenade/grenade_imperial_detonator.iff;object/weapon/ranged/heavy/heavy_acid_beam.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +binayre_pirates_lvl4 rifle_t21 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +binayre_pirates_lvl5 grenade_imperial_detonator;heavy_acid_beam 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 col_aurebesh_tiles col_fried_icecream_fryer_broken_activation;col_fried_icecream_fryer_broken_activation;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_zerek_02_01;col_aurebesh_tile_yirt_02_01;col_aurebesh_tile_yirt_02_01;col_aurebesh_tile_yirt_02_01;col_aurebesh_tile_yirt_02_01;col_aurebesh_tile_xesh_02_01;col_aurebesh_tile_xesh_02_01;col_aurebesh_tile_xesh_02_01;col_aurebesh_tile_wesk_02_01;col_aurebesh_tile_wesk_02_01;col_aurebesh_tile_wesk_02_01;col_aurebesh_tile_vev_02_01;col_aurebesh_tile_vev_02_01;col_aurebesh_tile_usk_02_01;col_aurebesh_tile_usk_02_01;col_aurebesh_tile_usk_02_01;col_aurebesh_tile_trill_02_01;col_aurebesh_tile_trill_02_01;col_aurebesh_tile_thesh_02_01;col_aurebesh_tile_thesh_02_01;col_aurebesh_tile_shen_02_01;col_aurebesh_tile_senth_02_01;col_aurebesh_tile_resh_02_01;col_aurebesh_tile_resh_02_01;col_aurebesh_tile_qek_02_01;col_aurebesh_tile_qek_02_01;col_aurebesh_tile_peth_02_01;col_aurebesh_tile_osk_02_01;col_aurebesh_tile_orenth_02_01;col_aurebesh_tile_orenth_02_01;col_aurebesh_tile_onith_02_01;col_aurebesh_tile_nern_02_01;col_aurebesh_tile_nern_02_01;col_aurebesh_tile_nen_02_01;col_aurebesh_tile_nen_02_01;col_aurebesh_tile_nen_02_01;col_aurebesh_tile_nen_02_01;col_aurebesh_tile_nen_02_01;col_aurebesh_tile_nen_02_01;col_aurebesh_tile_nen_02_01;col_aurebesh_tile_mern_02_01;col_aurebesh_tile_leth_02_01;col_aurebesh_tile_leth_02_01;col_aurebesh_tile_krill_02_01;col_aurebesh_tile_krill_02_01;col_aurebesh_tile_kerenth_02_01;col_aurebesh_tile_jenth_02_01;col_aurebesh_tile_isk_02_01;col_aurebesh_tile_isk_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_herf_02_01;col_aurebesh_tile_grek_02_01;col_aurebesh_tile_forn_02_01;col_aurebesh_tile_forn_02_01;col_aurebesh_tile_forn_02_01;col_aurebesh_tile_forn_02_01;col_aurebesh_tile_forn_02_01;col_aurebesh_tile_esk_02_01;col_aurebesh_tile_esk_02_01;col_aurebesh_tile_esk_02_01;col_aurebesh_tile_enth_02_01;col_aurebesh_tile_dorn_02_01;col_aurebesh_tile_dorn_02_01;col_aurebesh_tile_dorn_02_01;col_aurebesh_tile_dorn_02_01;col_aurebesh_tile_cresh_02_01;col_aurebesh_tile_cherek_02_01;col_aurebesh_tile_cherek_02_01;col_aurebesh_tile_cherek_02_01;col_aurebesh_tile_cherek_02_01;col_aurebesh_tile_cherek_02_01;col_aurebesh_tile_cherek_02_01;col_aurebesh_tile_besh_02_01;col_aurebesh_tile_besh_02_01;col_aurebesh_tile_aurek_02_01;col_aurebesh_tile_aurek_02_01;col_aurebesh_tile_aurek_02_01;col_aurebesh_tile_aurek_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 col_bane_back_spider col_trophy_bane_back_spider_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 col_contraband_set_01 col_fried_icecream_fryer_broken_activation;col_fried_icecream_fryer_broken_activation;col_contraband5_item_02_01;col_contraband5_item_02_01;col_contraband5_item_02_01;col_contraband5_item_02_01;col_contraband5_item_02_01;col_contraband5_item_02_01;col_contraband4_item_02_01;col_contraband4_item_02_01;col_contraband4_item_02_01;col_contraband4_item_02_01;col_contraband4_item_02_01;col_contraband4_item_02_01;col_contraband3_item_02_05;col_contraband3_item_02_05;col_contraband3_item_02_05;col_contraband3_item_02_05;col_contraband3_item_02_05;col_contraband3_item_02_05;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband3_item_02_01;col_contraband2_item_02_05;col_contraband2_item_02_05;col_contraband2_item_02_05;col_contraband2_item_02_05;col_contraband2_item_02_05;col_contraband2_item_02_05;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband2_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01;col_contraband1_item_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -180,13 +180,13 @@ exar_hate_fist exar_hate_fist col_heroic_exar_kun_lost_journal_02_05;col_heroic_ exar_minder exar_minder col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;col_heroic_exar_kun_lost_journal_02_07;item_heroic_exar_broach_02_01;item_heroic_exar_broach_02_01;item_heroic_exar_broach_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_artifact_crate_02_01;item_heroic_exar_artifact_crate_02_01;item_heroic_exar_artifact_crate_02_01;item_heroic_exar_artifact_scroll_02_01;item_heroic_exar_artifact_scroll_02_01;item_heroic_exar_artifact_scroll_02_01;item_heroic_exar_artifact_02_01;item_heroic_exar_artifact_02_01;item_heroic_exar_artifact_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_artifact_02_01;item_heroic_exar_artifact_02_01;col_pristine_egg_02_01;col_pristine_milk_02_01;col_pristine_egg_02_01;col_pristine_milk_02_01;col_pristine_egg_02_01;col_pristine_milk_02_01 66 wp_comp_heroic object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s18.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s18.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 exar_open_hand exar_open_hand col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_03;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;col_heroic_exar_kun_lost_journal_02_04;item_heroic_exar_broach_02_01;item_heroic_exar_broach_02_01;item_heroic_exar_broach_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_excavation_toolchest_02_01;item_heroic_exar_artifact_crate_02_01;item_heroic_exar_artifact_crate_02_01;item_heroic_exar_artifact_crate_02_01;item_heroic_exar_artifact_scroll_02_01;item_heroic_exar_artifact_scroll_02_01;item_heroic_exar_artifact_scroll_02_01;item_heroic_exar_artifact_02_01;item_heroic_exar_artifact_02_01;item_heroic_exar_artifact_02_01 66 wp_comp_heroic object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s18.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s18.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 flit_bloodsucker_loot creature_cash_loot_31_40 item_junk_creature_31thru40_01_01;item_junk_creature_31thru40_01_02;item_junk_creature_31thru40_01_03;item_junk_creature_31thru40_01_04;item_junk_creature_31thru40_01_05 78 simple_consumables_31_40 item_consumable_drop_agi_lvl30_01_02;item_consumable_drop_sta_lvl30_01_02;item_consumable_drop_con_lvl30_01_02;item_consumable_drop_str_lvl30_01_02;item_consumable_drop_pre_lvl30_01_02;item_consumable_drop_lck_lvl30_01_02 91 ranged_31_40 weapon_pistol_drop_lvl30_02_01;weapon_carbine_drop_lvl30_02_01;weapon_rifle_drop_lvl30_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 -forest_exemplar forest_exemplar object/weapon/ranged/carbine/ep3_loot_mark.iff;object/weapon/ranged/carbine/ep3_loot_corestrike.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_rations.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_spice.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_07.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_vitamins.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_rations.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_spice.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_07.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_vitamins.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -forest_kerritamba forest_kerritamba object/weapon/ranged/heavy/ep3_loot_corellian.iff;object/weapon/ranged/pistol/ep3_loot_dragoneye.iff;object/weapon/ranged/pistol/ep3_loot_liquidsilver.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_artifact.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_jaw.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_medallion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_skull.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_artifact.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_jaw.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_medallion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_skull.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_spirits.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -forest_mouf forest_mouf object/weapon/ranged/pistol/ep3_loot_blackhand.iff;object/weapon/ranged/pistol/ep3_loot_hydra.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -forest_outcast forest_outcast object/weapon/ranged/pistol/ep3_loot_rhiss.iff;object/weapon/ranged/carbine/ep3_loot_rilctur.iff;object/weapon/ranged/rifle/ep3_loot_sharpshooter.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_rations.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_spice.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_07.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_vitamins.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +forest_exemplar forest_exemplar ep3_loot_mark;ep3_loot_corestrike;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_rations.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_spice.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_07.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_vitamins.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_rations.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_spice.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_07.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_vitamins.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +forest_kerritamba forest_kerritamba ep3_loot_corellian;ep3_loot_dragoneye;ep3_loot_liquidsilver;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_artifact.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_jaw.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_medallion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_skull.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_artifact.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_jaw.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_medallion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_skull.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_spirits.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +forest_mouf forest_mouf ep3_loot_blackhand;ep3_loot_hydra;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +forest_outcast forest_outcast ep3_loot_rhiss;ep3_loot_rilctur;ep3_loot_sharpshooter;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_rations.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_spice.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_tool_07.iff;object/tangible/loot/creature_loot/kashyyyk_loot/outcast_vitamins.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 forest_snake forest_snake object/tangible/loot/creature_loot/kashyyyk_loot/snake_blood.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_brain.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_egg.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_eye.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_forgotten_relic.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_meat.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_poison.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_riverpearl.iff;object/tangible/loot/creature_loot/kashyyyk_loot/snake_riverweed.iff;object/tangible/loot/creature_loot/kashyyyk_loot/lost_chance_dice.iff;object/tangible/loot/creature_loot/kashyyyk_loot/decomposed_fish_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/decomposed_fish_02.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -forest_steelhoof forest_steelhoof object/weapon/ranged/carbine/ep3_loot_firestar.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -forest_vesad forest_vesad object/weapon/ranged/heavy/ep3_loot_void.iff;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_leg_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_poison_sac_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_leg_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_poison_sac_01.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +forest_steelhoof forest_steelhoof ep3_loot_firestar;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_paw_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mouf_pelt_01.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +forest_vesad forest_vesad ep3_loot_void;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_leg_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_poison_sac_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_leg_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/webweaver_poison_sac_01.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 forest_warchief forest_warchief object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_artifact.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_jaw.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_medallion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_skull.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_artifact.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_jaw.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_medallion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_skull.iff;object/tangible/loot/creature_loot/kashyyyk_loot/kerritamba_spirits.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 generic object/tangible/component/armor/armor_core_assault_advanced.iff 34 object/tangible/component/armor/armor_core_recon_advanced.iff 67 object/tangible/component/armor/armor_core_battle_advanced.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 geonosian dynamic_clothing_standard dynamic_clothing_standard 34 dynamic_armor_standard dynamic_armor_standard 33 geonosian object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_honey_carafe.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_honey_carafe.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_honey_carafe.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_honey_carafe.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_honey_carafe.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_honey_carafe.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/loot/dungeon/geonosian_mad_bunker/relic_gbb_tech_kit.iff;object/tangible/component/weapon/geonosian_sword_core.iff;object/tangible/component/weapon/geonosian_sword_core.iff;object/tangible/component/weapon/geonosian_reinforcement_core.iff;object/tangible/component/weapon/geonosian_reinforcement_core.iff;object/tangible/component/weapon/geonosian_solidifying_agent.iff;object/tangible/component/weapon/geonosian_solidifying_agent.iff;object/tangible/component/weapon/geonosian_solidifying_agent.iff;object/tangible/component/weapon/geonosian_solidifying_agent.iff;object/tangible/component/weapon/geonosian_solidifying_agent.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube.iff;object/tangible/component/weapon/geonosian_power_cube_green.iff;object/tangible/component/weapon/geonosian_power_cube_red.iff;object/tangible/loot/loot_schematic/geonosian_tenloss_dxr6_schematic.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -314,10 +314,10 @@ mustafar_voakar_duset voakar_duset object/tangible/loot/mustafar/cube_loot/cube_ mustafar_xandank xandank item_tow_junk_creature_jaw_02_01;object/tangible/item/som/xandank_jaw.iff;object/tangible/loot/mustafar/cube_loot/cube_loot_1o.iff;object/tangible/loot/mustafar/cube_loot/cube_loot_1x.iff 50 creature item_tow_junk_creature_brain_02_01;item_tow_junk_creature_bone_02_01;item_tow_junk_creature_intestines_02_01;item_tow_junk_creature_hide_02_01;item_tow_junk_creature_blood_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 mustafar_xandank_patriarch xandank_patriarch object/tangible/loot/mustafar/cube_loot/cube_loot_1x.iff 50 creature item_tow_junk_creature_brain_02_01;item_tow_junk_creature_bone_02_01;item_tow_junk_creature_intestines_02_01;item_tow_junk_creature_hide_02_01;item_tow_junk_creature_blood_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 mustafar_xandank_plated xankdank_plated object/tangible/loot/mustafar/cube_loot/cube_loot_1o.iff 50 creature item_tow_junk_creature_brain_02_01;item_tow_junk_creature_bone_02_01;item_tow_junk_creature_intestines_02_01;item_tow_junk_creature_hide_02_01;item_tow_junk_creature_blood_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -myyydril_deathswarm myyydril_deathswarm object/weapon/melee/polearm/ep3_loot_pestilence.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_blood.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_enzymes.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_fluid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_larvae.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_leg.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_parasites.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_pincer.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison_sac.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_rotting_meat.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_blood.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_enzymes.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_fluid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_larvae.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_leg.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_parasites.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_pincer.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison_sac.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_rotting_meat.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -myyydril_eviserator myyydril_eviserator object/weapon/ranged/carbine/ep3_loot_retribution.iff;object/weapon/ranged/pistol/ep3_loot_silencer.iff;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -myyydril_grievous myyydril_grievous object/weapon/melee/special/ep3_loot_necrosis.iff;object/weapon/melee/sword/ep3_loot_ripper.iff;object/weapon/melee/2h_sword/ep3_loot_executer.iff;object/weapon/melee/polearm/ep3_loot_poisonspike.iff;object/weapon/ranged/rifle/ep3_loot_darksting.iff;object/weapon/ranged/pistol/ep3_loot_deathrain.iff;object/weapon/ranged/carbine/ep3_loot_grievance.iff;object/weapon/ranged/rifle/ep3_loot_nullifier.iff;object/weapon/ranged/rifle/rifle_proton.iff;object/weapon/ranged/rifle/ep3_loot_retaliation.iff;object/weapon/ranged/pistol/ep3_loot_calibrated.iff;object/weapon/ranged/rifle/ep3_loot_dawnsorrow.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -myyydril_nefarious myyydril_nefarious object/weapon/melee/sword/ep3_loot_eventide.iff;object/weapon/ranged/rifle/ep3/rifle_naktra_crystal.iff;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +myyydril_deathswarm myyydril_deathswarm ep3_loot_pestilence;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_blood.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_enzymes.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_fluid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_larvae.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_leg.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_parasites.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_pincer.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison_sac.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_rotting_meat.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_05.iff;object/tangible/loot/creature_loot/kashyyyk_loot/adventurers_remains_06.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_blood.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_enzymes.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_fluid.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_larvae.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_leg.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_parasites.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_pincer.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_poison_sac.iff;object/tangible/loot/creature_loot/kashyyyk_loot/uwari_rotting_meat.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +myyydril_eviserator myyydril_eviserator ep3_loot_retribution;ep3_loot_silencer;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +myyydril_grievous myyydril_grievous ep3_loot_necrosis;ep3_loot_ripper;ep3_loot_executer;ep3_loot_poisonspike;ep3_loot_darksting;ep3_loot_deathrain;ep3_loot_grievance;ep3_loot_nullifier;rifle_proton;ep3_loot_retaliation;ep3_loot_calibrated;ep3_loot_dawnsorrow 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +myyydril_nefarious myyydril_nefarious ep3_loot_eventide;rifle_naktra_crystal;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff;object/tangible/loot/quest/mind_pod_eye.iff;object/tangible/loot/quest/mind_pod_sac.iff;object/tangible/loot/quest/mind_pod_brain.iff;object/tangible/loot/quest/mind_pod_stomach.iff;object/tangible/loot/quest/naktra_crystal.iff;object/tangible/loot/quest/mind_pod_parasites.iff;object/tangible/loot/quest/mind_pod_blood.iff;object/tangible/loot/quest/mind_pod_guts.iff;object/tangible/loot/quest/mind_pod_slime.iff;object/tangible/loot/quest/decomposed_foot.iff;object/tangible/loot/quest/decomposed_hand.iff;object/tangible/loot/quest/decomposed_skull.iff;object/tangible/loot/quest/broken_bottle.iff;object/tangible/loot/quest/runestone.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 narglatch_guardian_loot creature_cash_loot_21_30 item_junk_creature_21thru30_01_01;item_junk_creature_21thru30_01_02;item_junk_creature_21thru30_01_03;item_junk_creature_21thru30_01_04;item_junk_creature_21thru30_01_05 50 dynamic_clothing_standard dynamic_clothing_standard 70 dynamic_clothing_boss dynamic_clothing_boss 75 dynamic_armor_standard dynamic_armor_standard 95 dynamic_armor_boss dynamic_armor_boss 100 0 0 0 0 0 0 0 0 0 0 0 npc_1_10 dynamic_clothing_standard dynamic_clothing_standard 8 dynamic_simple dynamic_simple 12 npc_cash_loot_1_10 item_junk_npc_1thru5_01_01;item_junk_npc_1thru5_01_02;item_junk_npc_1thru5_01_03;item_junk_npc_1thru5_01_04;item_junk_npc_1thru5_01_05;item_junk_npc_6thru10_01_01;item_junk_npc_6thru10_01_02;item_junk_npc_6thru10_01_03;item_junk_npc_6thru10_01_04;item_junk_npc_6thru10_01_05 88 painting object/tangible/painting/painting_valley_view.iff;object/tangible/painting/painting_dance_party.iff;object/tangible/painting/painting_armor_blueprint.iff;object/tangible/painting/painting_bioengineer_orange.iff;object/tangible/painting/painting_cargoport.iff;object/tangible/painting/painting_trandoshan_wanted.iff 92 simple_consumables_1_10 item_consumable_drop_agi_lvl01_01_02;item_consumable_drop_sta_lvl01_01_02;item_consumable_drop_con_lvl01_01_02;item_consumable_drop_str_lvl01_01_02;item_consumable_drop_pre_lvl01_01_02;item_consumable_drop_lck_lvl01_01_02 100 0 0 0 0 0 0 0 0 0 0 0 npc_11_20 common object/tangible/loot/collectible/collectible_parts/orange_rug_thread_01.iff;object/tangible/loot/collectible/collectible_parts/orange_rug_thread_02.iff;object/tangible/loot/collectible/collectible_parts/orange_rug_thread_03.iff;object/tangible/loot/collectible/collectible_parts/orange_rug_thread_04.iff;object/tangible/loot/collectible/collectible_parts/orange_rug_thread_05.iff;object/tangible/loot/collectible/collectible_parts/orange_rug_thread_06.iff;object/tangible/loot/collectible/collectible_parts/orange_rug_thread_07.iff;object/tangible/loot/collectible/collectible_parts/blue_rug_thread_01.iff;object/tangible/loot/collectible/collectible_parts/blue_rug_thread_02.iff;object/tangible/loot/collectible/collectible_parts/blue_rug_thread_03.iff;object/tangible/loot/collectible/collectible_parts/blue_rug_thread_04.iff;object/tangible/loot/collectible/collectible_parts/blue_rug_thread_05.iff;object/tangible/loot/collectible/collectible_parts/blue_rug_thread_06.iff;object/tangible/loot/collectible/collectible_parts/blue_rug_thread_07.iff;object/tangible/loot/collectible/collectible_parts/gong_structure_01.iff;object/tangible/loot/collectible/collectible_parts/gong_structure_02.iff;object/tangible/loot/collectible/collectible_parts/gong_structure_03.iff;object/tangible/loot/collectible/collectible_parts/gong_structure_04.iff;object/tangible/loot/collectible/collectible_parts/gong_structure_05.iff;object/tangible/loot/collectible/collectible_parts/gong_structure_06.iff;object/tangible/loot/collectible/collectible_parts/gong_structure_07.iff;object/tangible/loot/collectible/collectible_parts/light_table_structure_01.iff;object/tangible/loot/collectible/collectible_parts/light_table_structure_02.iff;object/tangible/loot/collectible/collectible_parts/light_table_structure_03.iff;object/tangible/loot/collectible/collectible_parts/light_table_structure_04.iff;object/tangible/loot/collectible/collectible_parts/light_table_structure_05.iff;object/tangible/loot/collectible/collectible_parts/light_table_structure_06.iff;object/tangible/loot/collectible/collectible_parts/light_table_structure_07.iff;object/tangible/loot/collectible/collectible_parts/sculpture_structure_01.iff;object/tangible/loot/collectible/collectible_parts/sculpture_structure_02.iff;object/tangible/loot/collectible/collectible_parts/sculpture_structure_03.iff;object/tangible/loot/collectible/collectible_parts/sculpture_structure_04.iff;object/tangible/loot/collectible/collectible_parts/sculpture_structure_05.iff;object/tangible/loot/collectible/collectible_parts/sculpture_structure_06.iff;object/tangible/loot/collectible/collectible_parts/sculpture_structure_07.iff 4 dynamic_clothing_standard dynamic_clothing_standard 12 dynamic_simple dynamic_simple 16 npc_cash_loot_11_20 item_junk_npc_11thru15_01_01;item_junk_npc_11thru15_01_02;item_junk_npc_11thru15_01_03;item_junk_npc_11thru15_01_04;item_junk_npc_11thru15_01_05;item_junk_npc_16thru20_01_01;item_junk_npc_16thru20_01_02;item_junk_npc_16thru20_01_03;item_junk_npc_16thru20_01_04;item_junk_npc_16thru20_01_05 80 painting object/tangible/painting/painting_valley_view.iff;object/tangible/painting/painting_dance_party.iff;object/tangible/painting/painting_armor_blueprint.iff;object/tangible/painting/painting_bioengineer_orange.iff;object/tangible/painting/painting_cargoport.iff;object/tangible/painting/painting_trandoshan_wanted.iff 84 simple_consumables_11_20 item_consumable_drop_agi_lvl10_01_02;item_consumable_drop_sta_lvl10_01_02;item_consumable_drop_con_lvl10_01_02;item_consumable_drop_str_lvl10_01_02;item_consumable_drop_pre_lvl10_01_02;item_consumable_drop_lck_lvl10_01_02 92 other object/tangible/dice/eqp_chance_cube.iff;object/tangible/magic_eight_ball/magic_eight_ball.iff;object/tangible/loot/misc/palm_frond.iff;object/tangible/loot/misc/firework_dud_s1.iff;object/tangible/loot/misc/firework_dud_s2.iff;object/tangible/loot/misc/ticket_expired.iff;object/tangible/loot/misc/slave_collar.iff;object/tangible/dice/eqp_one_hundred_sided_dice_set.iff;object/tangible/dice/eqp_six_sided_dice_set.iff;object/tangible/dice/eqp_ten_sided_dice_set.iff;object/tangible/dice/eqp_twelve_sided_dice_set.iff;object/tangible/dice/eqp_twenty_sided_dice_set.iff;object/tangible/loot/misc/decryptor_broken_s01.iff;object/tangible/loot/misc/picture_handheld_s01.iff;object/tangible/loot/misc/picture_handheld_s02.iff;object/tangible/loot/misc/worklight.iff;object/tangible/loot/simple_kit/paint_cartridge.iff;object/tangible/loot/simple_kit/paint_disperser.iff;object/tangible/loot/simple_kit/flat_canvas.iff;object/tangible/loot/simple_kit/viewscreen_reader.iff;object/tangible/loot/tool/viewscreen_broken_s1.iff;object/tangible/loot/tool/viewscreen_broken_s2.iff;object/tangible/loot/simple_kit/powder_pack.iff;object/tangible/loot/simple_kit/datadisk.iff;object/tangible/loot/tool/datapad_broken.iff;object/tangible/loot/simple_kit/datapad_connectors.iff;object/tangible/loot/simple_kit/datapad_backlight.iff;object/tangible/loot/simple_kit/datapad_battery.iff;object/tangible/loot/simple_kit/viewscreen_printer.iff;object/tangible/loot/simple_kit/picture_printer.iff;object/tangible/loot/simple_kit/firework_fixer.iff;object/tangible/loot/simple_kit/datapad_casing.iff;object/tangible/loot/simple_kit/datadisk_repair_kit.iff;object/tangible/loot/simple_kit/empty_datapad.iff;object/tangible/loot/simple_kit/firework_casing.iff;object/tangible/loot/misc/datadisk_corrupt.iff;object/tangible/loot/simple_kit/recovery_software.iff;object/tangible/loot/simple_kit/magnetic_burner.iff;object/tangible/loot/simple_kit/magnetic_reader.iff;object/tangible/loot/simple_kit/wiring.iff 96 wp_comp_11_20 object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s01.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_two_s01.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s01.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_two_s01.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s10.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s10.iff 100 0 0 0 0 0 0 0 0 @@ -379,11 +379,11 @@ razor_cat_eviscerator_loot creature_cash_loot_21_30 item_junk_creature_21thru30_ restuss_emperors_hand jinzu item_restuss_schematic_saber_04_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 rhoa_kwi_pack_leader_loot creature_cash_loot_61_70 item_junk_creature_61thru70_01_01;item_junk_creature_61thru70_01_02;item_junk_creature_61thru70_01_03;item_junk_creature_61thru70_01_04;item_junk_creature_61thru70_01_05 78 simple_consumables_61_70 item_consumable_drop_agi_lvl60_01_02;item_consumable_drop_sta_lvl60_01_02;item_consumable_drop_con_lvl60_01_02;item_consumable_drop_str_lvl60_01_02;item_consumable_drop_pre_lvl60_01_02;item_consumable_drop_lck_lvl60_01_02 91 ranged_61_70 weapon_pistol_drop_lvl60_02_01;weapon_carbine_drop_lvl60_02_01;weapon_rifle_drop_lvl60_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 sayormi sayormi object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -sayormi_cyrans sayormi_cyrans object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;object/weapon/melee/2h_sword/ep3_loot_sickle.iff;object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;object/weapon/ranged/pistol/ep3_loot_quicktrigger.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -sayormi_monk sayormi_monk object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;object/weapon/melee/special/ep3_loot_heartstriker.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -sayormi_queen sayormi_queen object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;object/weapon/melee/special/ep3_loot_soulstinger.iff;object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -sayormi_warrior sayormi_warrior object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;object/weapon/melee/2h_sword/ep3_loot_lifeblood.iff;object/weapon/melee/polearm/ep3_loot_strike.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -sayormi_witch sayormi_witch object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;object/weapon/melee/knife/ep3_loot_blackbane.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +sayormi_cyrans sayormi_cyrans object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;ep3_loot_sickle;object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;ep3_loot_quicktrigger 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +sayormi_monk sayormi_monk object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;ep3_loot_heartstriker 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +sayormi_queen sayormi_queen object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;ep3_loot_soulstinger;object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +sayormi_warrior sayormi_warrior object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;ep3_loot_lifeblood;ep3_loot_strike 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +sayormi_witch sayormi_witch object/tangible/loot/creature_loot/kashyyyk_loot/archaic_sayormi_blade.iff;object/tangible/loot/creature_loot/kashyyyk_loot/black_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/corrupted_fruit.iff;object/tangible/loot/creature_loot/kashyyyk_loot/glow_stick.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_scroll.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/mystical_tome_04.iff;object/tangible/loot/creature_loot/kashyyyk_loot/orange_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_01.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_02.iff;object/tangible/loot/creature_loot/kashyyyk_loot/potion_component_03.iff;object/tangible/loot/creature_loot/kashyyyk_loot/purple_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/red_potion.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sacrificial_knife.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_heart.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_silk.iff;object/tangible/loot/creature_loot/kashyyyk_loot/sayormi_spirits.iff;object/tangible/loot/creature_loot/kashyyyk_loot/scarecrow_toy.iff;object/tangible/loot/creature_loot/kashyyyk_loot/voodoo_bag.iff;object/tangible/loot/creature_loot/kashyyyk_loot/white_potion.iff;ep3_loot_blackbane 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 screaming_kai_tok_loot creature_cash_loot_41_50 item_junk_creature_41thru50_01_01;item_junk_creature_41thru50_01_02;item_junk_creature_41thru50_01_03;item_junk_creature_41thru50_01_04;item_junk_creature_41thru50_01_05 78 simple_consumables_41_50 item_consumable_drop_agi_lvl40_01_02;item_consumable_drop_sta_lvl40_01_02;item_consumable_drop_con_lvl40_01_02;item_consumable_drop_str_lvl40_01_02;item_consumable_drop_pre_lvl40_01_02;item_consumable_drop_lck_lvl40_01_02 91 ranged_41_50 weapon_pistol_drop_lvl40_02_01;weapon_carbine_drop_lvl40_02_01;weapon_rifle_drop_lvl40_02_01 100 0 0 0 0 0 0 0 0 0 0 0 0 0 sd_boss sd_boss item_heroic_schematic_backpack_01_07;item_heroic_schematic_backpack_01_07;item_heroic_random_neck_01_01;item_heroic_random_neck_01_01;item_heroic_schematic_backpack_01_08;item_heroic_schematic_backpack_01_08;item_heroic_random_neck_01_02;item_heroic_random_neck_01_02;item_heroic_schematic_backpack_01_09;item_heroic_schematic_backpack_01_09;item_heroic_random_neck_01_03;item_heroic_random_neck_01_03;item_heroic_random_neck_01_04;item_heroic_random_neck_01_04;item_limited_use_schematic_commando_ice_gun_04_01;item_heroic_destroyer_cooling_coil;item_heroic_destroyer_power_transformer;item_heroic_destroyer_solar_console;item_heroic_destroyer_space_beacon 66 wp_comp_heroic object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s18.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s18.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 sd_sub_1 sd_sub_1 item_heroic_random_neck_01_06;item_heroic_random_neck_01_06;item_heroic_random_neck_01_07;item_heroic_random_neck_01_07;item_heroic_random_neck_01_08;item_heroic_random_neck_01_08;item_schematic_polearm_heroic_sd_01_01;item_schematic_polearm_heroic_sd_01_01;item_heroic_random_neck_01_09;item_heroic_random_neck_01_09;item_heroic_random_neck_01_10;item_heroic_random_neck_01_10;item_heroic_random_neck_01_05;item_heroic_random_neck_01_05;item_schematic_polearm_heroic_sd_01_01;item_schematic_polearm_heroic_sd_01_01;item_limited_use_schematic_commando_ice_gun_04_01;item_heroic_destroyer_cooling_coil;item_heroic_destroyer_power_transformer;item_heroic_destroyer_solar_console;item_heroic_destroyer_space_beacon 66 wp_comp_heroic object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_two_s09.iff;object/tangible/component/weapon/new_weapon/enhancement_melee_slot_one_s18.iff;object/tangible/component/weapon/new_weapon/enhancement_ranged_slot_one_s18.iff 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/src/main/ProjectSWG.java b/src/main/ProjectSWG.java index fdedac746..5026dfa79 100644 --- a/src/main/ProjectSWG.java +++ b/src/main/ProjectSWG.java @@ -30,6 +30,7 @@ package main; import java.io.File; import java.io.IOException; import java.lang.Thread.State; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,6 +43,7 @@ import org.junit.runner.notification.Failure; import com.projectswg.common.concurrency.Delay; import com.projectswg.common.control.IntentManager; +import com.projectswg.common.control.IntentManager.IntentSpeedRecord; import com.projectswg.common.debug.Log; import com.projectswg.common.debug.Log.LogLevel; import com.projectswg.common.debug.log_wrapper.ConsoleLogWrapper; @@ -130,6 +132,16 @@ public class ProjectSWG { for (Thread thread : threads) { Log.i(" Thread: %s", thread.getName()); } + List intentTimes = IntentManager.getInstance().getSpeedRecorder().getAllTimes(); + Collections.sort(intentTimes); + Log.i(" Intent Times: [%d]", intentTimes.size()); + Log.i(" %-30s%-40s%-10s%s", "Intent", "Receiver", "Count", "Time"); + for (IntentSpeedRecord record : intentTimes) { + String receiverName = record.getConsumer().getClass().getName(); + if (receiverName.indexOf('$') != -1) + receiverName = receiverName.substring(0, receiverName.indexOf('$')); + Log.i(" %-30s%-40s%-10s%.6fms", record.getIntent().getSimpleName(), receiverName, Long.toString(record.getCount()), record.getTime() / 1E6); + } } private static Result verifyTestCases() { @@ -250,7 +262,7 @@ public class ProjectSWG { private void loop() { setStatus((manager.getGalaxyStatus() == GalaxyStatus.UP) ? ServerStatus.OPEN : ServerStatus.LOCKED); while (!shutdownRequested && !manager.isShutdownRequested() && manager.isOperational()) { - if (Delay.sleepMicro(50)) + if (Delay.sleepMilli(50)) throw new CoreException("Main Thread Interrupted"); } } diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java index cd22a8b33..b8271503c 100644 --- a/src/resources/objects/SWGObject.java +++ b/src/resources/objects/SWGObject.java @@ -29,17 +29,19 @@ package resources.objects; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import com.projectswg.common.concurrency.SynchronizedMap; -import com.projectswg.common.concurrency.SynchronizedSet; import com.projectswg.common.data.CRC; import com.projectswg.common.data.location.Location; import com.projectswg.common.data.location.Terrain; @@ -79,11 +81,11 @@ public abstract class SWGObject extends BaselineObject implements Comparable containedObjects= new SynchronizedSet<>(); + private final Set containedObjects= new CopyOnWriteArraySet<>(); private final Map slots = new SynchronizedMap<>(); private final Map attributes = new SynchronizedMap<>(new LinkedHashMap<>()); private final ObjectAware awareness = new ObjectAware(this); - private final Map dataAttributes = new SynchronizedMap<>(); + private final Map dataAttributes = new ConcurrentHashMap<>(); private final AtomicInteger updateCounter = new AtomicInteger(1); private ObjectClassification classification = ObjectClassification.GENERATED; @@ -121,12 +123,10 @@ public abstract class SWGObject extends BaselineObject implements Comparable observer.sendPacket(update)); AwarenessUtilities.callForNewObserver(oldObservers, newObservers, (observer) -> createObject(observer)); AwarenessUtilities.callForOldObserver(oldObservers, newObservers, (observer) -> destroyObject(observer)); - new ContainerTransferIntent(this, container).broadcast(); + if (parent != container) + new ContainerTransferIntent(this, container).broadcast(); return ContainerResult.SUCCESS; } @@ -275,9 +274,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable getContainedObjects() { - synchronized (containedObjects) { - return new ArrayList<>(containedObjects); - } + return Collections.unmodifiableSet(containedObjects); } public boolean hasSlot(String slotName) { - synchronized (slots) { - return slots.containsKey(slotName); - } + return slots.containsKey(slotName); } public void setSlot(String name, SWGObject value) { - synchronized (slots) { - slots.put(name, value); - } + slots.put(name, value); } public Map getSlots() { @@ -358,16 +349,12 @@ public abstract class SWGObject extends BaselineObject implements Comparable bubble) - bubble = dist; - } + for (SWGObject contained : containedObjects) { + double x = contained.getX(); + double z = contained.getZ(); + double dist = Math.sqrt(x*x+z*z) + contained.getLoadRange(); + if (dist > bubble) + bubble = dist; } return bubble; } @@ -628,10 +613,8 @@ public abstract class SWGObject extends BaselineObject implements Comparable contained; - synchronized (containedObjects) { - contained = new HashSet<>(containedObjects); - } - synchronized (slots) { - contained.addAll(slots.values()); - contained.remove(null); - } + Set contained = new HashSet<>(containedObjects); + contained.addAll(slots.values()); + contained.remove(null); stream.addList(contained, (c) -> SWGObjectFactory.save(c, stream)); } diff --git a/src/resources/objects/awareness/AwarenessHandler.java b/src/resources/objects/awareness/AwarenessHandler.java index 7b005620a..763374c91 100644 --- a/src/resources/objects/awareness/AwarenessHandler.java +++ b/src/resources/objects/awareness/AwarenessHandler.java @@ -73,7 +73,7 @@ public class AwarenessHandler implements AutoCloseable { public void moveObject(SWGObject obj, Location requestedLocation) { // Remove from previous awareness - if (obj.getTerrain() != requestedLocation.getTerrain()) { + if (obj.getTerrain() != requestedLocation.getTerrain() && obj.getTerrain() != null) { TerrainMap oldTerrainMap = getTerrainMap(obj.getTerrain()); if (oldTerrainMap != null) oldTerrainMap.removeWithoutUpdate(obj); diff --git a/src/resources/objects/awareness/TerrainMapChunk.java b/src/resources/objects/awareness/TerrainMapChunk.java index b2e608e56..828a73134 100644 --- a/src/resources/objects/awareness/TerrainMapChunk.java +++ b/src/resources/objects/awareness/TerrainMapChunk.java @@ -31,8 +31,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; - -import com.projectswg.common.concurrency.SynchronizedSet; +import java.util.concurrent.CopyOnWriteArraySet; import resources.objects.SWGObject; import resources.objects.creature.CreatureObject; @@ -46,7 +45,7 @@ class TerrainMapChunk { private final double maxZ; public TerrainMapChunk(double minX, double minZ, double maxX, double maxZ) { - objects = new SynchronizedSet<>(); // There will be some expanding and shrinking + objects = new CopyOnWriteArraySet<>(); // There will be some expanding and shrinking this.minX = minX; this.minZ = minZ; this.maxX = maxX; @@ -79,11 +78,9 @@ class TerrainMapChunk { public void getWithinAwareness(SWGObject obj, Collection withinRange) { double loadRange = obj.getLoadRange(); - synchronized (objects) { - for (SWGObject test : objects) { - if (isValidWithinRange(obj, test, loadRange)) - withinRange.add(test); - } + for (SWGObject test : objects) { + if (isValidWithinRange(obj, test, loadRange)) + withinRange.add(test); } } diff --git a/src/resources/server_info/ConfigWatcher.java b/src/resources/server_info/ConfigWatcher.java index b4d6a0d76..ffee61e98 100644 --- a/src/resources/server_info/ConfigWatcher.java +++ b/src/resources/server_info/ConfigWatcher.java @@ -69,7 +69,6 @@ public final class ConfigWatcher { } catch (IOException e) { this.watcher = null; } - watcherThread.setInterruptOnStop(true); } public void start() { @@ -79,7 +78,7 @@ public final class ConfigWatcher { public void stop() { running.set(false); - watcherThread.stop(); + watcherThread.stop(true); watcherThread.awaitTermination(1000); } diff --git a/src/services/galaxy/travel/TravelHelper.java b/src/services/galaxy/travel/TravelHelper.java index 7feadfddd..62200d28c 100644 --- a/src/services/galaxy/travel/TravelHelper.java +++ b/src/services/galaxy/travel/TravelHelper.java @@ -84,7 +84,7 @@ class TravelHelper { } public void stop() { - travelExecutor.stop(); + travelExecutor.stop(false); } public void addTravelPoint(TravelPoint point) { diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java index 8ef73726f..087f3b599 100644 --- a/src/services/objects/ObjectAwareness.java +++ b/src/services/objects/ObjectAwareness.java @@ -304,15 +304,13 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { } private void moveObjectWithTransform(SWGObject obj, SWGObject parent, Location requestedLocation, double speed, int update) { - SWGObject oldParent = obj.getParent(); - Location oldLocation = obj.getLocation(); moveObject(obj, parent, requestedLocation); if (parent == null) dataTransformHandler.handleMove(obj, speed, update); else dataTransformHandler.handleMove(obj, parent, speed, update); if (obj instanceof CreatureObject && ((CreatureObject) obj).isLoggedInPlayer()) - new PlayerTransformedIntent((CreatureObject) obj, oldParent, parent, oldLocation, requestedLocation).broadcast(); + new PlayerTransformedIntent((CreatureObject) obj, obj.getParent(), parent, obj.getLocation(), requestedLocation).broadcast(); } private void disappearObject(SWGObject obj, boolean disappearObjects, boolean disappearCustom) { diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 6906d5434..3058b3be7 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -27,8 +27,8 @@ ***********************************************************************************/ package services.objects; -import java.util.Hashtable; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import com.projectswg.common.control.Manager; @@ -76,7 +76,7 @@ public class ObjectManager extends Manager { staticItemService = new StaticItemService(); database = new CachedObjectDatabase<>("odb/objects.db", SWGObjectFactory::create, SWGObjectFactory::save); - objectMap = new Hashtable<>(16*1024); + objectMap = new ConcurrentHashMap<>(128*1024); started = new AtomicBoolean(false); addChildService(objectAwareness); @@ -94,17 +94,13 @@ public class ObjectManager extends Manager { @Override public boolean initialize() { - synchronized (objectMap) { - objectMap.putAll(clientBuildoutService.loadClientObjects()); - } + objectMap.putAll(clientBuildoutService.loadClientObjects()); if (!loadObjects()) return false; synchronized (database) { database.traverse((obj) -> loadObject(obj)); } - synchronized (objectMap) { - objectMap.forEach((id, obj) -> new ObjectCreatedIntent(obj).broadcast()); - } + objectMap.forEach((id, obj) -> new ObjectCreatedIntent(obj).broadcast()); return super.initialize(); } @@ -150,24 +146,20 @@ public class ObjectManager extends Manager { @Override public boolean start() { - synchronized (objectMap) { - for (SWGObject obj : objectMap.values()) { - if (obj instanceof AIObject) - ((AIObject) obj).aiStart(); - } - started.set(true); + for (SWGObject obj : objectMap.values()) { + if (obj instanceof AIObject) + ((AIObject) obj).aiStart(); } + started.set(true); return super.start(); } @Override public boolean stop() { - synchronized (objectMap) { - started.set(false); - for (SWGObject obj : objectMap.values()) { - if (obj instanceof AIObject) - ((AIObject) obj).aiStop(); - } + started.set(false); + for (SWGObject obj : objectMap.values()) { + if (obj instanceof AIObject) + ((AIObject) obj).aiStop(); } return super.stop(); } @@ -191,20 +183,16 @@ public class ObjectManager extends Manager { } if (!(obj instanceof AIObject)) return; - synchronized (objectMap) { - if (started.get()) - ((AIObject) obj).aiStart(); - } + if (started.get()) + ((AIObject) obj).aiStart(); } private void processDestroyObjectIntent(DestroyObjectIntent doi) { destroyObject(doi.getObject()); if (!(doi.getObject() instanceof AIObject)) return; - synchronized (objectMap) { - if (started.get()) - ((AIObject) doi.getObject()).aiStop(); - } + if (started.get()) + ((AIObject) doi.getObject()).aiStop(); } private void processGalacticPacketIntent(GalacticPacketIntent gpi) { @@ -220,17 +208,13 @@ public class ObjectManager extends Manager { } public SWGObject getObjectById(long objectId) { - synchronized (objectMap) { - return objectMap.get(objectId); - } + return objectMap.get(objectId); } private void putObject(SWGObject object) { - synchronized (objectMap) { - SWGObject replaced = objectMap.put(object.getObjectId(), object); - if (replaced != null && replaced != object) - Log.e("Replaced object in object map! Old: %s New: %s", replaced, object); - } + SWGObject replaced = objectMap.put(object.getObjectId(), object); + if (replaced != null && replaced != object) + Log.e("Replaced object in object map! Old: %s New: %s", replaced, object); } private SWGObject destroyObject(SWGObject object) { @@ -247,10 +231,8 @@ public class ObjectManager extends Manager { if (database.remove(object)) database.save(); } - synchronized (objectMap) { - objectMap.remove(object.getObjectId()); - } - + objectMap.remove(object.getObjectId()); + return object; } diff --git a/test/resources/objects/awareness/TestAwarenessHandler.java b/test/resources/objects/awareness/TestAwarenessHandler.java index b342130dc..9b4ccfe8a 100644 --- a/test/resources/objects/awareness/TestAwarenessHandler.java +++ b/test/resources/objects/awareness/TestAwarenessHandler.java @@ -142,6 +142,7 @@ public class TestAwarenessHandler { awaitCallbacks(awareness); callback.testAssert(0, 0, 1, 0); callback.set(0, 0, 0, 0); + creature.setPosition(Terrain.TATOOINE, 0, 0, 0); awareness.moveObject(creature, starport.getCellByNumber(1), new Location(0, 0, 0, Terrain.TATOOINE)); awaitCallbacks(awareness); callback.testAssert(0, 0, 0, 0);