From 87f10370f06ed3c9634a00df7c38a0ce5bd74d6c Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Thu, 1 May 2014 05:12:05 +0200 Subject: [PATCH 01/19] Added most droppable armor pieces --- options.cfg | 4 +-- .../armor/bone/bone_armor_bicep_left.py | 31 +++++++++++++++++++ .../armor/bone/bone_armor_bicep_right.py | 31 +++++++++++++++++++ .../lootItems/armor/bone/bone_armor_boots.py | 31 +++++++++++++++++++ .../armor/bone/bone_armor_bracer_left.py | 31 +++++++++++++++++++ .../armor/bone/bone_armor_bracer_right.py | 31 +++++++++++++++++++ .../armor/bone/bone_armor_chestplate.py | 31 +++++++++++++++++++ .../lootItems/armor/bone/bone_armor_gloves.py | 31 +++++++++++++++++++ .../lootItems/armor/bone/bone_armor_helmet.py | 31 +++++++++++++++++++ .../armor/bone/bone_armor_leggings.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_bicep_left.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_bicep_right.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_boots.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_bracer_left.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_bracer_right.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_chestplate.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_gloves.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_helmet.py | 31 +++++++++++++++++++ .../armor/chitin/chitin_armor_leggings.py | 31 +++++++++++++++++++ .../composite_armor_bicep_left.py | 0 .../composite_armor_bicep_right.py | 0 .../{ => composite}/composite_armor_boots.py | 0 .../composite_armor_bracer_left.py | 0 .../composite_armor_bracer_right.py | 0 .../composite_armor_chestplate.py | 0 .../{ => composite}/composite_armor_gloves.py | 0 .../{ => composite}/composite_armor_helmet.py | 0 .../composite_armor_leggings.py | 0 .../ithorian_defender_armor_bicep_left.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_bicep_right.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_boots.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_bracer_left.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_bracer_right.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_chestplate.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_gloves.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_helmet.py | 31 +++++++++++++++++++ .../ithorian_defender_armor_leggings.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_bicep_left.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_bicep_right.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_boots.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_bracer_left.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_bracer_right.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_chestplate.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_gloves.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_helmet.py | 31 +++++++++++++++++++ .../ithorian_guardian_armor_leggings.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_bicep_left.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_bicep_right.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_boots.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_bracer_left.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_bracer_right.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_chestplate.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_gloves.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_helmet.py | 31 +++++++++++++++++++ .../ithorian_sentinel_armor_leggings.py | 31 +++++++++++++++++++ .../kashyyykian_black_mtn_armor_bicep_left.py | 31 +++++++++++++++++++ ...kashyyykian_black_mtn_armor_bicep_right.py | 31 +++++++++++++++++++ ...kashyyykian_black_mtn_armor_bracer_left.py | 31 +++++++++++++++++++ ...ashyyykian_black_mtn_armor_bracer_right.py | 31 +++++++++++++++++++ .../kashyyykian_black_mtn_armor_chestplate.py | 31 +++++++++++++++++++ .../kashyyykian_black_mtn_leggings.py | 31 +++++++++++++++++++ .../kashyyykian_ceremonial_bicep_left.py | 31 +++++++++++++++++++ .../kashyyykian_ceremonial_bicep_right.py | 31 +++++++++++++++++++ .../kashyyykian_ceremonial_bracer_left.py | 31 +++++++++++++++++++ .../kashyyykian_ceremonial_bracer_right.py | 31 +++++++++++++++++++ .../kashyyykian_ceremonial_chestplate.py | 31 +++++++++++++++++++ .../kashyyykian_ceremonial_leggings.py | 31 +++++++++++++++++++ .../kashyyykian_hunting_bicep_left.py | 31 +++++++++++++++++++ .../kashyyykian_hunting_bicep_right.py | 31 +++++++++++++++++++ .../kashyyykian_hunting_bracer_left.py | 31 +++++++++++++++++++ .../kashyyykian_hunting_bracer_right.py | 31 +++++++++++++++++++ .../kashyyykian_hunting_chestplate.py | 31 +++++++++++++++++++ .../kashyyykian_hunting_leggings.py | 31 +++++++++++++++++++ .../marauder/marauder_armor_bicep_left.py | 31 +++++++++++++++++++ .../marauder/marauder_armor_bicep_right.py | 31 +++++++++++++++++++ .../armor/marauder/marauder_armor_boots.py | 31 +++++++++++++++++++ .../marauder/marauder_armor_bracer_left.py | 31 +++++++++++++++++++ .../marauder/marauder_armor_bracer_right.py | 31 +++++++++++++++++++ .../marauder/marauder_armor_chestplate.py | 31 +++++++++++++++++++ .../armor/marauder/marauder_armor_gloves.py | 31 +++++++++++++++++++ .../armor/marauder/marauder_armor_helmet.py | 31 +++++++++++++++++++ .../armor/marauder/marauder_armor_leggings.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_bicep_left.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_bicep_right.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_boots.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_bracer_left.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_bracer_right.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_chestplate.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_gloves.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_helmet.py | 31 +++++++++++++++++++ .../armor/padded/padded_armor_leggings.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_bicep_left.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_bicep_right.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_boots.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_bracer_left.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_bracer_right.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_chestplate.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_gloves.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_helmet.py | 31 +++++++++++++++++++ .../armor/tantel/tantel_armor_leggings.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_bandolier.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_boots.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_bracer_left.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_bracer_right.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_gloves.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_helmet.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_jacket.py | 31 +++++++++++++++++++ .../armor/ubese/ubese_armor_shirt.py | 31 +++++++++++++++++++ .../chronicle_relic_fragment.py | 0 .../clothing/suits/reinforced_jumpsuit.py | 0 .../clothing/suits/traders_flightsuit.py | 0 .../{ => tusken}/tusken_raider_bandolier.py | 0 .../{ => tusken}/tusken_raider_boots.py | 0 .../{ => tusken}/tusken_raider_dress.py | 0 .../{ => tusken}/tusken_raider_gloves.py | 0 .../{ => tusken}/tusken_raider_helmet.py | 0 scripts/loot/lootPools/armor_various.py | 23 ++++++++++++++ scripts/loot/lootPools/chronicle_relic.py | 0 .../object/mobile/dressed_stormtrooper_m.py | 2 +- scripts/object/mobile/tusken_raider.py | 2 +- src/services/LootService.java | 12 +++++-- 121 files changed, 3075 insertions(+), 6 deletions(-) create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/bone/bone_armor_leggings.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/chitin/chitin_armor_leggings.py rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_bicep_left.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_bicep_right.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_boots.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_bracer_left.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_bracer_right.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_chestplate.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_gloves.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_helmet.py (100%) rename scripts/loot/lootItems/armor/{ => composite}/composite_armor_leggings.py (100%) create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_leggings.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_leggings.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_leggings.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_leggings.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_chestplate.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_leggings.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_chestplate.py create mode 100644 scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_leggings.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/marauder/marauder_armor_leggings.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/padded/padded_armor_leggings.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_left.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_right.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_chestplate.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/tantel/tantel_armor_leggings.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_left.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_right.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_helmet.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_jacket.py create mode 100644 scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py create mode 100644 scripts/loot/lootItems/chroniclerelics/chronicle_relic_fragment.py create mode 100644 scripts/loot/lootItems/clothing/suits/reinforced_jumpsuit.py create mode 100644 scripts/loot/lootItems/clothing/suits/traders_flightsuit.py rename scripts/loot/lootItems/clothing/{ => tusken}/tusken_raider_bandolier.py (100%) rename scripts/loot/lootItems/clothing/{ => tusken}/tusken_raider_boots.py (100%) rename scripts/loot/lootItems/clothing/{ => tusken}/tusken_raider_dress.py (100%) rename scripts/loot/lootItems/clothing/{ => tusken}/tusken_raider_gloves.py (100%) rename scripts/loot/lootItems/clothing/{ => tusken}/tusken_raider_helmet.py (100%) create mode 100644 scripts/loot/lootPools/armor_various.py create mode 100644 scripts/loot/lootPools/chronicle_relic.py diff --git a/options.cfg b/options.cfg index 5a3a7f8e..cb743c88 100644 --- a/options.cfg +++ b/options.cfg @@ -1,3 +1,3 @@ -LOAD.SNAPSHOT_OBJECTS=1 -LOAD.BUILDOUT_OBJECTS=1 +LOAD.SNAPSHOT_OBJECTS=0 +LOAD.BUILDOUT_OBJECTS=0 LOAD.RESOURCE.SYSTEM=1 \ No newline at end of file diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_bicep_left.py b/scripts/loot/lootItems/armor/bone/bone_armor_bicep_left.py new file mode 100644 index 00000000..c6582c41 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_bicep_l.iff'] + +def customItemName(): + + return 'Bone Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_bicep_right.py b/scripts/loot/lootItems/armor/bone/bone_armor_bicep_right.py new file mode 100644 index 00000000..09b6ad68 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_bicep_r.iff'] + +def customItemName(): + + return 'Bone Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_boots.py b/scripts/loot/lootItems/armor/bone/bone_armor_boots.py new file mode 100644 index 00000000..d2debb33 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_boots.iff'] + +def customItemName(): + + return 'Bone Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_bracer_left.py b/scripts/loot/lootItems/armor/bone/bone_armor_bracer_left.py new file mode 100644 index 00000000..75e01372 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_bracer_l.iff'] + +def customItemName(): + + return 'Bone Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_bracer_right.py b/scripts/loot/lootItems/armor/bone/bone_armor_bracer_right.py new file mode 100644 index 00000000..a7049c68 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_bracer_r.iff'] + +def customItemName(): + + return 'Bone Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_chestplate.py b/scripts/loot/lootItems/armor/bone/bone_armor_chestplate.py new file mode 100644 index 00000000..dd41276b --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_chest_plate.iff'] + +def customItemName(): + + return 'Bone Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py b/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py new file mode 100644 index 00000000..c888e788 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_gloves.iff'] + +def customItemName(): + + return 'Bone Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_helmet.py b/scripts/loot/lootItems/armor/bone/bone_armor_helmet.py new file mode 100644 index 00000000..88cab026 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_helmet.iff'] + +def customItemName(): + + return 'Bone Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_leggings.py b/scripts/loot/lootItems/armor/bone/bone_armor_leggings.py new file mode 100644 index 00000000..2c3f2671 --- /dev/null +++ b/scripts/loot/lootItems/armor/bone/bone_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/bone/shared_armor_bone_s01_leggings.iff'] + +def customItemName(): + + return 'Bone Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_left.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_left.py new file mode 100644 index 00000000..d70540c8 --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_bicep_l.iff'] + +def customItemName(): + + return 'Chitin Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_right.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_right.py new file mode 100644 index 00000000..76a9ff3d --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_bicep_r.iff'] + +def customItemName(): + + return 'Chitin Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py new file mode 100644 index 00000000..4163c447 --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_boots.iff'] + +def customItemName(): + + return 'Chitin Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_left.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_left.py new file mode 100644 index 00000000..70f1135c --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_bracer_l.iff'] + +def customItemName(): + + return 'Chitin Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_right.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_right.py new file mode 100644 index 00000000..5ae0a4f3 --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_bracer_r.iff'] + +def customItemName(): + + return 'Chitin Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_chestplate.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_chestplate.py new file mode 100644 index 00000000..29450398 --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_chest_plate.iff'] + +def customItemName(): + + return 'Chitin Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py new file mode 100644 index 00000000..0fec0496 --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_gloves.iff'] + +def customItemName(): + + return 'Chitin Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_helmet.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_helmet.py new file mode 100644 index 00000000..16fea8fd --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_helmet.iff'] + +def customItemName(): + + return 'Chitin Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_leggings.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_leggings.py new file mode 100644 index 00000000..f98f26c2 --- /dev/null +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_leggings.iff'] + +def customItemName(): + + return 'Chitin Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/composite_armor_bicep_left.py b/scripts/loot/lootItems/armor/composite/composite_armor_bicep_left.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_bicep_left.py rename to scripts/loot/lootItems/armor/composite/composite_armor_bicep_left.py diff --git a/scripts/loot/lootItems/armor/composite_armor_bicep_right.py b/scripts/loot/lootItems/armor/composite/composite_armor_bicep_right.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_bicep_right.py rename to scripts/loot/lootItems/armor/composite/composite_armor_bicep_right.py diff --git a/scripts/loot/lootItems/armor/composite_armor_boots.py b/scripts/loot/lootItems/armor/composite/composite_armor_boots.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_boots.py rename to scripts/loot/lootItems/armor/composite/composite_armor_boots.py diff --git a/scripts/loot/lootItems/armor/composite_armor_bracer_left.py b/scripts/loot/lootItems/armor/composite/composite_armor_bracer_left.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_bracer_left.py rename to scripts/loot/lootItems/armor/composite/composite_armor_bracer_left.py diff --git a/scripts/loot/lootItems/armor/composite_armor_bracer_right.py b/scripts/loot/lootItems/armor/composite/composite_armor_bracer_right.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_bracer_right.py rename to scripts/loot/lootItems/armor/composite/composite_armor_bracer_right.py diff --git a/scripts/loot/lootItems/armor/composite_armor_chestplate.py b/scripts/loot/lootItems/armor/composite/composite_armor_chestplate.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_chestplate.py rename to scripts/loot/lootItems/armor/composite/composite_armor_chestplate.py diff --git a/scripts/loot/lootItems/armor/composite_armor_gloves.py b/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_gloves.py rename to scripts/loot/lootItems/armor/composite/composite_armor_gloves.py diff --git a/scripts/loot/lootItems/armor/composite_armor_helmet.py b/scripts/loot/lootItems/armor/composite/composite_armor_helmet.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_helmet.py rename to scripts/loot/lootItems/armor/composite/composite_armor_helmet.py diff --git a/scripts/loot/lootItems/armor/composite_armor_leggings.py b/scripts/loot/lootItems/armor/composite/composite_armor_leggings.py similarity index 100% rename from scripts/loot/lootItems/armor/composite_armor_leggings.py rename to scripts/loot/lootItems/armor/composite/composite_armor_leggings.py diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_left.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_left.py new file mode 100644 index 00000000..06abafbd --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_bicep_l.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_right.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_right.py new file mode 100644 index 00000000..3a226c23 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_bicep_r.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py new file mode 100644 index 00000000..6c6c1ca4 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_boots.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_left.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_left.py new file mode 100644 index 00000000..607baa7f --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_bracer_l.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_right.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_right.py new file mode 100644 index 00000000..63cb0e4b --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_bracer_r.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_chestplate.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_chestplate.py new file mode 100644 index 00000000..0c0d699b --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_chest_plate.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py new file mode 100644 index 00000000..5d1f4535 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_gloves.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_helmet.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_helmet.py new file mode 100644 index 00000000..7828a56b --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_helmet.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_leggings.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_leggings.py new file mode 100644 index 00000000..f95cff3f --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_leggings.iff'] + +def customItemName(): + + return 'Ithorian Defender Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_left.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_left.py new file mode 100644 index 00000000..eedb6c9b --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_bicep_l.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_right.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_right.py new file mode 100644 index 00000000..b0edd6d9 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_bicep_r.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py new file mode 100644 index 00000000..3b27d829 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_boots.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_left.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_left.py new file mode 100644 index 00000000..3f72841a --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_bracer_l.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_right.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_right.py new file mode 100644 index 00000000..9072b494 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_bracer_r.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_chestplate.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_chestplate.py new file mode 100644 index 00000000..6ec13a5e --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_chest_plate.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py new file mode 100644 index 00000000..002612cb --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_gloves.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_helmet.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_helmet.py new file mode 100644 index 00000000..418501a6 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_helmet.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_leggings.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_leggings.py new file mode 100644 index 00000000..bcc43166 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_leggings.iff'] + +def customItemName(): + + return 'Ithorian Guardian Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_left.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_left.py new file mode 100644 index 00000000..0963cfc9 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bicep_l.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_right.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_right.py new file mode 100644 index 00000000..acd5473f --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bicep_r.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py new file mode 100644 index 00000000..e961438f --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_boots.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_left.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_left.py new file mode 100644 index 00000000..fd73de77 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bracer_l.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_right.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_right.py new file mode 100644 index 00000000..dba70a3c --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_bracer_r.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_chestplate.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_chestplate.py new file mode 100644 index 00000000..2bde059c --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_chest_plate.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py new file mode 100644 index 00000000..439d857e --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_gloves.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_helmet.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_helmet.py new file mode 100644 index 00000000..efc9a054 --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_helmet.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_leggings.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_leggings.py new file mode 100644 index 00000000..b4f3eafc --- /dev/null +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_leggings.iff'] + +def customItemName(): + + return 'Ithorian Sentinel Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_left.py b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_left.py new file mode 100644 index 00000000..2f6e2b95 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_black_mtn/shared_armor_kashyyykian_black_mtn_bicep_l.iff'] + +def customItemName(): + + return 'Kashyyykian Black Mountain Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_right.py b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_right.py new file mode 100644 index 00000000..8cec0f7d --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_black_mtn/shared_armor_kashyyykian_black_mtn_bicep_r.iff'] + +def customItemName(): + + return 'Kashyyykian Black Mountain Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_left.py b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_left.py new file mode 100644 index 00000000..64ee47c3 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_black_mtn/shared_armor_kashyyykian_black_mtn_bracer_l.iff'] + +def customItemName(): + + return 'Kashyyykian Black Mountain Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_right.py b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_right.py new file mode 100644 index 00000000..c17c1c47 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_black_mtn/shared_armor_kashyyykian_black_mtn_bracer_r.iff'] + +def customItemName(): + + return 'Kashyyykian Black Mountain Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_chestplate.py b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_chestplate.py new file mode 100644 index 00000000..618d2a57 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_black_mtn/shared_armor_kashyyykian_black_mtn_chestplate.iff'] + +def customItemName(): + + return 'Kashyyykian Black Mountain Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_leggings.py b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_leggings.py new file mode 100644 index 00000000..0118c616 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_black_mtn/kashyyykian_black_mtn_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_black_mtn/shared_armor_kashyyykian_black_mtn_leggings.iff'] + +def customItemName(): + + return 'Kashyyykian Black Mountain Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_left.py b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_left.py new file mode 100644 index 00000000..6f2e204e --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_ceremonial/shared_armor_kashyyykian_ceremonial_bicep_l.iff'] + +def customItemName(): + + return 'Kashyyykian Ceremonial Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_right.py b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_right.py new file mode 100644 index 00000000..b8e67983 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_ceremonial/shared_armor_kashyyykian_ceremonial_bicep_r.iff'] + +def customItemName(): + + return 'Kashyyykian Ceremonial Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_left.py b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_left.py new file mode 100644 index 00000000..3e27ce7f --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_ceremonial/shared_armor_kashyyykian_ceremonial_bracer_l.iff'] + +def customItemName(): + + return 'Kashyyykian Ceremonial Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_right.py b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_right.py new file mode 100644 index 00000000..fa389235 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_ceremonial/shared_armor_kashyyykian_ceremonial_bracer_r.iff'] + +def customItemName(): + + return 'Kashyyykian Ceremonial Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_chestplate.py b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_chestplate.py new file mode 100644 index 00000000..de3f29d8 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_ceremonial/shared_armor_kashyyykian_ceremonial_chestplate.iff'] + +def customItemName(): + + return 'Kashyyykian Ceremonial Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_leggings.py b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_leggings.py new file mode 100644 index 00000000..5ffea758 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_ceremonial/kashyyykian_ceremonial_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_ceremonial/shared_armor_kashyyykian_ceremonial_leggings.iff'] + +def customItemName(): + + return 'Kashyyykian Ceremonial Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_left.py b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_left.py new file mode 100644 index 00000000..02717dc3 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bicep_l.iff'] + +def customItemName(): + + return 'Kashyyykian Hunting Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_right.py b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_right.py new file mode 100644 index 00000000..70aba08f --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bicep_r.iff'] + +def customItemName(): + + return 'Kashyyykian Hunting Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_left.py b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_left.py new file mode 100644 index 00000000..601c880d --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bracer_l.iff'] + +def customItemName(): + + return 'Kashyyykian Hunting Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_right.py b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_right.py new file mode 100644 index 00000000..b00a3420 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_bracer_r.iff'] + +def customItemName(): + + return 'Kashyyykian Hunting Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_chestplate.py b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_chestplate.py new file mode 100644 index 00000000..692bca15 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_chest_plate.iff'] + +def customItemName(): + + return 'Kashyyykian Hunting Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_leggings.py b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_leggings.py new file mode 100644 index 00000000..ff7c10c1 --- /dev/null +++ b/scripts/loot/lootItems/armor/kashyyykian_hunting/kashyyykian_hunting_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/kashyyykian_hunting/shared_armor_kashyyykian_hunting_leggings.iff'] + +def customItemName(): + + return 'Kashyyykian Hunting Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_left.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_left.py new file mode 100644 index 00000000..5311bb2a --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_bicep_l.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_bicep_l.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_bicep_l.iff'] + +def customItemName(): + + return 'Marauder Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_right.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_right.py new file mode 100644 index 00000000..ec4725e9 --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_bicep_r.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_bicep_r.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_bicep_r.iff'] + +def customItemName(): + + return 'Marauder Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py new file mode 100644 index 00000000..4fff799b --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_boots.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_boots.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_boots.iff'] + +def customItemName(): + + return 'Marauder Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_left.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_left.py new file mode 100644 index 00000000..13e8df13 --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_bracer_l.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_bracer_l.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_bracer_l.iff'] + +def customItemName(): + + return 'Marauder Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_right.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_right.py new file mode 100644 index 00000000..7d7938f0 --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_bracer_r.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_bracer_r.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_bracer_r.iff'] + +def customItemName(): + + return 'Marauder Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_chestplate.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_chestplate.py new file mode 100644 index 00000000..2372a663 --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_chest_plate.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_chest_plate.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_chest_plate.iff'] + +def customItemName(): + + return 'Marauder Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py new file mode 100644 index 00000000..79bf35b1 --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_gloves.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_gloves.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_gloves.iff'] + +def customItemName(): + + return 'Marauder Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_helmet.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_helmet.py new file mode 100644 index 00000000..0e8674f7 --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_helmet.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_helmet.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_helmet.iff'] + +def customItemName(): + + return 'Marauder Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_leggings.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_leggings.py new file mode 100644 index 00000000..8e613148 --- /dev/null +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_leggings.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_leggings.iff','object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_leggings.iff'] + +def customItemName(): + + return 'Marauder Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_bicep_left.py b/scripts/loot/lootItems/armor/padded/padded_armor_bicep_left.py new file mode 100644 index 00000000..c2f93b24 --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_bicep_l.iff'] + +def customItemName(): + + return 'Padded Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_bicep_right.py b/scripts/loot/lootItems/armor/padded/padded_armor_bicep_right.py new file mode 100644 index 00000000..30d77a43 --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_bicep_r.iff'] + +def customItemName(): + + return 'Padded Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_boots.py b/scripts/loot/lootItems/armor/padded/padded_armor_boots.py new file mode 100644 index 00000000..a1767be7 --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_boots.iff'] + +def customItemName(): + + return 'Padded Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_bracer_left.py b/scripts/loot/lootItems/armor/padded/padded_armor_bracer_left.py new file mode 100644 index 00000000..2eb2c45c --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_bracer_l.iff'] + +def customItemName(): + + return 'Padded Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_bracer_right.py b/scripts/loot/lootItems/armor/padded/padded_armor_bracer_right.py new file mode 100644 index 00000000..182131bf --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_bracer_r.iff'] + +def customItemName(): + + return 'Padded Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_chestplate.py b/scripts/loot/lootItems/armor/padded/padded_armor_chestplate.py new file mode 100644 index 00000000..7b3c84d5 --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_chest_plate.iff'] + +def customItemName(): + + return 'Padded Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py b/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py new file mode 100644 index 00000000..72001ed2 --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_gloves.iff'] + +def customItemName(): + + return 'Padded Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_helmet.py b/scripts/loot/lootItems/armor/padded/padded_armor_helmet.py new file mode 100644 index 00000000..575e5b98 --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_helmet.iff'] + +def customItemName(): + + return 'Padded Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_leggings.py b/scripts/loot/lootItems/armor/padded/padded_armor_leggings.py new file mode 100644 index 00000000..c6c299d5 --- /dev/null +++ b/scripts/loot/lootItems/armor/padded/padded_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/padded/shared_armor_padded_s01_leggings.iff'] + +def customItemName(): + + return 'Padded Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_left.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_left.py new file mode 100644 index 00000000..4705777e --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bicep_l.iff'] + +def customItemName(): + + return 'Tantel Armor Bicep Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_right.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_right.py new file mode 100644 index 00000000..6da6c94b --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_bicep_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bicep_r.iff'] + +def customItemName(): + + return 'Tantel Armor Bicep Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py new file mode 100644 index 00000000..7920a987 --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_boots.iff'] + +def customItemName(): + + return 'Tantel Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_left.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_left.py new file mode 100644 index 00000000..70c573f3 --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bracer_l.iff'] + +def customItemName(): + + return 'Tantel Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_right.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_right.py new file mode 100644 index 00000000..ff47d129 --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_bracer_r.iff'] + +def customItemName(): + + return 'Tantel Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_chestplate.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_chestplate.py new file mode 100644 index 00000000..d6babe12 --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_chestplate.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_chest_plate.iff'] + +def customItemName(): + + return 'Tantel Armor Chestplate' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py new file mode 100644 index 00000000..555b5ab1 --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_gloves.iff'] + +def customItemName(): + + return 'Tantel Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_helmet.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_helmet.py new file mode 100644 index 00000000..211b9735 --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_helmet.iff'] + +def customItemName(): + + return 'Tantel Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_leggings.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_leggings.py new file mode 100644 index 00000000..8550f9a9 --- /dev/null +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_leggings.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_leggings.iff'] + +def customItemName(): + + return 'Tantel Armor Leggings' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py new file mode 100644 index 00000000..17fcecd9 --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_bandolier.iff'] + +def customItemName(): + + return 'Ubese Armor Bandolier' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py new file mode 100644 index 00000000..9720add5 --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_boots.iff'] + +def customItemName(): + + return 'Ubese Armor Boots' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_left.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_left.py new file mode 100644 index 00000000..6f2d6dd4 --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_left.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_bracer_l.iff'] + +def customItemName(): + + return 'Ubese Armor Bracer Left' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_right.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_right.py new file mode 100644 index 00000000..a1fbed28 --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_bracer_right.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_bracer_r.iff'] + +def customItemName(): + + return 'Ubese Armor Bracer Right' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py new file mode 100644 index 00000000..38d47564 --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_gloves.iff'] + +def customItemName(): + + return 'Ubese Armor Gloves' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_helmet.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_helmet.py new file mode 100644 index 00000000..ff18ad4a --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_helmet.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_helmet.iff'] + +def customItemName(): + + return 'Ubese Armor Helmet' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_jacket.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_jacket.py new file mode 100644 index 00000000..98a7fedd --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_jacket.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_jacket.iff'] + +def customItemName(): + + return 'Ubese Armor Jacket' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py new file mode 100644 index 00000000..0ad493a1 --- /dev/null +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py @@ -0,0 +1,31 @@ + +def itemTemplate(): + + return ['object/tangible/wearables/armor/ubese/shared_armor_ubese_shirt.iff'] + +def customItemName(): + + return 'Ubese Armor Shirt' + +def customItemStackCount(): + + return 1 + +def customizationAttributes(): + + return [] + +def customizationValues(): + + return [] + +def itemStats(): + + stats = ['armor_efficiency_kinetic','5000','6800'] + stats += ['armor_efficiency_energy','3000','4800'] + stats += ['special_protection_heat','4000','5800'] + stats += ['special_protection_cold','4000','5800'] + stats += ['special_protection_acid','4000','5800'] + stats += ['special_protection_electricity','4000','5800'] + + return stats diff --git a/scripts/loot/lootItems/chroniclerelics/chronicle_relic_fragment.py b/scripts/loot/lootItems/chroniclerelics/chronicle_relic_fragment.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/loot/lootItems/clothing/suits/reinforced_jumpsuit.py b/scripts/loot/lootItems/clothing/suits/reinforced_jumpsuit.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/loot/lootItems/clothing/suits/traders_flightsuit.py b/scripts/loot/lootItems/clothing/suits/traders_flightsuit.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/loot/lootItems/clothing/tusken_raider_bandolier.py b/scripts/loot/lootItems/clothing/tusken/tusken_raider_bandolier.py similarity index 100% rename from scripts/loot/lootItems/clothing/tusken_raider_bandolier.py rename to scripts/loot/lootItems/clothing/tusken/tusken_raider_bandolier.py diff --git a/scripts/loot/lootItems/clothing/tusken_raider_boots.py b/scripts/loot/lootItems/clothing/tusken/tusken_raider_boots.py similarity index 100% rename from scripts/loot/lootItems/clothing/tusken_raider_boots.py rename to scripts/loot/lootItems/clothing/tusken/tusken_raider_boots.py diff --git a/scripts/loot/lootItems/clothing/tusken_raider_dress.py b/scripts/loot/lootItems/clothing/tusken/tusken_raider_dress.py similarity index 100% rename from scripts/loot/lootItems/clothing/tusken_raider_dress.py rename to scripts/loot/lootItems/clothing/tusken/tusken_raider_dress.py diff --git a/scripts/loot/lootItems/clothing/tusken_raider_gloves.py b/scripts/loot/lootItems/clothing/tusken/tusken_raider_gloves.py similarity index 100% rename from scripts/loot/lootItems/clothing/tusken_raider_gloves.py rename to scripts/loot/lootItems/clothing/tusken/tusken_raider_gloves.py diff --git a/scripts/loot/lootItems/clothing/tusken_raider_helmet.py b/scripts/loot/lootItems/clothing/tusken/tusken_raider_helmet.py similarity index 100% rename from scripts/loot/lootItems/clothing/tusken_raider_helmet.py rename to scripts/loot/lootItems/clothing/tusken/tusken_raider_helmet.py diff --git a/scripts/loot/lootPools/armor_various.py b/scripts/loot/lootPools/armor_various.py new file mode 100644 index 00000000..aee801b3 --- /dev/null +++ b/scripts/loot/lootPools/armor_various.py @@ -0,0 +1,23 @@ + +def itemNames(): + + components = ['bone_armor_bicep_left','bone_armor_bicep_right','bone_armor_boots','bone_armor_bracer_left','bone_armor_bracer_right','bone_armor_chestplate','bone_armor_gloves','bone_armor_helmet','bone_armor_leggings'] + components += ['chitin_armor_bicep_left','chitin_armor_bicep_right','chitin_armor_boots','chitin_armor_bracer_left','chitin_armor_bracer_right','chitin_armor_chestplate','chitin_armor_gloves','chitin_armor_helmet','chitin_armor_leggings'] + components += ['composite_armor_bicep_left','composite_armor_bicep_right','composite_armor_boots','composite_armor_bracer_left','composite_armor_bracer_right','composite_armor_chestplate','composite_armor_gloves','composite_armor_helmet','composite_armor_leggings'] + components += ['ithorian_defender_armor_bicep_left','ithorian_defender_armor_bicep_right','ithorian_defender_armor_boots','ithorian_defender_armor_bracer_left','ithorian_defender_armor_bracer_right','ithorian_defender_armor_chestplate','ithorian_defender_armor_gloves','ithorian_defender_armor_helmet','ithorian_defender_armor_leggings'] + components += ['ithorian_guardian_armor_bicep_left','ithorian_guardian_armor_bicep_right','ithorian_guardian_armor_boots','ithorian_guardian_armor_bracer_left','ithorian_guardian_armor_bracer_right','ithorian_guardian_armor_chestplate','ithorian_guardian_armor_gloves','ithorian_guardian_armor_helmet','ithorian_guardian_armor_leggings'] + components += ['ithorian_sentinel_armor_bicep_left','ithorian_sentinel_armor_bicep_right','ithorian_sentinel_armor_boots','ithorian_sentinel_armor_bracer_left','ithorian_sentinel_armor_bracer_right','ithorian_sentinel_armor_chestplate','ithorian_sentinel_armor_gloves','ithorian_sentinel_armor_helmet','ithorian_sentinel_armor_leggings'] + components += ['kashyyykian_black_mtn_armor_bicep_left','kashyyykian_black_mtn_armor_bicep_right','kashyyykian_black_mtn_armor_bracer_left','kashyyykian_black_mtn_armor_bracer_right','kashyyykian_black_mtn_armor_chestplate','kashyyykian_black_mtn_leggings'] + components += ['kashyyykian_ceremonial_bicep_left','kashyyykian_ceremonial_bicep_right','kashyyykian_ceremonial_bracer_left','kashyyykian_ceremonial_bracer_right','kashyyykian_ceremonial_chestplate','kashyyykian_ceremonial_leggings'] + components += ['kashyyykian_hunting_bicep_left','kashyyykian_hunting_bicep_right','kashyyykian_hunting_bracer_left','kashyyykian_hunting_bracer_right','kashyyykian_hunting_chestplate','kashyyykian_hunting_leggings'] + components += ['marauder_armor_bicep_left','marauder_armor_bicep_right','marauder_armor_boots','marauder_armor_bracer_left','marauder_armor_bracer_right','marauder_armor_chestplate','marauder_armor_gloves','marauder_armor_helmet','marauder_armor_leggings'] + components += ['padded_armor_bicep_left','padded_armor_bicep_right','padded_armor_boots','padded_armor_bracer_left','padded_armor_bracer_right','padded_armor_chestplate','padded_armor_gloves','padded_armor_helmet','padded_armor_leggings'] + components += ['tantel_armor_bicep_left','tantel_armor_bicep_right','tantel_armor_boots','tantel_armor_bracer_left','tantel_armor_bracer_right','tantel_armor_chestplate','tantel_armor_gloves','tantel_armor_helmet','tantel_armor_leggings'] + components += ['ubese_armor_bandolier','ubese_armor_boots','ubese_armor_bracer_left','ubese_armor_bracer_right','ubese_armor_gloves','ubese_armor_helmet','ubese_armor_jacket','ubese_armor_shirt'] + return components + +def itemChances(): + + return [-1] # all equal + + \ No newline at end of file diff --git a/scripts/loot/lootPools/chronicle_relic.py b/scripts/loot/lootPools/chronicle_relic.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/object/mobile/dressed_stormtrooper_m.py b/scripts/object/mobile/dressed_stormtrooper_m.py index 6e1e28ee..f0b52957 100644 --- a/scripts/object/mobile/dressed_stormtrooper_m.py +++ b/scripts/object/mobile/dressed_stormtrooper_m.py @@ -7,7 +7,7 @@ def setup(core, object): lootGroupChance_1 = 90 object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) - lootPoolNames_2 = ['composite_armor','random_loot_rifles'] + lootPoolNames_2 = ['armor_various','random_loot_rifles'] lootPoolChances_2 = [50,50] lootGroupChance_2 = 20 object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) diff --git a/scripts/object/mobile/tusken_raider.py b/scripts/object/mobile/tusken_raider.py index 2d06ec85..0fcd5010 100644 --- a/scripts/object/mobile/tusken_raider.py +++ b/scripts/object/mobile/tusken_raider.py @@ -7,7 +7,7 @@ def setup(core, object): lootGroupChance_1 = 90 object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) - lootPoolNames_2 = ['batons','random_loot_rifles',] + lootPoolNames_2 = ['batons','random_loot_rifles'] lootPoolChances_2 = [60,40] lootGroupChance_2 = 20 object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) diff --git a/src/services/LootService.java b/src/services/LootService.java index 97d45a46..edc0f5c7 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -217,9 +217,13 @@ public class LootService implements INetworkDispatch { double randomItemFromGroup = new Random().nextDouble()*100; double remainder = 0; // [10,20,30,34,5,1] + double span = 100/lootPoolNames.length; for(int i=0;i Date: Thu, 1 May 2014 21:25:41 +0200 Subject: [PATCH 02/19] Random stat jewelry added, loot service further debugged Added stat jewelry --- scripts/loot/lootItems/junk/explosive_dud.py | 2 +- .../randomstatjewelry/random_stat_bracelet.py | 12 + .../randomstatjewelry/random_stat_necklace.py | 13 + .../randomstatjewelry/random_stat_ring.py | 9 + .../randomstatjewelry/randomstatjewelry.py | 0 .../lootItems/weapons/carbine/EE3_carbine.py | 0 .../{ => rifle}/adjusted_cdef_rifle.py | 0 .../lootItems/weapons/rifle/jawa_ion_rifle.py | 0 .../lootItems/weapons/rifle/spraystick.py | 0 scripts/loot/lootPools/random_stat_jewelry.py | 6 + .../object/mobile/dressed_stormtrooper_m.py | 6 + src/services/LootService.java | 262 +++++++++++++++++- 12 files changed, 295 insertions(+), 15 deletions(-) create mode 100644 scripts/loot/lootItems/randomstatjewelry/random_stat_bracelet.py create mode 100644 scripts/loot/lootItems/randomstatjewelry/random_stat_necklace.py create mode 100644 scripts/loot/lootItems/randomstatjewelry/random_stat_ring.py create mode 100644 scripts/loot/lootItems/randomstatjewelry/randomstatjewelry.py create mode 100644 scripts/loot/lootItems/weapons/carbine/EE3_carbine.py rename scripts/loot/lootItems/weapons/{ => rifle}/adjusted_cdef_rifle.py (100%) create mode 100644 scripts/loot/lootItems/weapons/rifle/jawa_ion_rifle.py create mode 100644 scripts/loot/lootItems/weapons/rifle/spraystick.py create mode 100644 scripts/loot/lootPools/random_stat_jewelry.py diff --git a/scripts/loot/lootItems/junk/explosive_dud.py b/scripts/loot/lootItems/junk/explosive_dud.py index 2d0291da..1fdcf7c3 100644 --- a/scripts/loot/lootItems/junk/explosive_dud.py +++ b/scripts/loot/lootItems/junk/explosive_dud.py @@ -1,7 +1,7 @@ def itemTemplate(): - return ['object/tangible/loot/npc_loot/shared_firework_dud_s1.iff'] + return ['object/tangible/loot/npc_loot/shared_firework_generic.iff'] def customItemName(): diff --git a/scripts/loot/lootItems/randomstatjewelry/random_stat_bracelet.py b/scripts/loot/lootItems/randomstatjewelry/random_stat_bracelet.py new file mode 100644 index 00000000..6576cc22 --- /dev/null +++ b/scripts/loot/lootItems/randomstatjewelry/random_stat_bracelet.py @@ -0,0 +1,12 @@ + +def itemTemplate(): + + bracelets = ['object/tangible/wearables/bracelet/shared_bracelet_s02_l.iff','object/tangible/wearables/bracelet/shared_bracelet_s02_r.iff'] + bracelets += ['object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff','object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff'] + bracelets += ['object/tangible/wearables/bracelet/shared_bracelet_s04_l.iff','object/tangible/wearables/bracelet/shared_bracelet_s04_r.iff'] + bracelets += ['object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff','object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff'] + bracelets += ['object/tangible/wearables/bracelet/shared_bracelet_s06_l.iff','object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff'] + return bracelets + +def randomStatJewelry(): + return diff --git a/scripts/loot/lootItems/randomstatjewelry/random_stat_necklace.py b/scripts/loot/lootItems/randomstatjewelry/random_stat_necklace.py new file mode 100644 index 00000000..947af23a --- /dev/null +++ b/scripts/loot/lootItems/randomstatjewelry/random_stat_necklace.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + necklaces = ['object/tangible/wearables/necklace/shared_necklace_s01.iff','object/tangible/wearables/necklace/shared_necklace_s02.iff'] + necklaces += ['object/tangible/wearables/necklace/shared_necklace_s03.iff','object/tangible/wearables/necklace/shared_necklace_s04.iff'] + necklaces += ['object/tangible/wearables/necklace/shared_necklace_s05.iff','object/tangible/wearables/necklace/shared_necklace_s06.iff'] + necklaces += ['object/tangible/wearables/necklace/shared_necklace_s07.iff','object/tangible/wearables/necklace/shared_necklace_s08.iff'] + necklaces += ['object/tangible/wearables/necklace/shared_necklace_s09.iff','object/tangible/wearables/necklace/shared_necklace_s10.iff'] + necklaces += ['object/tangible/wearables/necklace/shared_necklace_s11.iff','object/tangible/wearables/necklace/shared_necklace_s12.iff'] + return necklaces + +def randomStatJewelry(): + return 1 diff --git a/scripts/loot/lootItems/randomstatjewelry/random_stat_ring.py b/scripts/loot/lootItems/randomstatjewelry/random_stat_ring.py new file mode 100644 index 00000000..8f7d669b --- /dev/null +++ b/scripts/loot/lootItems/randomstatjewelry/random_stat_ring.py @@ -0,0 +1,9 @@ + +def itemTemplate(): + + rings = ['object/tangible/wearables/ring/shared_ring_s01.iff','object/tangible/wearables/ring/shared_ring_s02.iff'] + rings += ['object/tangible/wearables/ring/shared_ring_s03.iff','object/tangible/wearables/ring/shared_ring_s04.iff'] + return rings + +def randomStatJewelry(): + return diff --git a/scripts/loot/lootItems/randomstatjewelry/randomstatjewelry.py b/scripts/loot/lootItems/randomstatjewelry/randomstatjewelry.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/loot/lootItems/weapons/carbine/EE3_carbine.py b/scripts/loot/lootItems/weapons/carbine/EE3_carbine.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/loot/lootItems/weapons/adjusted_cdef_rifle.py b/scripts/loot/lootItems/weapons/rifle/adjusted_cdef_rifle.py similarity index 100% rename from scripts/loot/lootItems/weapons/adjusted_cdef_rifle.py rename to scripts/loot/lootItems/weapons/rifle/adjusted_cdef_rifle.py diff --git a/scripts/loot/lootItems/weapons/rifle/jawa_ion_rifle.py b/scripts/loot/lootItems/weapons/rifle/jawa_ion_rifle.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/loot/lootItems/weapons/rifle/spraystick.py b/scripts/loot/lootItems/weapons/rifle/spraystick.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/loot/lootPools/random_stat_jewelry.py b/scripts/loot/lootPools/random_stat_jewelry.py new file mode 100644 index 00000000..0e11105e --- /dev/null +++ b/scripts/loot/lootPools/random_stat_jewelry.py @@ -0,0 +1,6 @@ + +def itemNames(): + return ['random_stat_bracelet','random_stat_necklace','random_stat_ring'] + +def itemChances(): + return [50,35,15] #= 100% \ No newline at end of file diff --git a/scripts/object/mobile/dressed_stormtrooper_m.py b/scripts/object/mobile/dressed_stormtrooper_m.py index f0b52957..6b81cf5a 100644 --- a/scripts/object/mobile/dressed_stormtrooper_m.py +++ b/scripts/object/mobile/dressed_stormtrooper_m.py @@ -16,5 +16,11 @@ def setup(core, object): lootPoolChances_3 = [100] lootGroupChance_3 = 6 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + # just to test + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 100 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/src/services/LootService.java b/src/services/LootService.java index edc0f5c7..8e4f5aad 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -81,18 +81,25 @@ public class LootService implements INetworkDispatch { // security check if (hasAccess(requester,lootedObject) && ! lootedObject.isLooted()){ LootRollSession lootRollSession = (LootRollSession )lootedObject.getAttachment("LootSession"); - if (lootRollSession.getDroppedItems().size()==0) - return; + if (lootRollSession.getDroppedItems().size()==0){ + System.err.println("lootRollSession.getDroppedItems().size()==0"); + return; + } SWGObject lootedObjectInventory = lootedObject.getSlottedObject("inventory"); core.simulationService.openContainer(requester, lootedObjectInventory); setLooted(requester,lootedObject); } + System.err.println("NO ACCESS lootedObject.isLooted(): " + lootedObject.isLooted()); + System.err.println("NO ACCESS hasAccess(requester,lootedObject): " + hasAccess(requester,lootedObject)); } private boolean hasAccess(CreatureObject requester, TangibleObject lootedObject){ LootRollSession lootRollSession = (LootRollSession )lootedObject.getAttachment("LootSession"); + if (lootRollSession==null) + System.err.println("LootSession null: " + lootRollSession); if (lootRollSession!=null){ - if (lootRollSession.getRequester()==requester){ + if (lootRollSession.getRequester()==requester && lootedObject.isLooted()){ + System.err.println("lootRollSession.getRequester()==requester: " + (lootRollSession.getRequester()==requester)); return true; } } @@ -118,6 +125,7 @@ public class LootService implements INetworkDispatch { lootedObject.setLootLock(true); LootRollSession lootRollSession = new LootRollSession(requester,lootedObject); + lootedObject.setAttachment("LootSession", lootRollSession); // preliminarily register session already here handleCreditDrop(requester,lootedObject,lootRollSession); @@ -144,18 +152,18 @@ public class LootService implements INetworkDispatch { } // Rare Loot System Stage (Is in place for all looted creatures) - if (lootRollSession.isAllowRareLoot()){ - int randomRareLoot = new Random().nextInt(100); - int chanceRequirement = 1; - if (lootRollSession.isIncreasedRLSChance()) - chanceRequirement+=3; // RLS chance is at 4% for groupsize >= 4 - if (randomRareLoot <= chanceRequirement){ - handleRareLootChest(lootRollSession); - } - } +//if (lootRollSession.isAllowRareLoot()){ +// int randomRareLoot = new Random().nextInt(100); +// int chanceRequirement = 1; +// if (lootRollSession.isIncreasedRLSChance()) +// chanceRequirement+=3; // RLS chance is at 4% for groupsize >= 4 +// if (randomRareLoot <= chanceRequirement){ +// handleRareLootChest(lootRollSession); +// } +//} // set info above corpse - + System.out.println("lootedObject instanceof CreatureObject " + (lootedObject instanceof CreatureObject)); if (lootedObject instanceof CreatureObject){ float y = 0.5F; // 1.3356977F float qz= 1.06535322E9F; @@ -182,7 +190,7 @@ public class LootService implements INetworkDispatch { // For autoloot //SWGObject requesterInventory = requester.getSlottedObject("inventory"); - + System.out.println("lootRollSession.getDroppedItems() " + (lootRollSession.getDroppedItems())); for (TangibleObject droppedItem : lootRollSession.getDroppedItems()){ //droppedItem.setAttachment("radial_filename", "lootitem"); @@ -219,6 +227,8 @@ public class LootService implements INetworkDispatch { double remainder = 0; // [10,20,30,34,5,1] double span = 100/lootPoolNames.length; + boolean test = false; + for(int i=0;i70 && levelOfDrop<90 && difficultyLevel==1) + statNumber = 2; + + if (levelOfDrop>=90 && difficultyLevel==1) + statNumber = 2; + int statRoll = new Random().nextInt(100); + if (statRoll<30) + statNumber = 3; + + if (levelOfDrop>=90 && difficultyLevel>=2){ + statNumber = 2; + statRoll = new Random().nextInt(100); + if (statRoll<8) + statNumber = 4; + else if (statRoll<50) + statNumber = 3; + } + + int primaryAttribute = new Random().nextInt(6); // 0-6 + int maxValue = 25; + droppedItem.setIntAttribute(getAttributeSTF(primaryAttribute), getStatValue(maxValue)); + maxValue -= 2; //secondary attributes must have less maxValue + String prefix = getJewelryPrefix(droppedItem); + String suffix = getJewelrySuffix(primaryAttribute, statNumber); + String itemName = prefix + suffix; + Vector alreadyUsedStats = new Vector(); + alreadyUsedStats.add(primaryAttribute); + int attribute = primaryAttribute; + + + for (int i=0;i Date: Fri, 2 May 2014 01:18:50 +0200 Subject: [PATCH 03/19] Fixed some bugs --- .gitignore | 1 + src/resources/loot/LootRollSession.java | 11 +++++++++++ src/services/LootService.java | 18 ++++++++++-------- src/services/SimulationService.java | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ab30f143..0b643352 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,7 @@ odb/resourceroots/je.info.* odb/resources/je.info.* odb/auction/je.info.* odb/bounties/je.info.* +odb/swgobjects/je.info.* # External tool builders .externalToolBuilders/ diff --git a/src/resources/loot/LootRollSession.java b/src/resources/loot/LootRollSession.java index e79951fe..26a91e32 100644 --- a/src/resources/loot/LootRollSession.java +++ b/src/resources/loot/LootRollSession.java @@ -46,11 +46,13 @@ public class LootRollSession { private int sessionLootMode; private boolean allowRareLoot; private boolean increasedRLSChance; + private int lootedObjectLevel=0; public LootRollSession(){ } public LootRollSession(CreatureObject requester, TangibleObject lootedObject){ + long requesterGroupId = requester.getGroupId(); if (requesterGroupId>0){ this.playerGroup = (GroupObject) NGECore.getInstance().objectService.getObject(requesterGroupId); @@ -62,6 +64,7 @@ public class LootRollSession { if (lootedObject instanceof CreatureObject){ CreatureObject lootedCreature = (CreatureObject)lootedObject; + lootedObjectLevel = lootedCreature.getLevel(); // Exclude rare loot depending on creature level // For groups maybe average CL? if (requester.getLevel()-lootedCreature.getLevel()<=6){ @@ -160,4 +163,12 @@ public class LootRollSession { public void setRequester(CreatureObject requester) { this.requester = requester; } + + public int getLootedObjectLevel() { + return lootedObjectLevel; + } + + public void setLootedObjectLevel(int lootedObjectLevel) { + this.lootedObjectLevel = lootedObjectLevel; + } } diff --git a/src/services/LootService.java b/src/services/LootService.java index 8e4f5aad..ff6d7260 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -77,7 +77,7 @@ public class LootService implements INetworkDispatch { } public void handleLootRequest(CreatureObject requester, TangibleObject lootedObject) { - + System.out.println("handleLootRequest "); // security check if (hasAccess(requester,lootedObject) && ! lootedObject.isLooted()){ LootRollSession lootRollSession = (LootRollSession )lootedObject.getAttachment("LootSession"); @@ -98,7 +98,7 @@ public class LootService implements INetworkDispatch { if (lootRollSession==null) System.err.println("LootSession null: " + lootRollSession); if (lootRollSession!=null){ - if (lootRollSession.getRequester()==requester && lootedObject.isLooted()){ + if (lootRollSession.getRequester()==requester){ System.err.println("lootRollSession.getRequester()==requester: " + (lootRollSession.getRequester()==requester)); return true; } @@ -897,7 +897,7 @@ public class LootService implements INetworkDispatch { //determine number of stats #20 yt int statNumber = 1; - int levelOfDrop = 0; + int levelOfDrop = lootRollSession.getLootedObjectLevel(); int difficultyLevel = 1; if (levelOfDrop>70 && levelOfDrop<90 && difficultyLevel==1) @@ -919,9 +919,11 @@ public class LootService implements INetworkDispatch { } int primaryAttribute = new Random().nextInt(6); // 0-6 - int maxValue = 25; - droppedItem.setIntAttribute(getAttributeSTF(primaryAttribute), getStatValue(maxValue)); + int maxValue = (int) (levelOfDrop*25/90); + int minValue = (int) (0.75*maxValue); + droppedItem.setIntAttribute(getAttributeSTF(primaryAttribute), getStatValue(minValue,maxValue)); maxValue -= 2; //secondary attributes must have less maxValue + minValue = (int) (0.75*maxValue); String prefix = getJewelryPrefix(droppedItem); String suffix = getJewelrySuffix(primaryAttribute, statNumber); String itemName = prefix + suffix; @@ -934,7 +936,7 @@ public class LootService implements INetworkDispatch { while (alreadyUsedStats.contains(attribute)) { attribute = new Random().nextInt(6); if (! alreadyUsedStats.contains(attribute)){ - droppedItem.setIntAttribute(getAttributeSTF(attribute), getStatValue(maxValue)); + droppedItem.setIntAttribute(getAttributeSTF(attribute), getStatValue(minValue,maxValue)); alreadyUsedStats.add(attribute); } } @@ -942,8 +944,8 @@ public class LootService implements INetworkDispatch { return itemName; } - private int getStatValue(int maxValue){ - return 1 + new Random().nextInt(maxValue-1); + private int getStatValue(int minValue, int maxValue){ + return minValue + new Random().nextInt(maxValue-minValue); } diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 0b941eb6..75837210 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -1195,7 +1195,7 @@ public class SimulationService implements INetworkDispatch { float height = (float) (creature.getHeight()/* - 0.3*/); - if(creature.getPosture() == 2 || creature.getPosture() == 13) + if(creature.getPosture() == 2 || creature.getPosture() == 13 || creature.getPosture() == 14) height = 0.3f; else if(creature.getPosture() == 1) height /= 2.f; From 6404f3144713ebdd57fddde6d37f2d3aa70cce08 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Sat, 3 May 2014 15:11:35 -0400 Subject: [PATCH 04/19] Updated Force Cloak Tested and Works. --- scripts/buffs/invis_fs_buff_invis_1.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/buffs/invis_fs_buff_invis_1.py b/scripts/buffs/invis_fs_buff_invis_1.py index c60417a0..84ef0058 100644 --- a/scripts/buffs/invis_fs_buff_invis_1.py +++ b/scripts/buffs/invis_fs_buff_invis_1.py @@ -4,8 +4,12 @@ def setup(core, actor, buff): return def add(core, actor, buff): + actor.setInStealth(True) + actor.setRadarVisible(False) return def remove(core, actor, buff): + actor.setInStealth(False) + actor.setRadarVisible(True) return - \ No newline at end of file + From 43d1bd5ea4d0b882d5e6a987ec63dc714ccfeeee Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Sun, 4 May 2014 01:31:00 +0200 Subject: [PATCH 05/19] Attempts to fix loot bugs --- odb/swgobjects/placeholder.txt | 0 scripts/mobiles/canon/stormtrooper.py | 2 +- src/resources/loot/LootRollSession.java | 10 ++++ src/services/LootService.java | 74 +++++++++++++++++++------ src/services/SimulationService.java | 14 ++++- src/services/ai/AIActor.java | 3 +- src/services/ai/states/DeathState.java | 3 +- 7 files changed, 84 insertions(+), 22 deletions(-) create mode 100644 odb/swgobjects/placeholder.txt diff --git a/odb/swgobjects/placeholder.txt b/odb/swgobjects/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/scripts/mobiles/canon/stormtrooper.py b/scripts/mobiles/canon/stormtrooper.py index a7a49123..1dd8a67e 100644 --- a/scripts/mobiles/canon/stormtrooper.py +++ b/scripts/mobiles/canon/stormtrooper.py @@ -8,7 +8,7 @@ def addTemplate(core): mobileTemplate.setCreatureName('stormtrooper') mobileTemplate.setLevel(90) - mobileTemplate.setDifficulty(0) + mobileTemplate.setDifficulty(2) mobileTemplate.setAttackRange(24) mobileTemplate.setAttackSpeed(1.0) mobileTemplate.setWeaponType(0) diff --git a/src/resources/loot/LootRollSession.java b/src/resources/loot/LootRollSession.java index 26a91e32..d6f26ad4 100644 --- a/src/resources/loot/LootRollSession.java +++ b/src/resources/loot/LootRollSession.java @@ -47,6 +47,7 @@ public class LootRollSession { private boolean allowRareLoot; private boolean increasedRLSChance; private int lootedObjectLevel=0; + private int lootedObjectDifficulty=0; public LootRollSession(){ } @@ -65,6 +66,7 @@ public class LootRollSession { if (lootedObject instanceof CreatureObject){ CreatureObject lootedCreature = (CreatureObject)lootedObject; lootedObjectLevel = lootedCreature.getLevel(); + lootedObjectDifficulty = lootedCreature.getDifficulty(); // Exclude rare loot depending on creature level // For groups maybe average CL? if (requester.getLevel()-lootedCreature.getLevel()<=6){ @@ -171,4 +173,12 @@ public class LootRollSession { public void setLootedObjectLevel(int lootedObjectLevel) { this.lootedObjectLevel = lootedObjectLevel; } + + public int getLootedObjectDifficulty() { + return lootedObjectDifficulty; + } + + public void setLootedObjectDifficulty(int lootedObjectDifficulty) { + this.lootedObjectDifficulty = lootedObjectDifficulty; + } } diff --git a/src/services/LootService.java b/src/services/LootService.java index ff6d7260..1c2dfb22 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -87,6 +87,8 @@ public class LootService implements INetworkDispatch { } SWGObject lootedObjectInventory = lootedObject.getSlottedObject("inventory"); core.simulationService.openContainer(requester, lootedObjectInventory); + System.err.println("core.simulationService.openContainer " + lootedObject.getTemplate() ); + System.err.println("core.simulationService.openContainer " + lootedObjectInventory.getTemplate()); setLooted(requester,lootedObject); } System.err.println("NO ACCESS lootedObject.isLooted(): " + lootedObject.isLooted()); @@ -898,32 +900,70 @@ public class LootService implements INetworkDispatch { //determine number of stats #20 yt int statNumber = 1; int levelOfDrop = lootRollSession.getLootedObjectLevel(); - int difficultyLevel = 1; + int difficultyLevel = lootRollSession.getLootedObjectDifficulty(); // better for calculation + //difficultyLevel++; // better for calculation - if (levelOfDrop>70 && levelOfDrop<90 && difficultyLevel==1) - statNumber = 2; +// if (levelOfDrop>70 && levelOfDrop<90 && difficultyLevel==1) +// statNumber = 2; +// +// if (levelOfDrop>=90 && difficultyLevel==1) +// statNumber = 2; +// int statRoll = new Random().nextInt(100); +// if (statRoll<30) +// statNumber = 3; +// +// if (levelOfDrop>=90 && difficultyLevel>=2){ +// statNumber = 2; +// statRoll = new Random().nextInt(100); +// if (statRoll<8) +// statNumber = 4; +// else if (statRoll<50) +// statNumber = 3; +// } + + int statRoll = new Random().nextInt(100); + int difficultyBonus = 0; + + // stage 1 + if (difficultyLevel==1) + difficultyBonus = 60; + if (difficultyLevel>=2) + difficultyBonus = 75; + + if (statRoll<20+difficultyBonus) // diff 3 95% diff 2 70 diff1 20 + statNumber++; + + // stage 2 + difficultyBonus = 0; + if (difficultyLevel==1) + difficultyBonus = 20; + if (difficultyLevel>=2) + difficultyBonus = 60; + + if (statRoll<10+difficultyBonus) // diff 3 70% diff 2 30 diff1 10 + statNumber++; + + // stage 3 + difficultyBonus = 0; + if (difficultyLevel==1) + difficultyBonus = 3; + if (difficultyLevel>=2) + difficultyBonus = 5; + + if (statRoll<1+difficultyBonus) + statNumber++; - if (levelOfDrop>=90 && difficultyLevel==1) - statNumber = 2; - int statRoll = new Random().nextInt(100); - if (statRoll<30) - statNumber = 3; - - if (levelOfDrop>=90 && difficultyLevel>=2){ - statNumber = 2; - statRoll = new Random().nextInt(100); - if (statRoll<8) - statNumber = 4; - else if (statRoll<50) - statNumber = 3; - } int primaryAttribute = new Random().nextInt(6); // 0-6 int maxValue = (int) (levelOfDrop*25/90); int minValue = (int) (0.75*maxValue); + minValue = Math.max(1, minValue); + maxValue = Math.max(2, maxValue); droppedItem.setIntAttribute(getAttributeSTF(primaryAttribute), getStatValue(minValue,maxValue)); maxValue -= 2; //secondary attributes must have less maxValue minValue = (int) (0.75*maxValue); + minValue = Math.max(1, minValue); + maxValue = Math.max(2, maxValue); String prefix = getJewelryPrefix(droppedItem); String suffix = getJewelrySuffix(primaryAttribute, statNumber); String itemName = prefix + suffix; diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 75837210..29f352cf 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -916,9 +916,15 @@ public class SimulationService implements INetworkDispatch { if(container.getPermissions().canView(requester, container)) { OpenedContainerMessage opm = new OpenedContainerMessage(container.getObjectID()); + if (!(container instanceof CreatureObject)) + System.out.println("(!(container instanceof CreatureObject)"); + + if(requester.getClient() != null && requester.getClient().getSession() != null && !(container instanceof CreatureObject)) requester.getClient().getSession().write(opm.serialize()); - } + else + System.out.println("NOT SENT"); + } else {System.out.println("NO VIEW PERMISSION");} } @@ -983,6 +989,10 @@ public class SimulationService implements INetworkDispatch { float heightOrigin = 1.f; float heightDirection = 1.f; + if (obj2.getTemplate().equals("object/tangible/inventory/shared_character_inventory.iff")){ + obj2 = obj2.getContainer(); // LOS message fix on corpse + } + if(obj1 instanceof CreatureObject) heightOrigin = getHeightOrigin((CreatureObject) obj1); @@ -1196,7 +1206,7 @@ public class SimulationService implements INetworkDispatch { float height = (float) (creature.getHeight()/* - 0.3*/); if(creature.getPosture() == 2 || creature.getPosture() == 13 || creature.getPosture() == 14) - height = 0.3f; + height = 0.45f; else if(creature.getPosture() == 1) height /= 2.f; diff --git a/src/services/ai/AIActor.java b/src/services/ai/AIActor.java index c34ed1fc..30eb11bc 100644 --- a/src/services/ai/AIActor.java +++ b/src/services/ai/AIActor.java @@ -229,7 +229,8 @@ public class AIActor { } public void doStateAction(byte result) { - + CreatureObject creature = this.getCreature(); + System.out.println("AI creature.getPosture() " + creature.getPosture() + " result " + result + " getCurrentState " + getCurrentState().getClass().getName()); switch(result) { case StateResult.DEAD: diff --git a/src/services/ai/states/DeathState.java b/src/services/ai/states/DeathState.java index 3e9ea1a0..c4419ff6 100644 --- a/src/services/ai/states/DeathState.java +++ b/src/services/ai/states/DeathState.java @@ -32,7 +32,8 @@ public class DeathState extends AIState { public byte onEnter(AIActor actor) { NGECore.getInstance().aiService.awardExperience(actor); actor.getCreature().setAttachment("radial_filename", "npc/corpse"); - NGECore.getInstance().lootService.DropLoot((CreatureObject)(actor.getCreature().getKiller()),(TangibleObject)(actor.getCreature())); + System.out.println("DEATH STATE!!!!"); + NGECore.getInstance().lootService.DropLoot((CreatureObject)(actor.getCreature().getKiller()),(TangibleObject)(actor.getCreature())); actor.scheduleDespawn(); return 0; } From fabeaed919e91ebb77de5cebf14eb148676b8f01 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Sun, 4 May 2014 23:06:27 +0200 Subject: [PATCH 06/19] Armor loot fix, stat loot fix fixed numeric errors Loot client command response coded --- .gitignore | 446 +++++++++--------- ...lOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat | 20 +- scripts/commands/loot.py | 14 + scripts/mobiles/canon/stormtrooper.py | 2 +- .../dressed_dark_force_crystal_hunter.py | 11 +- .../dressed_dark_jedi_elder_male_human_01.py | 29 +- .../dressed_dark_jedi_female_human_01.py | 29 +- .../dressed_dark_jedi_female_human_02.py | 29 +- .../dressed_dark_jedi_female_human_03.py | 29 +- .../dressed_dark_jedi_female_human_04.py | 29 +- .../dressed_dark_jedi_female_marauder_01.py | 29 +- .../mobile/dressed_dark_jedi_female_twk_01.py | 29 +- .../mobile/dressed_dark_jedi_female_twk_02.py | 29 +- .../mobile/dressed_dark_jedi_female_twk_03.py | 29 +- .../mobile/dressed_dark_jedi_female_zab_01.py | 29 +- .../mobile/dressed_dark_jedi_female_zab_02.py | 29 +- .../mobile/dressed_dark_jedi_female_zab_03.py | 29 +- .../dressed_dark_jedi_human_female_01.py | 29 +- .../mobile/dressed_dark_jedi_human_male_01.py | 29 +- .../mobile/dressed_dark_jedi_male_human_01.py | 29 +- .../mobile/dressed_dark_jedi_male_human_02.py | 29 +- .../mobile/dressed_dark_jedi_male_human_03.py | 29 +- .../mobile/dressed_dark_jedi_male_human_04.py | 29 +- .../mobile/dressed_dark_jedi_male_human_05.py | 29 +- .../mobile/dressed_dark_jedi_male_human_06.py | 29 +- .../dressed_dark_jedi_male_marauder_01.py | 29 +- .../mobile/dressed_dark_jedi_male_twk_01.py | 29 +- .../mobile/dressed_dark_jedi_male_twk_02.py | 29 +- .../mobile/dressed_dark_jedi_male_twk_03.py | 29 +- .../mobile/dressed_dark_jedi_male_zab_01.py | 29 +- .../mobile/dressed_dark_jedi_male_zab_02.py | 29 +- .../mobile/dressed_dark_jedi_male_zab_03.py | 29 +- ...dressed_dark_jedi_master_female_bith_01.py | 24 +- ...essed_dark_jedi_master_female_bothan_01.py | 24 +- ...ressed_dark_jedi_master_female_chiss_01.py | 24 +- ...ressed_dark_jedi_master_female_chiss_02.py | 24 +- .../dressed_dark_jedi_master_female_twk_01.py | 4 + .../dressed_dark_jedi_master_female_twk_02.py | 4 + .../dressed_dark_jedi_master_female_zab_01.py | 4 + .../dressed_dark_jedi_master_female_zab_02.py | 4 + ...dressed_dark_jedi_master_male_arcona_01.py | 24 +- ...dressed_dark_jedi_master_male_barada_01.py | 24 +- .../dressed_dark_jedi_master_male_gotal_01.py | 24 +- .../dressed_dark_jedi_master_male_human_01.py | 4 + .../dressed_dark_jedi_master_male_human_02.py | 4 + .../dressed_dark_jedi_master_male_human_03.py | 4 + .../dressed_dark_jedi_master_male_human_04.py | 4 + .../dressed_dark_jedi_master_male_human_05.py | 4 + .../dressed_dark_jedi_master_male_human_06.py | 4 + .../dressed_dark_jedi_master_male_sul_01.py | 24 +- .../dressed_dark_jedi_master_male_twk_01.py | 24 +- .../dressed_dark_jedi_master_male_twk_02.py | 24 +- .../dressed_dark_jedi_master_male_twk_03.py | 24 +- .../dressed_dark_jedi_master_male_twk_04.py | 24 +- ...ressed_dark_jedi_master_male_weequay_01.py | 24 +- .../dressed_dark_jedi_master_male_zab_01.py | 24 +- .../dressed_dark_jedi_master_male_zab_02.py | 24 +- .../dressed_force_sensitive_crypt_crawler.py | 11 +- .../dressed_force_sensitive_renegade.py | 11 +- .../mobile/dressed_novice_force_mystic.py | 11 +- .../object/mobile/dressed_stormtrooper_m.py | 6 +- ...essed_untrained_wielder_of_the_darkside.py | 11 +- scripts/radial/npc/corpse.py | 2 + src/services/LootService.java | 105 +++-- src/services/SimulationService.java | 12 +- src/services/ai/AIActor.java | 3 +- src/services/ai/states/DeathState.java | 7 +- src/services/sui/SUIService.java | 15 +- 68 files changed, 1523 insertions(+), 347 deletions(-) create mode 100644 scripts/commands/loot.py diff --git a/.gitignore b/.gitignore index 8c1860c6..f80b1387 100644 --- a/.gitignore +++ b/.gitignore @@ -1,225 +1,221 @@ -################# -## Eclipse -################# - -*.pydevproject -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.pkc -*.swp -*~.nib -local.properties -.settings/ -.loadpath -*.ltn -*.pln -*.lsb -pt_sword_glint -*.lod -*.msh -*.mesh -*.iff -*.pob -*.ws -*.trn -*.tga -*.lmg -*.sat -*.lay -*.flr -*.apt -*.prt -*.cfg -*.spr -*.swh -*.jdb -*.lck -*.mgn -*.0 -cachedir/ -appearance/ -clientdata/ -*.class - -# SWG Client Folders -footprint/ -interiorlayout/ -clientdata/quest/ - -# PSWG Object Databases -odb/building/je.info.* -odb/creature/je.info.* -odb/doids/je.info.* -odb/guild/je.info.* -odb/mails/je.info.* -odb/oids/je.info.* -odb/chatRooms/je.info.* -odb/resourcehistory/je.info.* -odb/resourceroots/je.info.* -odb/resources/je.info.* -<<<<<<< HEAD -odb/auction/je.info.* -odb/swgobjects/je.info.* -======= -odb/auction/je.info.* -odb/bounties/je.info.* -<<<<<<< HEAD -odb/swgobjects/je.info.* -======= ->>>>>>> 12ca3ae66170fcfe09d848a7eea529041b9af5ad ->>>>>>> origin/master - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.vspscc -.builds -*.dotCover - -## TODO: If you have NuGet Package Restore enabled, uncomment this -#packages/ - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Others -[Bb]in -[Oo]bj -sql -TestResults -*.Cache -ClientBin -stylecop.* -~$* -*.dbmdl -Generated_Code #added for RIA/Silverlight projects - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML - - - -############ -## Windows -############ - -# Windows image file caches -Thumbs.db - -# Folder config file -Desktop.ini - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -# Mac crap -.DS_Store - - -############# -## PyCharm -############# -.idea +################# +## Eclipse +################# + +*.pydevproject +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.pkc +*.swp +*~.nib +local.properties +.settings/ +.loadpath +*.ltn +*.pln +*.lsb +pt_sword_glint +*.lod +*.msh +*.mesh +*.iff +*.pob +*.ws +*.trn +*.tga +*.lmg +*.sat +*.lay +*.flr +*.apt +*.prt +*.cfg +*.spr +*.swh +*.jdb +*.lck +*.mgn +*.0 +cachedir/ +appearance/ +clientdata/ +*.class + +# SWG Client Folders +footprint/ +interiorlayout/ +clientdata/quest/ + +# PSWG Object Databases +odb/building/je.info.* +odb/creature/je.info.* +odb/doids/je.info.* +odb/guild/je.info.* +odb/mails/je.info.* +odb/oids/je.info.* +odb/chatRooms/je.info.* +odb/resourcehistory/je.info.* +odb/resourceroots/je.info.* +odb/resources/je.info.* +<<<<<<< HEAD +odb/auction/je.info.* +odb/swgobjects/je.info.* +======= +odb/auction/je.info.* +odb/bounties/je.info.* +>>>>>>> 12ca3ae66170fcfe09d848a7eea529041b9af5ad + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results +[Dd]ebug/ +[Rr]elease/ +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.vspscc +.builds +*.dotCover + +## TODO: If you have NuGet Package Restore enabled, uncomment this +#packages/ + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf + +# Visual Studio profiler +*.psess +*.vsp + +# ReSharper is a .NET coding add-in +_ReSharper* + +# Installshield output folder +[Ee]xpress + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish + +# Others +[Bb]in +[Oo]bj +sql +TestResults +*.Cache +ClientBin +stylecop.* +~$* +*.dbmdl +Generated_Code #added for RIA/Silverlight projects + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML + + + +############ +## Windows +############ + +# Windows image file caches +Thumbs.db + +# Folder config file +Desktop.ini + + +############# +## Python +############# + +*.py[co] + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg + +# Mac crap +.DS_Store + + +############# +## PyCharm +############# +.idea diff --git a/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat b/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat index ebbd9e09..6fa1c55b 100644 --- a/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat +++ b/odb/WipeAllOdbFolders_ONLY_EXECUTE_IN_ODB_FOLDER.bat @@ -7,6 +7,23 @@ cls setlocal EnableDelayedExpansion +for %%* in (.) do set CurrDirName=%%~n* + +if "%CurrDirName%" == "eclipse" ( + echo You are running this script from inside Eclipse ^^! + echo You must execute it via windows in the odb folder ONLY ^^! + echo Terminating for your own data safety. + pause + EXIT +) + +if NOT "%CurrDirName%" == "odb" ( + echo You are not executing this file from the odb folder^^! + echo Terminating for your own data safety. + pause + EXIT +) + set /a count=0 for /d %%d in (*) do ( @@ -15,5 +32,4 @@ for /d %%d in (*) do ( del "%%d\*.*" /s/q echo. 2>%%d\placeholder.txt ) -setlocal DisableDelayedExpansion - +setlocal DisableDelayedExpansion \ No newline at end of file diff --git a/scripts/commands/loot.py b/scripts/commands/loot.py new file mode 100644 index 00000000..19ae81f3 --- /dev/null +++ b/scripts/commands/loot.py @@ -0,0 +1,14 @@ +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + + if not target: + return + + #actor.sendSystemMessage('LOOT SCRIPT COMMAND', 0) + core.lootService.handleLootRequest(actor,target) + return + \ No newline at end of file diff --git a/scripts/mobiles/canon/stormtrooper.py b/scripts/mobiles/canon/stormtrooper.py index 1dd8a67e..a7a49123 100644 --- a/scripts/mobiles/canon/stormtrooper.py +++ b/scripts/mobiles/canon/stormtrooper.py @@ -8,7 +8,7 @@ def addTemplate(core): mobileTemplate.setCreatureName('stormtrooper') mobileTemplate.setLevel(90) - mobileTemplate.setDifficulty(2) + mobileTemplate.setDifficulty(0) mobileTemplate.setAttackRange(24) mobileTemplate.setAttackSpeed(1.0) mobileTemplate.setWeaponType(0) diff --git a/scripts/object/mobile/dressed_dark_force_crystal_hunter.py b/scripts/object/mobile/dressed_dark_force_crystal_hunter.py index dbbb65df..c7237ff3 100644 --- a/scripts/object/mobile/dressed_dark_force_crystal_hunter.py +++ b/scripts/object/mobile/dressed_dark_force_crystal_hunter.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['sithholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py b/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_elder_male_human_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_01.py b/scripts/object/mobile/dressed_dark_jedi_female_human_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_02.py b/scripts/object/mobile/dressed_dark_jedi_female_human_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_03.py b/scripts/object/mobile/dressed_dark_jedi_female_human_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_human_04.py b/scripts/object/mobile/dressed_dark_jedi_female_human_04.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_human_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_human_04.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py b/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_marauder_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_twk_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_twk_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py b/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_twk_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_zab_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_zab_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py b/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_female_zab_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_human_female_01.py b/scripts/object/mobile/dressed_dark_jedi_human_female_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_human_female_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_human_female_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_human_male_01.py b/scripts/object/mobile/dressed_dark_jedi_human_male_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_human_male_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_human_male_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_01.py b/scripts/object/mobile/dressed_dark_jedi_male_human_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_02.py b/scripts/object/mobile/dressed_dark_jedi_male_human_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_03.py b/scripts/object/mobile/dressed_dark_jedi_male_human_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_04.py b/scripts/object/mobile/dressed_dark_jedi_male_human_04.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_04.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_05.py b/scripts/object/mobile/dressed_dark_jedi_male_human_05.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_05.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_05.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_human_06.py b/scripts/object/mobile/dressed_dark_jedi_male_human_06.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_human_06.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_human_06.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py b/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_marauder_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_twk_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_twk_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py b/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_twk_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_zab_01.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_zab_02.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py b/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py index ccad8904..be97678c 100644 --- a/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_male_zab_03.py @@ -1,4 +1,31 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_bith_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_bothan_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_chiss_02.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_01.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_twk_02.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_01.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_female_zab_02.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_arcona_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_barada_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_gotal_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_01.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_02.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_03.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_04.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_05.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py b/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py index 9e598690..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_human_06.py @@ -17,6 +17,10 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_sul_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_02.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_03.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_twk_04.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_weequay_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_01.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py index ccad8904..dba8fbeb 100644 --- a/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py +++ b/scripts/object/mobile/dressed_dark_jedi_master_male_zab_02.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + + lootPoolNames_1 = ['Junk'] + lootPoolChances_1 = [100] + lootGroupChance_1 = 65 + object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) + + lootPoolNames_2 = ['jedi_relic_1'] + lootPoolChances_2 = [100] + lootGroupChance_2 = 85 + object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) + + lootPoolNames_3 = ['powercrystals_hiq'] + lootPoolChances_3 = [100] + lootGroupChance_3 = 12 + object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) + + lootPoolNames_4 = ['random_stat_jewelry'] + lootPoolChances_4 = [100] + lootGroupChance_4 = 8 + object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + + + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py b/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py index 2c42c975..a96bd6e6 100644 --- a/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py +++ b/scripts/object/mobile/dressed_force_sensitive_crypt_crawler.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['jediholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['jediholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_force_sensitive_renegade.py b/scripts/object/mobile/dressed_force_sensitive_renegade.py index 2c42c975..a96bd6e6 100644 --- a/scripts/object/mobile/dressed_force_sensitive_renegade.py +++ b/scripts/object/mobile/dressed_force_sensitive_renegade.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['jediholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['jediholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_novice_force_mystic.py b/scripts/object/mobile/dressed_novice_force_mystic.py index 2c42c975..a96bd6e6 100644 --- a/scripts/object/mobile/dressed_novice_force_mystic.py +++ b/scripts/object/mobile/dressed_novice_force_mystic.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['jediholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['jediholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_stormtrooper_m.py b/scripts/object/mobile/dressed_stormtrooper_m.py index 6b81cf5a..e972026a 100644 --- a/scripts/object/mobile/dressed_stormtrooper_m.py +++ b/scripts/object/mobile/dressed_stormtrooper_m.py @@ -8,8 +8,8 @@ def setup(core, object): object.addToLootGroups(lootPoolNames_1,lootPoolChances_1,lootGroupChance_1) lootPoolNames_2 = ['armor_various','random_loot_rifles'] - lootPoolChances_2 = [50,50] - lootGroupChance_2 = 20 + lootPoolChances_2 = [99,1] + lootGroupChance_2 = 100 object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) lootPoolNames_3 = ['Colorcrystals'] @@ -20,7 +20,7 @@ def setup(core, object): # just to test lootPoolNames_4 = ['random_stat_jewelry'] lootPoolChances_4 = [100] - lootGroupChance_4 = 100 + lootGroupChance_4 = 10 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py b/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py index dbbb65df..c7237ff3 100644 --- a/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py +++ b/scripts/object/mobile/dressed_untrained_wielder_of_the_darkside.py @@ -17,11 +17,16 @@ def setup(core, object): lootGroupChance_3 = 12 object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3) - lootPoolNames_4 = ['sithholocrons'] - lootPoolChances_4 = [100] - lootGroupChance_4 = 1 + lootPoolNames_4 = ['armor_various','random_loot_rifles'] + lootPoolChances_4 = [80,20] + lootGroupChance_4 = 35 object.addToLootGroups(lootPoolNames_4,lootPoolChances_4,lootGroupChance_4) + lootPoolNames_5 = ['sithholocrons'] + lootPoolChances_5 = [100] + lootGroupChance_5 = 1 + object.addToLootGroups(lootPoolNames_5,lootPoolChances_5,lootGroupChance_5) + return \ No newline at end of file diff --git a/scripts/radial/npc/corpse.py b/scripts/radial/npc/corpse.py index dc93d74a..4f8093d5 100644 --- a/scripts/radial/npc/corpse.py +++ b/scripts/radial/npc/corpse.py @@ -2,12 +2,14 @@ from resources.common import RadialOptions import sys def createRadial(core, owner, target, radials): + #owner.sendSystemMessage('Correct Loot Radial created', 0) radials.clear() radials.add(RadialOptions(0, 36, 0, 'Loot')) return def handleSelection(core, owner, target, option): + #owner.sendSystemMessage('Correct Loot Radial called', 0) if option == 36 and target: #core.lootService.handleLootRequest(owner,target) core.lootService.handleLootRequest(owner,target) diff --git a/src/services/LootService.java b/src/services/LootService.java index 1c2dfb22..a23d367b 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -25,9 +25,14 @@ import java.io.File; import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.DirectoryStream.Filter; +import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.FileVisitor; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -36,6 +41,8 @@ import java.util.Map; import java.util.Random; import java.util.Vector; +import org.apache.commons.lang3.ArrayUtils; + import protocol.swg.PlayClientEffectObjectTransformMessage; import resources.loot.LootGroup; import resources.loot.LootRollSession; @@ -87,12 +94,8 @@ public class LootService implements INetworkDispatch { } SWGObject lootedObjectInventory = lootedObject.getSlottedObject("inventory"); core.simulationService.openContainer(requester, lootedObjectInventory); - System.err.println("core.simulationService.openContainer " + lootedObject.getTemplate() ); - System.err.println("core.simulationService.openContainer " + lootedObjectInventory.getTemplate()); setLooted(requester,lootedObject); } - System.err.println("NO ACCESS lootedObject.isLooted(): " + lootedObject.isLooted()); - System.err.println("NO ACCESS hasAccess(requester,lootedObject): " + hasAccess(requester,lootedObject)); } private boolean hasAccess(CreatureObject requester, TangibleObject lootedObject){ @@ -101,7 +104,6 @@ public class LootService implements INetworkDispatch { System.err.println("LootSession null: " + lootRollSession); if (lootRollSession!=null){ if (lootRollSession.getRequester()==requester){ - System.err.println("lootRollSession.getRequester()==requester: " + (lootRollSession.getRequester()==requester)); return true; } } @@ -151,7 +153,9 @@ public class LootService implements INetworkDispatch { System.out.println("this lootGroup will drop something"); handleLootGroup(lootGroup,lootRollSession); //this lootGroup will drop something e.g. {kraytpearl_range,krayt_tissue_rare} } + System.out.println("While Loop Stuck check"); } + System.out.println("Past while "); // Rare Loot System Stage (Is in place for all looted creatures) //if (lootRollSession.isAllowRareLoot()){ @@ -256,9 +260,9 @@ public class LootService implements INetworkDispatch { Vector itemChances = (Vector)core.scriptService.fetchDoubleVector(path,"itemChances"); double randomItemFromPool = new Random().nextDouble()*100; - int remainder = 0; // [10,20,30,34,5,1] - double span = 100/itemNames.size(); - + double remainder = 0.0; // [10,20,30,34,5,1] + double span = 100.0/(double)itemNames.size(); + for (int i=0;i subfolders = new ArrayList(); // Consider all sub-folders - try (DirectoryStream ds = Files.newDirectoryStream(FileSystems.getDefault().getPath("scripts/loot/lootItems/"), new DirectoriesFilter())) { - for (Path p : ds) { - subfolders.add(p.getFileName().toString()); - } - } catch (IOException e) { - lootRollSession.addErrorMessage("File system check caused an error. Please contact Charon about this issue."); - return; - } - - String itemPath = "scripts/loot/lootItems/"+itemName.toLowerCase()+".py"; - File file = new File(itemPath); - if (!file.isFile()){ - for (String subfolderName : subfolders){ - itemPath = "scripts/loot/lootItems/"+ subfolderName +"/"+itemName.toLowerCase()+".py"; - File subfile = new File(itemPath); - if (subfile.isFile()) - break; - } + + final Vector foundPath = new Vector(); + Path p = Paths.get("scripts/loot/lootItems/"); + FileVisitor fv = new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + String actualFileName = file.getFileName().toString(); + actualFileName = actualFileName.substring(0, actualFileName.length()-3); + if (actualFileName.equals(itemName.toLowerCase())){ + foundPath.add(file.toString()); + } + return FileVisitResult.CONTINUE; + } + }; + try { + Files.walkFileTree(p, fv); + } catch (IOException e) { + e.printStackTrace(); } - - File checkfile = new File(itemPath); - if (!checkfile.isFile()){ + + + if (foundPath.size()==0){ String errorMessage = "Loot item '" + itemName + "' not found in file system. Please contact Charon about this issue."; lootRollSession.addErrorMessage(errorMessage); return; - } + + } + String itemPath = foundPath.get(0); itemPath = itemPath.substring(0, itemPath.length()-3); // remove the file type @@ -358,7 +363,7 @@ public class LootService implements INetworkDispatch { if(core.scriptService.getMethod(itemPath,"","itemStats")!=null) itemStats = (Vector)core.scriptService.fetchStringVector(itemPath,"itemStats"); - if(core.scriptService.getMethod(itemPath,"","itemStats")!=null) + if(core.scriptService.getMethod(itemPath,"","itemSkillMods")!=null) itemSkillMods = (Vector)core.scriptService.fetchStringVector(itemPath,"itemSkillMods"); if(core.scriptService.getMethod(itemPath,"","biolink")!=null) @@ -448,7 +453,7 @@ public class LootService implements INetworkDispatch { lootRollSession.addDroppedItem(droppedItem); - System.err.println("END REACHED"); + System.out.println("END REACHED"); } private void handleCustomDropName(TangibleObject droppedItem,String customName) { @@ -954,7 +959,7 @@ public class LootService implements INetworkDispatch { statNumber++; - int primaryAttribute = new Random().nextInt(6); // 0-6 + int primaryAttribute = new Random().nextInt(7); // 0-6 int maxValue = (int) (levelOfDrop*25/90); int minValue = (int) (0.75*maxValue); minValue = Math.max(1, minValue); @@ -972,15 +977,27 @@ public class LootService implements INetworkDispatch { int attribute = primaryAttribute; +// for (int i=0;i statList = new ArrayList(); + for (int i=0;i<7;i++) + statList.add(i); + statList.remove(primaryAttribute); + for (int i=0;i()); + NGECore.getInstance().lootService.DropLoot((CreatureObject)(actor.getCreature().getKiller()),(TangibleObject)(actor.getCreature())); actor.scheduleDespawn(); return 0; } diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index 309577cc..7be91518 100644 --- a/src/services/sui/SUIService.java +++ b/src/services/sui/SUIService.java @@ -77,7 +77,7 @@ public class SUIService implements INetworkDispatch { ObjectMenuRequest request = new ObjectMenuRequest(); request.deserialize(data); - + SWGObject target = core.objectService.getObject(request.getTargetId()); SWGObject owner = core.objectService.getObject(request.getCharacterId()); @@ -107,6 +107,7 @@ public class SUIService implements INetworkDispatch { } if (target instanceof CreatureObject){ + //System.out.println("SUI target is creatureobject"); CreatureObject creature = (CreatureObject) target; if (!creature.isPlayer() && creature.isLootLock()){ LootRollSession lootRollSession = (LootRollSession )creature.getAttachment("LootSession"); @@ -114,12 +115,22 @@ public class SUIService implements INetworkDispatch { if (lootRollSession.getRequester()!=owner){ // ToDo: RADIALS MUST BE DISABLED HERE FOR THE CORPSE, BUT HOW? - core.scriptService.callScript("scripts/radial/", "npc/noloot", "createRadial", core, owner, target, request.getRadialOptions()); + target.setAttachment("radial_filename", "npc/noloot"); + core.scriptService.callScript("scripts/radial/npc/noloot", "", "createRadial", core, owner, target, request.getRadialOptions()); sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); return; + } else { + // Note: Bugged NPC corpses never make it through here, they are not sent from client at all it seems + target.setAttachment("radial_filename", "npc/corpse"); + core.scriptService.callScript("scripts/radial/npc/corpse", "", "createRadial", core, owner, target, request.getRadialOptions()); + sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); + //((CreatureObject)owner).sendSystemMessage("Radial set from suiservice", (byte)0); + return; } } } + } else { + //System.out.println("SUI target is NOT creatureobject " + target.getTemplate()); } if(target.getGrandparent() != null && target.getGrandparent().getAttachment("structureAdmins") != null) From 6a01095e3ce590ff4a0c5ebfb51db6d6cb07ad25 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Sun, 4 May 2014 17:51:01 -0400 Subject: [PATCH 07/19] Rifle is Temporarily Removed Until Rifle Bug is Fixed --- src/services/DevService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/DevService.java b/src/services/DevService.java index 5f99911c..3a8d08ea 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -257,7 +257,7 @@ public class DevService implements INetworkDispatch { rifle1.setMaxDamage(1250); rifle1.setWeaponType(WeaponType.RIFLE); - inventory.add(rifle1); + // inventory.add(rifle1); WeaponObject carbine1 = (WeaponObject) core.objectService.createObject("object/weapon/ranged/carbine/shared_carbine_cdef.iff", planet); carbine1.setIntAttribute("required_combat_level", 90); From a5ee3ff2b4fc2ca2b58f0f8154e2d6b9a248a96e Mon Sep 17 00:00:00 2001 From: Treeku Date: Sun, 4 May 2014 23:22:15 +0100 Subject: [PATCH 08/19] StaticService can now use mobileTemplates Just put a mobileTemplate in place of the objectTemplate. --- .../objects/creature/CreatureObject.java | 9 -------- .../objects/tangible/TangibleObject.java | 1 - src/services/StaticService.java | 21 +++++++------------ src/services/spawn/SpawnService.java | 8 +++++-- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index b1191fea..eed37aa2 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -172,7 +172,6 @@ public class CreatureObject extends TangibleObject implements Serializable { @NotPersistent private transient ScheduledFuture spectatorTask; - private boolean staticNPC = false; // temp @NotPersistent private transient int flourishCount = 0; @NotPersistent @@ -1488,14 +1487,6 @@ public class CreatureObject extends TangibleObject implements Serializable { getClient().getSession().write(new PlayMusicMessage(sndFile, targetId, 1, false)); } - public boolean getStaticNPC() { - return staticNPC; - } - - public boolean setStaticNPC(boolean staticNPC) { - return this.staticNPC = staticNPC; - } - public boolean getGroupDance() { synchronized(objectMutex) { return groupDance; diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index 5b2e9ad9..48c84449 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -101,7 +101,6 @@ public class TangibleObject extends SWGObject implements Serializable { private byte junkType = -1; private int junkDealerPrice = 0; - private String serialNumber; @NotPersistent diff --git a/src/services/StaticService.java b/src/services/StaticService.java index 9ccaf996..f7631ecc 100644 --- a/src/services/StaticService.java +++ b/src/services/StaticService.java @@ -36,8 +36,6 @@ import java.util.Map; import resources.common.FileUtilities; import resources.objects.building.BuildingObject; import resources.objects.cell.CellObject; -import resources.objects.creature.CreatureObject; -import resources.objects.tangible.TangibleObject; import main.NGECore; import engine.clientdata.ClientFileManager; import engine.clientdata.visitors.PortalVisitor; @@ -57,13 +55,6 @@ public class StaticService implements INetworkDispatch { } public void spawnStatics() { - for (SWGObject object : core.objectService.getObjectList().values()) { - if (object instanceof CreatureObject && ((CreatureObject) object).getStaticNPC()) { - ((TangibleObject) object).setRespawnTime(0); - core.objectService.destroyObject(object); - } - } - for (Planet planet : core.terrainService.getPlanetList()) { if (FileUtilities.doesFileExist("scripts/static_spawns/" + planet.getName())) { Path p = Paths.get("scripts/static_spawns/" + planet.getName()); @@ -122,7 +113,13 @@ public class StaticService implements INetworkDispatch { long objectId = core.objectService.getDOId(planetName, template, 0, buildingId, cellNumber, x, y, z); - SWGObject object = core.objectService.createObject(template, objectId, planet, new Point3D(x, y, z), new Quaternion(qW, qX, qY, qZ), null, true, true); + SWGObject object; + + if (core.spawnService.getMobileTemplate(template) != null) { + object = core.spawnService.spawnCreature(template, planetName, cellId, x, y, z, qW, qX, qY, qZ, (short) -1); + } else { + object = core.objectService.createObject(template, objectId, planet, new Point3D(x, y, z), new Quaternion(qW, qX, qY, qZ), null, true, true); + } if (object == null) { System.err.println("Static object is null with id " + objectId + " and template " + template + "."); @@ -133,10 +130,6 @@ public class StaticService implements INetworkDispatch { System.err.println("StaticService: ObjectId " + objectId + " was taken for object with template " + object.getTemplate() + ". Replacement: " + object.getObjectID()); } - if (object instanceof CreatureObject) { - ((CreatureObject) object).setStaticNPC(true); - } - boolean checkCells = false; // shouldn't be needed; for debugging if (object instanceof BuildingObject && checkCells) { diff --git a/src/services/spawn/SpawnService.java b/src/services/spawn/SpawnService.java index 26336387..b3b51689 100644 --- a/src/services/spawn/SpawnService.java +++ b/src/services/spawn/SpawnService.java @@ -70,7 +70,7 @@ public class SpawnService { } } - public CreatureObject spawnCreature(String template, String planetName, long cellId, float x, float y, float z, float qW, float qX, float qY, float qZ, short level) { + public CreatureObject spawnCreature(String template, long objectId, String planetName, long cellId, float x, float y, float z, float qW, float qX, float qY, float qZ, short level) { Planet planet = core.terrainService.getPlanetByName(planetName); MobileTemplate mobileTemplate = mobileTemplates.get(template); @@ -85,7 +85,7 @@ public class SpawnService { return null; } - CreatureObject creature = (CreatureObject) core.objectService.createObject(mobileTemplate.getTemplates().get(new Random().nextInt(mobileTemplate.getTemplates().size())), 0, planet, new Point3D(x, y, z), new Quaternion(qW, qX, qY, qZ)); + CreatureObject creature = (CreatureObject) core.objectService.createObject(mobileTemplate.getTemplates().get(new Random().nextInt(mobileTemplate.getTemplates().size())), objectId, planet, new Point3D(x, y, z), new Quaternion(qW, qX, qY, qZ)); if(creature == null) return null; @@ -211,6 +211,10 @@ public class SpawnService { return creature; } + public CreatureObject spawnCreature(String template, String planetName, long cellId, float x, float y, float z, float qW, float qX, float qY, float qZ, short level) { + return spawnCreature(template, 0L, planetName, cellId, x, y, z, qW, qX, qY, qZ, level); + } + public CreatureObject spawnCreature(String mobileTemplate, String planetName, long cellId, float x, float y, float z, float qW, float qX, float qY, float qZ, int level) { return spawnCreature(mobileTemplate, planetName, cellId, x, y, z, 1, 0, 0, 0, (short) level); } From 5969c40306d29320914c298ff7ad992b03e474ab Mon Sep 17 00:00:00 2001 From: DAK- Date: Sun, 4 May 2014 17:27:18 -0500 Subject: [PATCH 09/19] Updated BountyHunter Take Cover buff Take cover now uses setRadarVisible command to take player off radar for the buff duration. --- scripts/buffs/bh_cover_1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/buffs/bh_cover_1.py b/scripts/buffs/bh_cover_1.py index b68de518..0b7e2859 100644 --- a/scripts/buffs/bh_cover_1.py +++ b/scripts/buffs/bh_cover_1.py @@ -6,12 +6,12 @@ def setup(core, actor, buff): def add(core, actor, buff): core.skillModService.addSkillMod(actor, 'expertise_damage_all', 10) core.skillModService.addSkillMod(actor, 'expertise_glancing_blow_ranged', 40) - core.skillModService.addSkillMod(actor, 'invis', 1) + actor.setRadarVisible(False) return def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'expertise_damage_all', 10) core.skillModService.deductSkillMod(actor, 'expertise_glancing_blow_ranged', 40) - core.skillModService.deductSkillMod(actor, 'invis', 1) + actor.setRadarVisible(True) return \ No newline at end of file From 5529ab41551123f8be56ae550ab98b6a4c4e2649 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Mon, 5 May 2014 00:49:27 +0200 Subject: [PATCH 10/19] conflict again --- .../combat_brawler_humanoid_female.py | 13 +++++++++++ .../combat_brawler_humanoid_male.py | 13 +++++++++++ .../combat_brawler_ithorian_female.py | 15 +++++++++++++ .../combat_brawler_ithorian_male.py | 9 ++++++++ .../combat_brawler_trandoshan_female.py | 11 ++++++++++ .../combat_brawler_trandoshan_male.py | 10 +++++++++ .../combat_brawler_wookiee_female.py | 7 ++++++ .../combat_brawler_wookiee_male.py | 8 +++++++ .../combat_marksman_humanoid_female.py | 15 +++++++++++++ .../combat_marksman_humanoid_male.py | 12 ++++++++++ .../combat_marksman_ithorian_female.py | 12 ++++++++++ .../combat_marksman_ithorian_male.py | 12 ++++++++++ .../combat_marksman_trandoshan_female.py | 14 ++++++++++++ .../combat_marksman_trandoshan_male.py | 10 +++++++++ .../combat_marksman_wookiee_female.py | 8 +++++++ .../combat_marksman_wookiee_male.py | 8 +++++++ .../crafting_artisan_humanoid_female.py | 18 +++++++++++++++ .../crafting_artisan_humanoid_male.py | 14 ++++++++++++ .../crafting_artisan_ithorian_female.py | 8 +++++++ .../crafting_artisan_ithorian_male.py | 10 +++++++++ .../crafting_artisan_trandoshan_female.py | 16 ++++++++++++++ .../crafting_artisan_trandoshan_male.py | 12 ++++++++++ .../crafting_artisan_twilek_female.py | 20 +++++++++++++++++ .../crafting_artisan_wookiee_female.py | 8 +++++++ .../crafting_artisan_wookiee_male.py | 8 +++++++ .../outdoors_scout_humanoid_female.py | 22 +++++++++++++++++++ .../outdoors_scout_humanoid_male.py | 14 ++++++++++++ .../outdoors_scout_ithorian_female.py | 10 +++++++++ .../outdoors_scout_ithorian_male.py | 10 +++++++++ .../outdoors_scout_trandoshan_female.py | 18 +++++++++++++++ .../outdoors_scout_trandoshan_male.py | 12 ++++++++++ .../outdoors_scout_wookiee_female.py | 6 +++++ .../outdoors_scout_wookiee_male.py | 6 +++++ .../science_medic_humanoid_female.py | 12 ++++++++++ .../science_medic_humanoid_male.py | 10 +++++++++ .../science_medic_ithorian_female.py | 8 +++++++ .../science_medic_ithorian_male.py | 10 +++++++++ .../science_medic_trandoshan_female.py | 10 +++++++++ .../science_medic_trandoshan_male.py | 8 +++++++ .../science_medic_wookiee_female.py | 8 +++++++ .../science_medic_wookiee_male.py | 8 +++++++ .../social_entertainer_humanoid_female.py | 16 ++++++++++++++ .../social_entertainer_humanoid_male.py | 10 +++++++++ .../social_entertainer_ithorian_female.py | 16 ++++++++++++++ .../social_entertainer_ithorian_male.py | 10 +++++++++ .../social_entertainer_trandoshan_female.py | 14 ++++++++++++ .../social_entertainer_trandoshan_male.py | 8 +++++++ .../social_entertainer_twilek_female.py | 18 +++++++++++++++ .../social_entertainer_wookiee_female.py | 8 +++++++ .../social_entertainer_wookiee_male.py | 8 +++++++ 50 files changed, 571 insertions(+) create mode 100644 scripts/starter_clothing/combat_brawler_humanoid_female.py create mode 100644 scripts/starter_clothing/combat_brawler_humanoid_male.py create mode 100644 scripts/starter_clothing/combat_brawler_ithorian_female.py create mode 100644 scripts/starter_clothing/combat_brawler_ithorian_male.py create mode 100644 scripts/starter_clothing/combat_brawler_trandoshan_female.py create mode 100644 scripts/starter_clothing/combat_brawler_trandoshan_male.py create mode 100644 scripts/starter_clothing/combat_brawler_wookiee_female.py create mode 100644 scripts/starter_clothing/combat_brawler_wookiee_male.py create mode 100644 scripts/starter_clothing/combat_marksman_humanoid_female.py create mode 100644 scripts/starter_clothing/combat_marksman_humanoid_male.py create mode 100644 scripts/starter_clothing/combat_marksman_ithorian_female.py create mode 100644 scripts/starter_clothing/combat_marksman_ithorian_male.py create mode 100644 scripts/starter_clothing/combat_marksman_trandoshan_female.py create mode 100644 scripts/starter_clothing/combat_marksman_trandoshan_male.py create mode 100644 scripts/starter_clothing/combat_marksman_wookiee_female.py create mode 100644 scripts/starter_clothing/combat_marksman_wookiee_male.py create mode 100644 scripts/starter_clothing/crafting_artisan_humanoid_female.py create mode 100644 scripts/starter_clothing/crafting_artisan_humanoid_male.py create mode 100644 scripts/starter_clothing/crafting_artisan_ithorian_female.py create mode 100644 scripts/starter_clothing/crafting_artisan_ithorian_male.py create mode 100644 scripts/starter_clothing/crafting_artisan_trandoshan_female.py create mode 100644 scripts/starter_clothing/crafting_artisan_trandoshan_male.py create mode 100644 scripts/starter_clothing/crafting_artisan_twilek_female.py create mode 100644 scripts/starter_clothing/crafting_artisan_wookiee_female.py create mode 100644 scripts/starter_clothing/crafting_artisan_wookiee_male.py create mode 100644 scripts/starter_clothing/outdoors_scout_humanoid_female.py create mode 100644 scripts/starter_clothing/outdoors_scout_humanoid_male.py create mode 100644 scripts/starter_clothing/outdoors_scout_ithorian_female.py create mode 100644 scripts/starter_clothing/outdoors_scout_ithorian_male.py create mode 100644 scripts/starter_clothing/outdoors_scout_trandoshan_female.py create mode 100644 scripts/starter_clothing/outdoors_scout_trandoshan_male.py create mode 100644 scripts/starter_clothing/outdoors_scout_wookiee_female.py create mode 100644 scripts/starter_clothing/outdoors_scout_wookiee_male.py create mode 100644 scripts/starter_clothing/science_medic_humanoid_female.py create mode 100644 scripts/starter_clothing/science_medic_humanoid_male.py create mode 100644 scripts/starter_clothing/science_medic_ithorian_female.py create mode 100644 scripts/starter_clothing/science_medic_ithorian_male.py create mode 100644 scripts/starter_clothing/science_medic_trandoshan_female.py create mode 100644 scripts/starter_clothing/science_medic_trandoshan_male.py create mode 100644 scripts/starter_clothing/science_medic_wookiee_female.py create mode 100644 scripts/starter_clothing/science_medic_wookiee_male.py create mode 100644 scripts/starter_clothing/social_entertainer_humanoid_female.py create mode 100644 scripts/starter_clothing/social_entertainer_humanoid_male.py create mode 100644 scripts/starter_clothing/social_entertainer_ithorian_female.py create mode 100644 scripts/starter_clothing/social_entertainer_ithorian_male.py create mode 100644 scripts/starter_clothing/social_entertainer_trandoshan_female.py create mode 100644 scripts/starter_clothing/social_entertainer_trandoshan_male.py create mode 100644 scripts/starter_clothing/social_entertainer_twilek_female.py create mode 100644 scripts/starter_clothing/social_entertainer_wookiee_female.py create mode 100644 scripts/starter_clothing/social_entertainer_wookiee_male.py diff --git a/scripts/starter_clothing/combat_brawler_humanoid_female.py b/scripts/starter_clothing/combat_brawler_humanoid_female.py new file mode 100644 index 00000000..3a176081 --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_humanoid_female.py @@ -0,0 +1,13 @@ +import sys + +def CombatBrawlerHumanoidFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s24.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s25.iff', object.getPlanet()) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s05.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_01.iff', object.getPlanet()) + object._add(shirt) + object._add(jacket) + object._add(pants) + object._add(boots) + object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_humanoid_male.py b/scripts/starter_clothing/combat_brawler_humanoid_male.py new file mode 100644 index 00000000..a1ae7072 --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_humanoid_male.py @@ -0,0 +1,13 @@ +import sys + +def CombatBrawlerHumanoidMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) + gloves = core.objectService.createObject('object/tangible/wearables/gloves/shared_gloves_s06.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', object.getPlanet()) + object._add(shirt) + object._add(jacket) + object._add(gloves) + object._add(pants) + object._add(boots) diff --git a/scripts/starter_clothing/combat_brawler_ithorian_female.py b/scripts/starter_clothing/combat_brawler_ithorian_female.py new file mode 100644 index 00000000..223236bd --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_ithorian_female.py @@ -0,0 +1,15 @@ +import sys + +def CombatBrawlerIthorianFemale(core, object): + jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s06.iff', object.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s01.iff', object.getPlanet()) + bandolier = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_bandolier_s04.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s17.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s01.iff', object.getPlanet()) + gloves = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_gloves_s01.iff', object.getPlanet()) + object._add(jacket) + object._add(shirt) + object._add(bandolier) + object._add(belt) + object._add(pants) + object._add(gloves) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_ithorian_male.py b/scripts/starter_clothing/combat_brawler_ithorian_male.py new file mode 100644 index 00000000..cd6dce81 --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_ithorian_male.py @@ -0,0 +1,9 @@ +import sys + +def CombatBrawlerIthorianMale(core, object): + jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s10.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', object.getPlanet()) + bandolier = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_bandolier_s04.iff', object.getPlanet()) + object._add(jacket) + object._add(pants) + object._add(bandolier) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_trandoshan_female.py b/scripts/starter_clothing/combat_brawler_trandoshan_female.py new file mode 100644 index 00000000..1f755bfe --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_trandoshan_female.py @@ -0,0 +1,11 @@ +import sys + +def CombatBrawlerTrandoshanFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s24.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s25.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_01.iff', object.getPlanet()) + object._add(shirt) + object._add(jacket) + object._add(pants) + object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_trandoshan_male.py b/scripts/starter_clothing/combat_brawler_trandoshan_male.py new file mode 100644 index 00000000..78b4d786 --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_trandoshan_male.py @@ -0,0 +1,10 @@ +import sys + +def CombatBrawlerTrandoshanMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(jacket) + object._add(pants) diff --git a/scripts/starter_clothing/combat_brawler_wookiee_female.py b/scripts/starter_clothing/combat_brawler_wookiee_female.py new file mode 100644 index 00000000..917fb2d0 --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_wookiee_female.py @@ -0,0 +1,7 @@ +import sys + +def CombatBrawlerWookieeFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s04.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', object.getPlanet()) + object._add(shirt) + object._add(skirt) diff --git a/scripts/starter_clothing/combat_brawler_wookiee_male.py b/scripts/starter_clothing/combat_brawler_wookiee_male.py new file mode 100644 index 00000000..8646f4e9 --- /dev/null +++ b/scripts/starter_clothing/combat_brawler_wookiee_male.py @@ -0,0 +1,8 @@ +import sys + +def CombatBrawlerWookieeMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s04.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(skirt) diff --git a/scripts/starter_clothing/combat_marksman_humanoid_female.py b/scripts/starter_clothing/combat_marksman_humanoid_female.py new file mode 100644 index 00000000..f43d084b --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_humanoid_female.py @@ -0,0 +1,15 @@ +import sys + +def CombatMarksmanHumanoidFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s28.iff', object.getPlanet()) + bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_npe_bandolier.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_04.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s09.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) + object._add(shirt) + object._add(bandolier) + object._add(necklace) + object._add(pants) + object._add(belt) + object._add(shoes) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_humanoid_male.py b/scripts/starter_clothing/combat_marksman_humanoid_male.py new file mode 100644 index 00000000..421fed10 --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_humanoid_male.py @@ -0,0 +1,12 @@ +import sys + +def CombatMarksmanHumanoidMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s16.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s21.iff', object.getPlanet()) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(jacket) + object._add(pants) + object._add(boots) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_ithorian_female.py b/scripts/starter_clothing/combat_marksman_ithorian_female.py new file mode 100644 index 00000000..4f9903d7 --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_ithorian_female.py @@ -0,0 +1,12 @@ +import sys + +def CombatMarksmanIthorianFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s09.iff', object.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s01.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s01.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s17.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._addshirt) + object._add(vest) + object._add(pants) + object._add(belt) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_ithorian_male.py b/scripts/starter_clothing/combat_marksman_ithorian_male.py new file mode 100644 index 00000000..11db70e3 --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_ithorian_male.py @@ -0,0 +1,12 @@ +import sys + +def CombatMarksmanIthorianMale(core, object): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s20.iff', object.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s11.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s07.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s04.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(belt) + object._add(shirt) + object._add(jacket) + object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_trandoshan_female.py b/scripts/starter_clothing/combat_marksman_trandoshan_female.py new file mode 100644 index 00000000..569d1ad6 --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_trandoshan_female.py @@ -0,0 +1,14 @@ +import sys + +def CombatMarksmanTrandoshanFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s28.iff', object.getPlanet()) + bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_npe_bandolier.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_04.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s09.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(bandolier) + object._add(necklace) + object._add(pants) + object._add(belt) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_trandoshan_male.py b/scripts/starter_clothing/combat_marksman_trandoshan_male.py new file mode 100644 index 00000000..724752b6 --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_trandoshan_male.py @@ -0,0 +1,10 @@ +import sys + +def CombatMarksmanTrandoshanMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s16.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s21.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(jacket) + object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_wookiee_female.py b/scripts/starter_clothing/combat_marksman_wookiee_female.py new file mode 100644 index 00000000..4c33c52a --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_wookiee_female.py @@ -0,0 +1,8 @@ +import sys + +def CombatMarksmanWookieeFemale(core, object): + bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s04.iff', object.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(bandolier) + object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_wookiee_male.py b/scripts/starter_clothing/combat_marksman_wookiee_male.py new file mode 100644 index 00000000..b43a9f0a --- /dev/null +++ b/scripts/starter_clothing/combat_marksman_wookiee_male.py @@ -0,0 +1,8 @@ +import sys + +def CombatMarksmanWookieeMale(core, object): + bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s04.iff', object.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(bandolier) + object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_humanoid_female.py b/scripts/starter_clothing/crafting_artisan_humanoid_female.py new file mode 100644 index 00000000..e02090dd --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_humanoid_female.py @@ -0,0 +1,18 @@ +import sys + +def CraftingArtisanHumanoidFemale(core, object): + dress = core.objectService.createObject('object/tangible/wearables/dress/shared_dress_s29.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet()) + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet()) + bracelet_l_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_l.iff', object.getPlanet()) + bracelet_r_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + inventory.add(bracelet_l_2) + inventory.add(bracelet_r_2) + object._add(dress) + object._add(necklace) + object._add(bracelet_l) + object._add(bracelet_r) + object._add(shoes) diff --git a/scripts/starter_clothing/crafting_artisan_humanoid_male.py b/scripts/starter_clothing/crafting_artisan_humanoid_male.py new file mode 100644 index 00000000..f140e4c1 --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_humanoid_male.py @@ -0,0 +1,14 @@ +import sys + +def CraftingArtisanHumanoidMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s03.iff', object.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(vest) + object._add(necklace) + object._add(pants) + object._add(shoes) diff --git a/scripts/starter_clothing/crafting_artisan_ithorian_female.py b/scripts/starter_clothing/crafting_artisan_ithorian_female.py new file mode 100644 index 00000000..4ae7a7ea --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_ithorian_female.py @@ -0,0 +1,8 @@ +import sys + +def CraftingArtisanIthorianFemale(core, object): + dress = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_dress_s03.iff', object.getPlanet()) + hat = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_hat_s02.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(dress) + object._add(hat) diff --git a/scripts/starter_clothing/crafting_artisan_ithorian_male.py b/scripts/starter_clothing/crafting_artisan_ithorian_male.py new file mode 100644 index 00000000..8ecd98cf --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_ithorian_male.py @@ -0,0 +1,10 @@ +import sys + +def CraftingArtisanIthorianMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s10.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s06.iff', object.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(pants) + object._add(vest) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_trandoshan_female.py b/scripts/starter_clothing/crafting_artisan_trandoshan_female.py new file mode 100644 index 00000000..60acce4a --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_trandoshan_female.py @@ -0,0 +1,16 @@ +import sys + +def CraftingArtisanTrandoshanFemale(core, object): + dress = core.objectService.createObject('object/tangible/wearables/dress/shared_dress_s29.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet()) + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet()) + bracelet_l_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_l.iff', object.getPlanet()) + bracelet_r_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + inventory.add(bracelet_l_2) + inventory.add(bracelet_r_2) + object._add(dress) + object._add(necklace) + object._add(bracelet_l) + object._add(bracelet_r) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_trandoshan_male.py b/scripts/starter_clothing/crafting_artisan_trandoshan_male.py new file mode 100644 index 00000000..fcabfeda --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_trandoshan_male.py @@ -0,0 +1,12 @@ +import sys + +def CraftingArtisanTrandoshanMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s03.iff', object.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.if', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.ifff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(vest) + object._add(necklace) + object._add(pants) diff --git a/scripts/starter_clothing/crafting_artisan_twilek_female.py b/scripts/starter_clothing/crafting_artisan_twilek_female.py new file mode 100644 index 00000000..77e72081 --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_twilek_female.py @@ -0,0 +1,20 @@ +import sys + +def CraftingArtisanTwilekFemale(core, object): + dress = core.objectService.createObject('object/tangible/wearables/dress/shared_dress_s29.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet()) + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet()) + bracelet_l_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_l.iff', object.getPlanet()) + bracelet_r_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) + hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_twilek_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + inventory.add(bracelet_l_2) + inventory.add(bracelet_r_2) + object._add(dress) + object._add(necklace) + object._add(bracelet_l) + object._add(bracelet_r) + object._add(shoes) + object._add(hat) diff --git a/scripts/starter_clothing/crafting_artisan_wookiee_female.py b/scripts/starter_clothing/crafting_artisan_wookiee_female.py new file mode 100644 index 00000000..aa6fb915 --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_wookiee_female.py @@ -0,0 +1,8 @@ +import sys + +def CraftingArtisanWookieeFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(skirt) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_wookiee_male.py b/scripts/starter_clothing/crafting_artisan_wookiee_male.py new file mode 100644 index 00000000..841dfd41 --- /dev/null +++ b/scripts/starter_clothing/crafting_artisan_wookiee_male.py @@ -0,0 +1,8 @@ +import sys + +def CraftingArtisanWookieeMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(skirt) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_humanoid_female.py b/scripts/starter_clothing/outdoors_scout_humanoid_female.py new file mode 100644 index 00000000..a3347f00 --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_humanoid_female.py @@ -0,0 +1,22 @@ +import sys + +def OutdoorScoutHumanoidFemale(core, object): + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', object.getPlanet()) + bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s02.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet()) + gloves = core.objectService.createObject('object/tangible/wearables/gloves/shared_gloves_s06.iff', object.getPlanet()) + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s04.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(vest) + object._add(bustier) + object._add(pants) + object._add(gloves) + object._add(bracelet_l) + object._add(bracelet_r) + object._add(boots) + object._add(belt) + object._add(necklace) diff --git a/scripts/starter_clothing/outdoors_scout_humanoid_male.py b/scripts/starter_clothing/outdoors_scout_humanoid_male.py new file mode 100644 index 00000000..a6c8d1c4 --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_humanoid_male.py @@ -0,0 +1,14 @@ +import sys + +def OutdoorScoutHumanoidMale(core, object): + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_hutt_gang_s01.iff', object.getPlanet()) + bracelet = core.objectService.createObject('object/tangible/wearables/bracelet/shared_primitive_bracelet.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_03.iff', object.getPlanet()) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s05.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(vest) + object._add(bracelet) + object._add(pants) + object._add(belt) + object._add(boots) diff --git a/scripts/starter_clothing/outdoors_scout_ithorian_female.py b/scripts/starter_clothing/outdoors_scout_ithorian_female.py new file mode 100644 index 00000000..11fd41ff --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_ithorian_female.py @@ -0,0 +1,10 @@ +import sys + +def OutdoorScoutIthorianFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s05.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s16.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s02.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(pants) + object._add(jacket) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_ithorian_male.py b/scripts/starter_clothing/outdoors_scout_ithorian_male.py new file mode 100644 index 00000000..6b824c94 --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_ithorian_male.py @@ -0,0 +1,10 @@ +import sys + +def OutdoorScoutIthorianMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s13.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s12.iff', object.getPlanet()) + jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(pants) + object._add(jacket) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_trandoshan_female.py b/scripts/starter_clothing/outdoors_scout_trandoshan_female.py new file mode 100644 index 00000000..8bf336ed --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_trandoshan_female.py @@ -0,0 +1,18 @@ +import sys + +def OutdoorScoutTrandoshanFemale(core, object): + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', object.getPlanet()) + bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s02.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet()) + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(vest) + object._add(bustier) + object._add(pants) + object._add(bracelet_l) + object._add(bracelet_r) + object._add(belt) + object._add(necklace) diff --git a/scripts/starter_clothing/outdoors_scout_trandoshan_male.py b/scripts/starter_clothing/outdoors_scout_trandoshan_male.py new file mode 100644 index 00000000..de822de3 --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_trandoshan_male.py @@ -0,0 +1,12 @@ +import sys + +def OutdoorScoutTrandoshanMale(core, object): + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_hutt_gang_s01.iff', object.getPlanet()) + bracelet = core.objectService.createObject('object/tangible/wearables/bracelet/shared_primitive_bracelet.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(vest) + object._add(bracelet) + object._add(pants) + object._add(belt) diff --git a/scripts/starter_clothing/outdoors_scout_wookiee_female.py b/scripts/starter_clothing/outdoors_scout_wookiee_female.py new file mode 100644 index 00000000..c2fca3a7 --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_wookiee_female.py @@ -0,0 +1,6 @@ +import sys + +def OutdoorScoutWookieeFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_wookiee_male.py b/scripts/starter_clothing/outdoors_scout_wookiee_male.py new file mode 100644 index 00000000..63a6b6cf --- /dev/null +++ b/scripts/starter_clothing/outdoors_scout_wookiee_male.py @@ -0,0 +1,6 @@ +import sys + +def OutdoorScoutWookieeMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_humanoid_female.py b/scripts/starter_clothing/science_medic_humanoid_female.py new file mode 100644 index 00000000..5e6ba991 --- /dev/null +++ b/scripts/starter_clothing/science_medic_humanoid_female.py @@ -0,0 +1,12 @@ +import sys + +def ScienceMedicHumanoidFemale(core, object): + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s26.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(jacket) + object._add(pants) + object._add(shoes) + object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_humanoid_male.py b/scripts/starter_clothing/science_medic_humanoid_male.py new file mode 100644 index 00000000..ca19c6e2 --- /dev/null +++ b/scripts/starter_clothing/science_medic_humanoid_male.py @@ -0,0 +1,10 @@ +import sys + +def ScienceMedicHumanoidMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s01.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s02.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(pants) + object._add(shoes) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_ithorian_female.py b/scripts/starter_clothing/science_medic_ithorian_female.py new file mode 100644 index 00000000..fb7638b8 --- /dev/null +++ b/scripts/starter_clothing/science_medic_ithorian_female.py @@ -0,0 +1,8 @@ +import sys + +def ScienceMedicIthorianFemale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s12.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_ithorian_male.py b/scripts/starter_clothing/science_medic_ithorian_male.py new file mode 100644 index 00000000..88ec8b7a --- /dev/null +++ b/scripts/starter_clothing/science_medic_ithorian_male.py @@ -0,0 +1,10 @@ +import sys + +def ScienceMedicIthorianMale(core, object): + jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s01.iff', object.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s04.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s18.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(jacket) + object._add(shirt) + object._add(pants) diff --git a/scripts/starter_clothing/science_medic_trandoshan_female.py b/scripts/starter_clothing/science_medic_trandoshan_female.py new file mode 100644 index 00000000..556e8e94 --- /dev/null +++ b/scripts/starter_clothing/science_medic_trandoshan_female.py @@ -0,0 +1,10 @@ +import sys + +def ScienceMedicTrandoshanFemale(core, object): + jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s26.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(jacket) + object._add(pants) + object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_trandoshan_male.py b/scripts/starter_clothing/science_medic_trandoshan_male.py new file mode 100644 index 00000000..9b50dd69 --- /dev/null +++ b/scripts/starter_clothing/science_medic_trandoshan_male.py @@ -0,0 +1,8 @@ +import sys + +def ScienceMedicTrandoshanMale(core, object): + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(shirt) + object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_wookiee_female.py b/scripts/starter_clothing/science_medic_wookiee_female.py new file mode 100644 index 00000000..9e969888 --- /dev/null +++ b/scripts/starter_clothing/science_medic_wookiee_female.py @@ -0,0 +1,8 @@ +import sys + +def ScienceMedicWookieeFemale(core, object): + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', object.getPlanet()) + bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s09.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(hood) + object._add(bandolier) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_wookiee_male.py b/scripts/starter_clothing/science_medic_wookiee_male.py new file mode 100644 index 00000000..ba2c8845 --- /dev/null +++ b/scripts/starter_clothing/science_medic_wookiee_male.py @@ -0,0 +1,8 @@ +import sys + +def ScienceMedicWookieeMale(core, object): + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', object.getPlanet()) + bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s09.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(hood) + object._add(bandolier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_humanoid_female.py b/scripts/starter_clothing/social_entertainer_humanoid_female.py new file mode 100644 index 00000000..0b9f5157 --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_humanoid_female.py @@ -0,0 +1,16 @@ +import sys + +def SocialEntertainerHumanoidFemale(core, object): + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) + bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(bracelet_l) + object._add(bracelet_r) + object._add(necklace) + object._add(shoes) + object._add(skirt) + object._add(bustier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_humanoid_male.py b/scripts/starter_clothing/social_entertainer_humanoid_male.py new file mode 100644 index 00000000..c9fcfec6 --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_humanoid_male.py @@ -0,0 +1,10 @@ +import sys + +def SocialEntertainerHumanoidMale(core, object): + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s15.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_skirt_s05.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(vest) + object._add(skirt) + object._add(shoes) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_ithorian_female.py b/scripts/starter_clothing/social_entertainer_ithorian_female.py new file mode 100644 index 00000000..4afa5c52 --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_ithorian_female.py @@ -0,0 +1,16 @@ +import sys + +def SocialEntertainerIthorianFemale(core, object): + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) + bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(bracelet_l) + object._add(bracelet_r) + object._add(necklace) + object._add(shoes) + object._add(skirt) + object._add(bustier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_ithorian_male.py b/scripts/starter_clothing/social_entertainer_ithorian_male.py new file mode 100644 index 00000000..a13a5c78 --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_ithorian_male.py @@ -0,0 +1,10 @@ +import sys + +def SocialEntertainerIthorianMale(core, object): + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s10.iff', object.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s08.iff', object.getPlanet()) + dress = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_dress_short_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(pants) + object._add(shirt) + object._add(dress) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_trandoshan_female.py b/scripts/starter_clothing/social_entertainer_trandoshan_female.py new file mode 100644 index 00000000..b77afa50 --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_trandoshan_female.py @@ -0,0 +1,14 @@ +import sys + +def SocialEntertainerTrandoshanFemale(core, object): + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) + bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(bracelet_l) + object._add(bracelet_r) + object._add(necklace) + object._add(skirt) + object._add(bustier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_trandoshan_male.py b/scripts/starter_clothing/social_entertainer_trandoshan_male.py new file mode 100644 index 00000000..cd9bcc6c --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_trandoshan_male.py @@ -0,0 +1,8 @@ +import sys + +def SocialEntertainerTrandoshanMale(core, object): + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s15.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_skirt_s05.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(vest) + object._add(skirt) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_twilek_female.py b/scripts/starter_clothing/social_entertainer_twilek_female.py new file mode 100644 index 00000000..e5dcdd36 --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_twilek_female.py @@ -0,0 +1,18 @@ +import sys + +def SocialEntertainerTwilekFemale(core, object): + bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) + bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) + necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) + bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) + hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_twilek_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(bracelet_l) + object._add(bracelet_r) + object._add(necklace) + object._add(shoes) + object._add(skirt) + object._add(bustier) + object._add(hat) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_wookiee_female.py b/scripts/starter_clothing/social_entertainer_wookiee_female.py new file mode 100644 index 00000000..a8cdfee0 --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_wookiee_female.py @@ -0,0 +1,8 @@ +import sys + +def SocialEntertainerWookieeFemale(core, object): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s04.iff', object.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(gloves) + object._add(hood) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_wookiee_male.py b/scripts/starter_clothing/social_entertainer_wookiee_male.py new file mode 100644 index 00000000..ed797f8c --- /dev/null +++ b/scripts/starter_clothing/social_entertainer_wookiee_male.py @@ -0,0 +1,8 @@ +import sys + +def SocialEntertainerWookieeMale(core, object): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s04.iff', object.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s03.iff', object.getPlanet()) + inventory = object.getSlottedObject('inventory') + object._add(gloves) + object._add(hood) \ No newline at end of file From 5c2cfc3b4457c3e899f8654aedc43d0bac6873bc Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Mon, 5 May 2014 01:01:51 +0200 Subject: [PATCH 11/19] corpse script fix --- scripts/radial/npc/corpse.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/radial/npc/corpse.py b/scripts/radial/npc/corpse.py index b552e41a..453b7382 100644 --- a/scripts/radial/npc/corpse.py +++ b/scripts/radial/npc/corpse.py @@ -15,9 +15,6 @@ def createRadial(core, owner, target, radials): return def handleSelection(core, owner, target, option): -<<<<<<< HEAD - #owner.sendSystemMessage('Correct Loot Radial called', 0) -======= if option == 164 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target): core.resourceService.doHarvest(owner, target, 'meat') @@ -25,7 +22,6 @@ def handleSelection(core, owner, target, option): core.resourceService.doHarvest(owner, target, 'hide') if option == 166 and target.getAttachment('AI') and core.resourceService.canHarvest(owner, target): core.resourceService.doHarvest(owner, target, 'bone') ->>>>>>> origin/master if option == 36 and target: #core.lootService.handleLootRequest(owner,target) core.lootService.handleLootRequest(owner,target) From d4332eb80ac994afa74c5901bc4f92bacf677163 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Mon, 5 May 2014 01:09:08 +0200 Subject: [PATCH 12/19] folders cleaned --- options.cfg | 4 ++-- .../combat_brawler_humanoid_female.py | 13 ----------- .../combat_brawler_humanoid_male.py | 13 ----------- .../combat_brawler_ithorian_female.py | 15 ------------- .../combat_brawler_ithorian_male.py | 9 -------- .../combat_brawler_trandoshan_female.py | 11 ---------- .../combat_brawler_trandoshan_male.py | 10 --------- .../combat_brawler_wookiee_female.py | 7 ------ .../combat_brawler_wookiee_male.py | 8 ------- .../combat_marksman_humanoid_female.py | 15 ------------- .../combat_marksman_humanoid_male.py | 12 ---------- .../combat_marksman_ithorian_female.py | 12 ---------- .../combat_marksman_ithorian_male.py | 12 ---------- .../combat_marksman_trandoshan_female.py | 14 ------------ .../combat_marksman_trandoshan_male.py | 10 --------- .../combat_marksman_wookiee_female.py | 8 ------- .../combat_marksman_wookiee_male.py | 8 ------- .../crafting_artisan_humanoid_female.py | 18 --------------- .../crafting_artisan_humanoid_male.py | 14 ------------ .../crafting_artisan_ithorian_female.py | 8 ------- .../crafting_artisan_ithorian_male.py | 10 --------- .../crafting_artisan_trandoshan_female.py | 16 -------------- .../crafting_artisan_trandoshan_male.py | 12 ---------- .../crafting_artisan_twilek_female.py | 20 ----------------- .../crafting_artisan_wookiee_female.py | 8 ------- .../crafting_artisan_wookiee_male.py | 8 ------- .../outdoors_scout_humanoid_female.py | 22 ------------------- .../outdoors_scout_humanoid_male.py | 14 ------------ .../outdoors_scout_ithorian_female.py | 10 --------- .../outdoors_scout_ithorian_male.py | 10 --------- .../outdoors_scout_trandoshan_female.py | 18 --------------- .../outdoors_scout_trandoshan_male.py | 12 ---------- .../outdoors_scout_wookiee_female.py | 6 ----- .../outdoors_scout_wookiee_male.py | 6 ----- .../science_medic_humanoid_female.py | 12 ---------- .../science_medic_humanoid_male.py | 10 --------- .../science_medic_ithorian_female.py | 8 ------- .../science_medic_ithorian_male.py | 10 --------- .../science_medic_trandoshan_female.py | 10 --------- .../science_medic_trandoshan_male.py | 8 ------- .../science_medic_wookiee_female.py | 8 ------- .../science_medic_wookiee_male.py | 8 ------- .../social_entertainer_humanoid_female.py | 16 -------------- .../social_entertainer_humanoid_male.py | 10 --------- .../social_entertainer_ithorian_female.py | 16 -------------- .../social_entertainer_ithorian_male.py | 10 --------- .../social_entertainer_trandoshan_female.py | 14 ------------ .../social_entertainer_trandoshan_male.py | 8 ------- .../social_entertainer_twilek_female.py | 18 --------------- .../social_entertainer_wookiee_female.py | 8 ------- .../social_entertainer_wookiee_male.py | 8 ------- 51 files changed, 2 insertions(+), 573 deletions(-) delete mode 100644 scripts/starter_clothing/combat_brawler_humanoid_female.py delete mode 100644 scripts/starter_clothing/combat_brawler_humanoid_male.py delete mode 100644 scripts/starter_clothing/combat_brawler_ithorian_female.py delete mode 100644 scripts/starter_clothing/combat_brawler_ithorian_male.py delete mode 100644 scripts/starter_clothing/combat_brawler_trandoshan_female.py delete mode 100644 scripts/starter_clothing/combat_brawler_trandoshan_male.py delete mode 100644 scripts/starter_clothing/combat_brawler_wookiee_female.py delete mode 100644 scripts/starter_clothing/combat_brawler_wookiee_male.py delete mode 100644 scripts/starter_clothing/combat_marksman_humanoid_female.py delete mode 100644 scripts/starter_clothing/combat_marksman_humanoid_male.py delete mode 100644 scripts/starter_clothing/combat_marksman_ithorian_female.py delete mode 100644 scripts/starter_clothing/combat_marksman_ithorian_male.py delete mode 100644 scripts/starter_clothing/combat_marksman_trandoshan_female.py delete mode 100644 scripts/starter_clothing/combat_marksman_trandoshan_male.py delete mode 100644 scripts/starter_clothing/combat_marksman_wookiee_female.py delete mode 100644 scripts/starter_clothing/combat_marksman_wookiee_male.py delete mode 100644 scripts/starter_clothing/crafting_artisan_humanoid_female.py delete mode 100644 scripts/starter_clothing/crafting_artisan_humanoid_male.py delete mode 100644 scripts/starter_clothing/crafting_artisan_ithorian_female.py delete mode 100644 scripts/starter_clothing/crafting_artisan_ithorian_male.py delete mode 100644 scripts/starter_clothing/crafting_artisan_trandoshan_female.py delete mode 100644 scripts/starter_clothing/crafting_artisan_trandoshan_male.py delete mode 100644 scripts/starter_clothing/crafting_artisan_twilek_female.py delete mode 100644 scripts/starter_clothing/crafting_artisan_wookiee_female.py delete mode 100644 scripts/starter_clothing/crafting_artisan_wookiee_male.py delete mode 100644 scripts/starter_clothing/outdoors_scout_humanoid_female.py delete mode 100644 scripts/starter_clothing/outdoors_scout_humanoid_male.py delete mode 100644 scripts/starter_clothing/outdoors_scout_ithorian_female.py delete mode 100644 scripts/starter_clothing/outdoors_scout_ithorian_male.py delete mode 100644 scripts/starter_clothing/outdoors_scout_trandoshan_female.py delete mode 100644 scripts/starter_clothing/outdoors_scout_trandoshan_male.py delete mode 100644 scripts/starter_clothing/outdoors_scout_wookiee_female.py delete mode 100644 scripts/starter_clothing/outdoors_scout_wookiee_male.py delete mode 100644 scripts/starter_clothing/science_medic_humanoid_female.py delete mode 100644 scripts/starter_clothing/science_medic_humanoid_male.py delete mode 100644 scripts/starter_clothing/science_medic_ithorian_female.py delete mode 100644 scripts/starter_clothing/science_medic_ithorian_male.py delete mode 100644 scripts/starter_clothing/science_medic_trandoshan_female.py delete mode 100644 scripts/starter_clothing/science_medic_trandoshan_male.py delete mode 100644 scripts/starter_clothing/science_medic_wookiee_female.py delete mode 100644 scripts/starter_clothing/science_medic_wookiee_male.py delete mode 100644 scripts/starter_clothing/social_entertainer_humanoid_female.py delete mode 100644 scripts/starter_clothing/social_entertainer_humanoid_male.py delete mode 100644 scripts/starter_clothing/social_entertainer_ithorian_female.py delete mode 100644 scripts/starter_clothing/social_entertainer_ithorian_male.py delete mode 100644 scripts/starter_clothing/social_entertainer_trandoshan_female.py delete mode 100644 scripts/starter_clothing/social_entertainer_trandoshan_male.py delete mode 100644 scripts/starter_clothing/social_entertainer_twilek_female.py delete mode 100644 scripts/starter_clothing/social_entertainer_wookiee_female.py delete mode 100644 scripts/starter_clothing/social_entertainer_wookiee_male.py diff --git a/options.cfg b/options.cfg index cb743c88..5a3a7f8e 100644 --- a/options.cfg +++ b/options.cfg @@ -1,3 +1,3 @@ -LOAD.SNAPSHOT_OBJECTS=0 -LOAD.BUILDOUT_OBJECTS=0 +LOAD.SNAPSHOT_OBJECTS=1 +LOAD.BUILDOUT_OBJECTS=1 LOAD.RESOURCE.SYSTEM=1 \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_humanoid_female.py b/scripts/starter_clothing/combat_brawler_humanoid_female.py deleted file mode 100644 index 3a176081..00000000 --- a/scripts/starter_clothing/combat_brawler_humanoid_female.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys - -def CombatBrawlerHumanoidFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s24.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s25.iff', object.getPlanet()) - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s05.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_01.iff', object.getPlanet()) - object._add(shirt) - object._add(jacket) - object._add(pants) - object._add(boots) - object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_humanoid_male.py b/scripts/starter_clothing/combat_brawler_humanoid_male.py deleted file mode 100644 index a1ae7072..00000000 --- a/scripts/starter_clothing/combat_brawler_humanoid_male.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys - -def CombatBrawlerHumanoidMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) - gloves = core.objectService.createObject('object/tangible/wearables/gloves/shared_gloves_s06.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', object.getPlanet()) - object._add(shirt) - object._add(jacket) - object._add(gloves) - object._add(pants) - object._add(boots) diff --git a/scripts/starter_clothing/combat_brawler_ithorian_female.py b/scripts/starter_clothing/combat_brawler_ithorian_female.py deleted file mode 100644 index 223236bd..00000000 --- a/scripts/starter_clothing/combat_brawler_ithorian_female.py +++ /dev/null @@ -1,15 +0,0 @@ -import sys - -def CombatBrawlerIthorianFemale(core, object): - jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s06.iff', object.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s01.iff', object.getPlanet()) - bandolier = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_bandolier_s04.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s17.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s01.iff', object.getPlanet()) - gloves = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_gloves_s01.iff', object.getPlanet()) - object._add(jacket) - object._add(shirt) - object._add(bandolier) - object._add(belt) - object._add(pants) - object._add(gloves) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_ithorian_male.py b/scripts/starter_clothing/combat_brawler_ithorian_male.py deleted file mode 100644 index cd6dce81..00000000 --- a/scripts/starter_clothing/combat_brawler_ithorian_male.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def CombatBrawlerIthorianMale(core, object): - jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s10.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', object.getPlanet()) - bandolier = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_bandolier_s04.iff', object.getPlanet()) - object._add(jacket) - object._add(pants) - object._add(bandolier) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_trandoshan_female.py b/scripts/starter_clothing/combat_brawler_trandoshan_female.py deleted file mode 100644 index 1f755bfe..00000000 --- a/scripts/starter_clothing/combat_brawler_trandoshan_female.py +++ /dev/null @@ -1,11 +0,0 @@ -import sys - -def CombatBrawlerTrandoshanFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s24.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s25.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_01.iff', object.getPlanet()) - object._add(shirt) - object._add(jacket) - object._add(pants) - object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_brawler_trandoshan_male.py b/scripts/starter_clothing/combat_brawler_trandoshan_male.py deleted file mode 100644 index 78b4d786..00000000 --- a/scripts/starter_clothing/combat_brawler_trandoshan_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def CombatBrawlerTrandoshanMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s24.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(jacket) - object._add(pants) diff --git a/scripts/starter_clothing/combat_brawler_wookiee_female.py b/scripts/starter_clothing/combat_brawler_wookiee_female.py deleted file mode 100644 index 917fb2d0..00000000 --- a/scripts/starter_clothing/combat_brawler_wookiee_female.py +++ /dev/null @@ -1,7 +0,0 @@ -import sys - -def CombatBrawlerWookieeFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s04.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', object.getPlanet()) - object._add(shirt) - object._add(skirt) diff --git a/scripts/starter_clothing/combat_brawler_wookiee_male.py b/scripts/starter_clothing/combat_brawler_wookiee_male.py deleted file mode 100644 index 8646f4e9..00000000 --- a/scripts/starter_clothing/combat_brawler_wookiee_male.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def CombatBrawlerWookieeMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s04.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(skirt) diff --git a/scripts/starter_clothing/combat_marksman_humanoid_female.py b/scripts/starter_clothing/combat_marksman_humanoid_female.py deleted file mode 100644 index f43d084b..00000000 --- a/scripts/starter_clothing/combat_marksman_humanoid_female.py +++ /dev/null @@ -1,15 +0,0 @@ -import sys - -def CombatMarksmanHumanoidFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s28.iff', object.getPlanet()) - bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_npe_bandolier.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_04.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s09.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) - object._add(shirt) - object._add(bandolier) - object._add(necklace) - object._add(pants) - object._add(belt) - object._add(shoes) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_humanoid_male.py b/scripts/starter_clothing/combat_marksman_humanoid_male.py deleted file mode 100644 index 421fed10..00000000 --- a/scripts/starter_clothing/combat_marksman_humanoid_male.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def CombatMarksmanHumanoidMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s16.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s21.iff', object.getPlanet()) - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(jacket) - object._add(pants) - object._add(boots) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_ithorian_female.py b/scripts/starter_clothing/combat_marksman_ithorian_female.py deleted file mode 100644 index 4f9903d7..00000000 --- a/scripts/starter_clothing/combat_marksman_ithorian_female.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def CombatMarksmanIthorianFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s09.iff', object.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s01.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s01.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s17.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._addshirt) - object._add(vest) - object._add(pants) - object._add(belt) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_ithorian_male.py b/scripts/starter_clothing/combat_marksman_ithorian_male.py deleted file mode 100644 index 11db70e3..00000000 --- a/scripts/starter_clothing/combat_marksman_ithorian_male.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def CombatMarksmanIthorianMale(core, object): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s20.iff', object.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s11.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s07.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s04.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(belt) - object._add(shirt) - object._add(jacket) - object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_trandoshan_female.py b/scripts/starter_clothing/combat_marksman_trandoshan_female.py deleted file mode 100644 index 569d1ad6..00000000 --- a/scripts/starter_clothing/combat_marksman_trandoshan_female.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def CombatMarksmanTrandoshanFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s28.iff', object.getPlanet()) - bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_npe_bandolier.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_04.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s09.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(bandolier) - object._add(necklace) - object._add(pants) - object._add(belt) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_trandoshan_male.py b/scripts/starter_clothing/combat_marksman_trandoshan_male.py deleted file mode 100644 index 724752b6..00000000 --- a/scripts/starter_clothing/combat_marksman_trandoshan_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def CombatMarksmanTrandoshanMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s16.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s21.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(jacket) - object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_wookiee_female.py b/scripts/starter_clothing/combat_marksman_wookiee_female.py deleted file mode 100644 index 4c33c52a..00000000 --- a/scripts/starter_clothing/combat_marksman_wookiee_female.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def CombatMarksmanWookieeFemale(core, object): - bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s04.iff', object.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(bandolier) - object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/combat_marksman_wookiee_male.py b/scripts/starter_clothing/combat_marksman_wookiee_male.py deleted file mode 100644 index b43a9f0a..00000000 --- a/scripts/starter_clothing/combat_marksman_wookiee_male.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def CombatMarksmanWookieeMale(core, object): - bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s04.iff', object.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(bandolier) - object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_humanoid_female.py b/scripts/starter_clothing/crafting_artisan_humanoid_female.py deleted file mode 100644 index e02090dd..00000000 --- a/scripts/starter_clothing/crafting_artisan_humanoid_female.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys - -def CraftingArtisanHumanoidFemale(core, object): - dress = core.objectService.createObject('object/tangible/wearables/dress/shared_dress_s29.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet()) - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet()) - bracelet_l_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_l.iff', object.getPlanet()) - bracelet_r_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - inventory.add(bracelet_l_2) - inventory.add(bracelet_r_2) - object._add(dress) - object._add(necklace) - object._add(bracelet_l) - object._add(bracelet_r) - object._add(shoes) diff --git a/scripts/starter_clothing/crafting_artisan_humanoid_male.py b/scripts/starter_clothing/crafting_artisan_humanoid_male.py deleted file mode 100644 index f140e4c1..00000000 --- a/scripts/starter_clothing/crafting_artisan_humanoid_male.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def CraftingArtisanHumanoidMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s03.iff', object.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(vest) - object._add(necklace) - object._add(pants) - object._add(shoes) diff --git a/scripts/starter_clothing/crafting_artisan_ithorian_female.py b/scripts/starter_clothing/crafting_artisan_ithorian_female.py deleted file mode 100644 index 4ae7a7ea..00000000 --- a/scripts/starter_clothing/crafting_artisan_ithorian_female.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def CraftingArtisanIthorianFemale(core, object): - dress = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_dress_s03.iff', object.getPlanet()) - hat = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_hat_s02.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(dress) - object._add(hat) diff --git a/scripts/starter_clothing/crafting_artisan_ithorian_male.py b/scripts/starter_clothing/crafting_artisan_ithorian_male.py deleted file mode 100644 index 8ecd98cf..00000000 --- a/scripts/starter_clothing/crafting_artisan_ithorian_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def CraftingArtisanIthorianMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s10.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s06.iff', object.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(pants) - object._add(vest) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_trandoshan_female.py b/scripts/starter_clothing/crafting_artisan_trandoshan_female.py deleted file mode 100644 index 60acce4a..00000000 --- a/scripts/starter_clothing/crafting_artisan_trandoshan_female.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def CraftingArtisanTrandoshanFemale(core, object): - dress = core.objectService.createObject('object/tangible/wearables/dress/shared_dress_s29.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet()) - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet()) - bracelet_l_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_l.iff', object.getPlanet()) - bracelet_r_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - inventory.add(bracelet_l_2) - inventory.add(bracelet_r_2) - object._add(dress) - object._add(necklace) - object._add(bracelet_l) - object._add(bracelet_r) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_trandoshan_male.py b/scripts/starter_clothing/crafting_artisan_trandoshan_male.py deleted file mode 100644 index fcabfeda..00000000 --- a/scripts/starter_clothing/crafting_artisan_trandoshan_male.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def CraftingArtisanTrandoshanMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s03.iff', object.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.if', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.ifff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(vest) - object._add(necklace) - object._add(pants) diff --git a/scripts/starter_clothing/crafting_artisan_twilek_female.py b/scripts/starter_clothing/crafting_artisan_twilek_female.py deleted file mode 100644 index 77e72081..00000000 --- a/scripts/starter_clothing/crafting_artisan_twilek_female.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys - -def CraftingArtisanTwilekFemale(core, object): - dress = core.objectService.createObject('object/tangible/wearables/dress/shared_dress_s29.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet()) - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet()) - bracelet_l_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_l.iff', object.getPlanet()) - bracelet_r_2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) - hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_twilek_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - inventory.add(bracelet_l_2) - inventory.add(bracelet_r_2) - object._add(dress) - object._add(necklace) - object._add(bracelet_l) - object._add(bracelet_r) - object._add(shoes) - object._add(hat) diff --git a/scripts/starter_clothing/crafting_artisan_wookiee_female.py b/scripts/starter_clothing/crafting_artisan_wookiee_female.py deleted file mode 100644 index aa6fb915..00000000 --- a/scripts/starter_clothing/crafting_artisan_wookiee_female.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def CraftingArtisanWookieeFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(skirt) \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_wookiee_male.py b/scripts/starter_clothing/crafting_artisan_wookiee_male.py deleted file mode 100644 index 841dfd41..00000000 --- a/scripts/starter_clothing/crafting_artisan_wookiee_male.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def CraftingArtisanWookieeMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(skirt) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_humanoid_female.py b/scripts/starter_clothing/outdoors_scout_humanoid_female.py deleted file mode 100644 index a3347f00..00000000 --- a/scripts/starter_clothing/outdoors_scout_humanoid_female.py +++ /dev/null @@ -1,22 +0,0 @@ -import sys - -def OutdoorScoutHumanoidFemale(core, object): - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', object.getPlanet()) - bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s02.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet()) - gloves = core.objectService.createObject('object/tangible/wearables/gloves/shared_gloves_s06.iff', object.getPlanet()) - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s04.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(vest) - object._add(bustier) - object._add(pants) - object._add(gloves) - object._add(bracelet_l) - object._add(bracelet_r) - object._add(boots) - object._add(belt) - object._add(necklace) diff --git a/scripts/starter_clothing/outdoors_scout_humanoid_male.py b/scripts/starter_clothing/outdoors_scout_humanoid_male.py deleted file mode 100644 index a6c8d1c4..00000000 --- a/scripts/starter_clothing/outdoors_scout_humanoid_male.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def OutdoorScoutHumanoidMale(core, object): - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_hutt_gang_s01.iff', object.getPlanet()) - bracelet = core.objectService.createObject('object/tangible/wearables/bracelet/shared_primitive_bracelet.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_03.iff', object.getPlanet()) - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s05.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(vest) - object._add(bracelet) - object._add(pants) - object._add(belt) - object._add(boots) diff --git a/scripts/starter_clothing/outdoors_scout_ithorian_female.py b/scripts/starter_clothing/outdoors_scout_ithorian_female.py deleted file mode 100644 index 11fd41ff..00000000 --- a/scripts/starter_clothing/outdoors_scout_ithorian_female.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def OutdoorScoutIthorianFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s05.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s16.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s02.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(pants) - object._add(jacket) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_ithorian_male.py b/scripts/starter_clothing/outdoors_scout_ithorian_male.py deleted file mode 100644 index 6b824c94..00000000 --- a/scripts/starter_clothing/outdoors_scout_ithorian_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def OutdoorScoutIthorianMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s13.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s12.iff', object.getPlanet()) - jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(pants) - object._add(jacket) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_trandoshan_female.py b/scripts/starter_clothing/outdoors_scout_trandoshan_female.py deleted file mode 100644 index 8bf336ed..00000000 --- a/scripts/starter_clothing/outdoors_scout_trandoshan_female.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys - -def OutdoorScoutTrandoshanFemale(core, object): - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', object.getPlanet()) - bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s02.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet()) - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_02.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(vest) - object._add(bustier) - object._add(pants) - object._add(bracelet_l) - object._add(bracelet_r) - object._add(belt) - object._add(necklace) diff --git a/scripts/starter_clothing/outdoors_scout_trandoshan_male.py b/scripts/starter_clothing/outdoors_scout_trandoshan_male.py deleted file mode 100644 index de822de3..00000000 --- a/scripts/starter_clothing/outdoors_scout_trandoshan_male.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def OutdoorScoutTrandoshanMale(core, object): - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_hutt_gang_s01.iff', object.getPlanet()) - bracelet = core.objectService.createObject('object/tangible/wearables/bracelet/shared_primitive_bracelet.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s04.iff', object.getPlanet()) - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_npe_belt_03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(vest) - object._add(bracelet) - object._add(pants) - object._add(belt) diff --git a/scripts/starter_clothing/outdoors_scout_wookiee_female.py b/scripts/starter_clothing/outdoors_scout_wookiee_female.py deleted file mode 100644 index c2fca3a7..00000000 --- a/scripts/starter_clothing/outdoors_scout_wookiee_female.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys - -def OutdoorScoutWookieeFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/outdoors_scout_wookiee_male.py b/scripts/starter_clothing/outdoors_scout_wookiee_male.py deleted file mode 100644 index 63a6b6cf..00000000 --- a/scripts/starter_clothing/outdoors_scout_wookiee_male.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys - -def OutdoorScoutWookieeMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_humanoid_female.py b/scripts/starter_clothing/science_medic_humanoid_female.py deleted file mode 100644 index 5e6ba991..00000000 --- a/scripts/starter_clothing/science_medic_humanoid_female.py +++ /dev/null @@ -1,12 +0,0 @@ -import sys - -def ScienceMedicHumanoidFemale(core, object): - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s26.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(jacket) - object._add(pants) - object._add(shoes) - object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_humanoid_male.py b/scripts/starter_clothing/science_medic_humanoid_male.py deleted file mode 100644 index ca19c6e2..00000000 --- a/scripts/starter_clothing/science_medic_humanoid_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def ScienceMedicHumanoidMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s01.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s02.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(pants) - object._add(shoes) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_ithorian_female.py b/scripts/starter_clothing/science_medic_ithorian_female.py deleted file mode 100644 index fb7638b8..00000000 --- a/scripts/starter_clothing/science_medic_ithorian_female.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def ScienceMedicIthorianFemale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s12.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_ithorian_male.py b/scripts/starter_clothing/science_medic_ithorian_male.py deleted file mode 100644 index 88ec8b7a..00000000 --- a/scripts/starter_clothing/science_medic_ithorian_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def ScienceMedicIthorianMale(core, object): - jacket = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_jacket_s01.iff', object.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s04.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s18.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(jacket) - object._add(shirt) - object._add(pants) diff --git a/scripts/starter_clothing/science_medic_trandoshan_female.py b/scripts/starter_clothing/science_medic_trandoshan_female.py deleted file mode 100644 index 556e8e94..00000000 --- a/scripts/starter_clothing/science_medic_trandoshan_female.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def ScienceMedicTrandoshanFemale(core, object): - jacket = core.objectService.createObject('object/tangible/wearables/jacket/shared_jacket_s26.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(jacket) - object._add(pants) - object._add(necklace) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_trandoshan_male.py b/scripts/starter_clothing/science_medic_trandoshan_male.py deleted file mode 100644 index 9b50dd69..00000000 --- a/scripts/starter_clothing/science_medic_trandoshan_male.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def ScienceMedicTrandoshanMale(core, object): - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_npe_shirt.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(shirt) - object._add(pants) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_wookiee_female.py b/scripts/starter_clothing/science_medic_wookiee_female.py deleted file mode 100644 index 9e969888..00000000 --- a/scripts/starter_clothing/science_medic_wookiee_female.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def ScienceMedicWookieeFemale(core, object): - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', object.getPlanet()) - bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s09.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(hood) - object._add(bandolier) \ No newline at end of file diff --git a/scripts/starter_clothing/science_medic_wookiee_male.py b/scripts/starter_clothing/science_medic_wookiee_male.py deleted file mode 100644 index ba2c8845..00000000 --- a/scripts/starter_clothing/science_medic_wookiee_male.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def ScienceMedicWookieeMale(core, object): - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', object.getPlanet()) - bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s09.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(hood) - object._add(bandolier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_humanoid_female.py b/scripts/starter_clothing/social_entertainer_humanoid_female.py deleted file mode 100644 index 0b9f5157..00000000 --- a/scripts/starter_clothing/social_entertainer_humanoid_female.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def SocialEntertainerHumanoidFemale(core, object): - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) - bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(bracelet_l) - object._add(bracelet_r) - object._add(necklace) - object._add(shoes) - object._add(skirt) - object._add(bustier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_humanoid_male.py b/scripts/starter_clothing/social_entertainer_humanoid_male.py deleted file mode 100644 index c9fcfec6..00000000 --- a/scripts/starter_clothing/social_entertainer_humanoid_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def SocialEntertainerHumanoidMale(core, object): - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s15.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_skirt_s05.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(vest) - object._add(skirt) - object._add(shoes) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_ithorian_female.py b/scripts/starter_clothing/social_entertainer_ithorian_female.py deleted file mode 100644 index 4afa5c52..00000000 --- a/scripts/starter_clothing/social_entertainer_ithorian_female.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -def SocialEntertainerIthorianFemale(core, object): - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) - bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(bracelet_l) - object._add(bracelet_r) - object._add(necklace) - object._add(shoes) - object._add(skirt) - object._add(bustier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_ithorian_male.py b/scripts/starter_clothing/social_entertainer_ithorian_male.py deleted file mode 100644 index a13a5c78..00000000 --- a/scripts/starter_clothing/social_entertainer_ithorian_male.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def SocialEntertainerIthorianMale(core, object): - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s10.iff', object.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s08.iff', object.getPlanet()) - dress = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_dress_short_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(pants) - object._add(shirt) - object._add(dress) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_trandoshan_female.py b/scripts/starter_clothing/social_entertainer_trandoshan_female.py deleted file mode 100644 index b77afa50..00000000 --- a/scripts/starter_clothing/social_entertainer_trandoshan_female.py +++ /dev/null @@ -1,14 +0,0 @@ -import sys - -def SocialEntertainerTrandoshanFemale(core, object): - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) - bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(bracelet_l) - object._add(bracelet_r) - object._add(necklace) - object._add(skirt) - object._add(bustier) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_trandoshan_male.py b/scripts/starter_clothing/social_entertainer_trandoshan_male.py deleted file mode 100644 index cd9bcc6c..00000000 --- a/scripts/starter_clothing/social_entertainer_trandoshan_male.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def SocialEntertainerTrandoshanMale(core, object): - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s15.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_skirt_s05.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(vest) - object._add(skirt) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_twilek_female.py b/scripts/starter_clothing/social_entertainer_twilek_female.py deleted file mode 100644 index e5dcdd36..00000000 --- a/scripts/starter_clothing/social_entertainer_twilek_female.py +++ /dev/null @@ -1,18 +0,0 @@ -import sys - -def SocialEntertainerTwilekFemale(core, object): - bracelet_l = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_l.iff', object.getPlanet()) - bracelet_r = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s05_r.iff', object.getPlanet()) - necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s12.iff', object.getPlanet()) - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s07.iff', object.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/skirt/shared_npe_entertainer_skirt.iff', object.getPlanet()) - bustier = core.objectService.createObject('object/tangible/wearables/bustier/shared_bustier_s01.iff', object.getPlanet()) - hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_twilek_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(bracelet_l) - object._add(bracelet_r) - object._add(necklace) - object._add(shoes) - object._add(skirt) - object._add(bustier) - object._add(hat) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_wookiee_female.py b/scripts/starter_clothing/social_entertainer_wookiee_female.py deleted file mode 100644 index a8cdfee0..00000000 --- a/scripts/starter_clothing/social_entertainer_wookiee_female.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def SocialEntertainerWookieeFemale(core, object): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s04.iff', object.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(gloves) - object._add(hood) \ No newline at end of file diff --git a/scripts/starter_clothing/social_entertainer_wookiee_male.py b/scripts/starter_clothing/social_entertainer_wookiee_male.py deleted file mode 100644 index ed797f8c..00000000 --- a/scripts/starter_clothing/social_entertainer_wookiee_male.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -def SocialEntertainerWookieeMale(core, object): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s04.iff', object.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s03.iff', object.getPlanet()) - inventory = object.getSlottedObject('inventory') - object._add(gloves) - object._add(hood) \ No newline at end of file From 079605d063b8f9c66bcc753e8ca52afb91657af8 Mon Sep 17 00:00:00 2001 From: Levarrishawk Date: Sun, 4 May 2014 19:25:41 -0400 Subject: [PATCH 13/19] Corrected script titling --- scripts/static_spawns/tatooine/lars_homestead.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/static_spawns/tatooine/lars_homestead.py b/scripts/static_spawns/tatooine/lars_homestead.py index 88c7b417..90877ca9 100644 --- a/scripts/static_spawns/tatooine/lars_homestead.py +++ b/scripts/static_spawns/tatooine/lars_homestead.py @@ -1,5 +1,5 @@ import sys -# Project SWG: Mos Entha: Static Spawns +# Project SWG: Lars Homestead: Static Spawns # (C)2014 ProjectSWG From b532798a0c7994a9d2a231455f6226e6b2d03353 Mon Sep 17 00:00:00 2001 From: zingzing175 Date: Sun, 4 May 2014 18:01:57 -0700 Subject: [PATCH 14/19] Fixed some commands not firing unless targeting self --- scripts/buffs/of_stimulator_1.py | 1 + scripts/commands/en_sprint_1.py | 2 +- scripts/commands/forcerun.py | 2 +- scripts/commands/fs_buff_ca_1.py | 2 +- scripts/commands/fs_buff_def_1_1.py | 2 +- scripts/commands/fs_buff_invis_1.py | 2 +- scripts/commands/fs_saber_reflect_buff.py | 2 +- scripts/commands/me_cure_affliction_1.py | 2 +- scripts/commands/me_evasion_1.py | 2 +- scripts/commands/me_stasis_self_1.py | 2 +- scripts/commands/of_emergency_shield.py | 2 +- scripts/commands/of_firepower_1.py | 2 +- scripts/commands/of_inspiration_1.py | 2 +- scripts/commands/of_inspiration_2.py | 2 +- scripts/commands/of_inspiration_3.py | 2 +- scripts/commands/of_inspiration_4.py | 2 +- scripts/commands/of_inspiration_5.py | 2 +- scripts/commands/of_inspiration_6.py | 2 +- scripts/commands/of_purge_1.py | 2 +- scripts/commands/of_scatter_1.py | 2 +- scripts/commands/of_stimulator_1.py | 2 +- scripts/commands/saberblock.py | 2 +- 22 files changed, 22 insertions(+), 21 deletions(-) diff --git a/scripts/buffs/of_stimulator_1.py b/scripts/buffs/of_stimulator_1.py index 4e120b7f..492e64d7 100644 --- a/scripts/buffs/of_stimulator_1.py +++ b/scripts/buffs/of_stimulator_1.py @@ -9,4 +9,5 @@ def add(core, actor, buff): def remove(core, actor, buff): core.skillModService.deductSkillMod(actor, 'debuff_purge', 2) + return \ No newline at end of file diff --git a/scripts/commands/en_sprint_1.py b/scripts/commands/en_sprint_1.py index 1393d38e..a24ef49d 100644 --- a/scripts/commands/en_sprint_1.py +++ b/scripts/commands/en_sprint_1.py @@ -4,5 +4,5 @@ def setup(): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'en_sprint') + core.buffService.addBuffToCreature(actor, 'en_sprint', actor) return \ No newline at end of file diff --git a/scripts/commands/forcerun.py b/scripts/commands/forcerun.py index df72153b..c4dabf79 100644 --- a/scripts/commands/forcerun.py +++ b/scripts/commands/forcerun.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'fs_force_run') + core.buffService.addBuffToCreature(actor, 'fs_force_run', actor) return \ No newline at end of file diff --git a/scripts/commands/fs_buff_ca_1.py b/scripts/commands/fs_buff_ca_1.py index 141b3158..2d12673e 100644 --- a/scripts/commands/fs_buff_ca_1.py +++ b/scripts/commands/fs_buff_ca_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'fs_buff_ca_1') + core.buffService.addBuffToCreature(actor, 'fs_buff_ca_1', actor) return \ No newline at end of file diff --git a/scripts/commands/fs_buff_def_1_1.py b/scripts/commands/fs_buff_def_1_1.py index cd9637f1..0125c187 100644 --- a/scripts/commands/fs_buff_def_1_1.py +++ b/scripts/commands/fs_buff_def_1_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'fs_buff_def_1_1') + core.buffService.addBuffToCreature(actor, 'fs_buff_def_1_1', actor) return \ No newline at end of file diff --git a/scripts/commands/fs_buff_invis_1.py b/scripts/commands/fs_buff_invis_1.py index 57ed4a59..965d034c 100644 --- a/scripts/commands/fs_buff_invis_1.py +++ b/scripts/commands/fs_buff_invis_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'invis_fs_buff_invis_1') + core.buffService.addBuffToCreature(actor, 'invis_fs_buff_invis_1', actor) return \ No newline at end of file diff --git a/scripts/commands/fs_saber_reflect_buff.py b/scripts/commands/fs_saber_reflect_buff.py index 898e2530..29f49243 100644 --- a/scripts/commands/fs_saber_reflect_buff.py +++ b/scripts/commands/fs_saber_reflect_buff.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'fs_saber_reflect') + core.buffService.addBuffToCreature(actor, 'fs_saber_reflect', actor) return \ No newline at end of file diff --git a/scripts/commands/me_cure_affliction_1.py b/scripts/commands/me_cure_affliction_1.py index 1e9189f1..c03b5879 100644 --- a/scripts/commands/me_cure_affliction_1.py +++ b/scripts/commands/me_cure_affliction_1.py @@ -4,5 +4,5 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'me_cure_affliction_1') + core.buffService.addBuffToCreature(actor, 'me_cure_affliction_1', target) return \ No newline at end of file diff --git a/scripts/commands/me_evasion_1.py b/scripts/commands/me_evasion_1.py index 52391238..6fb5001a 100644 --- a/scripts/commands/me_evasion_1.py +++ b/scripts/commands/me_evasion_1.py @@ -4,5 +4,5 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'me_evasion_1') + core.buffService.addBuffToCreature(actor, 'me_evasion_1', actor) return \ No newline at end of file diff --git a/scripts/commands/me_stasis_self_1.py b/scripts/commands/me_stasis_self_1.py index fc808c70..192637a1 100644 --- a/scripts/commands/me_stasis_self_1.py +++ b/scripts/commands/me_stasis_self_1.py @@ -18,7 +18,7 @@ def run(core, actor, target, commandString): if not combatSvc.applySpecialCost(actor, weapon, CombatCommand('me_stasis_self_1')): return - core.buffService.addBuffToCreature(actor, 'me_stasis_self_1') + core.buffService.addBuffToCreature(actor, 'me_stasis_self_1', actor) return \ No newline at end of file diff --git a/scripts/commands/of_emergency_shield.py b/scripts/commands/of_emergency_shield.py index 0a9cb543..73586f60 100644 --- a/scripts/commands/of_emergency_shield.py +++ b/scripts/commands/of_emergency_shield.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'of_emergency_shield') + core.buffService.addBuffToCreature(actor, 'of_emergency_shield', actor) return \ No newline at end of file diff --git a/scripts/commands/of_firepower_1.py b/scripts/commands/of_firepower_1.py index 50eba86a..442a5d45 100644 --- a/scripts/commands/of_firepower_1.py +++ b/scripts/commands/of_firepower_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'of_firepower') + core.buffService.addBuffToCreature(actor, 'of_firepower', actor) return \ No newline at end of file diff --git a/scripts/commands/of_inspiration_1.py b/scripts/commands/of_inspiration_1.py index 9f0c3a20..fc017af7 100644 --- a/scripts/commands/of_inspiration_1.py +++ b/scripts/commands/of_inspiration_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addGroupBuff(actor, 'of_inspiration_1') + core.buffService.addGroupBuff(actor, 'of_inspiration_1', actor) return \ No newline at end of file diff --git a/scripts/commands/of_inspiration_2.py b/scripts/commands/of_inspiration_2.py index c7ffcb5e..44ae030d 100644 --- a/scripts/commands/of_inspiration_2.py +++ b/scripts/commands/of_inspiration_2.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addGroupBuff(actor, 'of_inspiration_2') + core.buffService.addGroupBuff(actor, 'of_inspiration_2', actor) return \ No newline at end of file diff --git a/scripts/commands/of_inspiration_3.py b/scripts/commands/of_inspiration_3.py index fd2e8b80..52711f2a 100644 --- a/scripts/commands/of_inspiration_3.py +++ b/scripts/commands/of_inspiration_3.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addGroupBuff(actor, 'of_inspiration_3') + core.buffService.addGroupBuff(actor, 'of_inspiration_3', actor) return \ No newline at end of file diff --git a/scripts/commands/of_inspiration_4.py b/scripts/commands/of_inspiration_4.py index 35bae1ab..853d793d 100644 --- a/scripts/commands/of_inspiration_4.py +++ b/scripts/commands/of_inspiration_4.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addGroupBuff(actor, 'of_inspiration_4') + core.buffService.addGroupBuff(actor, 'of_inspiration_4', actor) return \ No newline at end of file diff --git a/scripts/commands/of_inspiration_5.py b/scripts/commands/of_inspiration_5.py index f9c9ba48..8723fc61 100644 --- a/scripts/commands/of_inspiration_5.py +++ b/scripts/commands/of_inspiration_5.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addGroupBuff(actor, 'of_inspiration_5') + core.buffService.addGroupBuff(actor, 'of_inspiration_5', actor) return \ No newline at end of file diff --git a/scripts/commands/of_inspiration_6.py b/scripts/commands/of_inspiration_6.py index ca05422d..5459e9ec 100644 --- a/scripts/commands/of_inspiration_6.py +++ b/scripts/commands/of_inspiration_6.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addGroupBuff(actor, 'of_inspiration_6') + core.buffService.addGroupBuff(actor, 'of_inspiration_6', actor) return \ No newline at end of file diff --git a/scripts/commands/of_purge_1.py b/scripts/commands/of_purge_1.py index 7a6edae9..1d1f6bae 100644 --- a/scripts/commands/of_purge_1.py +++ b/scripts/commands/of_purge_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'of_purge_1') + core.buffService.addBuffToCreature(actor, 'of_purge_1', actor) return \ No newline at end of file diff --git a/scripts/commands/of_scatter_1.py b/scripts/commands/of_scatter_1.py index 3984ca10..855c1841 100644 --- a/scripts/commands/of_scatter_1.py +++ b/scripts/commands/of_scatter_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'of_scatter_1', actor) + core.buffService.addGroupBuff(actor, 'of_scatter_1', actor) return \ No newline at end of file diff --git a/scripts/commands/of_stimulator_1.py b/scripts/commands/of_stimulator_1.py index c9b5a1c1..25efda68 100644 --- a/scripts/commands/of_stimulator_1.py +++ b/scripts/commands/of_stimulator_1.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'of_stimulator_1') + core.buffService.addBuffToCreature(actor, 'of_stimulator_1', actor) return \ No newline at end of file diff --git a/scripts/commands/saberblock.py b/scripts/commands/saberblock.py index 55e12c59..4a69c0ff 100644 --- a/scripts/commands/saberblock.py +++ b/scripts/commands/saberblock.py @@ -4,6 +4,6 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'saberblock') + core.buffService.addBuffToCreature(actor, 'saberblock', actor) return \ No newline at end of file From 6333418ba910cb56144ee8813015d907764396cc Mon Sep 17 00:00:00 2001 From: Seefo Date: Sun, 4 May 2014 21:09:15 -0400 Subject: [PATCH 15/19] Fixed a few vehicle bugs, see extended Fixed AV-21s not being called from datapad Fixed dismounting of passengers in passenger vehicles Fixed vehicle posture (animations will be correct now) --- .../vehicle/landspeeder_av21_pcd.py | 1 + src/services/pet/MountService.java | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/object/intangible/vehicle/landspeeder_av21_pcd.py b/scripts/object/intangible/vehicle/landspeeder_av21_pcd.py index ccad8904..d7c3f4a1 100644 --- a/scripts/object/intangible/vehicle/landspeeder_av21_pcd.py +++ b/scripts/object/intangible/vehicle/landspeeder_av21_pcd.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'datapad/vehicle_pcd') return \ No newline at end of file diff --git a/src/services/pet/MountService.java b/src/services/pet/MountService.java index 6108e0a2..b75e9707 100644 --- a/src/services/pet/MountService.java +++ b/src/services/pet/MountService.java @@ -429,8 +429,8 @@ public class MountService implements INetworkDispatch { rider.setState(State.RidingMount, true); mount.setState(State.MountedCreature, true); - rider.setPosture((mount.getTemplate().contains("vehicle")) ? Posture.DrivingVehicle : Posture.RidingCreature); - //mount.setPosture((mount.getTemplate().contains("vehicle")) ? Posture.DrivingVehicle : Posture.RidingCreature); + // For some reason SOE decided the mount would need the following posture to be set for the character to have the driving or riding animation. + mount.setPosture((mount.getTemplate().contains("vehicle")) ? Posture.DrivingVehicle : Posture.RidingCreature); if (!mount.getSlotNameForObject(rider).equals("rider1")) { core.buffService.addBuffToCreature(rider, "vehicle_passenger", mount); @@ -551,7 +551,11 @@ public class MountService implements INetworkDispatch { LongAdder adder = new LongAdder(); - mount.getSlottedObject("inventory").viewChildren(mount, false, false, (obj) -> adder.increment()); + try + { + mount.getSlottedObject("inventory").viewChildren(mount, false, false, (obj) -> adder.increment()); + } + catch(Exception ex) { } int passengers = adder.intValue(); @@ -589,8 +593,7 @@ public class MountService implements INetworkDispatch { } public void dismount(CreatureObject rider, CreatureObject mount) { - // Check if mount is currently mounted // Not necessary since nobody'll be dismounted if so - + if (rider == null || mount == null) { return; } @@ -605,12 +608,12 @@ public class MountService implements INetworkDispatch { // Dismount all passengers if (rider.getObjectID() == mount.getOwnerId()) { - CreatureObject owner = rider; - mount.viewChildren(owner, false, false, new Traverser() { - - public void process(SWGObject passenger) { - if (passenger != owner) dismount(rider, mount); + mount.viewChildren(mount, false, false, new Traverser() + { + public void process(SWGObject passenger) + { + if (passenger.getObjectId() != mount.getOwnerId()) dismount((CreatureObject) passenger, mount); } }); From c1d355935830549bc50d3b87bfe533f8038be30a Mon Sep 17 00:00:00 2001 From: Seefo Date: Sun, 4 May 2014 21:21:14 -0400 Subject: [PATCH 16/19] Fixed vehicle system messages --- src/services/pet/MountService.java | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/services/pet/MountService.java b/src/services/pet/MountService.java index b75e9707..ac1b03db 100644 --- a/src/services/pet/MountService.java +++ b/src/services/pet/MountService.java @@ -63,7 +63,7 @@ public class MountService implements INetworkDispatch { } if (actor.getSlottedObject("ghost") == null) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:failed_to_call_vehicle"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:failed_to_call_vehicle"), DisplayType.Broadcast); return; } @@ -75,12 +75,12 @@ public class MountService implements INetworkDispatch { // Unsure if these are the right attributes. It doesn't generate the vehicle if the datapad has max # of vehicles. //if (datapad.getIntAttribute("data_size") >= datapad.getIntAttribute("datapad_slots")) { - //actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:has_max_vehicle"), DisplayType.Broadcast); + //actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:has_max_vehicle"), DisplayType.Broadcast); //return; //} if (actor.getTefTime() > 0){ - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:prose_cant_generate_yet", actor.getTefTime()), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:prose_cant_generate_yet", actor.getTefTime()), DisplayType.Broadcast); return; } @@ -114,7 +114,7 @@ public class MountService implements INetworkDispatch { core.objectService.destroyObject(deed); } - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:device_added"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:device_added"), DisplayType.Broadcast); call(actor, pcd); } @@ -129,38 +129,38 @@ public class MountService implements INetworkDispatch { } if (pcd == null) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_call"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_call"), DisplayType.Broadcast); return; } if (isMounted(actor)) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cannot_call_another_rideable"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cannot_call_another_rideable"), DisplayType.Broadcast); return; } if (actor.getCombatFlag() == 1) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cannot_call_in_combat"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cannot_call_in_combat"), DisplayType.Broadcast); return; } if (actor.getContainer() != null) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cannot_call_indoors"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cannot_call_indoors"), DisplayType.Broadcast); return; } if (actor.getPosture() == Posture.Dead) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cannot_call_while_dead"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cannot_call_while_dead"), DisplayType.Broadcast); return; } if (pcd.getSlottedObject("inventory") == null) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_call"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_call"), DisplayType.Broadcast); return; } if (pcd.getStringAttribute("required_faction") != null && pcd.getStringAttribute("required_faction").length() > 0) { if (!actor.getFaction().equals(pcd.getStringAttribute("required_faction"))) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:officer_faction"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:officer_faction"), DisplayType.Broadcast); return; } } @@ -175,7 +175,7 @@ public class MountService implements INetworkDispatch { if (mount == null) { // Somehow the vehicle object has got lost - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_call"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_call"), DisplayType.Broadcast); return; } @@ -194,24 +194,24 @@ public class MountService implements INetworkDispatch { private void callVehicle(CreatureObject actor, SWGObject pcd, PlayerObject player, CreatureObject mount) { if ((mount.getLevel() - actor.getLevel()) > 5) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_call_level"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_call_level"), DisplayType.Broadcast); return; } // FIXME Movement skillmod should always be used instead of CREO4 speed vars directly. Movement skillmod should NEVER be 0 unless rooted. Currently it is, which is wrong. //if (actor.getSkillModBase("movement") == 0) { - //actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_call_vehicle_rooted"), DisplayType.Broadcast); + //actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_call_vehicle_rooted"), DisplayType.Broadcast); //return; //} if (actor.getPlanet().getName().contains("kashyyyk") && !actor.getPlanet().getName().contains("_main")) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:vehicle_restricted_scene"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:vehicle_restricted_scene"), DisplayType.Broadcast); //mount_restricted_scene for creature mounts return; } if (player.isCallingCompanion()) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_call_1sec"), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_call_1sec"), DisplayType.Broadcast); return; } @@ -220,7 +220,7 @@ public class MountService implements INetworkDispatch { player.setCallingCompanion(true); if (actor.getTefTime() > 0) { - actor.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:call_vehicle_delay", actor.getTefTime()), DisplayType.Broadcast); + actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:call_vehicle_delay", actor.getTefTime()), DisplayType.Broadcast); } try { @@ -303,7 +303,7 @@ public class MountService implements INetworkDispatch { dismount(rider, mount); - rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:veh_disabled"), DisplayType.Broadcast); + rider.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:veh_disabled"), DisplayType.Broadcast); } }); @@ -361,12 +361,12 @@ public class MountService implements INetworkDispatch { } if (mount.getOption(Options.DISABLED)) { - repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cannot_repair_disabled"), DisplayType.Broadcast); + repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cannot_repair_disabled"), DisplayType.Broadcast); return; } if (mount.getConditionDamage() == 0) { - repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:undamaged_vehicle"), DisplayType.Broadcast); + repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:undamaged_vehicle"), DisplayType.Broadcast); return; } @@ -374,14 +374,14 @@ public class MountService implements INetworkDispatch { // But at the moment it's not important. if (!canRepair(repairer, mount)) { - repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:repair_unrecognized_garages"), DisplayType.Broadcast); + repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:repair_unrecognized_garages"), DisplayType.Broadcast); return; } int cost = mount.getConditionDamage(); if (repairer.getCashCredits() < cost) { - repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:repair_failed_due_to_funds"), DisplayType.Broadcast); + repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:repair_failed_due_to_funds"), DisplayType.Broadcast); return; } @@ -389,7 +389,7 @@ public class MountService implements INetworkDispatch { mount.setOptions(Options.DISABLED, false); - repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:repaired_to_max"), DisplayType.Broadcast); + repairer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:repaired_to_max"), DisplayType.Broadcast); } public void mount(CreatureObject rider, CreatureObject mount) { @@ -408,17 +408,17 @@ public class MountService implements INetworkDispatch { } if (mount.getOption(Options.DISABLED)) { - rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_mount_veh_disabled"), DisplayType.Broadcast); + rider.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_mount_veh_disabled"), DisplayType.Broadcast); return; } if (rider.isInStealth()) { - rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:no_mount_stealth"), DisplayType.Broadcast); + rider.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:no_mount_stealth"), DisplayType.Broadcast); return; } if (!canMount(rider, mount)) { - rider.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_mount"), DisplayType.Broadcast); + rider.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_mount"), DisplayType.Broadcast); return; } @@ -669,17 +669,17 @@ public class MountService implements INetworkDispatch { PlayerObject player = (PlayerObject) owner.getSlottedObject("ghost"); if (player.isCallingCompanion()) { - storer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:cant_store_1sec"), DisplayType.Broadcast); + storer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cant_store_1sec"), DisplayType.Broadcast); return; } if (isMounted(owner, mount)) { - storer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:must_dismount"), DisplayType.Broadcast); + storer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:must_dismount"), DisplayType.Broadcast); return; } if (owner.getTefTime() > 0) { - owner.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:prose_cant_store_yet", owner.getTefTime()), DisplayType.Broadcast); + owner.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:prose_cant_store_yet", owner.getTefTime()), DisplayType.Broadcast); return; } @@ -767,9 +767,9 @@ public class MountService implements INetworkDispatch { core.objectService.destroyObject(pcd); if (type.contains("vehicle")) { - destroyer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:vehicle_released"), DisplayType.Broadcast); + destroyer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:vehicle_released"), DisplayType.Broadcast); } else { - destroyer.sendSystemMessage(OutOfBand.ProsePackage("@pet_menu:pet_released"), DisplayType.Broadcast); + destroyer.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:pet_released"), DisplayType.Broadcast); } } From 07fb35b747a5d281ba454ba72048f9f32f71796a Mon Sep 17 00:00:00 2001 From: Treeku Date: Mon, 5 May 2014 02:27:26 +0100 Subject: [PATCH 17/19] Fixed issue where mount gets children of wrong obj --- src/services/pet/MountService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/pet/MountService.java b/src/services/pet/MountService.java index ac1b03db..1ffc8949 100644 --- a/src/services/pet/MountService.java +++ b/src/services/pet/MountService.java @@ -551,11 +551,11 @@ public class MountService implements INetworkDispatch { LongAdder adder = new LongAdder(); - try - { - mount.getSlottedObject("inventory").viewChildren(mount, false, false, (obj) -> adder.increment()); + try { + mount.viewChildren(mount, false, false, (object) -> adder.increment()); + } catch(Exception ex) { + } - catch(Exception ex) { } int passengers = adder.intValue(); From 90ded46f68ce152002bfce3194359335be1fcbb5 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 5 May 2014 17:42:08 +0200 Subject: [PATCH 18/19] Fixed Typo in Junkdealer conversation --- scripts/conversation/junk_dealer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/conversation/junk_dealer.py b/scripts/conversation/junk_dealer.py index 7c146b0f..5e5c435b 100644 --- a/scripts/conversation/junk_dealer.py +++ b/scripts/conversation/junk_dealer.py @@ -279,7 +279,7 @@ def noSellWindowCallBack(owner, window, eventType, returnList): #cancel if eventType == 1: - owner.sendSystemMessage('Cancle', 0) + owner.sendSystemMessage('Cancel', 0) sellItem = returnList.get(0) startConversation(coreRef,owner,junkDealerRef) return From ae728fc39af56b83586ab494a700882e1a66c6bd Mon Sep 17 00:00:00 2001 From: Seefo Date: Mon, 5 May 2014 13:04:59 -0400 Subject: [PATCH 19/19] Fixed an issue where creatures wouldn't be dismounted upon incapacitation (#613) --- src/services/combat/CombatService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index fc61e166..4688d12d 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -783,10 +783,12 @@ public class CombatService implements INetworkDispatch { } synchronized(target.getMutex()) { + if(core.mountService.isMounted(target)) core.mountService.dismount(target, (CreatureObject) target.getContainer()); + target.setHealth(1); target.setPosture((byte) 13); target.setTurnRadius(0); - target.setSpeedMultiplierBase(0); + target.setSpeedMultiplierBase(0); } ScheduledFuture incapTask = scheduler.schedule(() -> {