Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	scripts/radial/item/collection/loot_collection.py
	src/resources/objects/mission/MissionObject.java

scripts/loot/lootItems/collections/aurebesh_tiles/aurek.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_aurek.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_aurek.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_aurek','static_item_d','col_aurebesh_tile_aurek']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
 	
+def CollectionItemName():
+
+	return 'aurek'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/besh.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_besh.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_besh.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_besh','static_item_d','col_aurebesh_tile_besh']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
 	
+def CollectionItemName():
+
+	return 'besh'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/cherek.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_cherek.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_cherek','static_item_d','col_aurebesh_tile_cherek']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'cherek'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/cresh.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_cresh.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_cresh','static_item_d','col_aurebesh_tile_cresh']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'cresh'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/dorn.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_dorn.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_dorn','static_item_d','col_aurebesh_tile_dorn']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'dorn'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/enth.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_enth.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_enth','static_item_d','col_aurebesh_tile_enth']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'enth'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/esk.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_esk.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_esk','static_item_d','col_aurebesh_tile_esk']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'esk'
+
 def stackable():
 
 	return 1
-	
-def junkDealerPrice():
-
-	return 100
-

scripts/loot/lootItems/collections/aurebesh_tiles/forn.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_forn.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_forn','static_item_d','col_aurebesh_tile_forn']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'forn'
+
 def stackable():
 
 	return 1
-	
-def junkDealerPrice():
-
-	return 100
-

scripts/loot/lootItems/collections/aurebesh_tiles/grek.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_grek.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_grek','static_item_d','col_aurebesh_tile_grek']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'grek'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/herf.py

@@ -3,11 +3,19 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_herf.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_herf','static_item_d','col_aurebesh_tile_herf']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'herf'
+
 def stackable():
 
 	return 1
-	
-def junkDealerPrice():
-
-	return 100
 

scripts/loot/lootItems/collections/aurebesh_tiles/isk.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_isk.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_isk','static_item_d','col_aurebesh_tile_isk']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'isk'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/jenth.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_jenth.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_jenth','static_item_d','col_aurebesh_tile_jenth']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'jenth'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/kerenth.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_kerenth.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_kerenth','static_item_d','col_aurebesh_tile_kerenth']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'kerenth'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/krill.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_krill.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_krill','static_item_d','col_aurebesh_tile_krill']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'krill'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/leth.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_leth.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_leth','static_item_d','col_aurebesh_tile_leth']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'leth'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/mern.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_mern.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_mern','static_item_d','col_aurebesh_tile_mern']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'mern'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/nen.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_nen.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_nen','static_item_d','col_aurebesh_tile_nen']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'nen'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/nern.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_nern.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_nern','static_item_d','col_aurebesh_tile_nern']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'nern'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/onith.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_onith.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_onith','static_item_d','col_aurebesh_tile_onith']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'onith'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/orenth.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_orenth.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_orenth','static_item_d','col_aurebesh_tile_orenth']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'orenth'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/osk.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_osk.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_osk','static_item_d','col_aurebesh_tile_osk']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'osk'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/peth.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_peth.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_peth','static_item_d','col_aurebesh_tile_peth']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'peth'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/qek.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_qek.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_qek','static_item_d','col_aurebesh_tile_qek']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'qek'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/resh.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_resh.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_resh','static_item_d','col_aurebesh_tile_resh']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'resh'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/senth.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_senth.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_senth','static_item_d','col_aurebesh_tile_senth']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'senth'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/shen.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_shen.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_shen','static_item_d','col_aurebesh_tile_shen']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'shen'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/thesh.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_thesh.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_thesh','static_item_d','col_aurebesh_tile_thesh']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'thesh'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/trill.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_trill.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_trill','static_item_d','col_aurebesh_tile_trill']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'trill'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/usk.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_usk.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_usk','static_item_d','col_aurebesh_tile_usk']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'usk'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/vev.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_vev.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_vev','static_item_d','col_aurebesh_tile_vev']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'vev'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/wesk.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_wesk.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_wesk','static_item_d','col_aurebesh_tile_wesk']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'wesk'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/xesh.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_xesh.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_xesh','static_item_d','col_aurebesh_tile_xesh']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'xesh'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/yirt.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_yirt.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_yirt','static_item_d','col_aurebesh_tile_yirt']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'yirt'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/aurebesh_tiles/zerek.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_zerek.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_aurebesh_tile_zerek','static_item_d','col_aurebesh_tile_zerek']
+
+def AddToCollection():
+
+	return 'col_aurebesh_tiles'
+	
+def CollectionItemName():
+
+	return 'zerek'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_1.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_01','static_item_d','col_purple_rnd_cut_gem_style1_02_01']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_01'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_10.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_10','static_item_d','col_purple_rnd_cut_gem_style1_02_10']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_10'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_2.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_02','static_item_d','col_purple_rnd_cut_gem_style1_02_02']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_02'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_3.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_03','static_item_d','col_purple_rnd_cut_gem_style1_02_03']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_03'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_4.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_04','static_item_d','col_purple_rnd_cut_gem_style1_02_04']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_04'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_5.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_05','static_item_d','col_purple_rnd_cut_gem_style1_02_05']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_05'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_6.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_06','static_item_d','col_purple_rnd_cut_gem_style1_02_06']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_06'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_7.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_07','static_item_d','col_purple_rnd_cut_gem_style1_02_07']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_07'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_8.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_08','static_item_d','col_purple_rnd_cut_gem_style1_02_08']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_08'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/gem/purple_round_cut_gem/purple_gem_9.py

@@ -0,0 +1,19 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_purple_rnd_cut_gem_style1_02_09','static_item_d','col_purple_rnd_cut_gem_style1_02_09']
+
+def AddToCollection():
+
+	return 'col_round_purple_cut_gem_01'
+	
+def CollectionItemName():
+
+	return 'round_purple_gem_style1_09'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5.py

@@ -11,7 +11,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [7]  
     
 def STFparams():
 
@@ -19,4 +19,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+		
+def CollectionItemName():
+
+	return 'jedi_holocron_02_01'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5_wp.py

@@ -22,4 +22,8 @@ def AddToCollection():
 	
 def CollectionItemName():
 
-	return 'jedi_holocron_01_01'
+	return 'jedi_holocron_01_01'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [25]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+
+def CollectionItemName():
+
+	return 'jedi_holocron_02_02'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5_wp.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [6]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'jedi_holocron_01_02'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [9]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+	
+def CollectionItemName():
+
+	return 'jedi_holocron_02_03'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5_wp.py

@@ -11,7 +11,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [8]  
     
 def STFparams():
 
@@ -19,4 +19,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'jedi_holocron_01_03'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [5]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+	
+def CollectionItemName():
+
+	return 'jedi_holocron_02_04'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5_wp.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [4]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'jedi_holocron_01_04'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5.py

@@ -11,7 +11,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [12]  
     
 def STFparams():
 
@@ -19,4 +19,13 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+	
+	
+def CollectionItemName():
+
+	return 'jedi_holocron_02_05'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5_wp.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [5]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'jedi_holocron_01_05'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [1]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+
+def CollectionItemName():
+
+	return 'sith_holocron_02_01'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5_wp.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [5]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'sith_holocron_01_01'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [17]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+
+def CollectionItemName():
+
+	return 'sith_holocron_02_02'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5_wp.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [7]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'sith_holocron_01_02'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [8]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+
+def CollectionItemName():
+
+	return 'sith_holocron_02_03'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5_wp.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [9]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'sith_holocron_01_03'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [3]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+	
+def CollectionItemName():
+
+	return 'sith_holocron_02_04'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5_wp.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [13]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'sith_holocron_01_04'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5.py

@@ -10,7 +10,7 @@ def customizationAttributes():
     return ['/private/index_color_1']
     
 def customizationValues():
-    return [10]  
+    return [4]  
     
 def STFparams():
 
@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_02'
+	return 'inv_holocron_collection_02'
+	
+def CollectionItemName():
+
+	return 'sith_holocron_02_05'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5_wp.py

@@ -18,4 +18,12 @@ def STFparams():
 
 def AddToCollection():
 
-	return 'inv_holocron_collection_01'
+	return 'inv_holocron_collection_01'
+	
+def CollectionItemName():
+
+	return 'sith_holocron_01_05'
+
+def stackable():
+
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_1.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_01','static_item_d','col_shattered_shard_unknown_02_01']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_01'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_10.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_10','static_item_d','col_shattered_shard_unknown_02_10']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_10'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_2.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_02','static_item_d','col_shattered_shard_unknown_02_02']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_02'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_3.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_03','static_item_d','col_shattered_shard_unknown_02_03']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_03'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_4.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_04','static_item_d','col_shattered_shard_unknown_02_04']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_04'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_5.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_05','static_item_d','col_shattered_shard_unknown_02_05']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_05'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_6.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_06','static_item_d','col_shattered_shard_unknown_02_06']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_06'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_7.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_07','static_item_d','col_shattered_shard_unknown_02_07']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_07'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_8.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_08','static_item_d','col_shattered_shard_unknown_02_08']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_08'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_9.py

@@ -1,13 +1,19 @@
-
 def itemTemplate():
 
-	return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff']
+
+def STFparams():
+
+	return ['static_item_n','col_shattered_shard_unknown_02_09','static_item_d','col_shattered_shard_unknown_02_09']
+
+def AddToCollection():
+
+	return 'col_shattered_shards_01'
 	
+def CollectionItemName():
+
+	return 'col_shattered_shard_piece_09'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_1.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_01.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_dooku_datadisk_02_01','static_item_d','col_dooku_datadisk_02_01']
+
+def AddToCollection():
+
+	return 'col_story_count_dooku'
+	
+def CollectionItemName():
+
+	return 'dooku_datadisk_01'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_2.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_02.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_dooku_datadisk_02_02','static_item_d','col_dooku_datadisk_02_02']
+
+def AddToCollection():
+
+	return 'col_story_count_dooku'
+	
+def CollectionItemName():
+
+	return 'dooku_datadisk_02'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_3.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_03.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_dooku_datadisk_02_03','static_item_d','col_dooku_datadisk_02_03']
+
+def AddToCollection():
+
+	return 'col_story_count_dooku'
+	
+def CollectionItemName():
+
+	return 'dooku_datadisk_03'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_4.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_04.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_dooku_datadisk_02_04','static_item_d','col_dooku_datadisk_02_04']
+
+def AddToCollection():
+
+	return 'col_story_count_dooku'
+	
+def CollectionItemName():
+
+	return 'dooku_datadisk_04'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_5.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_05.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_dooku_datadisk_02_05','static_item_d','col_dooku_datadisk_02_05']
+
+def AddToCollection():
+
+	return 'col_story_count_dooku'
+	
+def CollectionItemName():
+
+	return 'dooku_datadisk_05'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_1.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_01.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_01','static_item_d','col_heroic_exar_kun_lost_journal_02_01']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_01'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_2.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_02.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_02','static_item_d','col_heroic_exar_kun_lost_journal_02_02']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_02'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_3.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_03.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_03','static_item_d','col_heroic_exar_kun_lost_journal_02_03']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_03'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_4.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_04.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_04','static_item_d','col_heroic_exar_kun_lost_journal_02_04']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_04'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_5.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_05.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_05','static_item_d','col_heroic_exar_kun_lost_journal_02_05']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_05'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_6.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_06.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_06','static_item_d','col_heroic_exar_kun_lost_journal_02_06']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_06'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_7.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_07.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_07','static_item_d','col_heroic_exar_kun_lost_journal_02_07']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_07'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_8.py

@@ -3,11 +3,18 @@ def itemTemplate():
 
 	return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_08.iff']
 	
+def STFparams():
+
+	return ['static_item_n','col_heroic_exar_kun_lost_journal_02_08','static_item_d','col_heroic_exar_kun_lost_journal_02_08']
+
+def AddToCollection():
+
+	return 'exar_kun_lost_journal'
+	
+def CollectionItemName():
+
+	return 'lost_journal_page_08'
+
 def stackable():
 
-	return 1
-	
-def junkDealerPrice():
-
-	return 100
-
+	return 1

scripts/mobiles/tatooine/mountain_squill.py

@@ -12,8 +12,6 @@ def addTemplate(core):
 	
 	mobileTemplate.setCreatureName('mountain_squill')
 	mobileTemplate.setLevel(18)
-	mobileTemplate.setMinLevel(17)
-	mobileTemplate.setMaxLevel(19)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 
 	mobileTemplate.setMinSpawnDistance(4)

scripts/mobiles/tatooine/mountain_squill_guardian.py

@@ -12,8 +12,6 @@ def addTemplate(core):
 	
 	mobileTemplate.setCreatureName('mountain_squill_guardian')
 	mobileTemplate.setLevel(19)
-	mobileTemplate.setMinLevel(18)
-	mobileTemplate.setMaxLevel(21)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 
 	mobileTemplate.setMinSpawnDistance(4)
@@ -29,7 +27,8 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("squill")
 	mobileTemplate.setAssistRange(10)
 	mobileTemplate.setStalker(False)
-	
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE)
+		
 	templates = Vector()
 	templates.add('object/mobile/shared_mountain_squill.iff')
 	mobileTemplate.setTemplates(templates)

scripts/mobiles/tatooine/mountain_squill_hunter.py

@@ -12,8 +12,6 @@ def addTemplate(core):
 	
 	mobileTemplate.setCreatureName('mountain_squill_hunter')
 	mobileTemplate.setLevel(19)
-	mobileTemplate.setMinLevel(18)
-	mobileTemplate.setMaxLevel(21)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 
 	mobileTemplate.setMinSpawnDistance(4)
@@ -29,6 +27,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("squill")
 	mobileTemplate.setAssistRange(10)
 	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_mountain_squill.iff')

scripts/mobiles/tatooine/slum_thief.py

@@ -0,0 +1,47 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
+from java.util import Vector
+
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('watto_thieves')
+	mobileTemplate.setLevel(16)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
+
+	mobileTemplate.setMinSpawnDistance(4)
+	mobileTemplate.setMaxSpawnDistance(8)
+	mobileTemplate.setDeathblow(False)
+	mobileTemplate.setScale(1)
+	mobileTemplate.setSocialGroup("junk thieves")
+	mobileTemplate.setAssistRange(0)
+	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE)	
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_human_female.iff')
+	templates.add('object/mobile/shared_human_male.iff')
+	templates.add('object/mobile/shared_zabrak_female.iff')
+	templates.add('object/mobile/shared_zabrak_male.iff')
+	templates.add('object/mobile/shared_rodian_female.iff')
+	templates.add('object/mobile/shared_rodian_male.iff')
+	templates.add('object/mobile/shared_moncal_female.iff')
+	templates.add('object/mobile/shared_moncal_male.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy')
+	weaponTemplates.add(weapontemplate)
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('meleehit')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('slum_thief', mobileTemplate)
+	return

scripts/mobiles/tatooine/tusken_follower.py

@@ -12,8 +12,6 @@ def addTemplate(core):
 	
 	mobileTemplate.setCreatureName('tusken_raider_18')
 	mobileTemplate.setLevel(19)
-	mobileTemplate.setMinLevel(18)
-	mobileTemplate.setMaxLevel(21)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 
 	mobileTemplate.setMinSpawnDistance(4)
@@ -23,6 +21,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("tusken raider")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE)	
 	
 	
 	templates = Vector()

scripts/mobiles/tatooine/young_mountain_squill.py

@@ -12,8 +12,6 @@ def addTemplate(core):
 	
 	mobileTemplate.setCreatureName('young_mountain_squill')
 	mobileTemplate.setLevel(16)
-	mobileTemplate.setMinLevel(15)
-	mobileTemplate.setMaxLevel(17)
 	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 
 	mobileTemplate.setMinSpawnDistance(4)
@@ -29,6 +27,8 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("squill")
 	mobileTemplate.setAssistRange(0)
 	mobileTemplate.setStalker(False)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE)
+
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_squill.iff')

scripts/radial/item/collection/loot_collection.py

@@ -8,10 +8,11 @@ def createRadial(core, owner, target, radials):
 	return
 	
 def handleSelection(core, actor, target, option):
-	if option == 21 and target and target.getAttachment('CollectionItemName'):
-		print (target.getAttachment('CollectionItemName'))
-		core.collectionService.addCollection(actor, target.getAttachment('CollectionItemName'))
-		core.objectService.useObject(actor, target)
-		#core.objectService.destroyObject(target)
+	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)
 	return
 	

scripts/static_spawns/tatooine/legs_camp.py

@@ -0,0 +1,28 @@
+import sys
+# Project SWG:   Droid Legs Camp:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+
+	
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-7201), float(301.1), float(3792), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-7198), float(301.1), float(3797), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-7206), float(301.1), float(3797), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-7215), float(301.1), float(3798), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-7213), float(301.1), float(3809), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-7207), float(301.1), float(3812), float(0), float(0), float(0), float(0), 45)
+	
+	return
+	
+	

scripts/static_spawns/tatooine/miners_camp.py

@@ -0,0 +1,27 @@
+import sys
+# Project SWG:   Miners Camp:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+
+	
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-5581), float(322.7), float(1738), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-5582), float(322.7), float(1746), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-5569), float(322.7), float(1744), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-5568), float(322.7), float(1734), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('tusken_follower', 'tatooine', long(0), float(-5586), float(322.7), float(1733), float(0), float(0), float(0), float(0), 45)
+	
+	return
+	
+	

scripts/static_spawns/tatooine/mos_espa_slum_thiefs.py

@@ -0,0 +1,40 @@
+import sys
+# Project SWG:   Anchorhead:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+
+	
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3165), float(5), float(2154), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3162), float(5), float(2174), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3175), float(5), float(2165), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3176), float(5), float(2149), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3185), float(5), float(2141), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3153), float(5), float(2149), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3161), float(5), float(2145), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3173), float(5), float(2139), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3178), float(5), float(2135), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3190), float(5), float(2138), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3193), float(5), float(2146), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3185), float(5), float(2155), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3187), float(5), float(2163), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3163), float(5), float(2162), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3176), float(5), float(2186), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3172), float(5), float(2189), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3189), float(5), float(2177), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3190), float(5), float(2175), float(0), float(0), float(0), float(0), 45)
+	stcSvc.spawnObject('slum_thief', 'tatooine', long(0), float(-3194), float(5), float(2169), float(0), float(0), float(0), float(0), 45)
+	
+	return
+	

scripts/static_spawns/tatooine/squill_cave.py

@@ -0,0 +1,104 @@
+import sys
+# Project SWG:   Anchorhead:  Static Spawns
+# (C)2014 ProjectSWG
+
+
+
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+	cave = core.objectService.getObject(long(-466404040697398729))
+	
+	
+	stcSvc.spawnObject('mountain_squill_guardian', 'tatooine', cave.getCellByCellNumber(1), float(1.2), float(-21.3), float(-17.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(19), float(17.6), float(-24.5), float(-29.8), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(19), float(16.5), float(-31.4), float(-49.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_guardian', 'tatooine', cave.getCellByCellNumber(20), float(15.5), float(-35.3), float(-77.8), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(20), float(-9.4), float(-35.2), float(-75.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(21), float(-31.2), float(-35.6), float(-66.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('young_mountain_squill', 'tatooine', cave.getCellByCellNumber(22), float(-15.3), float(-44.1), float(-103.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(22), float(-46.4), float(-47.3), float(-99.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(22), float(-53.4), float(-49.8), float(-111.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(9), float(-80.9), float(-52.9), float(-113.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_guardian', 'tatooine', cave.getCellByCellNumber(9), float(-107.2), float(-54.2), float(-112.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(23), float(-130.9), float(-58.4), float(-128.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(24), float(-106.3), float(-67), float(-136.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(9), float(-106.3), float(-69.9), float(-112.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(9), float(-78.3), float(-71.6), float(-114.8), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(9), float(-91.3), float(-71.4), float(-105.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(25), float(-75.7), float(-52.9), float(-136.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(28), float(-79.8), float(-65.6), float(-157.7), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('young_mountain_squill', 'tatooine', cave.getCellByCellNumber(28), float(-53.3), float(-66.3), float(-156.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(28), float(-45.7), float(-66.5), float(-176.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(28), float(-79.1), float(-66.8), float(-191.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(28), float(-56), float(-66.1), float(-199.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(29), float(-55.4), float(-65.5), float(-228.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(29), float(-64.7), float(-65), float(-231.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(25), float(-49.5), float(-69.6), float(-124.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(22), float(-34.9), float(-68.1), float(-112.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(26), float(-8.4), float(-69.1), float(-108.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(26), float(3.6), float(-68), float(-90.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(20), float(-1.9), float(-67.4), float(-65.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(20), float(9.1), float(-67.4), float(-66.7), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(22), float(-25.6), float(-43.2), float(-91.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(9), float(-107.3), float(-69.5), float(-104.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(2), float(-30.5), float(-30.7), float(-20.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(2), float(-15.9), float(-29.3), float(-33.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(2), float(-13.7), float(-30.4), float(-46.3), float(-0.75), float(0), float(-0.65), float(0), 60)	
+	stcSvc.spawnObject('mountain_squill_guardian', 'tatooine', cave.getCellByCellNumber(3), float(-35.1), float(-29.8), float(-49.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(3), float(-50.7), float(-30), float(-41.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_guardian', 'tatooine', cave.getCellByCellNumber(5), float(-71.8), float(-30.1), float(-40.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(5), float(-64.9), float(-31.4), float(-59.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(5), float(-69.1), float(-30.9), float(-72.2), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(7), float(-72.5), float(-36.4), float(-93.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('young_mountain_squill', 'tatooine', cave.getCellByCellNumber(9), float(-94.5), float(-37.8), float(-122.2), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(9), float(-105), float(-38.8), float(-107.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(11), float(-105.1), float(-38.9), float(-82.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(11), float(-125.5), float(-37.8), float(-79.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(6), float(-105.1), float(-36.1), float(-64.8), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(16), float(-103.7), float(-42.1), float(-30.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(17), float(-117), float(-45.6), float(-8.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(18), float(-133.8), float(-57.5), float(-14.5), float(-0.75), float(0), float(-0.65), float(0), 60) ### test###
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(16), float(-107.2), float(-58), float(-27), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(16), float(-115.2), float(-58.2), float(-33.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(14), float(-80.3), float(-58.1), float(-40.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(14), float(-80.4), float(-61.3), float(-64.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(14), float(-87.6), float(-56.5), float(-80.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(11), float(-109.1), float(-54.5), float(-83.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(11), float(-122.1), float(-54.3), float(-89.2), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(11), float(-133), float(-53.9), float(-79.7), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(11), float(-142.1), float(-54), float(-91.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(12), float(-143.7), float(-53.5), float(-116.2), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(12), float(-169.4), float(-54.8), float(-118.6), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(12), float(-171.5), float(-52.4), float(-102.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(10), float(-169.3), float(-49.7), float(-83.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(10), float(-167.3), float(-49.9), float(-71.2), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('young_mountain_squill', 'tatooine', cave.getCellByCellNumber(10), float(-168.7), float(-49.5), float(-54.8), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(8), float(-160.3), float(-50.3), float(-47), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(8), float(-139.7), float(-49.8), float(-46.1), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(6), float(-132.6), float(-49.8), float(-60.8), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(6), float(-111.9), float(-51), float(-60.3), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill_hunter', 'tatooine', cave.getCellByCellNumber(6), float(-88.9), float(-49.4), float(-61), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(5), float(-74.5), float(-47.3), float(-71.7), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(5), float(-79.3), float(-46.8), float(-42.5), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('young_mountain_squill', 'tatooine', cave.getCellByCellNumber(4), float(-66), float(-45.8), float(-25.9), float(-0.75), float(0), float(-0.65), float(0), 60)
+	stcSvc.spawnObject('mountain_squill', 'tatooine', cave.getCellByCellNumber(4), float(-59.9), float(-43.2), float(-15.4), float(-0.75), float(0), float(-0.65), float(0), 60)
+
+	
+	# Hermit
+	hermit = stcSvc.spawnObject('object/mobile/shared_dressed_hermit_of_tatooine.iff', 'tatooine', cave.getCellByCellNumber(27), float(38.2), float(-69.1), float(-103.1), float(-0.75), float(0), float(-0.65), float(0))
+	#hermit.setCustomName('quest_hero_of_tatooine_hermit')
+	hermit.setCustomName('a Hermit')
+	hermit.setOptionsBitmask(256)
+		
+	
+
+	return
+	

src/services/LootService.java

@@ -303,13 +303,11 @@ public class LootService implements INetworkDispatch {
 					if (inventory == null)
 						return;
 					
-					addToBuyBack(actor, itemToSell);
+					addToBuyBack(actor, itemToSell, inventory); // This removes the item from inventory as well
 					
 					actor.addCashCredits(price);
 					actor.sendSystemMessage(OutOfBand.ProsePackage("@junk_dealer:prose_sold_junk", "TT", itemToSell.getCustomName(), "DI", price), DisplayType.Broadcast);
 					
-					inventory.remove(itemToSell);
-					
 					core.suiService.closeSUIWindow(actor, window.getWindowId());
 					handleJunkDealerSellWindow(actor, junkDealer, getSellableInventoryItems(actor));
 					break;
@@ -465,19 +463,19 @@ public class LootService implements INetworkDispatch {
 		core.suiService.openSUIWindow(window);
 	}
 
-	public void addToBuyBack(CreatureObject actor, TangibleObject item) {
+	public void addToBuyBack(CreatureObject actor, TangibleObject item, TangibleObject inventory) {
+		
+		TangibleObject buyBackContainer = null;
+
 		if (actor.getAttachment("buy_back") == null)
-			createBuyBackDevice(actor);
+			buyBackContainer = createBuyBackDevice(actor);
+		else
+			buyBackContainer = (TangibleObject) core.objectService.getObject((long) actor.getAttachment("buy_back"));
 		
-		TangibleObject buyBackContainer = (TangibleObject) core.objectService.getObject((long) actor.getAttachment("buy_back"));
+		if (buyBackContainer == null) // at this point the buybackcontainer should not be null... but just incase...
+			buyBackContainer = createBuyBackDevice(actor); 		
 		
-		if (buyBackContainer == null) {
-			createBuyBackDevice(actor);
-			addToBuyBack(actor, item);
-			return;
-		}
-		
-		buyBackContainer.transferTo(actor, buyBackContainer, item);
+		inventory.transferTo(actor, buyBackContainer, item);
 
 		final AtomicInteger count = new AtomicInteger();
 		
@@ -2570,7 +2568,7 @@ public class LootService implements INetworkDispatch {
 	public Vector<SWGObject> getSellableInventoryItems(CreatureObject actor){
 		TangibleObject playerInventory = (TangibleObject) actor.getSlottedObject("inventory");
 		final Vector<SWGObject> sellableItems = new Vector<SWGObject>();
-		playerInventory.viewChildren(actor, false, false, new Traverser() {
+		playerInventory.viewChildren(actor, true, false, new Traverser() {
 			@Override
 			public void process(SWGObject obj) {
 				String itemTemplate = obj.getTemplate();
@@ -2593,10 +2591,10 @@ public class LootService implements INetworkDispatch {
 		return true;
 	}
 	
-	public void createBuyBackDevice(CreatureObject actor) {
+	public TangibleObject createBuyBackDevice(CreatureObject actor) {
 		TangibleObject datapad = (TangibleObject) actor.getSlottedObject("datapad");
 		if (datapad == null)
-			return;
+			return null;
 		
 		IntangibleObject device = (IntangibleObject) core.objectService.createObject("object/intangible/buy_back/shared_buy_back_control_device.iff", actor.getPlanet());
 		datapad.add(device);
@@ -2608,6 +2606,8 @@ public class LootService implements INetworkDispatch {
 		device.add(container);
 		
 		actor.setAttachment("buy_back", container.getObjectID()); // We can use device.getSlottedObject("inventory"), but this way we won't have to traverse..
+		
+		return container;
 	}
 	
 	@SuppressWarnings("unchecked")