Skip to content

*READ DESCRIPTION* #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mesagoppinmypants wants to merge 12 commits into
base: master
Choose a base branch
from
Open

*READ DESCRIPTION* #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b3bdad0
Fixed small typos in gate keeper conversation
Mesagoppinmypants Nov 13, 2014
43955cb
Added LightsaberColors datatable to lightsaber color crystals
Mesagoppinmypants Nov 13, 2014
68931e8
Merge pull request #6 from ProjectSWGCore/master
Mesagoppinmypants Nov 13, 2014
b7a49f7
Removed invulnerable from guards in spawn script
Mesagoppinmypants Nov 13, 2014
c8af146
Added invulnerable to the actual guard mobile scripts
Mesagoppinmypants Nov 13, 2014
00f3bb3
Added level 10 quarantine zone NPCs spawn placeholder
Mesagoppinmypants Nov 13, 2014
95ac0da
Removed un-needed imports for quarantine static spawns
Mesagoppinmypants Nov 13, 2014
7bd9a4f
Half fix to quarantine zone conversation
Mesagoppinmypants Nov 15, 2014
fe1b14a
Another fix to Quarantine Gate Keeper Conversation
Mesagoppinmypants Nov 16, 2014
8c4cb82
Added fizz instrument to entertainer profession starter box
Mesagoppinmypants Nov 16, 2014
2a76ff6
Added more instruments to test to the frog
Mesagoppinmypants Nov 16, 2014
4113419
Removed multiple of the same instruments on the frog.
Mesagoppinmypants Nov 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions scripts/character_builder_terminal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -1907,8 +1907,20 @@ 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()))
screenOne(core, owner)
return

Expand Down
41 changes: 15 additions & 26 deletions scripts/conversation/outbreak_imperial_officer_gate_keeper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,36 @@
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

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'))

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))
core.conversationService.sendConversationOptions(actor, npc, handleOptionsOne)
convSvc.sendConversationOptions(actor, npc, handleOptionsOne)
return

def handleOptionsOne(core, actor, npc, selection):
global coreRef
coreRef = core
convSvc = core.conversationService
convSvc = core.conversationService


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')

convSvc.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

def handleOptionsTwo(core, actor, npc, selection):
global coreRef
coreRef = core
convSvc = core.conversationService
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.
Expand All @@ -48,14 +39,12 @@ def handleOptionsTwo(core, actor, npc, selection):
# *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)
convSvc.sendConversationOptions(actor, npc, options, endConversation)
return

def endConversation(core, actor, npc):
global coreRef
coreRef = core
convSvc = core.conversationService

def endConversation(core, actor, npc):
convSvc = core.conversationService

# Go with the blessing, then.
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/azure_cabal_hoolar:s_195'))
return
Expand Down
1 change: 1 addition & 0 deletions scripts/mobiles/dathomir/outbreak_imperial_stormtrooper_guards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions scripts/mobiles/dathomir/outbreak_mixed_guard_aggro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
9 changes: 9 additions & 0 deletions scripts/mobiles/spawnareas/dathomir_quarantine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'))
Expand Down
1 change: 1 addition & 0 deletions scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_blackwing_crystal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from resources.datatables import LightsaberColors
import sys

def setup(core, object):
Expand Down
1 change: 1 addition & 0 deletions scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_lava_crystal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from resources.datatables import LightsaberColors
import sys

def setup(core, object):
Expand Down
1 change: 1 addition & 0 deletions scripts/object/tangible/component/weapon/lightsaber/lightsaber_module_permafrost_crystal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from resources.datatables import LightsaberColors
import sys

def setup(core, object):
Expand Down
6 changes: 6 additions & 0 deletions scripts/object/tangible/npe/npe_uniform_box.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
26 changes: 1 addition & 25 deletions scripts/static_spawns/dathomir/quarantine_zone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,50 @@
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):
stcSvc = core.staticService

# 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
#gamasurvivor1 = stcSvc.spawnObject('outbreak_camp_gamma_survivor', 'dathomir', long(0), float(-5930), float(560), float(-6690), float(0.26), float(0.85))

# 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
Expand Down