diff --git a/scripts/commands/getplayerid.py b/scripts/commands/getplayerid.py new file mode 100644 index 00000000..9b334674 --- /dev/null +++ b/scripts/commands/getplayerid.py @@ -0,0 +1,25 @@ +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + + if commandString.startswith("quart"): + print ('commnad: ' + commandString) + #cmdArgs = commandString.split(" ") + #qY = cmdArgs[1] + #qW = cmdArgs[2] + + quaternion = actor.getOrientation() + #tp = core.travelService.getTravelPointByName(actor.getPlanet().name, "Mos Eisley Starport") + #obj = tp.getShuttle() + target.setOrientation(quaternion) + print ('Orientation: qY- ' + str(quaternion.y) + ' --- qW- ' + str(quaternion.w)) + Console.println('Orientation: qY- ' + str(quaternion.y) + ' --- qW- ' + str(quaternion.w)) + return + + elif commandString.startswith("id"): + print ( str(target.getObjectId())) + return + return \ No newline at end of file diff --git a/scripts/object/mobile/lifeday_saun_dann.py b/scripts/object/mobile/lifeday_saun_dann.py index ccad8904..19a4da58 100644 --- a/scripts/object/mobile/lifeday_saun_dann.py +++ b/scripts/object/mobile/lifeday_saun_dann.py @@ -1,4 +1,6 @@ import sys def setup(core, object): + object.setCustomName('Suan Dann') + object.setCurrentAnimation('appearance/animation/all_b_dnc_bowie_loop.ans') return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine.py b/scripts/static_spawns/tatooine.py index e4c28842..515f99f8 100644 --- a/scripts/static_spawns/tatooine.py +++ b/scripts/static_spawns/tatooine.py @@ -13,6 +13,7 @@ def addPlanetSpawns(core, planet): stcSvc.spawnObject('object/creature/npc/theme_park/shared_player_transport.iff', 'tatooine', long(0), float(3618), float(5), float(-4801), float(0.500574469566), float(0.865693628788)) # mos eisley starport + stcSvc.spawnObject('object/tangible/travel/ticket_collector/shared_ticket_collector.iff', 'tatooine', long(0), float(-2886.3), float(5.6), float(1929.4), float(-0.113814), float(0.993502)) # mos espa shuttleport a stcSvc.spawnObject('object/tangible/travel/ticket_collector/shared_ticket_collector.iff', 'tatooine', long(0), float(-3116.3), float(5.6), float(2166.1), float(-0.621933), float(0.783071)) # mos espa shuttleport b stcSvc.spawnObject('object/tangible/travel/ticket_collector/shared_ticket_collector.iff', 'tatooine', long(0), float(3623.5), float(5.6), float(2178.4), float(-0.123692), float(0.992321)) # mos espa shuttleport c @@ -31,6 +32,15 @@ def addPlanetSpawns(core, planet): stcSvc.spawnObject('object/tangible/terminal/shared_terminal_travel.iff', 'tatooine', long(0), float(1403.6), float(7.6), float(3474.4), float(1), float(0)) # mos entha shuttleport a stcSvc.spawnObject('object/tangible/terminal/shared_terminal_travel.iff', 'tatooine', long(0), float(1739), float(7.6), float(3192.1), float(1), float(0)) # mos entha shuttleport b stcSvc.spawnObject('object/tangible/terminal/shared_terminal_travel.iff', 'tatooine', long(0), float(3418.4), float(5.6), float(-4659.3), float(-0.485545), float(0.874212)) # mos eisley shuttleport + + stcSvc.spawnObject('object/mobile/shared_lifeday_saun_dann.iff', 'tatooine', long(0), float(-5037.00), float(75), float(-6561), float(-0.75), float(0)) # Life Day + stcSvc.spawnObject('object/tangible/holiday/life_day/shared_main_lifeday_tree.iff', 'tatooine', long(0), float(-5043.00), float(75), float(-6541.00), float(0.999132931232), float(-0.0416347384453)) # Lifeday Tree + stcSvc.spawnObject('object/mobile/shared_lifeday_figrin_dan.iff', 'tatooine', long(0), float(-5043.00), float(75), float(-6560), float(-0.75), float(0)) # LD Figrin + stcSvc.spawnObject('object/mobile/shared_lifeday_figrin_dan_band.iff', 'tatooine', long(0), float(-5040.00), float(75), float(-6557), float(-0.75), float(0)) # LD Band 1 + stcSvc.spawnObject('object/mobile/shared_lifeday_figrin_dan_band.iff', 'tatooine', long(0), float(-5045.00), float(75), float(-6555), float(-0.75), float(0)) # LD band 2 + stcSvc.spawnObject('object/mobile/shared_lifeday_figrin_dan_band.iff', 'tatooine', long(0), float(-5050.00), float(75), float(-6559), float(-0.75), float(0)) # LD Band 3 + stcSvc.spawnObject('object/mobile/shared_lifeday_figrin_dan_band.iff', 'tatooine', long(0), float(-5050.00), float(75), float(-6563), float(-0.75), float(0)) # LD band 4 + return \ No newline at end of file diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 1bea2435..0ad5d5d1 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -140,6 +140,7 @@ public class SimulationService implements INetworkDispatch { core.commandService.registerCommand("duel"); core.commandService.registerCommand("purchaseticket"); core.commandService.registerCommand("boardshuttle"); + core.commandService.registerCommand("getplayerid"); } diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index b937da55..ef42e51f 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -178,6 +178,10 @@ public class ObjectService implements INetworkDispatch { object = new GroupObject(objectID); + } else if(Template.startsWith("object/mobile")){ + + object = new CreatureObject(objectID, planet, position, orientation, Template); + } else if(Template.startsWith("object/waypoint")) { object = new WaypointObject(objectID, planet, position);