projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-14 04:13:14 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Light2
2013-12-14 21:42:46 +01:00
parent 5d824324c4 6b565dcd65
commit 9a67e1c7a3
76 changed files with 10607 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/waypoint.py
+5 -5
View File
@@ -28,7 +28,7 @@ def run(core, actor, target, commandString):
waypoint.setPlanetCRC(crc.StringtoCRC(planet.getName()))
actorPlayer.getWaypoints().add(waypoint)
actorPlayer.waypointAdd(waypoint)
actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
return
@@ -42,7 +42,7 @@ def run(core, actor, target, commandString):
waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
actorPlayer.getWaypoints().add(waypoint)
actorPlayer.waypointAdd(waypoint)
actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
return
#/wp X Z Name
elif len(commandArgs) >= 3 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
@@ -54,7 +54,7 @@ def run(core, actor, target, commandString):
waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
actorPlayer.getWaypoints().add(waypoint)
actorPlayer.waypointAdd(waypoint)
actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
return
#/wp X Z
elif len(commandArgs) >= 2 and isFloat(commandArgs[0]) and isFloat(commandArgs[1]):
@@ -65,7 +65,7 @@ def run(core, actor, target, commandString):
waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
actorPlayer.getWaypoints().add(waypoint)
actorPlayer.waypointAdd(waypoint)
actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
return
#/wp planet x z y name
@@ -81,7 +81,7 @@ def run(core, actor, target, commandString):
waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
actorPlayer.getWaypoints().add(waypoint)
actorPlayer.waypointAdd(waypoint)
actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
return
#/wp NAME