Changed how life day boxes and tickets are destroyed, organized radial scripts, added unity

scripts/object/tangible/terminal/terminal_bank.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'bank')
+	object.setAttachment('radial_filename', 'terminal/bank')
 	core.mapService.addLocation(object.getPlanet(), 'Bank Terminal', object.getPosition().x, object.getPosition().z, 41, 42, 0)
 	return
 	

scripts/object/tangible/terminal/terminal_cloning.py

@@ -1,6 +1,6 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'cloning_terminal')
+	object.setAttachment('radial_filename', 'terminal/cloning_terminal')
 	return
 	

scripts/object/tangible/terminal/terminal_travel.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'travel_terminal')
+	object.setAttachment('radial_filename', 'terminal/travel_terminal')
 	return

scripts/object/tangible/travel/ticket_collector/ticket_collector.py

@@ -1,5 +1,5 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'npc_ticket_collector')
+	object.setAttachment('radial_filename', 'npc/npc_ticket_collector')
 	return

scripts/object/tangible/wearables/ring/aakuan_ring.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/item_bounty_hunter_ring_01_02.py

@@ -8,4 +8,5 @@ def setup(core, object):
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 6)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 6)
 	object.setStringAttribute('class_required', 'Bounty Hunter')
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/item_force_sensitive_ring_01_02.py

@@ -8,4 +8,5 @@ def setup(core, object):
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 6)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 6)
 	object.setStringAttribute('class_required', 'Jedi')
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/item_force_sensitive_ring_02_01.py

@@ -8,4 +8,5 @@ def setup(core, object):
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 5)
 	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 5)
 	object.setStringAttribute('class_required', 'Jedi')
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/ring_gcw_imperial.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/ring_gcw_rebel.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/ring_mark_hero.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/ring_nightsister.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/ring_s01.py

@@ -1,6 +1,7 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return
 	
 def equip(core, actor, object):

scripts/object/tangible/wearables/ring/ring_s02.py

@@ -1,6 +1,7 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return
 	
 def equip(core, actor, object):

scripts/object/tangible/wearables/ring/ring_s03.py

@@ -1,6 +1,7 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return
 	
 def equip(core, actor, object):

scripts/object/tangible/wearables/ring/ring_s03_quest.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return

scripts/object/tangible/wearables/ring/ring_s04.py

@@ -1,6 +1,7 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'ring/unity')
 	return
 	
 def equip(core, actor, object):

scripts/radial/lifeday_gift.py

@@ -53,5 +53,5 @@ def handleSelection(core, actor, object, option):
 		inventory.add(reward1)
 		inventory.add(reward2)
 		
-		core.objectService.destroyObject(object)
+		core.commandService.callCommand(actor, 'serverdestroyobject', object, None)
 	return

scripts/radial/ring/unity.py

@@ -0,0 +1,35 @@
+from resources.common import RadialOptions
+from services.sui.SUIWindow import Trigger
+import sys
+
+def createRadial(core, owner, target, radials):
+
+	ghost = owner.getSlottedObject('ghost')
+	if ghost is None:
+		return
+	print (owner.getTargetId())
+	print (owner.getObjectId())
+	if ghost.getSpouseName() is None:
+		targetPlayer = core.objectService.getObject(owner.getTargetId())
+		if targetPlayer is not None and targetPlayer.getSlottedObject('ghost') is not None:
+			radials.add(RadialOptions(0, 69, 1, 'Propose Unity'))
+	return
+	
+def handleSelection(core, owner, target, option):
+	if option == 69 and target:
+		tGhost = core.objectService.getObject(owner.getTargetId()).getSlottedObject('ghost')
+		suiSvc = core.suiService
+		targetWindow = suiSvc.createMessageBox(3, 'Proposal', owner.getCustomName() + ' would like to marry you. Would you like to marry?', tGhost, owner, 10)
+		returnList = Vector()
+		targetWindow.addHandler(0, '', Trigger.TRIGGER_OK, returnList, handleSUI)
+		targetWindow.addHandler(1, '', Trigger.TRIGGER_CANCEL, returnList, handleSUI)
+		suiSvc.openSUIWindow(targetWindow)
+		return
+	return
+
+def handleSUI(owner, window, eventType, returnList):
+    if eventType == 0:
+    	ghost = owner.getSlottedObject('ghost')
+    	ghost.setSpouseName("Waverunner")
+        return
+    return

scripts/radial/travel_ticket.py

@@ -21,7 +21,7 @@ def handleSelection(core, owner, target, option):
                 if tp.isShuttleAvailable() is True:
                     core.travelService.doTransport(owner, core.travelService.getTravelPointByName(target.getStringAttribute('@obj_attr_n:travel_arrival_planet'),
                                                                                                   target.getStringAttribute('@obj_attr_n:travel_arrival_point')))
-                    core.objectService.destroyObject(target)
+                    core.commandService.callCommand(owner, 'serverdestroyobject', target, None)
                     return
                 return
             else: