From e1b62d63dfd4fab0ad4e2d9d7cc602cc16613b88 Mon Sep 17 00:00:00 2001 From: cdmpse Date: Fri, 19 Sep 2014 20:06:16 -0500 Subject: [PATCH] Added Underworld Smuggler Tatooine Quests --- .../quests/tatooine/brokerbarak.py | 42 +++++++++++++++++++ scripts/conversation/quests/tatooine/diala.py | 23 ++++++++++ scripts/conversation/quests/tatooine/jalen.py | 23 ++++++++++ scripts/conversation/quests/tatooine/kaleb.py | 23 ++++++++++ scripts/conversation/quests/tatooine/kara.py | 23 ++++++++++ .../conversation/quests/tatooine/sarlin.py | 23 ++++++++++ .../generic/static/tatooine/brokerbarak.py | 4 +- .../mobiles/generic/static/tatooine/diala.py | 34 +++++++++++++++ .../mobiles/generic/static/tatooine/jalen.py | 34 +++++++++++++++ .../mobiles/generic/static/tatooine/kaleb.py | 34 +++++++++++++++ .../mobiles/generic/static/tatooine/kara.py | 34 +++++++++++++++ .../mobiles/generic/static/tatooine/sarlin.py | 33 +++++++++++++++ .../mobiles/tatooine/smuggler_patrol_bh_1.py | 39 +++++++++++++++++ .../object/mobile/smuggler_broker_barak.py | 8 +++- scripts/object/mobile/smuggler_fence_diala.py | 6 +++ scripts/object/mobile/smuggler_fence_jalen.py | 6 +++ scripts/object/mobile/smuggler_fence_kaleb.py | 6 +++ scripts/object/mobile/smuggler_fence_kara.py | 6 +++ .../object/mobile/smuggler_fence_sarlin.py | 6 +++ .../item_smuggler_contraband_crate_01_01.py | 11 +++++ .../events/signals/smugglerEnemyIncap.py | 9 ++++ .../events/signals/smugglerPatrolHelp.py | 9 ++++ scripts/static_spawns/tatooine/bestine.py | 2 +- .../tatooine/mos_eisley_quest.py | 2 + scripts/static_spawns/tatooine/mos_entha.py | 2 + scripts/static_spawns/tatooine/mos_espa.py | 1 + scripts/static_spawns/tatooine/mos_taike.py | 1 + scripts/static_spawns/tatooine/wayfar.py | 4 +- 28 files changed, 442 insertions(+), 6 deletions(-) create mode 100644 scripts/conversation/quests/tatooine/brokerbarak.py create mode 100644 scripts/conversation/quests/tatooine/diala.py create mode 100644 scripts/conversation/quests/tatooine/jalen.py create mode 100644 scripts/conversation/quests/tatooine/kaleb.py create mode 100644 scripts/conversation/quests/tatooine/kara.py create mode 100644 scripts/conversation/quests/tatooine/sarlin.py create mode 100644 scripts/mobiles/generic/static/tatooine/diala.py create mode 100644 scripts/mobiles/generic/static/tatooine/jalen.py create mode 100644 scripts/mobiles/generic/static/tatooine/kaleb.py create mode 100644 scripts/mobiles/generic/static/tatooine/kara.py create mode 100644 scripts/mobiles/generic/static/tatooine/sarlin.py create mode 100644 scripts/mobiles/tatooine/smuggler_patrol_bh_1.py create mode 100644 scripts/object/tangible/quest/item_smuggler_contraband_crate_01_01.py create mode 100644 scripts/quests/events/signals/smugglerEnemyIncap.py create mode 100644 scripts/quests/events/signals/smugglerPatrolHelp.py diff --git a/scripts/conversation/quests/tatooine/brokerbarak.py b/scripts/conversation/quests/tatooine/brokerbarak.py new file mode 100644 index 00000000..3fdc77e0 --- /dev/null +++ b/scripts/conversation/quests/tatooine/brokerbarak.py @@ -0,0 +1,42 @@ +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('smuggle_generic_1') + if quest is None or quest.isCompleted(): + options = Vector() + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/generic_broker_1:s_17'), 0)) # Yes. + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/generic_broker_1:s_18'), 0)) # Not right now. + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/generic_broker_1:s_14')) + core.conversationService.sendConversationOptions(actor, npc, options, handleOptionsOne) + return + elif player.getFactionStanding() >= 1000: + core.conversationService.sendStopConversation(actor, npc, 'conversation/generic_broker_1', 's_8') + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/generic_broker_1', 's_4') + return + +def handleOptionsOne(core, actor, npc, selection): + if selection == 0: # Yes. + options = Vector() + options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/generic_broker_1:s_24'), 0)) # OK + core.conversationService.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/generic_broker_1:s_22')) + core.conversationService.sendConversationOptions(actor, npc, options, handleOptionsTwo) + elif selection == 1: # Not right now. + core.conversationService.sendStopConversation(actor, npc, 'conversation/generic_broker_1', 's_30') + return + +def handleOptionsTwo(core, actor, npc, selection): + core.conversationService.sendStopConversation(actor, npc, 'conversation/generic_broker_1', 's_26') + core.questService.sendQuestAcceptWindow(actor, 'quest/smuggle_generic_1') + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/generic_broker_1', 's_4') + return diff --git a/scripts/conversation/quests/tatooine/diala.py b/scripts/conversation/quests/tatooine/diala.py new file mode 100644 index 00000000..885e2283 --- /dev/null +++ b/scripts/conversation/quests/tatooine/diala.py @@ -0,0 +1,23 @@ +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('smuggle_generic_1') + if quest is None or quest.isCompleted(): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + elif quest.isTaskActive(3) and quest.isTaskCompleted(7): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_5') + core.questService.completeTask(actor, quest, 3) + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_9') + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + return diff --git a/scripts/conversation/quests/tatooine/jalen.py b/scripts/conversation/quests/tatooine/jalen.py new file mode 100644 index 00000000..b11cd246 --- /dev/null +++ b/scripts/conversation/quests/tatooine/jalen.py @@ -0,0 +1,23 @@ +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('smuggle_generic_1') + if quest is None or quest.isCompleted(): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + elif quest.isTaskActive(2) and quest.isTaskCompleted(7): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_5') + core.questService.completeTask(actor, quest, 2) + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_9') + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + return diff --git a/scripts/conversation/quests/tatooine/kaleb.py b/scripts/conversation/quests/tatooine/kaleb.py new file mode 100644 index 00000000..c715af13 --- /dev/null +++ b/scripts/conversation/quests/tatooine/kaleb.py @@ -0,0 +1,23 @@ +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('smuggle_generic_1') + if quest is None or quest.isCompleted(): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + elif quest.isTaskActive(1) and quest.isTaskCompleted(7): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_5') + core.questService.completeTask(actor, quest, 1) + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_9') + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + return diff --git a/scripts/conversation/quests/tatooine/kara.py b/scripts/conversation/quests/tatooine/kara.py new file mode 100644 index 00000000..08cc18fc --- /dev/null +++ b/scripts/conversation/quests/tatooine/kara.py @@ -0,0 +1,23 @@ +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('smuggle_generic_1') + if quest is None or quest.isCompleted(): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + elif quest.isTaskActive(5) and quest.isTaskCompleted(7): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_5') + core.questService.completeTask(actor, quest, 5) + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_9') + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + return diff --git a/scripts/conversation/quests/tatooine/sarlin.py b/scripts/conversation/quests/tatooine/sarlin.py new file mode 100644 index 00000000..bc9e0623 --- /dev/null +++ b/scripts/conversation/quests/tatooine/sarlin.py @@ -0,0 +1,23 @@ +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('smuggle_generic_1') + if quest is None or quest.isCompleted(): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + elif quest.isTaskActive(4) and quest.isTaskCompleted(7): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_5') + core.questService.completeTask(actor, quest, 4) + else: + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_9') + return + +def endConversation(core, actor, npc): + core.conversationService.sendStopConversation(actor, npc, 'conversation/fence', 's_10') + return diff --git a/scripts/mobiles/generic/static/tatooine/brokerbarak.py b/scripts/mobiles/generic/static/tatooine/brokerbarak.py index 1e06a7d5..d61a86c5 100644 --- a/scripts/mobiles/generic/static/tatooine/brokerbarak.py +++ b/scripts/mobiles/generic/static/tatooine/brokerbarak.py @@ -11,11 +11,11 @@ from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCustomName('Barak') + mobileTemplate.setCreatureName('smuggler_broker_barak') mobileTemplate.setLevel(1) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setSocialGroup("township") - mobileTemplate.setOptionsBitmask(Options.INVULNERABLE) + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE) templates = Vector() templates.add('object/mobile/shared_smuggler_broker_barak.iff') diff --git a/scripts/mobiles/generic/static/tatooine/diala.py b/scripts/mobiles/generic/static/tatooine/diala.py new file mode 100644 index 00000000..beb58a2b --- /dev/null +++ b/scripts/mobiles/generic/static/tatooine/diala.py @@ -0,0 +1,34 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('smuggler_fence_diala') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setSocialGroup("township") + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE) + + templates = Vector() + templates.add('object/mobile/shared_smuggler_fence_diala.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('diala', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/static/tatooine/jalen.py b/scripts/mobiles/generic/static/tatooine/jalen.py new file mode 100644 index 00000000..a3db06ea --- /dev/null +++ b/scripts/mobiles/generic/static/tatooine/jalen.py @@ -0,0 +1,34 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('smuggler_fence_jalen') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setSocialGroup("township") + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE) + + templates = Vector() + templates.add('object/mobile/shared_smuggler_fence_jalen.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('jalen', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/static/tatooine/kaleb.py b/scripts/mobiles/generic/static/tatooine/kaleb.py new file mode 100644 index 00000000..43ca9c73 --- /dev/null +++ b/scripts/mobiles/generic/static/tatooine/kaleb.py @@ -0,0 +1,34 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('smuggler_fence_kaleb') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setSocialGroup("township") + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE) + + templates = Vector() + templates.add('object/mobile/shared_smuggler_fence_kaleb.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kaleb', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/static/tatooine/kara.py b/scripts/mobiles/generic/static/tatooine/kara.py new file mode 100644 index 00000000..8fec5eea --- /dev/null +++ b/scripts/mobiles/generic/static/tatooine/kara.py @@ -0,0 +1,34 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('smuggler_fence_kara') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setSocialGroup("township") + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE) + + templates = Vector() + templates.add('object/mobile/shared_smuggler_fence_kara.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kara', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/static/tatooine/sarlin.py b/scripts/mobiles/generic/static/tatooine/sarlin.py new file mode 100644 index 00000000..65d478b1 --- /dev/null +++ b/scripts/mobiles/generic/static/tatooine/sarlin.py @@ -0,0 +1,33 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('smuggler_fence_sarlin') + mobileTemplate.setLevel(1) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setSocialGroup("township") + mobileTemplate.setOptionsBitmask(Options.INVULNERABLE | Options.CONVERSABLE) + + templates = Vector() + templates.add('object/mobile/shared_smuggler_fence_sarlin.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sarlin', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/smuggler_patrol_bh_1.py b/scripts/mobiles/tatooine/smuggler_patrol_bh_1.py new file mode 100644 index 00000000..9489cc7e --- /dev/null +++ b/scripts/mobiles/tatooine/smuggler_patrol_bh_1.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('jabba_assassin') + mobileTemplate.setLevel(15) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("jabba") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_dressed_tatooine_jabba_assassin.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShotpistol') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('smuggler_patrol_bh_1', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/object/mobile/smuggler_broker_barak.py b/scripts/object/mobile/smuggler_broker_barak.py index ccad8904..7dbe75ec 100644 --- a/scripts/object/mobile/smuggler_broker_barak.py +++ b/scripts/object/mobile/smuggler_broker_barak.py @@ -1,4 +1,10 @@ import sys +from resources.datatables import Options def setup(core, object): - return \ No newline at end of file + object.setAttachment('radial_filename', 'object/conversation'); + object.setAttachment('conversationFile','quests/tatooine/brokerbarak') + object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) + object.setStfFilename('mob/creature_names') + object.setStfName('smuggler_broker_barak') + return diff --git a/scripts/object/mobile/smuggler_fence_diala.py b/scripts/object/mobile/smuggler_fence_diala.py index ccad8904..3394e0a4 100644 --- a/scripts/object/mobile/smuggler_fence_diala.py +++ b/scripts/object/mobile/smuggler_fence_diala.py @@ -1,4 +1,10 @@ import sys +from resources.datatables import Options def setup(core, object): + object.setAttachment('radial_filename', 'object/conversation'); + object.setAttachment('conversationFile','quests/tatooine/diala') + object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) + object.setStfFilename('mob/creature_names') + object.setStfName('smuggler_fence_diala') return \ No newline at end of file diff --git a/scripts/object/mobile/smuggler_fence_jalen.py b/scripts/object/mobile/smuggler_fence_jalen.py index ccad8904..b24b0380 100644 --- a/scripts/object/mobile/smuggler_fence_jalen.py +++ b/scripts/object/mobile/smuggler_fence_jalen.py @@ -1,4 +1,10 @@ import sys +from resources.datatables import Options def setup(core, object): + object.setAttachment('radial_filename', 'object/conversation'); + object.setAttachment('conversationFile','quests/tatooine/jalen') + object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) + object.setStfFilename('mob/creature_names') + object.setStfName('smuggler_fence_jalen') return \ No newline at end of file diff --git a/scripts/object/mobile/smuggler_fence_kaleb.py b/scripts/object/mobile/smuggler_fence_kaleb.py index ccad8904..f46c0b3f 100644 --- a/scripts/object/mobile/smuggler_fence_kaleb.py +++ b/scripts/object/mobile/smuggler_fence_kaleb.py @@ -1,4 +1,10 @@ import sys +from resources.datatables import Options def setup(core, object): + object.setAttachment('radial_filename', 'object/conversation'); + object.setAttachment('conversationFile','quests/tatooine/kaleb') + object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) + object.setStfFilename('mob/creature_names') + object.setStfName('smuggler_fence_kaleb') return \ No newline at end of file diff --git a/scripts/object/mobile/smuggler_fence_kara.py b/scripts/object/mobile/smuggler_fence_kara.py index ccad8904..52aa70f6 100644 --- a/scripts/object/mobile/smuggler_fence_kara.py +++ b/scripts/object/mobile/smuggler_fence_kara.py @@ -1,4 +1,10 @@ import sys +from resources.datatables import Options def setup(core, object): + object.setAttachment('radial_filename', 'object/conversation'); + object.setAttachment('conversationFile','quests/tatooine/kara') + object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) + object.setStfFilename('mob/creature_names') + object.setStfName('smuggler_fence_kara') return \ No newline at end of file diff --git a/scripts/object/mobile/smuggler_fence_sarlin.py b/scripts/object/mobile/smuggler_fence_sarlin.py index ccad8904..209832f3 100644 --- a/scripts/object/mobile/smuggler_fence_sarlin.py +++ b/scripts/object/mobile/smuggler_fence_sarlin.py @@ -1,4 +1,10 @@ import sys +from resources.datatables import Options def setup(core, object): + object.setAttachment('radial_filename', 'object/conversation'); + object.setAttachment('conversationFile','quests/tatooine/sarlin') + object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) + object.setStfFilename('mob/creature_names') + object.setStfName('smuggler_fence_sarlin') return \ No newline at end of file diff --git a/scripts/object/tangible/quest/item_smuggler_contraband_crate_01_01.py b/scripts/object/tangible/quest/item_smuggler_contraband_crate_01_01.py new file mode 100644 index 00000000..a1a35fca --- /dev/null +++ b/scripts/object/tangible/quest/item_smuggler_contraband_crate_01_01.py @@ -0,0 +1,11 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_smuggler_contraband_crate_01_01') + #object.setStfName('item_bracelet_l_set_bh_dps_01_01') + object.setDetailFilename('smuggle_crate_d') + object.setDetailName('item_smuggler_contraband_crate_01_01') + object.setIntAttribute('required_combat_level', 10) + object.setStringAttribute('class_required', 'Smuggler') + return \ No newline at end of file diff --git a/scripts/quests/events/signals/smugglerEnemyIncap.py b/scripts/quests/events/signals/smugglerEnemyIncap.py new file mode 100644 index 00000000..8f6a5dde --- /dev/null +++ b/scripts/quests/events/signals/smugglerEnemyIncap.py @@ -0,0 +1,9 @@ +def setup(core): + return + +def wait(core, actor): + return + +def activate(core, actor, quest): + core.questService.completeTask(actor, quest, 8) + return \ No newline at end of file diff --git a/scripts/quests/events/signals/smugglerPatrolHelp.py b/scripts/quests/events/signals/smugglerPatrolHelp.py new file mode 100644 index 00000000..ecc0527e --- /dev/null +++ b/scripts/quests/events/signals/smugglerPatrolHelp.py @@ -0,0 +1,9 @@ +def setup(core): + return + +def wait(core, actor): + return + +def activate(core, actor, quest): + core.questService.completeTask(actor, quest, 10) + return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/bestine.py b/scripts/static_spawns/tatooine/bestine.py index 275ee560..5703e42e 100644 --- a/scripts/static_spawns/tatooine/bestine.py +++ b/scripts/static_spawns/tatooine/bestine.py @@ -44,7 +44,7 @@ def addPlanetSpawns(core, planet): gilBurtin = stcSvc.spawnObject('gilburtin', 'tatooine', hotel.getCellByCellNumber(5), float(20.3), float(1.6), float(12.8), float(0), float(0), float(0.99), float(0)) # Outside - barak = stcSvc.spawnObject('brokerbarak', 'tatooine', long(0), float(-1049), float(5.0), float(-3537), float(0.97), float(0.23)) + barak = stcSvc.spawnObject('brokerbarak', 'tatooine', long(0), float(-1049), float(10), float(-3537), float(0.97), float(0.23)) barrezz = stcSvc.spawnObject('barezz', 'tatooine', long(0), float(-1146.8), float(98.0), float(-3892.1), float(0.75), float(0.65)) diff --git a/scripts/static_spawns/tatooine/mos_eisley_quest.py b/scripts/static_spawns/tatooine/mos_eisley_quest.py index b365360a..6a5cfd9b 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_quest.py +++ b/scripts/static_spawns/tatooine/mos_eisley_quest.py @@ -27,4 +27,6 @@ def addPlanetSpawns(core, planet): # Jano Bix jano = stcSvc.spawnObject('jano', 'tatooine', long(0), float(3186), float(5), float(-4781), float(-0.38), float(0.92)) + # Kaleb + kaleb = stcSvc.spawnObject('kaleb', 'tatooine', long(0), float(3216), float(5), float(-4610), float(0.25), float(1)) return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_entha.py b/scripts/static_spawns/tatooine/mos_entha.py index 0455d44a..5b61aee2 100644 --- a/scripts/static_spawns/tatooine/mos_entha.py +++ b/scripts/static_spawns/tatooine/mos_entha.py @@ -20,6 +20,8 @@ def addPlanetSpawns(core, planet): ankwee.setCustomName2('An\'kwee') ankwee.setOptionsBitmask(256) + sarlin = stcSvc.spawnObject('sarlin', 'tatooine', long(0), float(1537), float(7), float(3052), float(0.6), float(0.8)) + #Junkdealer stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(1271), float(7.7), float(2919), float(0), float(0)) stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(1271), float(7.7), float(2960), float(1), float(0)) diff --git a/scripts/static_spawns/tatooine/mos_espa.py b/scripts/static_spawns/tatooine/mos_espa.py index 7d704567..ce0fb2c7 100644 --- a/scripts/static_spawns/tatooine/mos_espa.py +++ b/scripts/static_spawns/tatooine/mos_espa.py @@ -24,6 +24,7 @@ def addPlanetSpawns(core, planet): #dalaSocuna.setCustomName2('Commander Da\'la Socuna') #dalaSocuna.setOptionsBitmask(256) + diala = stcSvc.spawnObject('diala', 'tatooine', long(0), float(-3105), float(5), float(2314), float(0.48), float(0.88)) #Watto's Shop ****TODO: Get Proper cells for Watto's Shop once Buildout structures are spawning as intended again. watto = stcSvc.spawnObject('object/mobile/shared_watto.iff', 'tatooine', building.getCellByCellNumber(2), float(4.7), float(-0.5), float(2.4), float(-0.71), float(0), float(0.70), float(0)) diff --git a/scripts/static_spawns/tatooine/mos_taike.py b/scripts/static_spawns/tatooine/mos_taike.py index 814d7b2e..dd08b8f3 100644 --- a/scripts/static_spawns/tatooine/mos_taike.py +++ b/scripts/static_spawns/tatooine/mos_taike.py @@ -15,6 +15,7 @@ def addPlanetSpawns(core, planet): # TODO Check all NPCs for personalized scripting, change format. + kara = stcSvc.spawnObject('kara', 'tatooine', long(0), float(3839), float(16.13), float(2335), float(-0.1), float(0.98)) #Junkdealer stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3902), float(33), float(2362), float(0), float(0)) diff --git a/scripts/static_spawns/tatooine/wayfar.py b/scripts/static_spawns/tatooine/wayfar.py index 0f9fd3f0..b40e025f 100644 --- a/scripts/static_spawns/tatooine/wayfar.py +++ b/scripts/static_spawns/tatooine/wayfar.py @@ -14,8 +14,8 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService # TODO Check all NPCs for personalized scripting, change format. - - + # Smuggler Fence Jalen + jalen = stcSvc.spawnObject('jalen', 'tatooine', long(0), float(-5185), float(75), float(-6458), float(0.7), float(0.7)) #Junkdealer stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-5240.87), float(75), float(-641.015), float(0.879), float(0.476)) stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-5132.33), float(75), float(-6584.92), float(0.637), float(0.771))