Merge remote-tracking branch 'origin/master' into PlayerCityUpdate

scripts/commands/forage.py

@@ -0,0 +1,74 @@
+import sys
+import engine.resources.scene.Point3D
+import resources.common.Forager
+import time
+
+
+def setup():
+	return
+	
+def run(core, actor, target, commandString):
+	
+	#if actor.getSkills('Foraging')==0:
+		#actor.sendSystemMessage('@skl_use:sys_forage_noskill'),0)
+	
+	#if actor.isForaging()==1:
+		#actor.sendSystemMessage('@skl_use:sys_forage_already',0)
+		#return
+	
+	if actor.getCombatFlag()!=0:
+		actor.sendSystemMessage('@skl_use:sys_forage_combatfail',0)
+		return
+		
+	if actor.getPosture()!=0:
+		actor.sendSystemMessage('@skl_use:sys_forage_cant',0)	
+		return
+		
+	if core.terrainService.isWater(actor.getPlanet(), actor.getPosition().x, actor.getPosition().z):
+		actor.sendSystemMessage('You cannot forage while in water.',0)
+		return
+		
+	if actor.getContainer() != None:
+		actor.sendSystemMessage('@skl_use:sys_forage_inside',0)
+		return
+		
+	if actor.getAction() < 200:
+		actor.sendSystemMessage('@skl_use:sys_forage_attrib',0)
+		return
+	
+	somepoint = engine.resources.scene.Point3D(0,0,0)
+	if actor.getAttachment('PostForagePosition')==None:
+		actor.setAttachment('PostForagePosition', somepoint)
+	
+	oldposition = actor.getAttachment('PostForagePosition')
+	if actor.getPosition().getDistance2D(oldposition)<5:
+				
+		actor.sendSystemMessage("@skl_use:sys_forage_empty", 0);
+		return
+		
+		
+	actor.sendSystemMessage('@skl_use:sys_forage_start', 0)
+	
+	actor.setAttachment("PreForagePosition", actor.getPosition())
+	actor.setCurrentAnimation('forage')
+	time.sleep(1) # does NOT stall other python scripts, tested
+	# Each command might be its own thread
+	
+	actor.setAttachment("PostForagePosition", actor.getPosition())
+	
+	if actor.getCombatFlag()!=0:
+		actor.sendSystemMessage('@skl_use:sys_forage_combatfail',0)
+		return
+	
+	oldposition = actor.getAttachment("PreForagePosition")
+	if actor.getPosition().getDistance2D(oldposition)>2:
+		actor.sendSystemMessage('@skl_use:sys_forage_movefail',0)
+		return
+		
+	
+	
+	forager = resources.common.Forager()
+	forager.handleForageResults(actor)
+	
+	return
+	

scripts/commands/suspendtest.py

@@ -0,0 +1,30 @@
+import sys
+import resources.common.Forager
+import time
+
+
+def setup():
+	return
+	
+def run(core, actor, target, commandString):
+	actor.sendSystemMessage('Test1', 1)
+	time.sleep(1) 
+	actor.sendSystemMessage('Test2', 1)
+	time.sleep(1)
+	actor.sendSystemMessage('Test3', 1)
+	time.sleep(1)
+	actor.sendSystemMessage('Test4', 1)
+	time.sleep(1)
+	actor.sendSystemMessage('Test5', 1)
+	time.sleep(1)
+	actor.sendSystemMessage('Test6', 1)
+	time.sleep(1)
+	actor.sendSystemMessage('Test7', 1)
+	time.sleep(1)
+	actor.sendSystemMessage('Test8', 1)
+	time.sleep(1)
+	
+	
+	
+	return
+	

scripts/conversation/missions/deliver.py

@@ -0,0 +1,70 @@
+from resources.common import OutOfBand
+from resources.common import ProsePackage
+from resources.objectives import DeliveryMissionObjective
+import sys
+
+def startConversation(core, actor, npc):
+	missionId = npc.getAttachment('assignedMission')
+	
+	if missionId is None:
+		return
+	
+	mission = core.objectService.getObject(missionId)
+	
+	if mission is None:
+		return
+	
+	objective = mission.getObjective()
+
+	if mission.getGrandparent().getObjectId() != actor.getObjectId() or objective is None:
+		core.conversationService.sendStopConversation(actor, npc, 'mission/mission_generic', 'npc_job_request_no_job')
+		return
+
+	if objective.getObjectivePhase() == 0:
+		handlePickupStage(core, actor, npc, objective, mission)
+		return
+	
+	elif objective.getObjectivePhase() == 1:
+		handleDeliveryStage(core, actor, npc, objective, mission)
+		return
+	
+	elif objective.getObjectivePhase() == 2:
+		handleCompletionStage(core, actor, npc, objective, mission)
+		return
+	return
+
+def endConversation(core, actor, npc):
+	core.conversationService.sendStopConversation(actor, npc, 'mission/mission_generic', 'npc_job_request_no_job')
+	return
+
+def handlePickupStage(core, actor, npc, objective, mission):
+	
+	if objective.getMissionGiver().getObjectId() != npc.getObjectId():
+		endConversation(core, actor, npc)
+		return
+	
+	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'p')
+	objective.createDeliveryItem()
+	objective.update()
+	return
+
+def handleDeliveryStage(core, actor, npc, objective, mission):
+	
+	if objective.getDropOffNpc().getObjectId() != npc.getObjectId():
+		endConversation(core, actor, npc)
+		return
+	
+	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'r')
+	core.objectService.destroyObject(objective.getDeliveryObject())
+	objective.update()
+	return
+
+def handleCompletionStage(core, actor, npc, objective, mission):
+	
+	if objective.getMissionGiver().getObjectId() != npc.getObjectId():
+		endConversation(core, actor, npc)
+		return
+	
+	core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 's')
+	objective.complete()
+	return

scripts/houses/player_house_atat.py

@@ -0,0 +1,19 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/tcg/series5/shared_structure_deed_player_house_atat.iff", "object/building/player/shared_player_house_atat.iff", 3)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-3.8), float(5.86), float(15.1)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(350)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_hangar.py

@@ -0,0 +1,19 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/tcg/series5/shared_structure_deed_player_house_hangar.iff", "object/building/player/shared_player_house_hangar.iff", 3)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(9.2), float(2.86), float(0.8)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(350)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_jabbas_sail_barge.py

@@ -0,0 +1,19 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_jabbas_sail_barge_deed.iff", "object/building/player/shared_player_house_jabbas_sail_barge.iff", 3)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(0), float(2.86), float(-3.5)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(350)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_jedi_meditation_room.py

@@ -0,0 +1,19 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/tcg/series3/shared_structure_deed_jedi_meditation_room_deed.iff", "object/building/player/shared_player_house_jedi_meditation_room.iff", 3)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(0), float(2.86), float(-3.5)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(350)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_mustafar_lg.py

@@ -0,0 +1,19 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_mustafar_house_lg.iff", "object/building/player/shared_player_house_mustafar_lg.iff", 5)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(1.5), float(2.86), float(13.7)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(200)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/houses/player_house_sith_meditation_room.py

@@ -0,0 +1,19 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(core):
+	houseTemplate = HouseTemplate("object/tangible/tcg/series3/shared_structure_deed_sith_meditation_room_deed.iff", "object/building/player/shared_player_house_sith_meditation_room.iff", 3)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3), float(2.86), float(5.7)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("corellia")
+	houseTemplate.addPlaceablePlanet("naboo")
+	houseTemplate.addPlaceablePlanet("talus")
+	houseTemplate.addPlaceablePlanet("rori")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(350)
+	
+	core.housingService.addHousingTemplate(houseTemplate)
+	return

scripts/loot/lootItems/kraytpearl_ancient_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/treasureloot/bracelet_of_Inspired_Status(right).py

@@ -0,0 +1,21 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Bracelet of Inspired Status (Right)'
+	
+def requiredProfession():
+
+	return 'Entertainer'
+	
+def requiredCL():
+	
+	return 80
+
+def itemSkillMods():
+
+	mods = ['expertise_en_inspire_pulse_duration_increase','1']
+	return mods 

scripts/loot/lootItems/treasureloot/counter-toxin_wristband_prototype_IV_(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Adventurer Hiker & Hunter Counter-Toxin Wristband Prototype IV (right)'
+	
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 75
+
+def itemSkillMods():
+
+	mods = ['absorption_bleeding','8']
+	mods += ['absorption_disease','8']
+	mods += ['absorption_fire','8']
+	mods += ['absorption_poison','8']
+	return mods 

scripts/loot/lootItems/treasureloot/force_amplification_crystal.py

@@ -0,0 +1,5 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/misc/shared_force_crystal.iff']
+

scripts/loot/lootItems/treasureloot/insurgency_wrist_implantat-BLACK-(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s06_r.iff']
+
+def customItemName():
+
+	return 'Corellidyne Personal Insurgency Wris Implantat -BLACK- (Right)'
+	
+def requiredProfession():
+
+	return 'Spy'
+	
+def requiredCL():
+	
+	return 75
+
+def itemSkillMods():
+
+	mods = ['expertise_action_line_sp_dm','4']
+	mods += ['expertise_critical_line_sp_dm','4']
+	mods += ['expertise_damage_line_sp_dm','4']
+	mods += ['expertise_freeshot_sp_dm','4']
+	return mods 

scripts/loot/lootItems/treasureloot/insurgent_scanner_wrist_module_(right).py

@@ -0,0 +1,21 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Idellian Arrays PLFS-4000 Insurgent Scanner Wrist Module (Right)'
+	
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 75
+
+def itemSkillMods():
+
+	mods = ['detect_hidden','10']
+	return mods 

scripts/loot/lootItems/treasureloot/jedi_knight_meditation_bracelet_(right).py

@@ -0,0 +1,26 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s04_r.iff']
+
+def customItemName():
+
+	return 'Jedi Knight Meditation Bracelet (right)'
+	
+def requiredProfession():
+
+	return 'Jedi'
+	
+def requiredCL():
+	
+	return 75
+
+def biolink():
+
+	return 1
+
+def itemSkillMods():
+
+	mods = ['jedi_saber_assembly','3']
+	mods += ['jedi_saber_experimentation','10']
+	return mods 

scripts/loot/lootItems/treasureloot/jedi_knights_wristguard_(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s02_r.iff']
+
+def customItemName():
+
+	return 'Jedi Knight\'s Wristguard (Right)'
+	
+def requiredProfession():
+
+	return 'Jedi'
+	
+def requiredCL():
+	
+	return 85
+
+def itemSkillMods():
+
+	mods = ['expertise_action_line_fs_dm','4']
+	mods += ['expertise_critical_line_fs_dm','4']
+	mods += ['expertise_damage_line_fs_dm','4']
+	mods += ['expertise_freeshot_fs_dm','4']
+	return mods 

scripts/loot/lootItems/treasureloot/jedi_wristguard(right).py

@@ -0,0 +1,28 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s02_r.iff']
+
+def customItemName():
+
+	return 'Jedi\'s Wristguard (Right)'
+	
+def requiredProfession():
+
+	return 'Jedi'
+	
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 61
+
+def itemSkillMods():
+
+	mods = ['expertise_action_line_fs_dm','3']
+	mods += ['expertise_critical_line_fs_dm','3']
+	mods += ['expertise_damage_line_fs_dm','3']
+	mods += ['expertise_freeshot_fs_dm','3']
+	return mods 

scripts/loot/lootItems/treasureloot/manufacturing_verdicator_200a_(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Saldalith Manufacturing Verdicator 200A (Right)'
+	
+def requiredProfession():
+
+	return 'Medic'
+	
+def requiredCL():
+	
+	return 85
+
+def itemSkillMods():
+
+	mods = ['expertise_action_line_me_dm','4']
+	mods += ['expertise_critical_line_me_dm','4']
+	mods += ['expertise_damage_line_me_dm','4']
+	mods += ['expertise_healing_all','4']
+	return mods 

scripts/loot/lootItems/treasureloot/mysterious_data_disk.py

@@ -0,0 +1,9 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/generic_usable/shared_datadisk_generic.iff']
+
+def customItemName():
+
+	return 'Mysterious Data Disk'
+	

scripts/loot/lootItems/treasureloot/personnel_comlink_wrist-P4_(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'SoroSuub Personnel Comlink Wrist-P4 (right)'
+	
+def requiredProfession():
+
+	return 'Officer'
+	
+def requiredCL():
+	
+	return 85
+
+def itemSkillMods():
+
+	mods = ['expertise_action_line_of_sure','4']
+	mods += ['expertise_critical_line_of_sure','4']
+	mods += ['expertise_damage_line_of_sure','4']
+	mods += ['expertise_freeshot_of_sure','4']
+	return mods 

scripts/loot/lootItems/treasureloot/targeter_ranging_wrist_assist_V4_(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Merr-Sonn Targeter Ranging Wrist Assist V4 (right)'
+	
+def requiredProfession():
+
+	return 'Smuggler'
+	
+def requiredCL():
+	
+	return 85
+
+def itemSkillMods():
+
+	mods = ['fast_attack_line_sm_dm','4']
+	mods += ['expertise_critical_line_sm_dm','4']
+	mods += ['expertise_damage_line_sm_dm','4']
+	mods += ['expertise_freeshot_sm_dm','4']
+	return mods 

scripts/loot/lootItems/treasureloot/targeting_assist_wrist_implant_PTI-IV_(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Traxes BioElectronic Targeting Assist Wrist Implant PTI-IV (Right)'
+	
+def requiredProfession():
+
+	return 'Commando'
+	
+def requiredCL():
+	
+	return 85
+
+def itemSkillMods():
+
+	mods = ['expertise_action_line_co_dm','4']
+	mods += ['expertise_critical_line_co_dm','4']
+	mods += ['expertise_damage_line_co_dm','4']
+	mods += ['expertise_freeshot_co_dm','4']
+	return mods 

scripts/loot/lootItems/treasureloot/wrist_assault_booster_zulu_(right).py

@@ -0,0 +1,24 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Blastech Wristek - Wrist Assault Booster Zulu (right)'
+	
+def requiredProfession():
+
+	return 'Bounty Hunter'
+	
+def requiredCL():
+	
+	return 85
+
+def itemSkillMods():
+
+	mods = ['expertise_action_line_fs_dm','4']
+	mods += ['expertise_critical_line_dm','4']
+	mods += ['expertise_damage_line_dm','4']
+	mods += ['expertise_freeshot_dm','4']
+	return mods 

scripts/loot/lootItems/treasureloot/wrist_communications_scanner_SCNv4_(right).py

@@ -0,0 +1,22 @@
+
+def itemTemplate():
+
+	return ['object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff']
+
+def customItemName():
+
+	return 'Courier Wrist Communications Scanner SCNv4 (Right)'
+	
+def requiredProfession():
+
+	return 'Bounty Hunter'
+	
+def requiredCL():
+	
+	return 75
+
+def itemSkillMods():
+
+	mods = ['droid_find_speed','10']
+	mods += ['expertise_critical_niche_pvp','2']
+	return mods 

scripts/loot/lootItems/veryrareloot/rare_ankarres_sapphire.py

@@ -0,0 +1,17 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def customItemName():
+
+	return 'Rare Ankarres Sapphire'
+		
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 80
+

scripts/loot/lootItems/veryrareloot/rare_corusca_gem.py

@@ -0,0 +1,16 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def customItemName():
+
+	return 'Rare Corusca Gem'
+		
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 80

scripts/loot/lootItems/veryrareloot/rare_nova_crystal.py

@@ -0,0 +1,17 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def customItemName():
+
+	return 'Rare Nova Crystal'
+		
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 80
+

scripts/loot/lootItems/veryrareloot/rare_power_gem.py

@@ -0,0 +1,17 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def customItemName():
+
+	return 'Rare Power Gem'
+		
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 80
+

scripts/loot/lootItems/veryrareloot/rare_rol_stone.py

@@ -0,0 +1,17 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def customItemName():
+
+	return 'Rare Rol Stone'
+		
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 80
+

scripts/loot/lootItems/veryrareloot/rare_sasho_gem.py

@@ -0,0 +1,17 @@
+
+def itemTemplate():
+
+	return ['object/tangible/loot/creature_loot/collections/shared_purple_rnd_cut_gem_style1.iff']
+
+def customItemName():
+
+	return 'Rare Sasho Gem'
+		
+def biolink():
+	
+	return 1
+	
+def requiredCL():
+	
+	return 80
+

scripts/loot/lootPools/advanced_stims_80.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+
+	return ['adv_agility_stim_80','adv_power_stim_80']
+	
+def itemChances():
+
+	return [50,50]

scripts/loot/lootPools/consumable_buff_items.py

@@ -0,0 +1,6 @@
+
+def itemNames():
+	return ['flask_of_elba_water ','flask_of_naris-bud_tea','small_flask_of_nerfmilk']
+	
+def itemChances():
+	return [33,33,33] 

scripts/loot/lootPools/jedi_components_treasure.py

@@ -0,0 +1,14 @@
+
+def itemNames():
+
+	components = ['jedi_relic_1','jedi_relic_2','colorcrystal']
+	components += ['powercrystal_select','powercrystal_premium']
+	components += ['kraytpearl_select','kraytpearl_premium','kraytpearl_flawless','kraytpearl_ancient_flawless']
+	components += ['jedi_holocron_2_5','jedi_holocron_4_5','sith_holocron_4_5']
+	return components
+	
+def itemChances():
+
+	return [48,2,29,3,2,5,4,1,0.1,5.7,0.1,0.1] #11
+	
+	

scripts/loot/lootPools/profession_bracelets_61.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+	names = ['jedi_wristguard(right)']
+	
+	return names
+	
+def itemChances():
+	return [100] 

scripts/loot/lootPools/profession_bracelets_75.py

@@ -0,0 +1,8 @@
+
+def itemNames():
+	names = ['jedi_knight_meditation_bracelet_(right)','wrist_communications_scanner_SCNv4_(right)']
+	names += ['insurgent_scanner_wrist_module_(right)','counter-toxin_wristband_prototype_IV_(right)','insurgency_wrist_implantat-BLACK-(right)']
+	return names
+	
+def itemChances():
+	return [20,20,20,20,20] 

scripts/loot/lootPools/profession_bracelets_85.py

@@ -0,0 +1,10 @@
+
+def itemNames():
+	names = ['jedi_knights_wristguard_(right)','wrist_assault_booster_zulu_(right)','targeting_assist_wrist_implant_PTI-IV_(right)']
+	names += ['personnel_comlink_wrist-P4_(right)','manufacturing_verdicator_200a_(right)']
+	names += ['targeter_ranging_wrist_assist_V4_(right)','bracelet_of_Inspired_Status(right)']
+	
+	return names
+	
+def itemChances():
+	return [16,14,14,14,14,14,14] 

scripts/loot/lootPools/rare_buff_items.py

@@ -0,0 +1,8 @@
+
+def itemTemplates():
+	names = ['rare_nova_crystal','rare_rol_stone','rare_power_gem']
+	names += ['rare_corusca_gem','rare_sasho_gem','rare_ankarres_sapphire']
+	return names
+	
+def itemChances():
+	return [15,17,17,17,17,17] 

scripts/loot/lootPools/treasure_extra.py

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

scripts/loot/lootPools/wearable_backpacks.py

@@ -0,0 +1,6 @@
+
+def itemNames():
+	return ['textiles_survival_backpack_(schematic)','textiles_survival_backpack_V2_(schematic)']
+	
+def itemChances():
+	return [60,40] 

scripts/mobiles/forage/goon.py

@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('forage_goon')
+	mobileTemplate.setLevel(1)
+	mobileTemplate.setDifficulty(1)
+	mobileTemplate.setAttackRange(6)
+	mobileTemplate.setAttackSpeed(1.0)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_criminal_assassin_human_female_01.iff')
+	templates.add('object/mobile/shared_dressed_criminal_assassin_human_male_01.iff')
+	templates.add('object/mobile/shared_twilek_male.iff')
+	templates.add('object/mobile/shared_dressed_binayre_pirate_zabrak_male_01.iff')
+	templates.add('object/mobile/shared_dressed_borvos_thug.iff')
+	templates.add('object/mobile/shared_wookiee_male.iff')
+
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_dh17.iff', 1, 0.6)
+	weaponTemplates.add(weapontemplate)
+	weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_dl44.iff', 2, 0.4)
+	weaponTemplates.add(weapontemplate)
+	weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_dlt20a.iff', 0, 0.8)
+	weaponTemplates.add(weapontemplate)	
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('rangedshot')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('forage_goon', mobileTemplate)
+	

scripts/mobiles/forage/treasure_guard.py

@@ -0,0 +1,57 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('treasure_guard')
+	mobileTemplate.setLevel(1)
+	mobileTemplate.setDifficulty(1)
+	mobileTemplate.setAttackRange(6)
+	mobileTemplate.setAttackSpeed(1.0)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_human_01.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_human_02.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_human_03.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_human_04.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_human_05.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_human_06.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_human_01.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_human_02.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_human_03.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_human_04.iff')	
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_twk_01.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_twk_02.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_twk_03.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_zab_01.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_zab_02.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_male_zab_03.iff')	
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_twk_01.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_twk_02.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_twk_03.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_zab_01.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_zab_02.iff')
+	templates.add('object/mobile/shared_dressed_dark_jedi_female_zab_03.iff')
+	
+
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/sword/crafted_saber/shared_sword_lightsaber_one_handed_gen5.iff', 9, 1.0)
+	weaponTemplates.add(weapontemplate)
+	weapontemplate = WeaponTemplate('object/weapon/melee/2h_sword/crafted_saber/shared_sword_lightsaber_two_handed_gen5.iff', 10, 1.0)
+	weaponTemplates.add(weapontemplate)
+	weapontemplate = WeaponTemplate('object/weapon/melee/polearm/crafted_saber/shared_sword_lightsaber_polearm_gen5.iff', 11, 1.0)
+	weaponTemplates.add(weapontemplate)	
+	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('saberHit')
+	mobileTemplate.setDefaultAttack('fs_flurry_1')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('treasure_guard', mobileTemplate)
+	

scripts/mobiles/forage/worm.py

@@ -0,0 +1,39 @@
+import sys
+from services.spawn import MobileTemplate
+from services.spawn import WeaponTemplate
+from java.util import Vector
+
+def addTemplate(core):
+	mobileTemplate = MobileTemplate()
+	
+	mobileTemplate.setCreatureName('forage_worm')
+	mobileTemplate.setLevel(1)
+	mobileTemplate.setDifficulty(1)
+	mobileTemplate.setAttackRange(6)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	
+	templates = Vector()
+	templates.add('object/mobile/shared_col_forage_aggravated_worm.iff')
+	templates.add('object/mobile/shared_col_forage_angry_worm.iff')
+	templates.add('object/mobile/shared_col_forage_brutal_worm.iff')
+	templates.add('object/mobile/shared_col_forage_carnivorous_worm.iff')
+	templates.add('object/mobile/shared_col_forage_ferocious_worm.iff')
+	templates.add('object/mobile/shared_col_forage_fierce_worm.iff')
+	templates.add('object/mobile/shared_col_forage_hungry_worm.iff')
+	templates.add('object/mobile/shared_col_forage_oozing_worm.iff')
+	templates.add('object/mobile/shared_col_forage_savage_worm.iff')
+	templates.add('object/mobile/shared_col_forage_territorial_worm.iff')
+	mobileTemplate.setTemplates(templates)
+	
+	weaponTemplates = Vector()
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weaponTemplates.add(weapontemplate)
+	#mobileTemplate.setWeaponTemplateVector(weaponTemplates)
+	
+	attacks = Vector()
+	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
+	mobileTemplate.setAttacks(attacks)
+	
+	core.spawnService.addMobileTemplate('forage_worm', mobileTemplate)
+	

scripts/mobiles/tatooine/tusken_raider.py

@@ -10,6 +10,7 @@ def addTemplate(core):
 	mobileTemplate.setLevel(10)
 	mobileTemplate.setDifficulty(1)
 	mobileTemplate.setAttackRange(24)
+	mobileTemplate.setAttackSpeed(1.0)
 	
 	templates = Vector()
 	templates.add('object/mobile/shared_tusken_raider.iff')

scripts/mobiles/tatooine/womprat.py

@@ -11,6 +11,10 @@ def addTemplate(core):
 	mobileTemplate.setAttackRange(5)
 	mobileTemplate.setAttackSpeed(5)
 	mobileTemplate.setLevel(5)
+	mobileTemplate.setAttackRange(3)
+	mobileTemplate.setAttackSpeed(1.0)
+	mobileTemplate.setWeaponType(6)
+	
 	attacks = Vector()
 	mobileTemplate.setDefaultAttack('creatureMeleeAttack')
 	mobileTemplate.setAttacks(attacks)

scripts/object/building/player/player_house_atat.py

@@ -1,4 +1,12 @@
 import sys
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -3.8, 5.86, 15.1, 0, 1, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 4.4, 18.5, 4.5, 0.707108, -0.707108, 1)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_hangar.py

@@ -1,4 +1,12 @@
 import sys
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -9.2, 2.86, 0.8, 1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 9.0, 0.7, -2, 0.707108, -0.707108, 1)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_jabbas_sail_barge.py

@@ -1,4 +1,12 @@
 import sys
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 0, 2.86, -3.5, 0, 1, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 9.0, 0.7, -2, 0.707108, -0.707108, 1)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_jedi_meditation_room.py

@@ -1,4 +1,12 @@
 import sys
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 3, 2.86, 5.7, 1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 8.2, 0.7, -1.0, 0.707108, -0.707108, 1)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/building/player/player_house_mustafar_lg.py

@@ -1,4 +1,11 @@
 import sys
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 1.5, 2.86, 13.0, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	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)
 	return

scripts/object/building/player/player_house_sith_meditation_room.py

@@ -1,4 +1,12 @@
 import sys
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', 3, 2.86, 5.7, 1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', 4.2, 0.7, 2, 0.707108, -0.707108, 1)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
 	return

scripts/object/tangible/deed/player_house_deed/jabbas_sail_barge_deed.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_jabbas_sail_barge.iff')
+	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_jabbas_sail_barge_deed.iff')
+	object.setLotRequirement(2)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/player_house_deed/mustafar_house_lg.py

@@ -1,4 +1,12 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_structure.iff')
+	object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_mustafar_house_lg.iff')
+	object.setLotRequirement(2)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/tcg/series3/structure_deed_jedi_meditation_room_deed.py

@@ -1,4 +1,14 @@
 import sys
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_jedi_meditation_room.iff')
+	object.setStructureTemplate('object/tangible/tcg/series3/shared_structure_deed_jedi_meditation_room_deed.iff')
+	object.setLotRequirement(3)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
+	return
+	
+	

scripts/object/tangible/tcg/series3/structure_deed_sith_meditation_room_deed.py

@@ -1,4 +1,14 @@
 import sys
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_sith_meditation_room.iff')
+	object.setStructureTemplate('object/tangible/tcg/series3/shared_structure_deed_sith_meditation_room_deed.iff')
+	object.setLotRequirement(3)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
+	return
+	
+	

scripts/object/tangible/tcg/series5/structure_deed_player_house_atat.py

@@ -1,4 +1,14 @@
 import sys
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_atat.iff')
+	object.setStructureTemplate('object/tangible/tcg/series5/shared_structure_deed_player_house_atat.iff')
+	object.setLotRequirement(3)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
+	return
+	
+	

scripts/object/tangible/tcg/series5/structure_deed_player_house_hangar.py

@@ -1,4 +1,14 @@
 import sys
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	object.setConstructorTemplate('object/building/player/construction/shared_construction_player_jedi_meditation_room.iff')
+	object.setStructureTemplate('object/tangible/tcg/series3/shared_structure_deed_jedi_meditation_room_deed.iff')
+	object.setLotRequirement(3)
+	object.setBMR(8)
+	return
+
+def use(core, actor, object):
+	return
+	
+	

scripts/radial/object/conversation.py

@@ -9,7 +9,6 @@ def createRadial(core, owner, target, radials):
 	
 def handleSelection(core, owner, target, option):
 	if option == 26 and target:
-		print 'test'
 		core.conversationService.handleStartConversation(owner, target)
 	return
 	

scripts/radial/object/treasureContainer.py

@@ -0,0 +1,35 @@
+from resources.common import RadialOptions
+from services.sui import SUIWindow
+from services.sui.SUIWindow import Trigger
+from java.util import Vector
+import resources.common.SpawnPoint
+import engine.resources.scene.Point3D
+import main.NGECore
+import resources.common.Forager
+from resources.objects.waypoint import WaypointObject
+from engine.resources.common import CRC
+import sys
+
+def createRadial(core, owner, target, radials):
+	radials.clear()
+	radials.add(RadialOptions(0, 21, 1, 'Open'))
+	radials.add(RadialOptions(0, 7, 1, 'Examine'))
+	return
+	
+def handleSelection(core, owner, target, option):
+	
+	if option == 21 and target:
+		
+		if target.getAttachment('TreasureExtractorID')!=owner.getObjectID():
+			owner.sendSystemMessage('@treasure_map/treasure_map:wrong_player',0);
+			return
+			
+		forager = resources.common.Forager()
+		if forager.countAliveGuards(target)>0:
+			owner.sendSystemMessage('@treasure_map/treasure_map:kill_guards_message',0);
+			return
+			
+		core.simulationService.openContainer(owner, target);
+		
+	return
+	

scripts/radial/object/treasuremap.py

@@ -0,0 +1,71 @@
+from resources.common import RadialOptions
+from services.sui import SUIWindow
+from services.sui.SUIWindow import Trigger
+from java.util import Vector
+import resources.common.SpawnPoint
+import engine.resources.scene.Point3D
+import main.NGECore
+from resources.objects.waypoint import WaypointObject
+from engine.resources.common import CRC
+import sys
+
+def createRadial(core, owner, target, radials):
+	radials.add(RadialOptions(0, 21, 1, '@treasure_map/treasure_map:use'))
+	radials.add(RadialOptions(0, 7, 1, ''))
+	return
+	
+def handleSelection(core, owner, target, option):
+	if option == 21 and target:
+		
+		mapPlanet = target.getAttachment('MapPlanet')
+		planet = core.terrainService.getPlanetByID(mapPlanet)
+		if planet==None:
+			owner.sendSystemMessage('The treasure map disk is faulty, no Planet',0)
+			return
+			
+		planetName = planet.getName()	
+		#if owner.getPlanetId()!=mapPlanet:
+			#owner.sendSystemMessage('The treasure is buried on ' + planetName,0)
+			#return
+			
+		window = core.suiService.createSUIWindow('Script.listBox', owner, target, 0)
+		window.setProperty('bg.caption.lblTitle:Text', '@treasure_map/treasure_map:title_'+target.getAttachment('MapSTFName'))
+		window.setProperty('Prompt.lblPrompt:Text', '@treasure_map/treasure_map:text_'+target.getAttachment('MapSTFName'))
+		
+		window.setProperty('btnCancel:visible', 'True')
+		window.setProperty('btnOk:visible', 'True')
+		window.setProperty('btnCancel:Text', '@treasure_map/treasure_map:close')
+		window.setProperty('btnOk:Text', '@treasure_map/treasure_map:store_waypoint')		
+		returnList = Vector()
+		window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, storeWaypoint)
+		window.addHandler(1, '', Trigger.TRIGGER_CANCEL, returnList, close)	
+		
+		owner.setAttachment('LastReadMap',target)
+		
+		core.suiService.openSUIWindow(window);
+	
+	return
+	
+def storeWaypoint(owner, window, eventType, returnList):
+	planetCenter = engine.resources.scene.Point3D(0,0,0)
+	#treasureLocation = resources.common.SpawnPoint.getRandomPosition(planetCenter, 2000, 6000, owner.getPlanetId());
+	treasureLocation = resources.common.SpawnPoint.getRandomPosition(owner.getPosition(), 1, 50, owner.getPlanetId());
+	waypoint = main.NGECore.getInstance().objectService.createObject('object/waypoint/shared_waypoint.iff', owner.getPlanet(), treasureLocation.x, treasureLocation.z, treasureLocation.y)
+	waypoint.setName('Treasure Map')
+	waypoint.setActive(True)
+	waypoint.setColor(WaypointObject.YELLOW)
+	waypoint.setPlanetCRC(CRC.StringtoCRC(owner.getPlanet().name))
+	waypoint.setStringAttribute('', '')
+	ghost = owner.getSlottedObject('ghost')
+	ghost.waypointAdd(waypoint)
+	owner.sendSystemMessage('@treasure_map/treasure_map:sys_store_waypoint', 0)
+	readMap = owner.getAttachment('LastReadMap')
+	readMap.setAttachment('radial_filename', 'object/treasuremapRead');
+	readMap.setAttachment('MapAreaLocation', treasureLocation);
+	return
+
+
+def close(owner, window, eventType, returnList):
+
+	return
+	

scripts/radial/object/treasuremapExtract.py

@@ -0,0 +1,35 @@
+from resources.common import RadialOptions
+from services.sui import SUIWindow
+from services.sui.SUIWindow import Trigger
+from java.util import Vector
+import resources.common.SpawnPoint
+import engine.resources.scene.Point3D
+import main.NGECore
+import resources.common.Forager
+from resources.objects.waypoint import WaypointObject
+from engine.resources.common import CRC
+import sys
+
+def createRadial(core, owner, target, radials):
+	radials.add(RadialOptions(0, 21, 1, '@treasure_map/treasure_map:extract_treasure'))
+	radials.add(RadialOptions(0, 7, 1, ''))
+	return
+	
+def handleSelection(core, owner, target, option):
+	if option == 21 and target and owner:
+		exactLoc = target.getAttachment('MapExactLocation')
+		
+		#if owner.getPosition().getDistance2D(owner.getPosition())<20:
+		if owner.getPosition().getDistance2D(exactLoc)<20:
+		
+			target.setAttachment('radial_filename', 'object/usable')
+			owner.sendSystemMessage('@treasure_map/treasure_map:sys_dist_here',0)
+			#spawn guards
+			forager = resources.common.Forager()
+			forager.handleGuardSpawn(owner,target)
+		else:
+			owner.sendSystemMessage('@treasure_map/treasure_map:sys_dist_near',0)
+			
+		
+	return
+	

scripts/radial/object/treasuremapRead.py

@@ -0,0 +1,57 @@
+from resources.common import RadialOptions
+from services.sui import SUIWindow
+from services.sui.SUIWindow import Trigger
+from java.util import Vector
+import resources.common.SpawnPoint
+import engine.resources.scene.Point3D
+import main.NGECore
+from resources.objects.waypoint import WaypointObject
+from engine.resources.common import CRC
+import sys
+
+def createRadial(core, owner, target, radials):
+	radials.add(RadialOptions(0, 21, 1, '@treasure_map/treasure_map:search_area'))
+	radials.add(RadialOptions(0, 7, 1, ''))
+	return
+	
+def handleSelection(core, owner, target, option):
+	if option == 21 and target:
+			
+		planetID = target.getAttachment('MapPlanet')
+		if planetID!=owner.getPlanetId():
+			owner.sendSystemMessage('@treasure_map/treasure_map:wrong_planet',0)
+			
+		if owner.getCombatFlag()!=0:
+			owner.sendSystemMessage('@treasure_map/treasure_map:sys_no_combat',0)
+			return
+			
+		if owner.getPosture()==10:
+			owner.sendSystemMessage('@treasure_map/treasure_map:sys_no_mount',0)
+			return
+		
+		
+		areaLoc = target.getAttachment('MapAreaLocation');
+		owner.sendSystemMessage('owner.getPosition().getDistance2D(areaLoc) %s' % owner.getPosition().getDistance2D(areaLoc),0)
+		
+		if owner.getPosition().getDistance2D(areaLoc)<20:
+			owner.sendSystemMessage('@treasure_map/treasure_map:sys_success',0)
+		
+			treasureLocation = resources.common.SpawnPoint.getRandomPosition(owner.getPosition(), 1, 100, owner.getPlanetId());
+			waypoint = main.NGECore.getInstance().objectService.createObject('object/waypoint/shared_waypoint.iff', owner.getPlanet(), treasureLocation.x, treasureLocation.z, treasureLocation.y)
+			waypoint.setName('Exact Location of the Treasure')
+			waypoint.setActive(True)
+			waypoint.setColor(WaypointObject.YELLOW)
+			waypoint.setPlanetCRC(CRC.StringtoCRC(owner.getPlanet().name))
+			waypoint.setStringAttribute('', '')
+			ghost = owner.getSlottedObject('ghost')
+			ghost.waypointAdd(waypoint)			
+			owner.sendSystemMessage('@treasure_map/treasure_map:sys_store_waypoint', 0)
+			readMap = owner.getAttachment('LastReadMap')
+			readMap.setAttachment('radial_filename', 'object/treasuremapExtract');
+			readMap.setAttachment('MapExactLocation', treasureLocation);
+		else:
+			owner.sendSystemMessage('@treasure_map/treasure_map:sys_cant_pinpoint',0)
+			
+		
+	return
+	

scripts/skillMods/absorption_bleeding.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/absorption_disease.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/absorption_fire.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/absorption_poison.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/accuracy_modifier.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/acid.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/action.py

@@ -1,12 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
-	actor.setMaxAction(actor.getMaxAction() + base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
-	actor.setMaxAction(actor.getMaxAction() - base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/actionPercent.py

@@ -2,13 +2,11 @@ import sys
 
 # Temporarily disabled until the skillmod calculation system is refactored
 
-def add(core, actor, name, base):
-	#actor.addSkillMod(name, base)
-	#actor.setMaxAction(actor.getMaxAction() + int((float(actor.getMaxAction()) * (float(base) / float(100)))))
+def add(core, actor, skillMod, divisor):
+	#actor.setMaxAction(actor.getMaxAction() + int((float(actor.getMaxAction()) * (float(skillMod.getBase()) / float(100)))))
 	return
-	
-def deduct(core, actor, name, base):
-	#actor.deductSkillMod(name, base)
-	#actor.setMaxAction(actor.getMaxAction() - int((float(actor.getMaxAction()) * (float(base) / float(100)))))
+
+def deduct(core, actor, skillMod, divisor):
+	#actor.setMaxAction(actor.getMaxAction() - int((float(actor.getMaxAction()) * (float(skillMod.getBase()) / float(100)))))
 	return
 	

scripts/skillMods/action_burn.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/advanced_assembly.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, divisor):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, divisor):
 	return
 	

scripts/skillMods/advanced_ship_experimentation.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/agility.py

@@ -1,16 +1,14 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
-	actor.addSkillMod('display_only_dodge', base)
-	actor.addSkillMod('display_only_parry', base / 2)
-	actor.addSkillMod('display_only_evasion', base)
+def add(core, actor, skillMod, value):
+	core.skillModService.addSkillMod('display_only_dodge', base)
+	core.skillModService.addSkillMod('display_only_parry', base / 2)
+	core.skillModService.addSkillMod('display_only_evasion', base)
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
-	actor.deductSkillMod('display_only_dodge', base)
-	actor.deductSkillMod('display_only_parry', base / 2)
-	actor.deductSkillMod('display_only_evasion', base)
+
+def deduct(core, actor, skillMod, value):
+	core.skillModService.deductSkillMod('display_only_dodge', base)
+	core.skillModService.deductSkillMod('display_only_parry', base / 2)
+	core.skillModService.deductSkillMod('display_only_evasion', base)
 	return
 	

scripts/skillMods/agility_modified.py

@@ -1,16 +1,14 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
-	actor.addSkillMod('display_only_dodge', base)
-	actor.addSkillMod('display_only_parry', base / 2)
-	actor.addSkillMod('display_only_evasion', base)
+def add(core, actor, skillMod, value):
+	core.skillModService.addSkillMod('display_only_dodge', base)
+	core.skillModService.addSkillMod('display_only_parry', base / 2)
+	core.skillModService.addSkillMod('display_only_evasion', base)
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
-	actor.deductSkillMod('display_only_dodge', base)
-	actor.deductSkillMod('display_only_parry', base / 2)
-	actor.deductSkillMod('display_only_evasion', base)
+
+def deduct(core, actor, skillMod, value):
+	core.skillModService.deductSkillMod('display_only_dodge', base)
+	core.skillModService.deductSkillMod('display_only_parry', base / 2)
+	core.skillModService.deductSkillMod('display_only_evasion', base)
 	return
 	

scripts/skillMods/area_damage_resist_full_percentage.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/armor_assembly.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/armor_customization.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/armor_experimentation.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/bh_dire_root.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/bh_dire_snare.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/bm_creature_knowledge.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/bm_incubator_dps_armor.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/bm_mutation_chance_increase.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/bm_xp_mod_boost.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/booster_assembly.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/booster_experimentation.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/bounty_hunter.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, divisor):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, divisor):
 	return
 	

scripts/skillMods/bounty_mission_level.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/camouflage.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/chassis_assembly.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/chassis_experimentation.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return
 	

scripts/skillMods/clothing_assembly.py

@@ -1,10 +1,8 @@
 import sys
 
-def add(core, actor, name, base):
-	actor.addSkillMod(name, base)
+def add(core, actor, skillMod, value):
 	return
-	
-def deduct(core, actor, name, base):
-	actor.deductSkillMod(name, base)
+
+def deduct(core, actor, skillMod, value):
 	return