From 92287f7fc9c80a6a5902791c1e16d23ead60cd8c Mon Sep 17 00:00:00 2001 From: Waverunner Date: Sun, 9 Mar 2014 13:35:20 -0400 Subject: [PATCH] Changed how life day boxes and tickets are destroyed, organized radial scripts, added unity --- .../object/tangible/terminal/terminal_bank.py | 2 +- .../tangible/terminal/terminal_cloning.py | 2 +- .../tangible/terminal/terminal_travel.py | 2 +- .../ticket_collector/ticket_collector.py | 2 +- .../tangible/wearables/ring/aakuan_ring.py | 1 + .../ring/item_bounty_hunter_ring_01_02.py | 1 + .../ring/item_force_sensitive_ring_01_02.py | 1 + .../ring/item_force_sensitive_ring_02_01.py | 1 + .../wearables/ring/ring_gcw_imperial.py | 1 + .../tangible/wearables/ring/ring_gcw_rebel.py | 1 + .../tangible/wearables/ring/ring_mark_hero.py | 1 + .../wearables/ring/ring_nightsister.py | 1 + .../tangible/wearables/ring/ring_s01.py | 1 + .../tangible/wearables/ring/ring_s02.py | 1 + .../tangible/wearables/ring/ring_s03.py | 1 + .../tangible/wearables/ring/ring_s03_quest.py | 1 + .../tangible/wearables/ring/ring_s04.py | 1 + scripts/radial/lifeday_gift.py | 2 +- .../radial/{ => npc}/npc_ticket_collector.py | 0 scripts/radial/ring/unity.py | 35 +++++++++++++++++++ scripts/radial/{ => terminal}/bank.py | 0 .../radial/{ => terminal}/cloning_terminal.py | 0 .../radial/{ => terminal}/travel_terminal.py | 0 scripts/radial/travel_ticket.py | 2 +- 24 files changed, 54 insertions(+), 6 deletions(-) rename scripts/radial/{ => npc}/npc_ticket_collector.py (100%) create mode 100644 scripts/radial/ring/unity.py rename scripts/radial/{ => terminal}/bank.py (100%) rename scripts/radial/{ => terminal}/cloning_terminal.py (100%) rename scripts/radial/{ => terminal}/travel_terminal.py (100%) diff --git a/scripts/object/tangible/terminal/terminal_bank.py b/scripts/object/tangible/terminal/terminal_bank.py index 4f068472..64205c68 100644 --- a/scripts/object/tangible/terminal/terminal_bank.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_cloning.py b/scripts/object/tangible/terminal/terminal_cloning.py index 91f80095..dc256f9a 100644 --- a/scripts/object/tangible/terminal/terminal_cloning.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_travel.py b/scripts/object/tangible/terminal/terminal_travel.py index 160aac1c..07222fe6 100644 --- a/scripts/object/tangible/terminal/terminal_travel.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/travel/ticket_collector/ticket_collector.py b/scripts/object/tangible/travel/ticket_collector/ticket_collector.py index d243308d..a4dcc12f 100644 --- a/scripts/object/tangible/travel/ticket_collector/ticket_collector.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/aakuan_ring.py b/scripts/object/tangible/wearables/ring/aakuan_ring.py index ccad8904..2540ccc0 100644 --- a/scripts/object/tangible/wearables/ring/aakuan_ring.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/item_bounty_hunter_ring_01_02.py b/scripts/object/tangible/wearables/ring/item_bounty_hunter_ring_01_02.py index 3040d4eb..e8042f0b 100644 --- a/scripts/object/tangible/wearables/ring/item_bounty_hunter_ring_01_02.py +++ b/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 diff --git a/scripts/object/tangible/wearables/ring/item_force_sensitive_ring_01_02.py b/scripts/object/tangible/wearables/ring/item_force_sensitive_ring_01_02.py index fa564825..1219d4db 100644 --- a/scripts/object/tangible/wearables/ring/item_force_sensitive_ring_01_02.py +++ b/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 diff --git a/scripts/object/tangible/wearables/ring/item_force_sensitive_ring_02_01.py b/scripts/object/tangible/wearables/ring/item_force_sensitive_ring_02_01.py index 90985ac0..7fc2c243 100644 --- a/scripts/object/tangible/wearables/ring/item_force_sensitive_ring_02_01.py +++ b/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 diff --git a/scripts/object/tangible/wearables/ring/ring_gcw_imperial.py b/scripts/object/tangible/wearables/ring/ring_gcw_imperial.py index ccad8904..2540ccc0 100644 --- a/scripts/object/tangible/wearables/ring/ring_gcw_imperial.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/ring_gcw_rebel.py b/scripts/object/tangible/wearables/ring/ring_gcw_rebel.py index ccad8904..2540ccc0 100644 --- a/scripts/object/tangible/wearables/ring/ring_gcw_rebel.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/ring_mark_hero.py b/scripts/object/tangible/wearables/ring/ring_mark_hero.py index ccad8904..2540ccc0 100644 --- a/scripts/object/tangible/wearables/ring/ring_mark_hero.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/ring_nightsister.py b/scripts/object/tangible/wearables/ring/ring_nightsister.py index ccad8904..2540ccc0 100644 --- a/scripts/object/tangible/wearables/ring/ring_nightsister.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/ring_s01.py b/scripts/object/tangible/wearables/ring/ring_s01.py index dc6ea0b1..83da2342 100644 --- a/scripts/object/tangible/wearables/ring/ring_s01.py +++ b/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): diff --git a/scripts/object/tangible/wearables/ring/ring_s02.py b/scripts/object/tangible/wearables/ring/ring_s02.py index 2ca3d3ca..f594fe2b 100644 --- a/scripts/object/tangible/wearables/ring/ring_s02.py +++ b/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): diff --git a/scripts/object/tangible/wearables/ring/ring_s03.py b/scripts/object/tangible/wearables/ring/ring_s03.py index 418b5aa4..c4aa2f2f 100644 --- a/scripts/object/tangible/wearables/ring/ring_s03.py +++ b/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): diff --git a/scripts/object/tangible/wearables/ring/ring_s03_quest.py b/scripts/object/tangible/wearables/ring/ring_s03_quest.py index ccad8904..2540ccc0 100644 --- a/scripts/object/tangible/wearables/ring/ring_s03_quest.py +++ b/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 \ No newline at end of file diff --git a/scripts/object/tangible/wearables/ring/ring_s04.py b/scripts/object/tangible/wearables/ring/ring_s04.py index 6410d76f..8eee5461 100644 --- a/scripts/object/tangible/wearables/ring/ring_s04.py +++ b/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): diff --git a/scripts/radial/lifeday_gift.py b/scripts/radial/lifeday_gift.py index 696d7662..f498c4bc 100644 --- a/scripts/radial/lifeday_gift.py +++ b/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 diff --git a/scripts/radial/npc_ticket_collector.py b/scripts/radial/npc/npc_ticket_collector.py similarity index 100% rename from scripts/radial/npc_ticket_collector.py rename to scripts/radial/npc/npc_ticket_collector.py diff --git a/scripts/radial/ring/unity.py b/scripts/radial/ring/unity.py new file mode 100644 index 00000000..704268a4 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/scripts/radial/bank.py b/scripts/radial/terminal/bank.py similarity index 100% rename from scripts/radial/bank.py rename to scripts/radial/terminal/bank.py diff --git a/scripts/radial/cloning_terminal.py b/scripts/radial/terminal/cloning_terminal.py similarity index 100% rename from scripts/radial/cloning_terminal.py rename to scripts/radial/terminal/cloning_terminal.py diff --git a/scripts/radial/travel_terminal.py b/scripts/radial/terminal/travel_terminal.py similarity index 100% rename from scripts/radial/travel_terminal.py rename to scripts/radial/terminal/travel_terminal.py diff --git a/scripts/radial/travel_ticket.py b/scripts/radial/travel_ticket.py index a42df278..fd898498 100644 --- a/scripts/radial/travel_ticket.py +++ b/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: