projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-11 21:45:43 -04:00
Code Issues Projects Releases Wiki Activity

Changed Teleport Command(s) System Messages

Browse Source
This commit is contained in:
Viaron
2014-08-09 01:22:49 -04:00
parent 79ab866a69
commit 01406dbce0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/teleport.py
+5 -5
View File
@@ -23,24 +23,24 @@ def run(core, actor, target, commandString):
if arg1 and arg2 and arg3 and arg4 is not None:
try:
actor.sendSystemMessage('gm: teleport: Command completed successfully.', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Command completed successfully.', 0)
position = Point3D(float(arg1), float(arg2), float(arg3))
core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName(arg4), position, actor.getOrientation(), None)
except:
actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleport <x> <z> [<y>] <planet>', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Invalid Syntax. Syntax is: /teleport <x> <y> [<z>] <planet>.', 0)
return
return
elif arg1 and arg2 and arg3:
try:
actor.sendSystemMessage('gm: teleport: Command completed successfully.', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Command completed successfully.', 0)
position = Point3D(float(arg1), 0, float(arg2))
core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName(arg3), position, actor.getOrientation(), None)
except:
actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleport <x> <z> [<y>] <planet>', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Invalid Syntax. Syntax is: /teleport <x> <y> [<z>] <planet>.', 0)
return
else:
actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleport <x> <z> [<y>] <planet>', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF Teleport: Invalid Syntax. Syntax is: /teleport <x> <y> [<z>] <planet>.', 0)
return
return
scripts/commands/teleporttarget.py
+2 -2
View File
@@ -12,11 +12,11 @@ def run(core, actor, target, commandString):
return
if target and target.getSlottedObject('ghost') is not None:
actor.sendSystemMessage('gm: teleporttarget: Command completed successfully.', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTarget: Command completed successfully.', 0)
core.simulationService.teleport(target, actor.getPosition(), actor.getOrientation(), 0)
return
else:
actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleporttarget <HoverTarget>', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTarget: Invalid Syntax. Syntax is: /teleportTarget <HoverTarget>', 0)
return
return
scripts/commands/teleportto.py
+2 -2
View File
@@ -15,7 +15,7 @@ def run(core, actor, target, commandString):
target = core.objectService.getObjectByFirstName(commandString)
if target and target.getSlottedObject('ghost') is not None:
actor.sendSystemMessage('gm: teleportto: Command completed successfully.', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTo: Command completed successfully.', 0)
if target.getPlanetId() == actor.getPlanetId():
core.simulationService.teleport(actor, target.getPosition(), target.getOrientation(), target.getParentId())
else:
@@ -25,6 +25,6 @@ def run(core, actor, target, commandString):
core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetById(target.getPlanetId()), target.getPosition(), target.getOrientation(), core.objectService.getObject(target.getParentId()))
return
else:
actor.sendSystemMessage('Invalid Syntax. Syntax is: /teleportto <playerName>', 0)
actor.sendSystemMessage(' \\#FE2EF7 [GM] \\#FFFFFF teleportTo: Invalid Syntax. Syntax is: /teleportTo <playerName>', 0)
return
return