From b7c9cd3a9e7eea7c848cd7dc721de679e99cb57e Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Mon, 5 May 2014 03:49:17 +0200 Subject: [PATCH] first steps cave coordinates set --- scripts/commands/kneel.py | 5 ++++- .../dantooine/force_crystal_hunters_cave.py | 17 +++++++++++++++++ src/services/DevService.java | 6 ++++++ src/services/StaticService.java | 3 ++- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 scripts/static_spawns/dantooine/force_crystal_hunters_cave.py diff --git a/scripts/commands/kneel.py b/scripts/commands/kneel.py index 77bec3ee..7a48df18 100644 --- a/scripts/commands/kneel.py +++ b/scripts/commands/kneel.py @@ -4,7 +4,10 @@ def setup(): return def run(core, actor, target, commandString): - + #actor.sendSystemMessage('Cell ID %s' % actor.getContainer().getTemplate(), 0) + #actor.sendSystemMessage('Cell ID ' + actor.getContainer().getTemplate(), 0) + #actor.sendSystemMessage('CellNumber: ' + str(actor.getGrandparent().getCellNumberByObjectId(actor.getContainer().getObjectID())), 0) + actor.sendSystemMessage('CellNumber: ' + str(actor.getContainer().getObjectID()), 0) if actor.getPosture() == 13 or actor.getPosture() == 14: return diff --git a/scripts/static_spawns/dantooine/force_crystal_hunters_cave.py b/scripts/static_spawns/dantooine/force_crystal_hunters_cave.py new file mode 100644 index 00000000..fabf90da --- /dev/null +++ b/scripts/static_spawns/dantooine/force_crystal_hunters_cave.py @@ -0,0 +1,17 @@ +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + + hunter1 = stcSvc.spawnObject('object/mobile/shared_dressed_dark_force_crystal_hunter.iff', 'dantooine', long(8535483), float(0), float(0), float(2), float(0.71), float(0.71)) + hunter2 = stcSvc.spawnObject('object/mobile/shared_dressed_dark_force_crystal_hunter.iff', 'dantooine', long(8535483), float(3), float(2), float(4), float(0.71), float(0.71)) + + wuher = stcSvc.spawnObject('object/mobile/shared_dressed_dark_force_crystal_hunter.iff', 'dantooine', long(8535483), float(8.6), float(-0.9), float(7), float(0.71), float(0.71)) + wuher.setCustomName2('Wuher') + wuher.setOptionsBitmask(256) + + #hunter1.setCustomName2('Reelo Baruk') + #hunter1.setOptionsBitmask(264) \ No newline at end of file diff --git a/src/services/DevService.java b/src/services/DevService.java index 3a8d08ea..0ea128fb 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -92,6 +92,7 @@ public class DevService implements INetworkDispatch { if(creature.getClient().isGM()) suiOptions.put((long) 130, "Vehicle Deeds"); if(creature.getClient().isGM()) suiOptions.put((long) 121, "Sandbox City"); if(creature.getClient().isGM()) suiOptions.put((long) 122, "Jedi Ruins"); + if(creature.getClient().isGM()) suiOptions.put((long) 153, "Force Crystal Hunter's Cave"); break; case 3: // [Items] Weapons @@ -1182,6 +1183,11 @@ public class DevService implements INetworkDispatch { Point3D position = new Point3D(4086,15,5554); core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), position, player.getOrientation(), null); return; + + case 153: + position = new Point3D(-6222,1,7380); + core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), position, player.getOrientation(), null); + return; case 123: TangibleObject arakydDroids = (TangibleObject) core.objectService.createObject("object/tangible/mission/shared_mission_bounty_droid_probot.iff", planet); diff --git a/src/services/StaticService.java b/src/services/StaticService.java index f7631ecc..a2445c33 100644 --- a/src/services/StaticService.java +++ b/src/services/StaticService.java @@ -32,6 +32,7 @@ import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Random; import resources.common.FileUtilities; import resources.objects.building.BuildingObject; @@ -116,7 +117,7 @@ public class StaticService implements INetworkDispatch { SWGObject object; if (core.spawnService.getMobileTemplate(template) != null) { - object = core.spawnService.spawnCreature(template, planetName, cellId, x, y, z, qW, qX, qY, qZ, (short) -1); + object = core.spawnService.spawnCreature(core.spawnService.getMobileTemplate(template).getTemplates().get(new Random().nextInt(core.spawnService.getMobileTemplate(template).getTemplates().size())), planetName, cellId, x, y, z, qW, qX, qY, qZ, (short) -1); } else { object = core.objectService.createObject(template, objectId, planet, new Point3D(x, y, z), new Quaternion(qW, qX, qY, qZ), null, true, true); }