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

scripts/commands/combat/attack.py

@@ -0,0 +1,15 @@
+import sys
+
+def preRun(core, actor, target, command):
+	return
+
+def run(core, actor, target, commandString):
+	return
+
+def setup(core, actor, target, command):
+	args = command.getCommandArguments()
+	
+	if args and args[1]:
+		weapon = core.objectService.getObject(long(args[1]))
+		core.objectService.useObject(actor, weapon)
+	return

scripts/commands/rotatefurniture.py

@@ -6,7 +6,7 @@ def setup():
 
 def run(core, actor, target, commandString):
 	tarObj = core.objectService.getObject(actor.getTargetId())
-	
+
 	container = actor.getContainer()
 	parsedMsg = commandString.split(' ', 2)
 	
@@ -14,14 +14,14 @@ def run(core, actor, target, commandString):
 		return
 	
 	if core.housingService.getPermissions(actor, container): # i should probably relook into my permissions system... it kinda sucks
-		if parsedMsg[0] == "pitch":
-			core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(1, 0, 0)) # this is messed up ???
+		if parsedMsg[0] == "pitch" and core.collectionService.isComplete(actor, 'force_shui_01'):
+			core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(0, 0, 1)) # this is messed up ???
 			return
 		elif parsedMsg[0] == "yaw":
 			core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(0, 1, 0)) # this is correct
 			return
-		elif parsedMsg[0] == "roll":
-			core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(0, 0, 1)) # this is messed up ???
+		elif parsedMsg[0] == "roll" and core.collectionService.isComplete(actor, 'force_shui_02'):
+			core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(1, 0, 0)) # this is messed up ???
 			return
 	elif container.getTemplate() == "object/cell/shared_cell.iff":
 		actor.sendSystemMessage("You do not have permission to access that container!", 0)

scripts/commands/transferitemmisc.py

@@ -23,12 +23,17 @@ def run(core, actor, target, commandString):
 
         if target.getTemplate() == 'object/tangible/item/shared_loot_cash.iff':
             core.lootService.handleCreditPickUp(actor,target)
+            if target.getGrandparent().getInventoryItemCount()==1:
+                core.lootService.setLooted(actor,target.getGrandparent())
             core.objectService.destroyObject(target)
             return
 			
         if target.isLootItem():
             target.setLootItem(0)
             actor.sendSystemMessage('You looted ' + target.getObjectName().getStfValue() + ' from corpse.', 0)
+            #actor.sendSystemMessage('container.getInventoryItemCount() %s' % target.getGrandparent().getInventoryItemCount(), 0)
+            if target.getGrandparent().getInventoryItemCount()==1:
+                core.lootService.setLooted(actor,target.getGrandparent())
         
         if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer):
 			target.getContainer().transferTo(actor, container, target)

scripts/gcw/gcwrank_imperial.py

@@ -0,0 +1,50 @@
+import sys
+from resources.datatables import GcwRank
+
+def handleRankUp(core, actor, newrank):
+	if newrank >= GcwRank.LIEUTENANT:
+		actor.addAbility('pvp_retaliation_ability')
+		core.collectionService.addCollection(actor, 'pvp_imperial_lieutenant')
+
+	if newrank >= GcwRank.CAPTAIN:
+		actor.addAbility('pvp_adrenaline_ability')
+		core.collectionService.addCollection(actor, 'pvp_imperial_captain')
+
+	if newrank >= GcwRank.MAJOR:
+		actor.addAbility('pvp_unstoppable_ability')
+		core.collectionService.addCollection(actor, 'pvp_imperial_major')
+
+	if newrank >= GcwRank.LTCOLONEL:
+		actor.addAbility('pvp_last_man_ability')
+		core.collectionService.addCollection(actor, 'pvp_imperial_lt_colonel')
+
+	if newrank >= GcwRank.COLONEL:
+		actor.addAbility('pvp_aura_buff_self_ability')
+		core.collectionService.addCollection(actor, 'pvp_imperial_colonel')
+
+	if newrank >= GcwRank.GENERAL:
+		actor.addAbility('pvp_airstrike_ability')
+		core.collectionService.addCollection(actor, 'pvp_imperial_general')
+
+	return
+
+def handleRankDown(actor, newrank):
+	if newrank < GcwRank.LIEUTENANT:
+		actor.removeAbility('pvp_retaliation_ability')
+
+	if newrank < GcwRank.CAPTAIN:
+		actor.removeAbility('pvp_adrenaline_ability')
+
+	if newrank < GcwRank.MAJOR:
+		actor.removeAbility('pvp_unstoppable_ability')
+
+	if newrank < GcwRank.LTCOLONEL:
+		actor.removeAbility('pvp_last_man_ability')
+
+	if newrank < GcwRank.COLONEL:
+		actor.removeAbility('pvp_aura_buff_self_ability')
+
+	if newrank < GcwRank.GENERAL:
+		actor.removeAbility('pvp_airstrike_ability')
+
+	return

scripts/gcw/gcwrank_rebel.py

@@ -0,0 +1,50 @@
+import sys
+from resources.datatables import GcwRank
+
+def handleRankUp(core, actor, newrank):
+	if newrank >= GcwRank.LIEUTENANT:
+		actor.addAbility('pvp_retaliation_rebel_ability')
+		core.collectionService.addCollection(actor, 'pvp_rebel_lieutenant')
+
+	if newrank >= GcwRank.CAPTAIN:
+		actor.addAbility('pvp_adrenaline_rebel_ability')
+		core.collectionService.addCollection(actor, 'pvp_rebel_captain')
+
+	if newrank >= GcwRank.MAJOR:
+		actor.addAbility('pvp_unstoppable_rebel_ability')
+		core.collectionService.addCollection(actor, 'pvp_rebel_major')
+
+	if newrank >= GcwRank.COMMANDER:
+		actor.addAbility('pvp_last_man_rebel_ability')
+		core.collectionService.addCollection(actor, 'pvp_rebel_commander')
+
+	if newrank >= GcwRank.COLONEL:
+		actor.addAbility('pvp_aura_buff_self_rebel_ability')
+		core.collectionService.addCollection(actor, 'pvp_rebel_colonel')
+
+	if newrank >= GcwRank.GENERAL:
+		actor.addAbility('pvp_airstrike_rebel_ability')
+		core.collectionService.addCollection(actor, 'pvp_rebel_general')
+
+	return
+
+def handleRankDown(actor, newrank):
+	if newrank < GcwRank.LIEUTENANT:
+		actor.removeAbility('pvp_retaliation_rebel_ability')
+
+	if newrank < GcwRank.CAPTAIN:
+		actor.removeAbility('pvp_adrenaline_rebel_ability')
+
+	if newrank < GcwRank.MAJOR:
+		actor.removeAbility('pvp_unstoppable_rebel_ability')
+
+	if newrank < GcwRank.COMMANDER:
+		actor.removeAbility('pvp_last_man_rebel_ability')
+
+	if newrank < GcwRank.COLONEL:
+		actor.removeAbility('pvp_aura_buff_self_rebel_ability')
+
+	if newrank < GcwRank.GENERAL:
+		actor.removeAbility('pvp_airstrike_rebel_ability')
+
+	return

scripts/loot/lootItems/exceptionallootchest/legendary_e5_carbine.py

@@ -25,12 +25,12 @@ def requiredCL():
 
 def itemStats():
 
-	stats = ['mindamage','400','450']
-	stats += ['maxdamage','850','900']
+	stats = ['mindamage','400','400']
+	stats += ['maxdamage','850','850']
 	stats += ['attackspeed','0.6','0.6']
 	stats += ['maxrange','0','50']
 	stats += ['damagetype','energy','energy']
-	stats += ['elemtype','@obj_attr_n:elemental_electricity','@obj_attr_n:elemental_electricity']
+	stats += ['elemtype','electricity','electricity']
 	stats += ['elemdamage','23','23']
 	stats += ['weapontype','1','1']
 	

scripts/loot/lootItems/exceptionallootchest/legendary_fwg5_pistol.py

@@ -25,12 +25,12 @@ def requiredCL():
 
 def itemStats():
 
-	stats = ['mindamage','250','270']
-	stats += ['maxdamage','500','530']
+	stats = ['mindamage','250','250']
+	stats += ['maxdamage','500','500']
 	stats += ['attackspeed','0.4','0.4']
 	stats += ['maxrange','0','35']
 	stats += ['damagetype','energy','energy']
-	stats += ['elemtype','@obj_attr_n:elemental_heat','@obj_attr_n:elemental_heat']
+	stats += ['elemtype','heat','heat']
 	stats += ['elemdamage','35','35']
 	stats += ['weapontype','2','2']
 	

scripts/loot/lootItems/exceptionallootchest/legendary_nightsister_energy_lance.py

@@ -25,12 +25,12 @@ def requiredCL():
 
 def itemStats():
 
-	stats = ['mindamage','750','800']
-	stats += ['maxdamage','1100','1200']
+	stats = ['mindamage','800','800']
+	stats += ['maxdamage','1200','1200']
 	stats += ['attackspeed','1.0','1.0']
 	stats += ['maxrange','0','5']
 	stats += ['damagetype','energy','energy']
-	stats += ['elemtype','@obj_attr_n:elemental_electricity','@obj_attr_n:elemental_electricity']
+	stats += ['elemtype','electricity','electricity']
 	stats += ['elemdamage','50','50']
 	stats += ['weapontype','7','7']
 	

scripts/loot/lootItems/exceptionallootchest/legendary_power_hammer.py

@@ -25,12 +25,12 @@ def requiredCL():
 
 def itemStats():
 
-	stats = ['mindamage','850','900']
-	stats += ['maxdamage','1250','1350']
+	stats = ['mindamage','900','900']
+	stats += ['maxdamage','1350','1350']
 	stats += ['attackspeed','1.0','1.0']
 	stats += ['maxrange','0','5']
 	stats += ['damagetype','energy','energy']
-	stats += ['elemtype','@obj_attr_n:elemental_acid','@obj_attr_n:elemental_acid']
+	stats += ['elemtype','acid','acid']
 	stats += ['elemdamage','20','20']
 	stats += ['weapontype','5','5']
 	

scripts/loot/lootItems/exceptionallootchest/legendary_stun_baton.py

@@ -25,12 +25,12 @@ def requiredCL():
 
 def itemStats():
 
-	stats = ['mindamage','550','600']
-	stats += ['maxdamage','1250','1300']
+	stats = ['mindamage','600','600']
+	stats += ['maxdamage','1300','1300']
 	stats += ['attackspeed','1.0','1.0']
 	stats += ['maxrange','0','5']
 	stats += ['damagetype','energy','energy']
-	stats += ['elemtype','@obj_attr_n:elemental_electricity','@obj_attr_n:elemental_electricity']
+	stats += ['elemtype','electricity','electricity']
 	stats += ['elemdamage','75','75']
 	stats += ['weapontype','5','5']
 	

scripts/loot/lootItems/exceptionallootchest/legendary_t21_rifle.py

@@ -25,12 +25,12 @@ def requiredCL():
 
 def itemStats():
 
-	stats = ['mindamage','500','550']
-	stats += ['maxdamage','1050','1100']
+	stats = ['mindamage','550','550']
+	stats += ['maxdamage','1100','1100']
 	stats += ['attackspeed','0.8','0.8']
 	stats += ['maxrange','0','64']
 	stats += ['damagetype','energy','energy']
-	stats += ['elemtype','@obj_attr_n:elemental_acid','@obj_attr_n:elemental_acid']
+	stats += ['elemtype','acid','acid']
 	stats += ['elemdamage','30','30']
 	stats += ['weapontype','0','0']
 	

scripts/loot/lootItems/holocrons/jedi_holocron_1_5.py

@@ -3,6 +3,16 @@ def itemTemplate():
 
 	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Jedi HoloCron 1/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_01_01','static_item_d','item_collection_jedi_holocron_01_01']

scripts/loot/lootItems/holocrons/jedi_holocron_1_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_02_01','static_item_d','item_collection_jedi_holocron_02_01']

scripts/loot/lootItems/holocrons/jedi_holocron_2_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
-	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_02.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Jedi HoloCron 2/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_01_02','static_item_d','item_collection_jedi_holocron_01_02']

scripts/loot/lootItems/holocrons/jedi_holocron_2_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_02_02','static_item_d','item_collection_jedi_holocron_02_02']

scripts/loot/lootItems/holocrons/jedi_holocron_3_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
-	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_03.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Jedi HoloCron 3/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_01_03','static_item_d','item_collection_jedi_holocron_01_03']

scripts/loot/lootItems/holocrons/jedi_holocron_3_5_wp.py

@@ -0,0 +1,18 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_02_03','static_item_d','item_collection_jedi_holocron_02_03']

scripts/loot/lootItems/holocrons/jedi_holocron_4_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
-	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_04.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Jedi HoloCron 4/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_01_04','static_item_d','item_collection_jedi_holocron_01_04']

scripts/loot/lootItems/holocrons/jedi_holocron_4_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_02_04','static_item_d','item_collection_jedi_holocron_02_04']

scripts/loot/lootItems/holocrons/jedi_holocron_5_5.py

@@ -1,8 +1,18 @@
 
 def itemTemplate():
 
-	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_05.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Jedi HoloCron 5/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_01_05','static_item_d','item_collection_jedi_holocron_01_05']

scripts/loot/lootItems/holocrons/jedi_holocron_5_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_jedi_holocron_02_05','static_item_d','item_collection_jedi_holocron_02_05']

scripts/loot/lootItems/holocrons/sith_holocron_1_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
 	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Sith HoloCron 1/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_01_01','static_item_d','item_collection_sith_holocron_01_01']

scripts/loot/lootItems/holocrons/sith_holocron_1_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_02_01','static_item_d','item_collection_sith_holocron_02_01']

scripts/loot/lootItems/holocrons/sith_holocron_2_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
-	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_02.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Sith HoloCron 2/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_01_02','static_item_d','item_collection_sith_holocron_01_02']

scripts/loot/lootItems/holocrons/sith_holocron_2_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_02_02','static_item_d','item_collection_sith_holocron_02_02']

scripts/loot/lootItems/holocrons/sith_holocron_3_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
-	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_03.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Sith HoloCron 3/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_01_03','static_item_d','item_collection_sith_holocron_01_03']

scripts/loot/lootItems/holocrons/sith_holocron_3_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_02_03','static_item_d','item_collection_sith_holocron_02_03']

scripts/loot/lootItems/holocrons/sith_holocron_4_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
-	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_04.iff']
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Sith HoloCron 4/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_01_04','static_item_d','item_collection_sith_holocron_01_04']

scripts/loot/lootItems/holocrons/sith_holocron_4_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_02_04','static_item_d','item_collection_sith_holocron_02_04']

scripts/loot/lootItems/holocrons/sith_holocron_5_5.py

@@ -1,8 +1,17 @@
-
 def itemTemplate():
 
 	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
 
-def customItemName():
+def lootDescriptor():
 
-	return 'Strange Sith HoloCron 5/5'
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_01_05','static_item_d','item_collection_sith_holocron_01_05']

scripts/loot/lootItems/holocrons/sith_holocron_5_5_wp.py

@@ -0,0 +1,17 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_sith_holocron_01.iff']
+
+def lootDescriptor():
+
+    return 'customattributes'
+        
+def customizationAttributes():
+    return ['/private/index_color_1']
+    
+def customizationValues():
+    return [10]  
+    
+def STFparams():
+
+	return ['static_item_n','item_collection_sith_holocron_02_05','static_item_d','item_collection_sith_holocron_02_05']

scripts/loot/lootItems/npc_loot/aero_magnifier_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_aero_magnifier_generic.iff']
+	
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/answering_machine_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_answering_machine_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/armor_repair_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_armor_repair_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/artifact_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_artifact_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/atat_life_support_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_atat_life_support_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/bacta_ampules_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_bacta_ampules_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/basket_generic.py

@@ -0,0 +1,14 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_basket_generic.iff']
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/blue_wiring_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_blue_wiring_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/bottle_s01_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_bottle_s01_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/bottle_s02_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_bottle_s02_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/bottle_s03_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_bottle_s03_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/bottle_s04_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_bottle_s04_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/bowl_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_bowl_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/briefcase_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_briefcase_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/broad_spectrum_med_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_broad_spectrum_med_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/bug_jar_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_bug_jar_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/building_repair_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_building_repair_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/cage_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_cage_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/camera_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_camera_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/canister_small_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_canister_small_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/chance_cube_8_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_chance_cube_8_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/chassis_blueprint_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_chassis_blueprint_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/chem_dispersion_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_chem_dispersion_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/circuit_board_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_circuit_board_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/clamp_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_clamp_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/clipon_id_badge_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_clipon_id_badge_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/cloth_box_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_cloth_box_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/cloth_kit_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_cloth_kit_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/clothing_repair_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_clothing_repair_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/comlink_civilian_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_comlink_civilian_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/copper_battery_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_copper_battery_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/datadisk_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_datadisk_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/datapad_flashy_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_datapad_flashy_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/datapad_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_datapad_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/datapad_trakball_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_datapad_trakball_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/decryptor_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_decryptor_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/deed_datapad_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_deed_datapad_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/dermal_analyzer_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_dermal_analyzer_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/disguise_makeup_kit_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_disguise_makeup_kit_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/disk_drive_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_disk_drive_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/dye_set_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_dye_set_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/elect_module_complex_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_elect_module_complex_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/elect_module_misc_01.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_elect_module_misc_01.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/elect_module_simple_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_elect_module_simple_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/elect_module_wires.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_elect_module_wires.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/elect_power_unit_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_elect_power_unit_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/electro_polearm_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_electro_polearm_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/electronic_key_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_electronic_key_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/engineer_analysis_board_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_engineer_analysis_board_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/firework_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_firework_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/flask_sample_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_flask_sample_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/fliptop_calibrator_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_fliptop_calibrator_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/frequency_jammer_wire_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_frequency_jammer_wire_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/furniture_repair_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_furniture_repair_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/generator_device_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_generator_device_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/generic_crystal.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_generic_crystal.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/generic_tool_kit_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_generic_tool_kit_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/green_stone_necklace_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_green_stone_necklace_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/handheld_viewscreen_1_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_handheld_viewscreen_1_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/handheld_viewscreen_2_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_handheld_viewscreen_2_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/healing_chemical_generic.py

@@ -0,0 +1,15 @@
+def itemTemplate():
+
+	return ['object/tangible/loot/npc_loot/shared_healing_chemical_generic.iff']
+
+def stackable():
+
+	return 1
+	
+def junkDealerPrice():
+
+	return 28
+	
+def junkType():
+
+	return 0

scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw_light.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s01.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s02.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s03.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/loot/lootItems/npc_loot/heroic_destroyer_cooling_coil.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/loot/lootItems/npc_loot/heroic_destroyer_power_transformer.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return