diff --git a/scripts/collections/inv_holocron_collection_01.py b/scripts/collections/inv_holocron_collection_01.py new file mode 100644 index 00000000..82708850 --- /dev/null +++ b/scripts/collections/inv_holocron_collection_01.py @@ -0,0 +1,15 @@ +from java.lang import System +import sys + +def modify(core, actor, count): + return + +def complete(core, actor, collection): + ghost = actor.getSlottedObject('ghost') + actor.sendSystemMessage('@collection_n:inv_holocron_collection_01_finished', 0) + print ('Collection Finished Test') + bb = core.objectService.createObject('object/tangible/wearables/backpack/shared_fannypack_s01.iff', object.getPlanet()) + core.playerService.giveItem(actor, bb) + print ('test2') + + return \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/relics/jedi_relic_1.py b/scripts/loot/lootItems/collections/relics/jedi_relic_1.py new file mode 100644 index 00000000..1885ce9c --- /dev/null +++ b/scripts/loot/lootItems/collections/relics/jedi_relic_1.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] + +def STFparams(): + + return ['static_item_n','col_lightsaber_1h_01_03','static_item_d','col_lightsaber_1h_01_03'] + +def AddToCollection(): + + return 'col_lightsaber_1h_01' + +def CollectionItemName(): + + return 'col_lightsaber_1h_01_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/relics/jedi_relic_2.py b/scripts/loot/lootItems/relics/jedi_relic_2.py deleted file mode 100644 index 1460ae13..00000000 --- a/scripts/loot/lootItems/relics/jedi_relic_2.py +++ /dev/null @@ -1,6 +0,0 @@ - -def itemTemplate(): - - return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] - - diff --git a/scripts/loot/lootPools/jediholocrons.py b/scripts/loot/lootPools/jediholocrons.py index a227cbe8..af0a9daa 100644 --- a/scripts/loot/lootPools/jediholocrons.py +++ b/scripts/loot/lootPools/jediholocrons.py @@ -1,8 +1,10 @@ def itemNames(): - return ['jedi_holocron_1_5','jedi_holocron_2_5','jedi_holocron_3_5','jedi_holocron_4_5','jedi_holocron_5_5'] + items=['jedi_holocron_1_5','jedi_holocron_2_5','jedi_holocron_3_5','jedi_holocron_4_5','jedi_holocron_5_5'] + items=items+['jedi_holocron_1_5_wp','jedi_holocron_2_5_wp','jedi_holocron_3_5_wp','jedi_holocron_4_5_wp','jedi_holocron_5_5_wp'] + return names def itemChances(): - return [25,15,30,5,25] \ No newline at end of file + return [9,9,15,6,12,10,9,15,3,12] \ No newline at end of file diff --git a/scripts/loot/lootPools/junk.py b/scripts/loot/lootPools/junk.py index ef757825..cb0b44c6 100644 --- a/scripts/loot/lootPools/junk.py +++ b/scripts/loot/lootPools/junk.py @@ -2,7 +2,7 @@ def itemNames(): templates=['damaged_datapad','red_wiring','worklight_generic','antenna','brain','eye','gland','heart','stomach','armor_repair_device'] #10 - templates=templates+['brain','chassis_blueprint','comlink','explosive_dud','hyperdrive_unit','id_chip','impulse_detector','laser_trap'] #8 + templates=templates+['brain','chassis_blueprints','comlink','explosive_dud','hyperdrive_unit','id_chip','impulse_detector','laser_trap'] #8 templates=templates+['launcher_tube','ledger','magseal_detector','medical_console','medical_device','motor','power_output_analyzer','shield_module'] #8 templates=templates+['software_module','survival_gear','underpowered_survey_pad','unidentified_serum_vial','used_notebook','weak_droid_battery'] #6 return templates diff --git a/scripts/loot/lootPools/sithholocrons.py b/scripts/loot/lootPools/sithholocrons.py index b264dabe..1e18966a 100644 --- a/scripts/loot/lootPools/sithholocrons.py +++ b/scripts/loot/lootPools/sithholocrons.py @@ -1,8 +1,10 @@ def itemNames(): - return ['sith_holocron_1_5','sith_holocron_2_5','sith_holocron_3_5','sith_holocron_4_5','sith_holocron_5_5'] + items=['sith_holocron_1_5','sith_holocron_2_5','sith_holocron_3_5','sith_holocron_4_5','sith_holocron_5_5'] + items=items+['sith_holocron_1_5_wp','sith_holocron_2_5_wp','sith_holocron_3_5_wp','sith_holocron_4_5_wp','sith_holocron_5_5_wp'] + return items def itemChances(): - return [25,15,30,5,25] \ No newline at end of file + return [9,9,15,6,12,10,9,15,3,12] \ No newline at end of file diff --git a/scripts/mobiles/dantooine/dark_jedi_master.py b/scripts/mobiles/dantooine/dark_jedi_master.py index 00b9c0f8..da18e248 100644 --- a/scripts/mobiles/dantooine/dark_jedi_master.py +++ b/scripts/mobiles/dantooine/dark_jedi_master.py @@ -54,7 +54,7 @@ def addTemplate(core): lootPoolNames_2 = ['jedi_relic_1'] lootPoolChances_2 = [100] - lootGroupChance_2 = 85 + lootGroupChance_2 = 30 mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) lootPoolNames_3 = ['powercrystals_hiq']