From b3bdad029068b0c3e6c01d900a14a9615a186bdd Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Thu, 13 Nov 2014 17:43:18 -0500 Subject: [PATCH 01/11] Fixed small typos in gate keeper conversation --- .../outbreak_imperial_officer_gate_keeper.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py index 5c02e9fa8..6e1644959 100644 --- a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py +++ b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py @@ -11,14 +11,14 @@ def startConversation(core, actor, npc): convSvc = core.conversationService - # The quarantine zone is a restricted area, citizen. - core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/conversation/gate_keeper_quarantine_zone:s_10')) + # The quarantine zone is a restricted area, citizen. + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_10')) - options = Vector() - # I have authorization to enter. - options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_12'), 0)) - core.conversationService.sendConversationOptions(actor, npc, handleOptionsOne) - return + options = Vector() + # I have authorization to enter. + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_12'), 0)) + core.conversationService.sendConversationOptions(actor, npc, handleOptionsOne) + return def handleOptionsOne(core, actor, npc, selection): global coreRef @@ -28,11 +28,11 @@ def handleOptionsOne(core, actor, npc, selection): if selection == 0: # What? Let me see your authorization code. - core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/conversation/gate_keeper_quarantine_zone:s_14') + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_14') options = Vector() # Here... - options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/conversation/gate_keeper_quarantine_zone:s_16'), 1) + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_16'), 1) convSvc.sendConversationOptions(actor, npc, options, handleOptionsTwo) return From 43955cbe31c01b7f6acc3e35993ac3bff1fb338d Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Thu, 13 Nov 2014 17:43:43 -0500 Subject: [PATCH 02/11] Added LightsaberColors datatable to lightsaber color crystals --- .../component/weapon/lightsaber/item_color_crystal_02_20.py | 2 +- .../weapon/lightsaber/lightsaber_module_blackwing_crystal.py | 1 + .../weapon/lightsaber/lightsaber_module_lava_crystal.py | 1 + .../weapon/lightsaber/lightsaber_module_permafrost_crystal.py | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py b/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py index a5430d414..41b63152b 100644 --- a/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py +++ b/scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py @@ -1,5 +1,5 @@ -import sys from resources.datatables import LightsaberColors +import sys def setup(core, object): object.setCustomizationVariable('/private/index_color_1', LightsaberColors.getByName('Windu\'s Guile')) diff --git a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py index 77e03485e..fb86302fb 100644 --- a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py +++ b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py @@ -1,3 +1,4 @@ +from resources.datatables import LightsaberColors import sys def setup(core, object): diff --git a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py index 030c03162..ff4eea877 100644 --- a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py +++ b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py @@ -1,3 +1,4 @@ +from resources.datatables import LightsaberColors import sys def setup(core, object): diff --git a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_permafrost_crystal.py b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_permafrost_crystal.py index 34b27b77f..900e1c71f 100644 --- a/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_permafrost_crystal.py +++ b/scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_permafrost_crystal.py @@ -1,3 +1,4 @@ +from resources.datatables import LightsaberColors import sys def setup(core, object): From b7a49f7a8d58b1858fdba575c6f090d4f02f2bb0 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Thu, 13 Nov 2014 17:59:21 -0500 Subject: [PATCH 03/11] Removed invulnerable from guards in spawn script --- .../static_spawns/dathomir/quarantine_zone.py | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/scripts/static_spawns/dathomir/quarantine_zone.py b/scripts/static_spawns/dathomir/quarantine_zone.py index 0aca166b2..94b7e0c0f 100644 --- a/scripts/static_spawns/dathomir/quarantine_zone.py +++ b/scripts/static_spawns/dathomir/quarantine_zone.py @@ -10,49 +10,32 @@ def addPlanetSpawns(core, planet): # Imperial Gate Guards - Entrance + General Starting Area guard1 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5775), float(510), float(-6553), float(0.36), float(0.85)) - guard1.setOptionsBitmask(Options.INVULNERABLE) guard2 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5785), float(510), float(-6545), float(0.43), float(0.85)) - guard2.setOptionsBitmask(Options.INVULNERABLE) guard3 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5745), float(511), float(-6484), float(0.51), float(0.85)) - guard3.setOptionsBitmask(Options.INVULNERABLE) guard4 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5744), float(511), float(-6480), float(0.51), float(0.85)) - guard4.setOptionsBitmask(Options.INVULNERABLE) liamwaurie1 = stcSvc.spawnObject('outbreak_imperial_officer_gate_keeper', 'dathomir', long(0), float(-5780), float(510), float(-6550), float(0.40), float(0.85)) firmuspiett1 = stcSvc.spawnObject('outbreak_imperial_officer_captain_piett', 'dathomir', long(0), float(-5749), float(510), float(-6492), float(0.40), float(0.85)) # Imperial Gate Troopers - Exit trooper1 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5793), float(510), float(-6553), float(0.56), float(0.85)) - trooper1.setOptionsBitmask(Options.INVULNERABLE) trooper2 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5784), float(510), float(-6560), float(0.28), float(0.85)) - trooper2.setOptionsBitmask(Options.INVULNERABLE) trooper3 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5789), float(510), float(-6562), float(0.23), float(0.85)) - trooper3.setOptionsBitmask(Options.INVULNERABLE) trooper4 = stcSvc.spawnObject('outbreak_imperial_stormtrooper_guards', 'dathomir', long(0), float(-5794), float(510), float(-6557), float(0.32), float(0.85)) - trooper4.setOptionsBitmask(Options.INVULNERABLE) - exittrooper1 = stcSvc.spawnObject('outbreak_facility_stormtrooper_survivor', 'dathomir', long(0), float(-5783), float(510), float(-6552), float(0.38), float(0.85)) + exitgatekeeper1 = stcSvc.spawnObject('outbreak_facility_stormtrooper_survivor', 'dathomir', long(0), float(-5783), float(510), float(-6552), float(0.38), float(0.85)) # Camp Alpha -5915, -6645 alphaguard1 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-5917), float(560), float(-6640), float(0.42), float(0.85)) - alphaguard1.setOptionsBitmask(Options.INVULNERABLE) alphaguard2 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-5908), float(560), float(-6645), float(0.34), float(0.85)) - alphaguard2.setOptionsBitmask(Options.INVULNERABLE) alphaguard3 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-5918), float(560), float(-6650), float(0.60), float(0.85)) - alphaguard3.setOptionsBitmask(Options.INVULNERABLE) alphaguard4 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-5913), float(560), float(-6670), float(-0.63), float(0.85)) - alphaguard4.setOptionsBitmask(Options.INVULNERABLE) alphaguard5 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-5930), float(560), float(-6690), float(0.26), float(0.85)) - alphaguard5.setOptionsBitmask(Options.INVULNERABLE) #alphasurvivor1 = stcSvc.spawnObject('outbreak_camp_alpha_survivor', 'dathomir', long(0), float(-5930), float(560), float(-6690), float(0.26), float(0.85)) # Camp Beta -6290 -7529 betaguard1 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-6300), float(560), float(-7535), float(-0.86), float(0.85)) - betaguard1.setOptionsBitmask(Options.INVULNERABLE) betaguard2 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-6300), float(560), float(-7528), float(-0.88), float(0.85)) - betaguard2.setOptionsBitmask(Options.INVULNERABLE) betaguard3 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-6290), float(560), float(-7520), float(1.38), float(0.85)) - betaguard3.setOptionsBitmask(Options.INVULNERABLE) betaguard4 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-6280), float(560), float(-7520), float(-1.04), float(0.85)) - betaguard4.setOptionsBitmask(Options.INVULNERABLE) #beltasurvivor1 = stcSvc.spawnObject('outbreak_camp_beta_survivor', 'dathomir', long(0), float(-5930), float(560), float(-6690), float(0.26), float(0.85)) # Camp Gamma -6815 -6454 @@ -60,15 +43,10 @@ def addPlanetSpawns(core, planet): # Camp Delta -7142 -6941 deltaguard1 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-7155), float(560), float(-6955), float(-1.29), float(0.85)) - deltaguard1.setOptionsBitmask(Options.INVULNERABLE) deltaguard2 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-7135), float(560), float(-6955), float(1.10), float(0.85)) - deltaguard2.setOptionsBitmask(Options.INVULNERABLE) deltaguard3 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-7150), float(560), float(-6940), float(1.20), float(0.85)) - deltaguard3.setOptionsBitmask(Options.INVULNERABLE) deltaguard4 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-7143), float(560), float(-6910), float(1.78), float(0.85)) - deltaguard4.setOptionsBitmask(Options.INVULNERABLE) deltaguard5 = stcSvc.spawnObject('outbreak_mixed_guard_aggro', 'dathomir', long(0), float(-7150), float(560), float(-6910), float(1.75), float(0.85)) - deltaguard5.setOptionsBitmask(Options.INVULNERABLE) #beltasurvivor1 = stcSvc.spawnObject('outbreak_camp_delta_survivor', 'dathomir', long(0), float(-5930), float(560), float(-6690), float(0.26), float(0.85)) # Camp Epsilon -7463 -7392 From c8af146f404d3333174ce0332d7d2fb1f10e0377 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Thu, 13 Nov 2014 17:59:47 -0500 Subject: [PATCH 04/11] Added invulnerable to the actual guard mobile scripts --- .../mobiles/dathomir/outbreak_imperial_stormtrooper_guards.py | 1 + scripts/mobiles/dathomir/outbreak_mixed_guard_aggro.py | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/mobiles/dathomir/outbreak_imperial_stormtrooper_guards.py b/scripts/mobiles/dathomir/outbreak_imperial_stormtrooper_guards.py index c7b7546af..b4ba85340 100644 --- a/scripts/mobiles/dathomir/outbreak_imperial_stormtrooper_guards.py +++ b/scripts/mobiles/dathomir/outbreak_imperial_stormtrooper_guards.py @@ -13,6 +13,7 @@ def addTemplate(core): mobileTemplate.setCreatureName('crackdown_stormtrooper') mobileTemplate.setLevel(90) mobileTemplate.setDifficulty(Difficulty.BOSS) + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE) mobileTemplate.setMinSpawnDistance(4) mobileTemplate.setMaxSpawnDistance(8) diff --git a/scripts/mobiles/dathomir/outbreak_mixed_guard_aggro.py b/scripts/mobiles/dathomir/outbreak_mixed_guard_aggro.py index 32351d83d..9fa00156c 100644 --- a/scripts/mobiles/dathomir/outbreak_mixed_guard_aggro.py +++ b/scripts/mobiles/dathomir/outbreak_mixed_guard_aggro.py @@ -12,6 +12,7 @@ def addTemplate(core): mobileTemplate.setCreatureName('outbreak_mixed_guard_aggro') mobileTemplate.setLevel(90) mobileTemplate.setDifficulty(Difficulty.BOSS) + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE) templates = Vector() templates.add('object/mobile/shared_outbreak_imp_trooper_guard_m_01.iff') From 00f3bb3bac676ce6c96a848db670220700db49cf Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Thu, 13 Nov 2014 18:19:33 -0500 Subject: [PATCH 05/11] Added level 10 quarantine zone NPCs spawn placeholder --- scripts/mobiles/spawnareas/dathomir_quarantine.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/mobiles/spawnareas/dathomir_quarantine.py b/scripts/mobiles/spawnareas/dathomir_quarantine.py index fba2d89b4..e384e361e 100644 --- a/scripts/mobiles/spawnareas/dathomir_quarantine.py +++ b/scripts/mobiles/spawnareas/dathomir_quarantine.py @@ -15,6 +15,15 @@ def addSpawnArea(core): core.spawnService.addDynamicSpawnArea(dynamicGroups, -5880, -6500, 540, 'dathomir') core.spawnService.addDynamicSpawnArea(dynamicGroups, -5850, -6650, 525, 'dathomir') + #dynamicGroups = Vector() + #dynamicGroups.add('dathomir_quarantine_lvl_10') + #core.spawnService.addDynamicSpawnArea(dynamicGroups, -5700, -6500, 100, 'dathomir') + #core.spawnService.addDynamicSpawnArea(dynamicGroups, -5640, -6550, 100, 'dathomir') + #core.spawnService.addDynamicSpawnArea(dynamicGroups, -5850, -6400, 100, 'dathomir') + #core.spawnService.addDynamicSpawnArea(dynamicGroups, -5800, -6500, 100, 'dathomir') + #core.spawnService.addDynamicSpawnArea(dynamicGroups, -5600, -6525, 100, 'dathomir') + #core.spawnService.addDynamicSpawnArea(dynamicGroups, -5850, -6725, 530, 'dathomir') + #dynamicGroups = Vector() #dynamicGroups.add('dathomir_quarantine_lvl_15') #core.spawnService.addDynamicSpawnArea(dynamicGroups, -5700, -6500, 100, 'dathomir') From 95ac0dac2a528754e5402046d6689d75016e3e93 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Thu, 13 Nov 2014 18:20:10 -0500 Subject: [PATCH 06/11] Removed un-needed imports for quarantine static spawns --- scripts/static_spawns/dathomir/quarantine_zone.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/static_spawns/dathomir/quarantine_zone.py b/scripts/static_spawns/dathomir/quarantine_zone.py index 94b7e0c0f..58ca09a0e 100644 --- a/scripts/static_spawns/dathomir/quarantine_zone.py +++ b/scripts/static_spawns/dathomir/quarantine_zone.py @@ -1,8 +1,6 @@ import sys from resources.datatables import Options from resources.datatables import State -from java.util import Vector -from engine.resources.scene import Point3D def addPlanetSpawns(core, planet): From 7bd9a4fee217c3b64828412f10429fd6492c3a22 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sat, 15 Nov 2014 13:18:41 -0500 Subject: [PATCH 07/11] Half fix to quarantine zone conversation --- .../outbreak_imperial_officer_gate_keeper.py | 51 +++++++------------ 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py index 6e1644959..d92bce041 100644 --- a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py +++ b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py @@ -1,62 +1,47 @@ -from engine.resources.scene import Point3D from resources.common import ConversationOption -from resources.common import OutOfBand +from engine.resources.scene import Point3D from resources.common import ProsePackage +from resources.datatables import Options +from resources.common import OutOfBand from java.util import Vector import sys - def startConversation(core, actor, npc): global coreRef coreRef = core - convSvc = core.conversationService - - # The quarantine zone is a restricted area, citizen. core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_10')) - options = Vector() # I have authorization to enter. options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_12'), 0)) core.conversationService.sendConversationOptions(actor, npc, handleOptionsOne) return - def handleOptionsOne(core, actor, npc, selection): global coreRef coreRef = core - convSvc = core.conversationService - - - if selection == 0: - # What? Let me see your authorization code. - core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_14') - - options = Vector() - # Here... - options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_16'), 1) - convSvc.sendConversationOptions(actor, npc, options, handleOptionsTwo) + if selection == 0: + # What? Let me see your authorization code. + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_14') + options = Vector() + # Here... + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_16'), 1) + core.sendConversationOptions(actor, npc, options, handleOptionsTwo) return - def handleOptionsTwo(core, actor, npc, selection): global coreRef coreRef = core - convSvc = core.conversationService - - if selection == 1: - # Well, I see. Everything checks out. I can't say that I envy you, but I certainly appreciate what you are doing for the Empire...whatever you are doing. - convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_19')) + if selection == 1: + # Well, I see. Everything checks out. I can't say that I envy you, but I certainly appreciate what you are doing for the Empire...whatever you are doing. + core.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_19')) - # *Teleports player to inside the gate* - #position = Point3D(-5789, 511, -6558) - #core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName("dathomir"), position, actor.getOrientation(), None) - #convSvc.sendConversationOptions(actor, npc, options, endConversation) + # *Teleports player to inside the gate* + #position = Point3D(-5789, 511, -6558) + #core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName("dathomir"), position, actor.getOrientation(), None) + core.sendConversationOptions(actor, npc, options, endConversation) return - def endConversation(core, actor, npc): global coreRef coreRef = core - convSvc = core.conversationService - # Go with the blessing, then. - convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/azure_cabal_hoolar:s_195')) + core.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/azure_cabal_hoolar:s_195')) return From fe1b14a99dd2fa2ccdeddaf1e92570c9ff039c3e Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sun, 16 Nov 2014 11:38:19 -0500 Subject: [PATCH 08/11] Another fix to Quarantine Gate Keeper Conversation There's still one error left to be fixed: Traceback (most recent call last): File "scripts/commands/npcconversationstop.py", line 8, in run core.conversationService.handleEndConversation(actor, actor.getConversingNpc()) File "scripts/conversation/outbreak_imperial_officer_gate_keeper.py", line 29 convSvc.sendConversationOptions(actor, npc, options, handleOptionsTwo) ^ SyntaxError: no viable alternative at input 'convSvc' --- .../outbreak_imperial_officer_gate_keeper.py | 64 ++++++++++--------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py index d92bce041..2a822ee08 100644 --- a/scripts/conversation/outbreak_imperial_officer_gate_keeper.py +++ b/scripts/conversation/outbreak_imperial_officer_gate_keeper.py @@ -5,43 +5,47 @@ from resources.common import OutOfBand from java.util import Vector import sys + def startConversation(core, actor, npc): - global coreRef - coreRef = core - # The quarantine zone is a restricted area, citizen. - core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_10')) - options = Vector() - # I have authorization to enter. - options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_12'), 0)) - core.conversationService.sendConversationOptions(actor, npc, handleOptionsOne) - return + convSvc = core.conversationService + + # The quarantine zone is a restricted area, citizen. + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_10')) + options = Vector() + # I have authorization to enter. + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_12'), 0)) + convSvc.sendConversationOptions(actor, npc, handleOptionsOne) + return + def handleOptionsOne(core, actor, npc, selection): - global coreRef - coreRef = core - if selection == 0: - # What? Let me see your authorization code. - core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_14') - options = Vector() - # Here... - options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_16'), 1) - core.sendConversationOptions(actor, npc, options, handleOptionsTwo) + convSvc = core.conversationService + + if selection == 0: + # What? Let me see your authorization code. + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_14')) + options = Vector() + # Here... + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_16'), 1) + convSvc.sendConversationOptions(actor, npc, options, handleOptionsTwo) return + def handleOptionsTwo(core, actor, npc, selection): - global coreRef - coreRef = core - if selection == 1: - # Well, I see. Everything checks out. I can't say that I envy you, but I certainly appreciate what you are doing for the Empire...whatever you are doing. - core.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_19')) + convSvc = core.conversationService + + if selection == 1: + # Well, I see. Everything checks out. I can't say that I envy you, but I certainly appreciate what you are doing for the Empire...whatever you are doing. + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/gate_keeper_quarantine_zone:s_19')) - # *Teleports player to inside the gate* - #position = Point3D(-5789, 511, -6558) - #core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName("dathomir"), position, actor.getOrientation(), None) - core.sendConversationOptions(actor, npc, options, endConversation) + # *Teleports player to inside the gate* + #position = Point3D(-5789, 511, -6558) + #core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName("dathomir"), position, actor.getOrientation(), None) + convSvc.sendConversationOptions(actor, npc, options, endConversation) return + def endConversation(core, actor, npc): - global coreRef - coreRef = core + convSvc = core.conversationService + # Go with the blessing, then. - core.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/azure_cabal_hoolar:s_195')) + convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/azure_cabal_hoolar:s_195')) return From 8c4cb8292c1ff08cb6e39ff2c70d46707a86c2fc Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sun, 16 Nov 2014 12:16:53 -0500 Subject: [PATCH 09/11] Added fizz instrument to entertainer profession starter box --- scripts/object/tangible/npe/npe_uniform_box.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/object/tangible/npe/npe_uniform_box.py b/scripts/object/tangible/npe/npe_uniform_box.py index e14bbaf76..cab4b504c 100644 --- a/scripts/object/tangible/npe/npe_uniform_box.py +++ b/scripts/object/tangible/npe/npe_uniform_box.py @@ -20,6 +20,8 @@ def use(core, actor, object): pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet(), 'item_entertainer_pants_02_01') shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01') vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet(), 'item_entertainer_vest_02_01') + fizz = core.objectService.createObject('object/tangible/instrument/shared_fizz.iff', actor.getPlanet() + items.add(fizz) items.add(gloves) items.add(pants) items.add(shirt) @@ -29,6 +31,8 @@ def use(core, actor, object): skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet(), 'item_entertainer_skirt_02_01') shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01') hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet(), 'item_entertainer_hat_02_01') + fizz = core.objectService.createObject('object/tangible/instrument/shared_fizz.iff', actor.getPlanet() + items.add(fizz) items.add(gloves) items.add(skirt) items.add(shirt) @@ -38,6 +42,8 @@ def use(core, actor, object): pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', actor.getPlanet(), 'item_entertainer_pants_02_01') shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s04.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01') hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_s02.iff', actor.getPlanet(), 'item_entertainer_hat_02_01') + fizz = core.objectService.createObject('object/tangible/instrument/shared_fizz.iff', actor.getPlanet() + items.add(fizz) items.add(boots) items.add(pants) items.add(shirt) From 2a76ff68cd77fc8e6d310c2c6cb2ea9baacf487d Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Sun, 16 Nov 2014 12:20:56 -0500 Subject: [PATCH 10/11] Added more instruments to test to the frog --- scripts/character_builder_terminal.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index cda2c353e..a20c02023 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -369,7 +369,7 @@ def miscHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, miscHandlerCallback) - window.addListBoxMenuItem('Instrument', 0) + window.addListBoxMenuItem('Instruments', 0) window.addListBoxMenuItem('Heroism Jewelry Set', 1) window.addListBoxMenuItem('Belt of Master Bodo Baas', 2) window.addListBoxMenuItem('Starter Equipment Box', 3) @@ -385,7 +385,7 @@ def miscHandlerCallback(owner, window, eventType, returnList): return if returnList.get(0)=='0': - instrument(owner, inventory) + instruments(owner, inventory) return if returnList.get(0)=='1': heroismJewelry(owner, inventory) @@ -1907,8 +1907,22 @@ def jediBelt(owner, inventory): screenOne(core, owner) return -def instrument(owner, inventory): +def instruments(owner, inventory): inventory.add(core.objectService.createObject("object/tangible/instrument/shared_slitherhorn.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_bandfill.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_downey_box.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_fanfar.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_flanged_jessoon.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_flute_droopy.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_kloo_horn.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_mandoviol.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_nalargon.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_ommni_box.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_traz.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_valahorn.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_xantha.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_traz.iff", owner.getPlanet())) + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_traz.iff", owner.getPlanet())) screenOne(core, owner) return From 411341951d59f6dcc18f0f315c17fd7870285282 Mon Sep 17 00:00:00 2001 From: Iosnowore Kun Date: Mon, 17 Nov 2014 20:15:46 -0500 Subject: [PATCH 11/11] Removed multiple of the same instruments on the frog. --- scripts/character_builder_terminal.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index a20c02023..c7b2f65ce 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -1921,8 +1921,6 @@ def instruments(owner, inventory): inventory.add(core.objectService.createObject("object/tangible/instrument/shared_traz.iff", owner.getPlanet())) inventory.add(core.objectService.createObject("object/tangible/instrument/shared_valahorn.iff", owner.getPlanet())) inventory.add(core.objectService.createObject("object/tangible/instrument/shared_xantha.iff", owner.getPlanet())) - inventory.add(core.objectService.createObject("object/tangible/instrument/shared_traz.iff", owner.getPlanet())) - inventory.add(core.objectService.createObject("object/tangible/instrument/shared_traz.iff", owner.getPlanet())) screenOne(core, owner) return