From 0b5cb550a30e441faee7898d341eea6b7770aaed Mon Sep 17 00:00:00 2001 From: cdmpse Date: Fri, 5 Sep 2014 20:59:24 -0500 Subject: [PATCH] Added "Tasty Dried Critters" Quest --- scripts/conversation/byxle.py | 15 ----- scripts/conversation/quests/tatooine/byxle.py | 57 +++++++++++++++++++ .../tatooine/{byxlepedette.py => byxle.py} | 2 +- .../mobile/dressed_tatooine_opening_byxle.py | 2 +- .../events/signals/tat_eisley_tdc_e1.py | 9 +++ .../events/signals/tat_eisley_tdc_e2.py | 9 +++ scripts/static_spawns/tatooine/mos_eisley.py | 4 +- .../tatooine/mos_eisley_quest.py | 3 + 8 files changed, 81 insertions(+), 20 deletions(-) delete mode 100644 scripts/conversation/byxle.py create mode 100644 scripts/conversation/quests/tatooine/byxle.py rename scripts/mobiles/generic/static/tatooine/{byxlepedette.py => byxle.py} (94%) create mode 100644 scripts/quests/events/signals/tat_eisley_tdc_e1.py create mode 100644 scripts/quests/events/signals/tat_eisley_tdc_e2.py diff --git a/scripts/conversation/byxle.py b/scripts/conversation/byxle.py deleted file mode 100644 index 71c08205..00000000 --- a/scripts/conversation/byxle.py +++ /dev/null @@ -1,15 +0,0 @@ -from resources.common import ConversationOption -from resources.common import OutOfBand -from resources.common import ProsePackage -from java.util import Vector -import sys - -def startConversation(core, actor, npc): - convSvc = core.conversationService - - core.conversationService.sendStopConversation(actor, npc, 'conversation/tatooine_eisley_byxle', 's_48') - return - -def endConversation(core, actor, npc): - core.conversationService.sendStopConversation(actor, npc, 'conversation/tatooine_eisley_byxle', 's_48') - return \ No newline at end of file diff --git a/scripts/conversation/quests/tatooine/byxle.py b/scripts/conversation/quests/tatooine/byxle.py new file mode 100644 index 00000000..884f6cf5 --- /dev/null +++ b/scripts/conversation/quests/tatooine/byxle.py @@ -0,0 +1,57 @@ +from resources.common import ConversationOption +from resources.common import OutOfBand +from resources.common import ProsePackage +from java.util import Vector +import sys + +def startConversation(core, actor, npc): + player = actor.getPlayerObject() + + if player is None: + return + + quest = player.getQuest('tatooine_eisley_tdc') + + if quest is None: + options = Vector() + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_58'), 0)) + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_56')) + core.conversationService.sendConversationOptions(actor, npc, options, handleOptionsOne) + return +# if quest.isCompleted() == True: +# core.conversationService.sendStopConversation(actor, npc, 'conversation/tatooine_eisley_byxle', 's_48') +# return + core.conversationService.sendStopConversation(actor, npc, 'conversation/tatooine_eisley_byxle', 's_48') + +def handleOptionsOne(core, actor, npc, selection): + options = Vector() + # So what do I need to do? + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_62'), 0)) + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_60')) + core.conversationService.sendConversationOptions(actor, npc, options, handleOptionsTwo) + return + +def handleOptionsTwo(core, actor, npc, selection): + options = Vector() + # Ok, Sure. I can do that for you. + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_66'), 0)) + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_64')) + core.conversationService.sendConversationOptions(actor, npc, options, handleOptionsThree) + return + +def handleOptionsThree(core, actor, npc, selection): + options = Vector() + # I have to say that? + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_76'), 0)) + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/tatooine_eisley_byxle:s_68')) + core.conversationService.sendConversationOptions(actor, npc, options, handleOptionsFour) + return + +def handleOptionsFour(core, actor, npc, selection): + core.conversationService.sendStopConversation(actor, npc, 'conversation/tatooine_eisley_byxle', 's_78') + core.questService.sendQuestAcceptWindow(actor, 'quest/tatooine_eisley_tdc') + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/tatooine_eisley_byxle', 's_48') + return diff --git a/scripts/mobiles/generic/static/tatooine/byxlepedette.py b/scripts/mobiles/generic/static/tatooine/byxle.py similarity index 94% rename from scripts/mobiles/generic/static/tatooine/byxlepedette.py rename to scripts/mobiles/generic/static/tatooine/byxle.py index dc7235b9..6fef7f06 100644 --- a/scripts/mobiles/generic/static/tatooine/byxlepedette.py +++ b/scripts/mobiles/generic/static/tatooine/byxle.py @@ -29,5 +29,5 @@ def addTemplate(core): mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('byxlepedette', mobileTemplate) + core.spawnService.addMobileTemplate('byxle', mobileTemplate) return \ No newline at end of file diff --git a/scripts/object/mobile/dressed_tatooine_opening_byxle.py b/scripts/object/mobile/dressed_tatooine_opening_byxle.py index a9115a52..c2ef05e6 100644 --- a/scripts/object/mobile/dressed_tatooine_opening_byxle.py +++ b/scripts/object/mobile/dressed_tatooine_opening_byxle.py @@ -3,7 +3,7 @@ from resources.datatables import Options def setup(core, object): object.setAttachment('radial_filename', 'object/conversation'); - object.setAttachment('conversationFile','byxle') + object.setAttachment('conversationFile','quests/tatooine/byxle') object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) object.setStfFilename('mob/creature_names') object.setStfName('tatooine_opening_byxle') diff --git a/scripts/quests/events/signals/tat_eisley_tdc_e1.py b/scripts/quests/events/signals/tat_eisley_tdc_e1.py new file mode 100644 index 00000000..2c219af1 --- /dev/null +++ b/scripts/quests/events/signals/tat_eisley_tdc_e1.py @@ -0,0 +1,9 @@ +def setup(core): + return + +def wait(core, actor): + return + +def activate(core, actor, quest): + core.questService.completeActiveTask(actor, quest) + return \ No newline at end of file diff --git a/scripts/quests/events/signals/tat_eisley_tdc_e2.py b/scripts/quests/events/signals/tat_eisley_tdc_e2.py new file mode 100644 index 00000000..2c219af1 --- /dev/null +++ b/scripts/quests/events/signals/tat_eisley_tdc_e2.py @@ -0,0 +1,9 @@ +def setup(core): + return + +def wait(core, actor): + return + +def activate(core, actor, quest): + core.questService.completeActiveTask(actor, quest) + return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_eisley.py b/scripts/static_spawns/tatooine/mos_eisley.py index 07b04bf6..ff0e6c6e 100644 --- a/scripts/static_spawns/tatooine/mos_eisley.py +++ b/scripts/static_spawns/tatooine/mos_eisley.py @@ -72,9 +72,7 @@ def addPlanetSpawns(core, planet): r3j7 = stcSvc.spawnObject('r3j7', 'tatooine', long(0), float(3311.1), float(4.0), float(-4820.2), float(0.38), float(-0.92)) noble4 = stcSvc.spawnObject('noble', 'tatooine', long(0), float(3255.3), float(4.0), float(-4848.1), float(0.42), float(0.91)) - - byxlePedette = stcSvc.spawnObject('byxlepedette', 'tatooine', long(0), float(3365), float(5), float(-4639), float(0.99), float(0.12)) - + errikDarksider = stcSvc.spawnObject('errikdarksider', 'tatooine', long(0), float(3381), float(4.6), float(-4498), float(0.91), float(0.40)) gendra = stcSvc.spawnObject('gendra', 'tatooine', long(0), float(3308), float(5.6), float(-4785), float(0.84), float(0.53)) diff --git a/scripts/static_spawns/tatooine/mos_eisley_quest.py b/scripts/static_spawns/tatooine/mos_eisley_quest.py index b6ddbc31..fb32adb9 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_quest.py +++ b/scripts/static_spawns/tatooine/mos_eisley_quest.py @@ -15,4 +15,7 @@ def addPlanetSpawns(core, planet): # Bib's Offer vourk = stcSvc.spawnObject('vourk', 'tatooine', long(0), float(3521.0), float(5.0), float(-4821.0), float(0.42), float(0.91)) + # Byxle Pedette + byxlePedette = stcSvc.spawnObject('byxle', 'tatooine', long(0), float(3365), float(5), float(-4639), float(0.99), float(0.12)) + return \ No newline at end of file