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

Conflicts:
	src/services/command/CommandService.java
	src/services/object/ObjectService.java

.gitignore

@@ -60,6 +60,7 @@ odb/chatRooms/je.info.*
 odb/resourcehistory/je.info.*
 odb/resourceroots/je.info.*
 odb/resources/je.info.*
+odb/auction/je.info.*
 
 # External tool builders
 .externalToolBuilders/

nge.cfg

@@ -13,5 +13,4 @@ GALAXY_ID=2
 GALAXY_NAME=Local Connection
 XPMULTIPLIER=1.0
 MAXNUMBEROFCHARACTERS=2
-LOAD.RESOURCE.SYSTEM=1
 MOTD=Welcome to PSWG Test Center!

options.cfg

@@ -1,2 +1,3 @@
 LOAD.SNAPSHOT_OBJECTS=1
-LOAD.BUILDOUT_OBJECTS=1
+LOAD.BUILDOUT_OBJECTS=1
+LOAD.RESOURCE.SYSTEM=1

scripts/commands/harvesteractivate.py

@@ -0,0 +1,10 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    core.harvesterService.handleHarvesterActivateCommand(actor, target, commandString)
+    return
+
+	

scripts/commands/harvesterdeactivate.py

@@ -0,0 +1,10 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    core.harvesterService.handleHarvesterDeactivateCommand(actor, target, commandString)
+    return
+
+	

scripts/commands/harvesterdiscardhopper.py

@@ -0,0 +1,11 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+	actor.sendSystemMessage('handleEmptyHarvester', 0)
+	core.harvesterService.handleEmptyHarvester(actor, target, commandString)
+	return
+
+	

scripts/commands/harvesterselectresource.py

@@ -0,0 +1,10 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    core.harvesterService.handleHarvesterSelectResourceCommand(actor, target, commandString)
+    return
+
+	

scripts/commands/movefurniture.py

@@ -6,7 +6,6 @@ def setup():
 	
 def run(core, actor, target, commandString):
 	tarObj = core.objectService.getObject(actor.getTargetId())
-	
 	container = actor.getContainer()
 	parsedMsg = commandString.split(' ', 2)
 	

scripts/commands/permissionlistmodify.py

@@ -0,0 +1,17 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+	permissionType = 'Undetermined'
+	commandArgs = commandString.split(' ')
+	if len(commandArgs) > 3:
+		permissionType = commandArgs[2]
+	if permissionType=='ENTRY' | permissionType=='BAN':
+		core.housingService.handlePermissionListModify(actor, target, commandString)
+	if permissionType=='ADMIN' | permissionType=='HOPPER':	
+		core.harvesterService.handlePermissionListModify(actor, target, commandString)
+    return
+
+	

scripts/commands/placestructure.py

@@ -1,4 +1,5 @@
 import sys
+import resources.objects.deed.Harvester_Deed
 
 def setup():
 	return
@@ -8,7 +9,12 @@ def run(core, actor, target, commandString):
 	
 	deedId = long(cmdArgs[0])
 	deed = core.objectService.getObject(deedId)
-	
+
+	if (actor.getAttachment('UsingHarvesterDeed') == '1'):
+		actor.setAttachment('UsingHarvesterDeed', '0');
+		core.harvesterService.handlePlaceStructureCommand(actor, target, commandString)
+		return
+		
 	positionX = float(cmdArgs[1])
 	positionZ = float(cmdArgs[2])
 	#positionY = core.terrainService.getHeight(actor.getPlanetId(), positionX, positionZ) + 2

scripts/commands/resourceemptyhopper.py

@@ -0,0 +1,10 @@
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    core.harvesterService.handleHarvesterDeactivateCommand(actor, target, commandString)
+    return
+
+	

scripts/commands/setspeed.py

@@ -5,6 +5,5 @@ def setup():
 	
 def run(core, actor, target, commandString):
 	actor.setSpeedMultiplierBase(float(commandString))
-	core.buffService.addBuffToCreature(actor, 'bh_prescience')
 	return
 	

scripts/commands/transferitemmisc.py

@@ -12,9 +12,10 @@ def run(core, actor, target, commandString):
         actorContainer = actor.getContainer()
         
         if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer):
-            target.getContainer().transferTo(actor, container, target)
-            core.simulationService.teleport(target, actor.getPosition(), Quaternion(1,0,0,0), containerID)
-            return
+			target.getContainer().transferTo(actor, container, target)
+			core.simulationService.teleport(target, actor.getPosition(), Quaternion(1,0,0,0), containerID)
+			#core.housingService.addItemToHouseItemList(target,actorContainer)
+			return
         elif actorContainer != None and container.getTemplate() == "object/cell/shared_cell.iff":
             actor.sendSystemMessage("You do not have permission to access that container!", 0)
             return

scripts/loot/lootItems/colorcrystal.py

@@ -0,0 +1,21 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''
+	
+def customItemStackCount():
+
+	return 1
+	
+def customizationAttributes():
+
+	return []
+	
+def customizationValues():
+
+	return []
+

scripts/loot/lootItems/junk/antenna.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/creature_loot/generic/shared_generic_antennae.iff'

scripts/loot/lootItems/junk/armor_repair_device.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_armor_repair_device_generic.iff'

scripts/loot/lootItems/junk/brain.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/creature_loot/generic/shared_brain_s01.iff'
+
+def customItemName():
+
+	return 'Brain'

scripts/loot/lootItems/junk/chassis_blueprint.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/generic_usable/shared_chassis_blueprint_usuable.iff'
+
+def customItemName():
+
+	return 'Chassis Blueprint'

scripts/loot/lootItems/junk/comlink.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_comlink_civilian_generic.iff'
+
+def customItemName():
+
+	return 'Comlink'

scripts/loot/lootItems/junk/damaged_datapad.py

@@ -0,0 +1,9 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/misc/shared_damaged_datapad.iff'
+
+def customItemName():
+
+	return 'Damaged Datapad'
+

scripts/loot/lootItems/junk/ear_jewel.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return '/object/tangible/loot/npc_loot/shared_jewelry_ear_s02.iff'

scripts/loot/lootItems/junk/explosive_dud.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return '/object/tangible/loot/npc_loot/shared_firework_dud_s1.iff'

scripts/loot/lootItems/junk/eye.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/creature_loot/generic/shared_generic_eye.iff'

scripts/loot/lootItems/junk/gland.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/creature_loot/generic/shared_lungs_gland.iff'
+
+def customItemName():
+
+	return 'Gland'

scripts/loot/lootItems/junk/heart.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/creature_loot/generic/shared_generic_heart.iff'

scripts/loot/lootItems/junk/hyperdrive_unit.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/miscshared_hyperdrive_part_s01.iff'

scripts/loot/lootItems/junk/id_chip.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_id_chip_generic.iff'
+	
+def customItemName():
+
+	return 'ID Chip'

scripts/loot/lootItems/junk/impulse_detector.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_impulse_detector_01_generic.iff'

scripts/loot/lootItems/junk/laser_trap.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_laser_trap_generic.iff'

scripts/loot/lootItems/junk/launcher_tube.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_launcher_tube_generic.iff'
+
+def customItemName():
+
+	return 'Launcher Tube'

scripts/loot/lootItems/junk/ledger.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_ledger_generic.iff'

scripts/loot/lootItems/junk/magseal_detector.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_magseal_detector_generic.iff'

scripts/loot/lootItems/junk/medical_console.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_medical_console_generic.iff'

scripts/loot/lootItems/junk/medical_device.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_medical_device_generic.iff'

scripts/loot/lootItems/junk/motor.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_small_motor_generic.iff'

scripts/loot/lootItems/junk/power_output_analyzer.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_power_output_analyzer_generic.iff'

scripts/loot/lootItems/junk/red_wiring.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_red_wiring_generic.iff'

scripts/loot/lootItems/junk/shield_module.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_shield_module_generic.iff'

scripts/loot/lootItems/junk/software_module.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_software_module_generic.iff'

scripts/loot/lootItems/junk/stomach.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/creature_loot/generic/shared_generic_stomach.iff'

scripts/loot/lootItems/junk/survival_gear.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_survival_equipment_generic.iff'

scripts/loot/lootItems/junk/underpowered_survey_pad.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_survey_pad_adv_generic.iff'

scripts/loot/lootItems/junk/unidentified_serum_vial.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_serum_vial_generic.iff'

scripts/loot/lootItems/junk/used_notebook.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_notebook_generic.iff'

scripts/loot/lootItems/junk/weak_droid_battery.py

@@ -0,0 +1,4 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/generic/shared_battery_useable_generic.iff'

scripts/loot/lootItems/junk/worklight_generic.py

@@ -0,0 +1,21 @@
+
+def itemTemplate():
+
+	return 'object/tangible/loot/npc_loot/shared_worklight_generic.iff'
+
+def customItemName():
+
+	return ''
+	
+def customItemStackCount():
+
+	return 1
+	
+def customizationAttributes():
+
+	return []
+	
+def customizationValues():
+
+	return []
+

scripts/loot/lootItems/kraytpearl_cracked.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_fair.py

@@ -0,0 +1,12 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''
+	
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_flawless.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_good.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_poor.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_premium.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_quality.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_scratched.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/kraytpearl_select.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_fair.py

@@ -0,0 +1,12 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''
+	
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_flawless.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_good.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_perfect.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_poor.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_premium.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_quality.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/powercrystal_select.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/rarelootchest1.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/item/shared_rare_loot_chest_3.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/rarelootchest2.py

@@ -0,0 +1,8 @@
+
+def itemTemplate():
+
+	return 'object/tangible/item/shared_rare_loot_chest_3.iff'
+
+def customItemName():
+
+	return ''

scripts/loot/lootItems/weapons/shared_rifle_cdef.py

@@ -0,0 +1,20 @@
+
+def itemTemplate():
+
+	return 'object/weapon/ranged/rifle/shared_rifle_cdef.iff'
+
+def customItemName():
+
+	return ''
+	
+def customItemStackCount():
+
+	return 1
+	
+def customizationAttributes():
+
+	return []
+	
+def customizationValues():
+
+	return []

scripts/loot/lootPools/colorcrystals.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+	
+	return ['colorCrystal']
+
+def itemChances():
+
+	return [70]

scripts/loot/lootPools/junk.py

@@ -0,0 +1,15 @@
+
+def itemNames():
+	
+	templates=['damaged_datapad','red_wiring','worklight_generic','antenna','brain','eye','gland','heart','stomach','armor_repair_device'] #10
+	templates=templates+['brain','chassis_blueprint','comlink','explosive_dud','hyperdrive_unit','id_chip','impulse_detector','laser_trap'] #8
+	templates=templates+['launcher_tube','ledger','magseal_detector','medical_console','medical_device','motor','power_output_analyzer','shield_module'] #8
+	templates=templates+['software_module','survival_gear','underpowered_survey_pad','unidentified_serum_vial','used_notebook','weak_droid_battery'] #6
+	return templates
+	
+def itemChances():
+	chances=[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125]
+	chances=chances+[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125]
+	chances=chances+[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125]
+	chances=chances+[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125]
+	return chances #32

scripts/loot/lootPools/kraytpearl_lowq.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+
+	return ['kraytpearl_cracked','kraytpearl_scratched','kraytpearl_poor']
+	
+def itemChances():
+
+	return [33,33,34]

scripts/loot/lootPools/kraytpearls_range.py

@@ -0,0 +1,6 @@
+
+def itemTemplates():
+	return ['kraytpearl_fair','kraytpearl_good','kraytpearl_quality','kraytpearl_select','kraytpearl_premium','kraytpearl_flawless']
+	
+def itemChances():
+	return [10,20,30,34,5,1] #= 100%

scripts/loot/lootPools/powercrystals_hiq.py

@@ -0,0 +1,6 @@
+
+def itemNames():
+	return ['powercrystal_premium','powercrystal_flawless','powercrystal_perfect']
+	
+def itemChances():
+	return [94,5,1] #= 100%

scripts/loot/lootPools/rareloot.py

@@ -0,0 +1,9 @@
+
+
+def itemNames():
+	
+	templates=['rarelootchest1','rarelootchest2']
+	return templates
+	
+def itemChances():
+	return [70,30]

scripts/loot/lootPools/rifles.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+	
+	return ['shared_rifle_cdef']
+	
+def itemChances():
+	return [100]
+	

scripts/loot/rarelootchestcontents/exceptionaltable.py

@@ -0,0 +1,12 @@
+
+def itemTemplates():
+	templates = ['Biological_Focus_Crystal','Synapse_Focus_Crystal','Concentrated_Bacta_Tank','DNA_Storage_Device_Kowakian']
+	templates = templates + ['Dug_Costume_Instructions','Dusk_in_Kachirho','Mercenaries_Despair','Mercenaries_Lament','Nightsister_Melee_Armguard']
+	templates = templates + ['Rare_Painting','Sunriders_Destiny']
+	return templates
+	
+def itemChances():
+	chances = [9,9,9,9]
+	chances = chances+[9,9,9,9,9]
+	chances = chances+[9,9] #= 100%
+	return chances

scripts/loot/rarelootchestcontents/legendarytable.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+	
+	return ['colorCrystal']
+
+def itemChances():
+
+	return [70]

scripts/mobiles/tatooine/krayt_dragon.py

@@ -0,0 +1,19 @@
+import sys
+from services.spawn import MobileTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	templates = Vector()
+	templates.add('object/mobile/shared_krayt_dragon.iff')
+	mobileTemplate.setTemplates(templates)
+	mobileTemplate.setLevel(10)
+	mobileTemplate.setDifficulty(2)
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	mobileTemplate.setCreatureName('krayt_dragon')
+	mobileTemplate.setScale(2)
+	mobileTemplate.setAttackRange(12)
+	core.spawnService.addMobileTemplate('krayt_dragon', mobileTemplate)
+	

scripts/mobiles/tatooine/tusken_raider.py

@@ -0,0 +1,27 @@
+import sys
+from services.spawn import MobileTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('tusken_raider')
+	mobileTemplate.setLevel(90)
+	mobileTemplate.setDifficulty(0)
+	mobileTemplate.setAttackRange(24)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_tusken_raider.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weaponTemplates.add('object/weapon/ranged/rifle/shared_rifle_tusken.iff')
+	mobileTemplate.setWeaponTemplates(weaponTemplates)
+
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedShot')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('tusken_raider', mobileTemplate)
+	

scripts/object/building/player/player_house_generic_small_style_01.py

@@ -5,5 +5,7 @@ def setup(core, object):
 	print(sign)
 	object.setAttachment("structureSign", sign)
 	
-	core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1)
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/installation/generators/power_generator_fusion_style_1.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'generator')
+	object.setHarvester_type(5)
+	object.setMaintenanceCost(30)
+	object.setGenerator(1)
 	return

scripts/object/installation/generators/power_generator_geothermal_style_1.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'generator')
+	object.setHarvester_type(5)
+	object.setMaintenanceCost(30)
+	object.setGenerator(1)
 	return

scripts/object/installation/generators/power_generator_photo_bio_style_1.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'generator')
+	object.setHarvester_type(5)
+	object.setMaintenanceCost(30)
+	object.setGenerator(1)
 	return

scripts/object/installation/generators/power_generator_solar_style_1.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'generator')
+	object.setHarvester_type(5)
+	object.setMaintenanceCost(30)
+	object.setGenerator(1)
 	return

scripts/object/installation/generators/power_generator_wind_style_1.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'generator')
+	object.setHarvester_type(5)
+	object.setMaintenanceCost(20)
+	object.setGenerator(1)
 	return

scripts/object/installation/mining_gas/mining_gas_harvester_style_1.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(3)
+	object.setPowerCost(25); 
+	object.setMaintenanceCost(16);
 	return

scripts/object/installation/mining_gas/mining_gas_harvester_style_2.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(3)
+	object.setPowerCost(60); 
+	object.setMaintenanceCost(60);
 	return

scripts/object/installation/mining_gas/mining_gas_harvester_style_3.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(3)
+	object.setPowerCost(75); 
+	object.setMaintenanceCost(90);
 	return

scripts/object/installation/mining_gas/mining_gas_harvester_style_4.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(3)
+	object.setPowerCost(100); 
+	object.setMaintenanceCost(120);
 	return

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_1.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(1)
+	object.setPowerCost(25); 
+	object.setMaintenanceCost(16);
 	return

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_2.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(1)
+	object.setPowerCost(60); 
+	object.setMaintenanceCost(60);
 	return

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_3.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(1)
+	object.setPowerCost(75); 
+	object.setMaintenanceCost(90);
 	return

scripts/object/installation/mining_liquid/mining_liquid_harvester_style_4.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(1)
+	object.setPowerCost(100); 
+	object.setMaintenanceCost(120);
 	return

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(4)
+	object.setPowerCost(25); 
+	object.setMaintenanceCost(16);
 	return

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester_elite.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(4)
+	object.setPowerCost(100); 
+	object.setMaintenanceCost(120);
 	return

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester_heavy.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(4)
+	object.setPowerCost(75); 
+	object.setMaintenanceCost(90);
 	return

scripts/object/installation/mining_liquid/mining_liquid_moisture_harvester_medium.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'harvester')
+	object.setHarvester_type(4)
+	object.setPowerCost(60); 
+	object.setMaintenanceCost(60);
 	return