diff --git a/scripts/commands/inspire.py b/scripts/commands/inspire.py index 495c193f..38a789ab 100644 --- a/scripts/commands/inspire.py +++ b/scripts/commands/inspire.py @@ -6,6 +6,10 @@ def setup(): return def run(core, actor, target, commandString): + + if (actor.getProfession() != "entertainer_1a"): + return + print ('Buffing Player: ' + str(target.getObjectId()) + ' or: ' + target.getCustomName()) openBuffWindow = BuffBuilderStartMessage(actor.getObjectId(), actor.getObjectId(), target.getObjectId()) objController = ObjControllerMessage(11, openBuffWindow) diff --git a/scripts/commands/of_focus_fire_1.py b/scripts/commands/of_focus_fire_1.py index 4857b1ce..d3a2cfb8 100644 --- a/scripts/commands/of_focus_fire_1.py +++ b/scripts/commands/of_focus_fire_1.py @@ -6,7 +6,9 @@ def setup(core, actor, buff): def run(core, actor, target, commandString): core.buffService.addBuffToCreature(actor, 'of_focus_fire_1') group = core.objectService.getObject(actor.getGroupId()) - for creature in group.getMemberList(): - core.buffService.addBuffToCreature(creature, 'of_focus_fire_1') + if group is not None: + for creature in group.getMemberList(): + core.buffService.addBuffToCreature(creature, 'of_focus_fire_1') + return return \ No newline at end of file diff --git a/scripts/commands/of_focus_fire_2.py b/scripts/commands/of_focus_fire_2.py index 2eb8248d..cafae5bd 100644 --- a/scripts/commands/of_focus_fire_2.py +++ b/scripts/commands/of_focus_fire_2.py @@ -4,8 +4,11 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'of_focus_fire_1') + core.buffService.addBuffToCreature(actor, 'of_focus_fire_2') group = core.objectService.getObject(actor.getGroupId()) - for creature in group.getMemberList(): - core.buffService.addBuffToCreature(creature, 'of_focus_fire_2') - return \ No newline at end of file + if group is not None: + for creature in group.getMemberList(): + core.buffService.addBuffToCreature(creature, 'of_focus_fire_2') + return + return + \ No newline at end of file diff --git a/scripts/commands/of_focus_fire_3.py b/scripts/commands/of_focus_fire_3.py index bac08eb4..75129446 100644 --- a/scripts/commands/of_focus_fire_3.py +++ b/scripts/commands/of_focus_fire_3.py @@ -4,8 +4,11 @@ def setup(core, actor, buff): return def run(core, actor, target, commandString): - core.buffService.addBuffToCreature(actor, 'of_focus_fire_1') + core.buffService.addBuffToCreature(actor, 'of_focus_fire_3') group = core.objectService.getObject(actor.getGroupId()) - for creature in group.getMemberList(): - core.buffService.addBuffToCreature(creature, 'of_focus_fire_3') - return \ No newline at end of file + if group is not None: + for creature in group.getMemberList(): + core.buffService.addBuffToCreature(creature, 'of_focus_fire_3') + return + return + \ No newline at end of file diff --git a/scripts/commands/of_tactical_sup_1.py b/scripts/commands/of_tactical_sup_1.py new file mode 100644 index 00000000..7ec7b103 --- /dev/null +++ b/scripts/commands/of_tactical_sup_1.py @@ -0,0 +1,72 @@ +from engine.resources.container import StaticContainerPermissions +import time +import sys + +def setup(core, actor, target, command): + return + +def run(core, actor, target, commandString): + doStimDrop(core, actor) + return + +def doStimDrop(core, actor): + stcSvc = core.staticService + shuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_lambda_shuttle.iff', actor.getPlanet().getName(), long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w) + shuttle.setPosture(0) + time.sleep(10) # Wait time before shuttle arrives after command is called + shuttle.setPosture(2) + time.sleep(20) # wait time for the crate to show (length of landing animation for shuttle) + spawnCrate(core, actor, shuttle) + time.sleep(5) # Wait time for the shuttle to leave after crate is spawned + shuttle.setPosture(0) + time.sleep(20) # How long the take-off sequence is, until the Shuttle is destroyed + core.objectService.destroyObject(shuttle) + return + +def spawnCrate(core, actor, shuttle): + crate = core.staticService.spawnObject('object/tangible/container/loot/shared_npe_loot_crate_low.iff', shuttle.getPlanet().getName(), long(0), shuttle.getPosition().x, shuttle.getPosition().y, shuttle.getPosition().z, shuttle.getOrientation().y, shuttle.getOrientation().w) + crate.setCustomName('Supply Crate') + + permissions = StaticContainerPermissions() + permissions.canRemove(actor, crate) + permissions.canView(actor, crate) + crate.setContainerPermissions(permissions) + + tac1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac1) + tac2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac2) + tac3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac3) + tac4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac4) + tac5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac5) + tac6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac6) + tac7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac7) + tac8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac8) + + stim1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim1) + stim2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim2) + stim3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim3) + stim4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim4) + stim5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim5) + stim6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim6) + stim7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim7) + stim8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim8) + + time.sleep(60) + core.objectService.destroyObject(crate) + + return \ No newline at end of file diff --git a/scripts/commands/of_tactical_sup_2.py b/scripts/commands/of_tactical_sup_2.py new file mode 100644 index 00000000..76c7b5aa --- /dev/null +++ b/scripts/commands/of_tactical_sup_2.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + print (' shuttle called!') + lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), + long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w) + + lambdaShuttle.setPosture(0) # 0 or 2? + print ('posture set!') + return \ No newline at end of file diff --git a/scripts/commands/of_tactical_sup_3.py b/scripts/commands/of_tactical_sup_3.py new file mode 100644 index 00000000..76c7b5aa --- /dev/null +++ b/scripts/commands/of_tactical_sup_3.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + print (' shuttle called!') + lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), + long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w) + + lambdaShuttle.setPosture(0) # 0 or 2? + print ('posture set!') + return \ No newline at end of file diff --git a/scripts/commands/of_tactical_sup_4.py b/scripts/commands/of_tactical_sup_4.py new file mode 100644 index 00000000..76c7b5aa --- /dev/null +++ b/scripts/commands/of_tactical_sup_4.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + print (' shuttle called!') + lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), + long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w) + + lambdaShuttle.setPosture(0) # 0 or 2? + print ('posture set!') + return \ No newline at end of file diff --git a/scripts/commands/of_tactical_sup_5.py b/scripts/commands/of_tactical_sup_5.py new file mode 100644 index 00000000..76c7b5aa --- /dev/null +++ b/scripts/commands/of_tactical_sup_5.py @@ -0,0 +1,13 @@ +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + print (' shuttle called!') + lambdaShuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_event_lambda_shuttle.iff', actor.getPlanet().getName(), + long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w) + + lambdaShuttle.setPosture(0) # 0 or 2? + print ('posture set!') + return \ No newline at end of file diff --git a/scripts/commands/of_tactical_sup_6.py b/scripts/commands/of_tactical_sup_6.py new file mode 100644 index 00000000..ec8f96db --- /dev/null +++ b/scripts/commands/of_tactical_sup_6.py @@ -0,0 +1,70 @@ +from engine.resources.container import StaticContainerPermissions +import time +import sys + +def setup(core, actor, buff): + return + +def run(core, actor, target, commandString): + doStimDrop(core, actor) + return + +def doStimDrop(core, actor): + stcSvc = core.staticService + time.sleep(10) # Wait time before shuttle arrives after command is called + shuttle = stcSvc.spawnObject('object/creature/npc/theme_park/shared_lambda_shuttle.iff', actor.getPlanet().getName(), long(0), actor.getPosition().x, actor.getPosition().y, actor.getPosition().z, actor.getOrientation().y, actor.getOrientation().w) + shuttle.setPosture(0) + time.sleep(1) + shuttle.setPosture(2) + time.sleep(20) # wait time for the crate to show (length of landing animation for shuttle) + spawnCrate(core, actor, shuttle) + time.sleep(5) # Wait time for the shuttle to leave after crate is spawned + shuttle.setPosture(0) + time.sleep(20) # How long the take-off sequence is, until the Shuttle is destroyed + core.objectService.destroyObject(shuttle) + return + +def spawnCrate(core, actor, shuttle): + crate = core.staticService.spawnObject('object/tangible/container/loot/shared_npe_loot_crate_low.iff', shuttle.getPlanet().getName(), long(0), shuttle.getPosition().x, shuttle.getPosition().y, shuttle.getPosition().z, shuttle.getOrientation().y, shuttle.getOrientation().w) + crate.setCustomName('Supply Crate') + + permissions = StaticContainerPermissions() + permissions.canRemove(actor, crate) + permissions.canView(actor, crate) + crate.setContainerPermissions(permissions) + + tac1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac1) + tac2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac2) + tac3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac3) + tac4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac4) + tac5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac5) + tac6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac6) + tac7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac7) + tac8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_syren.iff', actor.getPlanet()) + crate.add(tac8) + + stim1 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim1) + stim2 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim2) + stim3 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim3) + stim4 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim4) + stim5 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim5) + stim6 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim6) + stim7 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim7) + stim8 = core.objectService.createObject('object/tangible/medicine/instant_stimpack/shared_stimpack_generic_a.iff', actor.getPlanet()) + crate.add(stim8) + + return \ No newline at end of file diff --git a/scripts/expertise/expertise_of_tactical_sup_1.py b/scripts/expertise/expertise_of_tactical_sup_1.py index ce701bb6..d95ef2a5 100644 --- a/scripts/expertise/expertise_of_tactical_sup_1.py +++ b/scripts/expertise/expertise_of_tactical_sup_1.py @@ -36,11 +36,13 @@ def removeExpertisePoint(core, actor): # this checks what abilities the player gets by level, need to also call this on level-up def addAbilities(core, actor, player): - - + + actor.addAbility('of_tactical_sup_1') + return def removeAbilities(core, actor, player): - - + + actor.removeAbility('of_tactical_sup_1') + return diff --git a/scripts/object/creature/npc/theme_park/lambda_shuttle.py b/scripts/object/creature/npc/theme_park/lambda_shuttle.py index ccad8904..3e8a7cbb 100644 --- a/scripts/object/creature/npc/theme_park/lambda_shuttle.py +++ b/scripts/object/creature/npc/theme_park/lambda_shuttle.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + #object.setPosture(2) return \ No newline at end of file diff --git a/scripts/starter_clothing/crafting_artisan_trandoshan_male.py b/scripts/starter_clothing/crafting_artisan_trandoshan_male.py index fcabfeda..c6071a93 100644 --- a/scripts/starter_clothing/crafting_artisan_trandoshan_male.py +++ b/scripts/starter_clothing/crafting_artisan_trandoshan_male.py @@ -2,9 +2,9 @@ import sys def CraftingArtisanTrandoshanMale(core, object): shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s03.iff', object.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.if', object.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', object.getPlanet()) necklace = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_primitive_03.iff', object.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.ifff', object.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', object.getPlanet()) inventory = object.getSlottedObject('inventory') object._add(shirt) object._add(vest) diff --git a/scripts/static_travel_points.py b/scripts/static_travel_points.py index 70b156c3..e73ae0c9 100644 --- a/scripts/static_travel_points.py +++ b/scripts/static_travel_points.py @@ -26,11 +26,6 @@ def addPoints(core, planet): kashyyyk_mainPoints(core, planet) if planet.getName() == 'mustafar': mustafarPoints(core, planet) - if planet.getName() == 'kaas': - kaasPoints(core, planet) - if planet.getName() == 'taanab': - taanabPoints(core, planet) - return def corelliaPoints(core, planet): trvSvc = core.travelService @@ -154,12 +149,4 @@ def mustafarPoints(core, planet): trvSvc = core.travelService trvSvc.addTravelPoint(planet, "Mensix Mining Facility", 405, 230, -1352) - return - -#def kaasPoints(core, planet): - #trvSvc = core.travelService - #Return - -#def taanabPoints(core, planet): - #trvSvc = core.travelService - #return + return \ No newline at end of file diff --git a/src/main/NGECore.java b/src/main/NGECore.java index b714468f..fca62567 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -253,8 +253,6 @@ public class NGECore { terrainService.addPlanet(10, "dathomir", "terrain/dathomir.trn", true); terrainService.addPlanet(11, "mustafar", "terrain/mustafar.trn", true); terrainService.addPlanet(12, "kashyyyk_main", "terrain/kashyyyk_main.trn", true); - //terrainService.addPlanet(13, "kaas", "terrain/kaas.trn", true); - //terrainService.addPlanet(14, "taanab", "terrain/taanab.trn", true); // Travel Points travelService.loadTravelPoints(); diff --git a/src/services/combat/CombatCommands.java b/src/services/combat/CombatCommands.java index 4c199d95..7ba5c596 100644 --- a/src/services/combat/CombatCommands.java +++ b/src/services/combat/CombatCommands.java @@ -519,6 +519,12 @@ public class CombatCommands { core.commandService.registerCommand("of_purge_1"); core.commandService.registerCommand("of_scatter_1"); core.commandService.registerCommand("of_stimulator_1"); + core.commandService.registerCommand("of_tactical_sup_1"); + core.commandService.registerCommand("of_tactical_sup_2"); + core.commandService.registerCommand("of_tactical_sup_3"); + core.commandService.registerCommand("of_tactical_sup_4"); + core.commandService.registerCommand("of_tactical_sup_5"); + core.commandService.registerCommand("of_tactical_sup_6"); // Smuggler