Merge conflict resolve

2026-10-13 03:13:26 -04:00 · 2014-08-09 18:17:01 +02:00
parent 79d56ca4ef a8a824b8a7
commit 0f8466bf44
1452 changed files with 14987 additions and 14349 deletions
@@ -8,4 +8,10 @@ def setup(core, object):
 	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -4.1, 0.55, 6.6, 0.714 ,0.714, 1)
 	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
 	structureterminal.setAttachment('housing_parentstruct', object)
+	
+	elevatorterminal1 = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_elevator_down.iff', 0, 0.8, -0.655, -0.103, 0.998, 10)
+	
+	elevatorterminal2 = core.objectService.createChildobject(object, 'object/tangible/terminal/shared_terminal_elevator.iff', 0, -3, -0.655, 0.994, -0.103, 10)
+	
+	elevatorterminal3 = core.objectService.createChildobject(object, 'object/tangible/terminal/shared_terminal_elevator_up.iff', 0, -6, -0.655, 0.994, -0.103, 10)
 	return
@@ -1,12 +1,6 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
+
@@ -1,4 +1,5 @@
 import sys

 def setup(core, object):
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-	
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','imp_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('imperial_recruiter')
-
-	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
-	return
+    core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0)
+    return
@@ -1,12 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
 	return
@@ -1,13 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
-		
 	return
@@ -1,13 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')	
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
-	
 	return
@@ -1,13 +1,5 @@
 import sys
-from resources.datatables import Options

 def setup(core, object):
-	object.setAttachment('radial_filename', 'object/conversation');
-	object.setAttachment('conversationFile','reb_recruiter')
-	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
-	object.setStfFilename('mob/creature_names')
-	object.setStfName('rebel_recruiter')
-	
 	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
-	
 	return
@@ -11,6 +11,6 @@ def setup(core, object):
 	object.setStringAttribute('condition', '1000/1000')
 	object.setStringAttribute("@obj_attr_n:color", "Windu's Guile")
 	object.setAttachment('radial_filename', 'item/tunable')
-	object.setStringAttribute('@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ')
+	object.setStringAttribute('@obj_attr_n:crystal_owner', "\\#D1F56F UNTUNED \\#FFFFFF ", )
 	return
 	
@@ -0,0 +1,11 @@
+import sys
+
+def setup(core, object):
+	object.setStfFilename('static_item_n')
+	object.setStfName('item_npe_gen_craft_tool_trader_03_01')
+	object.setDetailFilename('static_item_d')
+	object.setDetailName('item_npe_gen_craft_tool_trader_03_01')
+	object.setIntAttribute('no_trade', 1)
+	object.setIntAttribute('required_combat_level', 1)
+
+	return
@@ -6,6 +6,7 @@ def setup(core, object):
 	object.setStfName('item_bounty_hunter_clicky_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_bounty_hunter_clicky_01_02')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	return

@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfFilename('static_item_n')
 	object.setStfName('item_commando_clicky_01_02')
 	object.setDetailFilename('static_item_d')
+	object.setIntAttribute('no_trade', 1)
 	object.setDetailName('item_commando_clicky_01_02')
 	object.setStringAttribute('class_required', 'Commando')
 	return
@@ -6,6 +6,7 @@ def setup(core, object):
 	object.setStfName('item_entertainer_clicky_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_entertainer_clicky_01_02')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Entertainer')
 	return

@@ -6,6 +6,7 @@ def setup(core, object):
 	object.setStfName('item_force_sensitive_clicky_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_force_sensitive_clicky_01_02')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Jedi')
 	return

@@ -6,6 +6,7 @@ def setup(core, object):
 	object.setStfName('item_medic_clicky_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_medic_clicky_01_02')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Medic')
 	return
 def use(core, actor, object):
@@ -6,6 +6,7 @@ def setup(core, object):
 	object.setStfName('item_officer_clicky_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_officer_clicky_01_02')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Officer')
 	return

@@ -6,6 +6,7 @@ def setup(core, object):
 	object.setStfName('item_smuggler_clicky_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_smuggler_clicky_01_02')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Smuggler')
 	return

@@ -6,6 +6,7 @@ def setup(core, object):
 	object.setStfName('item_spy_clicky_01_02')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('item_spy_clicky_01_02')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Spy')
 	return

@@ -1,4 +1,141 @@
 import sys
+from java.util import Vector

 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/usable')
+	return
+
+def use(core, actor, object):
+	
+	profession = actor.getSlottedObject('ghost').getProfession()
+	items = Vector()
+	
+	if profession =='force_sensitive_1a':
+		robe = core.objectService.createObject('object/tangible/wearables/robe/shared_robe_jedi_padawan.iff', actor.getPlanet(), 'item_npe_fs_robe_02_01')
+		items.add(robe)
+	
+	elif profession =='entertainer_1a':
+		boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet(), 'item_entertainer_boots_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', actor.getPlanet(), 'item_entertainer_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s04.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01')
+		hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_s02.iff', actor.getPlanet(), 'item_entertainer_hat_02_01')
+		items.add(boots)
+		items.add(pants)
+		items.add(shirt)
+		items.add(hat)
+		
+	elif profession =='officer_1a': 
+		boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_officer_boots_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_officer_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s34.iff', actor.getPlanet(), 'item_officer_shirt_02_01')
+		belt = core.objectService.createObject('object/tangible/wearables/belt/shared_belt_s11.iff', actor.getPlanet(), 'item_officer_belt_02_01')
+		items.add(boots)
+		items.add(pants)
+		items.add(shirt)
+		items.add(belt)
+		
+	elif profession =='bounty_hunter_1a':
+		boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s12.iff', actor.getPlanet(), 'item_bounty_hunter_boots_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_bounty_hunter_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_bounty_hunter_shirt_02_01')
+		vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', actor.getPlanet(), 'item_bounty_hunter_vest_02_01')
+		items.add(boots)
+		items.add(pants)
+		items.add(shirt)
+		items.add(vest)
+		
+	elif profession =='smuggler_1a':
+		boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet(), 'item_smuggler_boots_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet(), 'item_smuggler_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s16.iff', actor.getPlanet(), 'item_smuggler_shirt_02_01')
+		vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s15.iff', actor.getPlanet(), 'item_smuggler_vest_02_01')
+		items.add(boots)
+		items.add(pants)
+		items.add(shirt)
+		items.add(vest)
+		
+	elif profession =='commando_1a':
+		boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_commando_boots_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet(), 'item_commando_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_commando_shirt_02_01')
+		vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', actor.getPlanet(), 'item_commando_vest_02_01')
+		items.add(boots)
+		items.add(pants)
+		items.add(shirt)
+		items.add(vest)
+
+	elif profession =='spy_1a':
+		boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s12.iff', actor.getPlanet(), 'item_spy_boots_02_01')
+		gloves = core.objectService.createObject('object/tangible/wearables/gloves/shared_gloves_s12.iff', actor.getPlanet(), 'item_spy_gloves_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s30.iff', actor.getPlanet(), 'item_spy_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s30.iff', actor.getPlanet(), 'item_spy_shirt_02_01')
+		items.add(boots)
+		items.add(gloves)
+		items.add(pants)
+		items.add(shirt)
+		
+	elif profession == 'medic_1a':
+		boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_medic_boots_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_medic_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet(), 'item_medic_shirt_02_01')
+		vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet(), 'item_medic_vest_02_01')
+		items.add(shoes)
+		items.add(pants)
+		items.add(shirt)
+		items.add(vest)
+		
+	elif "trader" in profession:
+		shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', actor.getPlanet(), 'item_trader_shoes_02_01')
+		pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_trader_pants_02_01')
+		shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s05.iff', actor.getPlanet(), 'item_trader_shirt_02_01')
+		belt = core.objectService.createObject('object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff', actor.getPlanet())
+		items.add(shoes)
+		items.add(pants)
+		items.add(shirt)
+		items.add(belt)
+		
+	else:
+		actor.sendSystemMessage('@base_player:not_correct_skill', 0)
+		
+	items.add(createProfessionItem(core, actor))
+	core.playerService.giveItems(actor, items)
+	core.objectService.destroyObject(object)
+	return
+	
+
+def createProfessionItem(core, actor):
+	profession = actor.getSlottedObject('ghost').getProfession()
+
+	if profession == 'bounty_hunter_1a':
+		return core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_dh17_black_npe.iff', actor.getPlanet(), 'weapon_npe_carbine_bh_03_01')
+
+	elif profession == 'commando_1a':
+		return core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_dh17_black_npe.iff', actor.getPlanet(), 'weapon_npe_commando_carbine_03_01')
+	
+	elif profession == 'entertainer_1a':
+		print("Entertainer Professionitem disabled for now")
+		#return core.objectService.createObject('object/tangible/dance_prob/shared_prop_sparkler_l.iff', actor.getPlanet())
+
+	elif profession == 'force_sensitive_1a':
+		return core.objectService.createObject('object/weapon/melee/polearm/shared_polearm_vibro_axe_npe.iff', actor.getPlanet(), 'weapon_polearm_02_03')
+
+	elif profession == 'medic_1a':
+		return core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_scout_blaster_npe.iff', actor.getPlanet(), 'weapon_npe_medic_pistol_03_01')                  
+
+	elif profession == 'officer_1a':
+		return core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_scout_blaster_npe.iff', actor.getPlanet(), 'item_npe_officer_sidearm')       
+
+	elif profession == 'smuggler_1a':
+		return core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44_metal.iff', actor.getPlanet(), 'item_npe_smuggler_han_solo_gun')
+ 
+	elif profession == 'spy_1a':
+		return core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_dh17_black_npe.iff', actor.getPlanet(), 'weapon_npe_carbine_spy_03_01')                    
+   
+	elif "trader" in profession:
+		print("Trader Professionitem disabled until crafting is in")
+		#return core.objectService.createObject('object/tangible/crafting/station/shared_generic_generic_tool.iff', actor.getPlanet(), 'item_npe_gen_craft_tool_trader_03_01')
+
+
+	return
+
+	
@@ -5,5 +5,5 @@ def setup(core, object):
 	return

 def use(core, owner, target):
-	core.devService.sendCharacterBuilderSUI(owner, 0);
+	core.scriptService.callScript("scripts/", "character_builder_terminal", "screenOne", core, owner);
 	return
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_bicep_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_bicep_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_bicep_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_boots_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_boots_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_bracer_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_bracer_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_bracer_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_bracer_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_chest_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_chest_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_gloves_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_gloves_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_helmet_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_helmet_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_bounty_hunter_roadmap_leggings_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_bounty_hunter_roadmap_leggings_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_bicep_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_bicep_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_bicep_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_boots_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_boots_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_bracer_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_bracer_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_bracer_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_bracer_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_chest_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_chest_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_gloves_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_gloves_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_helmet_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_helmet_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_commando_roadmap_leggings_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_commando_roadmap_leggings_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Commando')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_bicep_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_bicep_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_bicep_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_boots_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_boots_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_bracer_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_bracer_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_bracer_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_bracer_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_chest_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_chest_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_gloves_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_gloves_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_helmet_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_helmet_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_officer_roadmap_leggings_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_officer_roadmap_leggings_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Officer')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_bicep_l_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_bicep_l_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_bicep_r_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_bicep_r_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_boots_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_boots_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_bracer_l_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_bracer_l_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_bracer_r_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_bracer_r_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_chest_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_chest_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_gloves_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_gloves_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_helmet_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_helmet_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_ithorian_roadmap_leggings_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_ithorian_roadmap_leggings_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_wookiee_roadmap_bicep_l_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_wookiee_roadmap_bicep_l_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_wookiee_roadmap_bicep_r_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_wookiee_roadmap_bicep_r_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_wookiee_roadmap_bracer_l_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_wookiee_roadmap_bracer_l_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_wookiee_roadmap_bracer_r_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_wookiee_roadmap_bracer_r_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_wookiee_roadmap_chest_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_wookiee_roadmap_chest_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_wookiee_roadmap_leggings_02_03')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_wookiee_roadmap_leggings_02_03')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
 	object.setStringAttribute('armor_category', 'Assault')
@@ -1,10 +0,0 @@
-import sys
-
-def setup(core, object):
-	object.setStfFilename('static_item_n')
-	object.setStfName('armor_spy_roadmap_boots_02_01')
-	object.setDetailFilename('static_item_d')
-	object.setDetailName('armor_spy_roadmap_boots_02_01')
-	object.setStringAttribute('class_required', 'Spy')
-	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
-	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_bicep_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_bicep_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_bicep_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_boots_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_boots_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_bracer_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_bracer_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_bracer_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_bracer_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_chest_plate_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_chest_plate_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
@@ -14,4 +15,4 @@ def setup(core, object):
 	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 1640)
 	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 1640)
 	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 1640)
-	return	
+	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_gloves_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_gloves_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
 	return	
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_helmet_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_helmet_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_spy_roadmap_leggings_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_spy_roadmap_leggings_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Spy')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_battle')
@@ -10,10 +10,4 @@ def setup(core, object):
 	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('faction_restriction', 'Rebel')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
-	object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
-	object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
 	return
@@ -10,10 +10,4 @@ def setup(core, object):
 	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('faction_restriction', 'Rebel')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
-	object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
-	object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
 	return
@@ -10,10 +10,4 @@ def setup(core, object):
 	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('faction_restriction', 'Rebel')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
-	object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
-	object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
 	return
@@ -1,6 +1,6 @@
 import sys

 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 22)
 	object.setStringAttribute('required_faction', 'Imperial')
+	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
 	return	
@@ -1,6 +1,6 @@
 import sys

 def setup(core, object):
-	object.setIntAttribute('required_combat_level', 22)
 	object.setStringAttribute('required_faction', 'Imperial')
+	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
 	return	
@@ -1,12 +1,4 @@
 import sys

 def setup(core, object):
-	object.setStringAttribute('faction_required', 'Imperial')
-	object.setStringAttribute('armor_category', 'Reconnaissance')
-	object.setIntAttribute('cat_armor_standard_protection.kinetic', 4608)
-	object.setIntAttribute('cat_armor_standard_protection.energy', 6608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
 	return	
@@ -11,10 +11,4 @@ def setup(core, object):
 	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('faction_restriction', 'Imperial')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
-	object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
-	object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
 	return
@@ -11,10 +11,4 @@ def setup(core, object):
 	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('faction_restriction', 'Imperial')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
-	object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
-	object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
 	return
@@ -11,10 +11,4 @@ def setup(core, object):
 	object.setIntAttribute('no_trade', 1)
 	object.setStringAttribute('faction_restriction', 'Imperial')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault')
-	object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608)
-	object.setIntAttribute('cat_armor_standard_protection.energy', 4608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608)
-	object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608)
 	return
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_bicep_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_bicep_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_bicep_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_boots_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_boots_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_bracer_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_bracer_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_bracer_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_chest_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_chest_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_gloves_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_gloves_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_helmet_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_helmet_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_medic_roadmap_leggings_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_medic_roadmap_leggings_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Medic')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_smuggler_roadmap_bicep_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_smuggler_roadmap_bicep_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Smuggler')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_smuggler_roadmap_bicep_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_smuggler_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Smuggler')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_smuggler_roadmap_boots_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_smuggler_roadmap_boots_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Smuggler')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_smuggler_roadmap_bracer_l_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_smuggler_roadmap_bracer_l_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Smuggler')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_smuggler_roadmap_bracer_r_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_smuggler_roadmap_bicep_r_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Smuggler')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
@@ -5,6 +5,7 @@ def setup(core, object):
 	object.setStfName('armor_smuggler_roadmap_chest_02_01')
 	object.setDetailFilename('static_item_d')
 	object.setDetailName('armor_smuggler_roadmap_chest_02_01')
+	object.setIntAttribute('no_trade', 1)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 3)
 	object.setStringAttribute('class_required', 'Smuggler')
 	object.setStringAttribute('armor_category', '@obj_attr_n:armor_reconnaissance')
--- a/Show More
+++ b/Show More