From cabce0658938dd5e328c12e2a5c6e5bd78de5aca Mon Sep 17 00:00:00 2001 From: Zing Date: Thu, 19 Jun 2014 18:49:42 -0700 Subject: [PATCH 1/3] Loot fixes --- .../collections/inv_holocron_collection_01.py | 15 ++++++++++++++ .../collections/relics/jedi_relic_1.py | 20 +++++++++++++++++++ scripts/loot/lootItems/relics/jedi_relic_2.py | 6 ------ scripts/loot/lootPools/jediholocrons.py | 6 ++++-- scripts/loot/lootPools/junk.py | 2 +- scripts/loot/lootPools/sithholocrons.py | 6 ++++-- scripts/mobiles/dantooine/dark_jedi_master.py | 2 +- 7 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 scripts/collections/inv_holocron_collection_01.py create mode 100644 scripts/loot/lootItems/collections/relics/jedi_relic_1.py delete mode 100644 scripts/loot/lootItems/relics/jedi_relic_2.py 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'] From d330be45539314f4bc0b50207f022225d23b9b3a Mon Sep 17 00:00:00 2001 From: Zing Date: Thu, 19 Jun 2014 18:50:05 -0700 Subject: [PATCH 2/3] missed one --- scripts/loot/lootItems/relics/jedi_relic_1.py | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 scripts/loot/lootItems/relics/jedi_relic_1.py diff --git a/scripts/loot/lootItems/relics/jedi_relic_1.py b/scripts/loot/lootItems/relics/jedi_relic_1.py deleted file mode 100644 index 321819e2..00000000 --- a/scripts/loot/lootItems/relics/jedi_relic_1.py +++ /dev/null @@ -1,8 +0,0 @@ - -def itemTemplate(): - - return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] - -def usedInCollection(): - - return 'One-Handed Fifth Generation Lightsaber' From 213a068c286debc2492e0d35142cf30f8229d62d Mon Sep 17 00:00:00 2001 From: Zing Date: Sat, 21 Jun 2014 00:49:31 -0700 Subject: [PATCH 3/3] Loot collection will auto delete if successfully added. --- .../bantha_braided_bracelet.py | 20 +++++++++++++++++++ .../tusken_valuables/broken_gaderaffi.py | 20 +++++++++++++++++++ .../tusken_valuables/hubba_gourd.py | 20 +++++++++++++++++++ .../tusken_valuables/massif_thorn.py | 20 +++++++++++++++++++ .../tusken_valuables/scavenged_metal.py | 20 +++++++++++++++++++ .../tusken_bantha_braided_sling.py | 20 +++++++++++++++++++ .../tusken_valuables/tusken_spirit_mask.py | 20 +++++++++++++++++++ .../tusken_valuables/tusken_talisman.py | 20 +++++++++++++++++++ .../tusken_valuables/womp_rat_tusk.py | 20 +++++++++++++++++++ .../radial/item/collection/loot_collection.py | 7 ++++--- 10 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py diff --git a/scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py b/scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py new file mode 100644 index 00000000..2367cdb9 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_bracelet.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_bantha_bracelet_02_01','static_item_d','col_tusken_bantha_bracelet_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_bantha_bracelet_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py b/scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py new file mode 100644 index 00000000..fd58b1b8 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_gaderffi.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_gaderffi_02_01','static_item_d','col_tusken_gaderffi_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_gaderffi_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py b/scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py new file mode 100644 index 00000000..188cf15c --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_hubba_gourd.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_hubba_gourd_02_01','static_item_d','col_tusken_hubba_gourd_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_hubba_gourd_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py b/scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py new file mode 100644 index 00000000..fc5f0ca7 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_massif_thorn.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_massif_thorn_02_01','static_item_d','col_tusken_massif_thorn_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_massif_thorn_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py b/scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py new file mode 100644 index 00000000..fed7a706 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_metal.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_metal_02_01','static_item_d','col_tusken_metal_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_metal_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py b/scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py new file mode 100644 index 00000000..3bd06f29 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_bantha_braid.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_bantha_braid_02_01','static_item_d','col_tusken_bantha_braid_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_bantha_braid_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py b/scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py new file mode 100644 index 00000000..4c5b4138 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_spirit_mask.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_spirit_mask_02_01','static_item_d','col_tusken_spirit_mask_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_spirit_mask_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py b/scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py new file mode 100644 index 00000000..db936f17 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_talisman.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_talisman_02_01','static_item_d','col_tusken_talisman_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_talisman_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py b/scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py new file mode 100644 index 00000000..c6f8438d --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_womp_rat_tusk.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_womp_rat_tusk_02_01','static_item_d','col_tusken_womp_rat_tusk_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_womp_rat_tusk_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/radial/item/collection/loot_collection.py b/scripts/radial/item/collection/loot_collection.py index 51fd1e57..f72a1fd2 100644 --- a/scripts/radial/item/collection/loot_collection.py +++ b/scripts/radial/item/collection/loot_collection.py @@ -11,8 +11,9 @@ def handleSelection(core, actor, target, option): if option == 21 and target: if target.getAttachment('CollectionItemName'): print (target.getAttachment('CollectionItemName')) - core.collectionService.addCollection(actor, target.getAttachment('CollectionItemName')) - core.objectService.useObject(actor, target) - #core.objectService.destroyObject(target) + if core.collectionService.isComplete(actor, target.getAttachment('CollectionItemName')) == False: + core.collectionService.addCollection(actor, target.getAttachment('CollectionItemName')) + core.objectService.useObject(actor, target) + core.objectService.destroyObject(target) return \ No newline at end of file