From 8d1cc1722061e28b68927a9faa8d86c83ac2f2a4 Mon Sep 17 00:00:00 2001 From: Zing Date: Sat, 21 Jun 2014 15:18:17 -0700 Subject: [PATCH] More Loot Collections Moved loot collection radial into collection radial (can be used for other consume item collections. added: Nightsister Valuables, Gem, Prototype IG-88, and StormTrooper collections. --- .../green_cusion_cut_gem/green_artusian.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_baltaran.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_bondar.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_chrysopaz.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_dragite.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_durindfire.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_firefacet.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_jenruax.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_pikach.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_vertex.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_artusian.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_baltaran.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_bondar.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_chrysopaz.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_dragite.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_durindfire.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_firefacet.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_jenruax.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_pikach.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_vertex.py | 19 ++++++++++++++++++ .../set_of_singing_mountain_clan_earrings.py | 20 +++++++++++++++++++ .../singing_mountain_clan_bracelet.py | 20 +++++++++++++++++++ .../singing_mountain_clan_broach.py | 20 +++++++++++++++++++ .../singing_mountain_clan_pendant.py | 20 +++++++++++++++++++ .../singing_mountain_clan_ring.py | 20 +++++++++++++++++++ .../collections/prototype_ig_88/ig_88_head.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_left_arm.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_left_leg.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_right_arm.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_right_leg.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_stand.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_torso.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_wooden_dowel.py | 12 +++++++++++ .../stormtrooper_head.py | 20 +++++++++++++++++++ .../stormtrooper_left_arm.py | 20 +++++++++++++++++++ .../stormtrooper_left_leg.py | 20 +++++++++++++++++++ .../stormtrooper_right_arm.py | 20 +++++++++++++++++++ .../stormtrooper_right_leg.py | 20 +++++++++++++++++++ .../stormtrooper_stand.py | 20 +++++++++++++++++++ .../stormtrooper_torso.py | 20 +++++++++++++++++++ .../stormtrooper_wooden_dowel.py | 12 +++++++++++ scripts/radial/item/collection.py | 10 +++++++--- .../radial/item/collection/loot_collection.py | 19 ------------------ src/services/LootService.java | 4 ++-- 44 files changed, 793 insertions(+), 24 deletions(-) create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py delete mode 100644 scripts/radial/item/collection/loot_collection.py diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py new file mode 100644 index 00000000..50f88977 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_02','static_item_d','col_green_sq_cut_gem_style1_02_02'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py new file mode 100644 index 00000000..3b1d9dea --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_03','static_item_d','col_green_sq_cut_gem_style1_02_03'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py new file mode 100644 index 00000000..721d7681 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_04','static_item_d','col_green_sq_cut_gem_style1_02_04'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py new file mode 100644 index 00000000..0a10d74c --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_05','static_item_d','col_green_sq_cut_gem_style1_02_05'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py new file mode 100644 index 00000000..95ac01b9 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_08','static_item_d','col_green_sq_cut_gem_style1_02_08'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py new file mode 100644 index 00000000..62a0cb60 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_06','static_item_d','col_green_sq_cut_gem_style1_02_06'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py new file mode 100644 index 00000000..ca518c62 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_09','static_item_d','col_green_sq_cut_gem_style1_02_09'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_09' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py new file mode 100644 index 00000000..7e61874a --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_10','static_item_d','col_green_sq_cut_gem_style1_02_10'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py new file mode 100644 index 00000000..6f3fa6dd --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_01','static_item_d','col_green_sq_cut_gem_style1_02_01'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py new file mode 100644 index 00000000..47430210 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_07','static_item_d','col_green_sq_cut_gem_style1_02_07'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py new file mode 100644 index 00000000..2b544015 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_02','static_item_d','col_red_rnd_cut_gem_style1_02_02'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py new file mode 100644 index 00000000..2315ce1e --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_03','static_item_d','col_red_rnd_cut_gem_style1_02_03'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py new file mode 100644 index 00000000..2b6dd744 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_04','static_item_d','col_red_rnd_cut_gem_style1_02_04'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py new file mode 100644 index 00000000..c569e47c --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_05','static_item_d','col_red_rnd_cut_gem_style1_02_05'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py new file mode 100644 index 00000000..9145a5d1 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_08','static_item_d','col_red_rnd_cut_gem_style1_02_08'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py new file mode 100644 index 00000000..a3c80bb8 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_06','static_item_d','col_red_rnd_cut_gem_style1_02_06'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py new file mode 100644 index 00000000..00c65c86 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_09','static_item_d','col_red_rnd_cut_gem_style1_02_09'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_09' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py new file mode 100644 index 00000000..7c13a2fc --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_10','static_item_d','col_red_rnd_cut_gem_style1_02_10'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py new file mode 100644 index 00000000..dfa1c5b3 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_01','static_item_d','col_red_rnd_cut_gem_style1_02_01'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py new file mode 100644 index 00000000..d3122ef5 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_07','static_item_d','col_red_rnd_cut_gem_style1_02_07'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py b/scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py new file mode 100644 index 00000000..bfb33ed5 --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_earrings.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_earrings_01','static_item_d','col_nightsister_earrings_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_earrings_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py new file mode 100644 index 00000000..029711ca --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_bracelet.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_bracelet_01','static_item_d','col_nightsister_bracelet_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_bracelet_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py new file mode 100644 index 00000000..f822586a --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_broach.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_broach_01','static_item_d','col_nightsister_broach_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_broach_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py new file mode 100644 index 00000000..81c67b54 --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_pendant.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_pendant_01','static_item_d','col_nightsister_pendant_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_pendant_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py new file mode 100644 index 00000000..d4e0c59d --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_ring.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_ring_01','static_item_d','col_nightsister_ring_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_ring_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py new file mode 100644 index 00000000..c32ff78f --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_head.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_head_02_01','static_item_d','col_ig_88_head_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_head' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py new file mode 100644 index 00000000..088b892c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_left_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_left_arm_02_01','static_item_d','col_ig_88_left_arm_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_left_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py new file mode 100644 index 00000000..243932c9 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_left_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_left_leg_02_01','static_item_d','col_ig_88_left_leg_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_left_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py new file mode 100644 index 00000000..965fb9ba --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_right_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_right_arm_02_01','static_item_d','col_ig_88_right_arm_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_right_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py new file mode 100644 index 00000000..a572c54c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_right_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_right_leg_02_01','static_item_d','col_ig_88_right_leg_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_right_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py new file mode 100644 index 00000000..1c590c94 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_stand_base.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_metal_stand_02_01','static_item_d','col_ig_88_metal_stand_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_stand_base' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py new file mode 100644 index 00000000..0fcc996a --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_torso.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_torso_02_01','static_item_d','col_ig_88_torso_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_torso' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py new file mode 100644 index 00000000..93783d3c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py @@ -0,0 +1,12 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_ig_88_wooden_dowel.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_wooden_dowel_02_01','static_item_d','col_ig_88_wooden_dowel_02_01'] + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py new file mode 100644 index 00000000..699ce198 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_head.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_head_02_01','static_item_d','col_stormtrooper_head_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_head' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py new file mode 100644 index 00000000..731e0233 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_left_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_left_arm_02_01','static_item_d','col_stormtrooper_left_arm_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_left_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py new file mode 100644 index 00000000..34659202 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_left_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_left_leg_02_01','static_item_d','col_stormtrooper_left_leg_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_left_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py new file mode 100644 index 00000000..728150ec --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_right_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_right_arm_02_01','static_item_d','col_stormtrooper_right_arm_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_right_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py new file mode 100644 index 00000000..60dc5e04 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_right_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_right_leg_02_01','static_item_d','col_stormtrooper_right_leg_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_right_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py new file mode 100644 index 00000000..2d59886b --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_stand_base.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_metal_stand_02_01','static_item_d','col_stormtrooper_metal_stand_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_stand_base' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py new file mode 100644 index 00000000..2f07827c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_torso.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_torso_02_01','static_item_d','col_stormtrooper_torso_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_torso' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py new file mode 100644 index 00000000..7f60ba3b --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py @@ -0,0 +1,12 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_stormtrooper_wooden_dowel.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_wooden_dowel_02_01','static_item_d','col_stormtrooper_wooden_dowel_02_01'] + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/radial/item/collection.py b/scripts/radial/item/collection.py index 0b45c9e4..f72a1fd2 100644 --- a/scripts/radial/item/collection.py +++ b/scripts/radial/item/collection.py @@ -7,9 +7,13 @@ def createRadial(core, owner, target, radials): radials.add(RadialOptions(0, 21, 3, '@collection:consume_item')) return -def handleSelection(core, owner, target, option): +def handleSelection(core, actor, target, option): if option == 21 and target: - core.collectionService.addCollection(owner, target.getStfName().rsplit('_n', 1)[0]) - core.objectService.useObject(owner, target) + if target.getAttachment('CollectionItemName'): + print (target.getAttachment('CollectionItemName')) + 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 diff --git a/scripts/radial/item/collection/loot_collection.py b/scripts/radial/item/collection/loot_collection.py deleted file mode 100644 index f72a1fd2..00000000 --- a/scripts/radial/item/collection/loot_collection.py +++ /dev/null @@ -1,19 +0,0 @@ -from resources.common import RadialOptions -import sys - -def createRadial(core, owner, target, radials): - radials.add(RadialOptions(0, 21, 1, '')) - radials.add(RadialOptions(0, 7, 1, '')) - radials.add(RadialOptions(0, 21, 3, '@collection:consume_item')) - return - -def handleSelection(core, actor, target, option): - if option == 21 and target: - if target.getAttachment('CollectionItemName'): - print (target.getAttachment('CollectionItemName')) - 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 diff --git a/src/services/LootService.java b/src/services/LootService.java index 35aec14e..0b45fd30 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -758,7 +758,7 @@ public class LootService implements INetworkDispatch { droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); //core.collectionService.addCollection(actor, "new_prof_officer_master") - droppedItem.setAttachment("radial_filename", "item/collection/loot_collection"); + droppedItem.setAttachment("radial_filename", "item/collection"); //System.out.println("collection"); } @@ -1224,7 +1224,7 @@ public class LootService implements INetworkDispatch { droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); //core.collectionService.addCollection(actor, "new_prof_officer_master") - droppedItem.setAttachment("radial_filename", "item/loot_collection"); + droppedItem.setAttachment("radial_filename", "item/collection"); }