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

Author: Light2

nge.backup

@@ -44,4 +44,5 @@ def run(core, actor, target, commandString):
 	elif command == 'addability' and arg1:
 		actor.addAbility(str(arg1))
 		actor.sendSystemMessage('You have learned ' + arg1 + '')
+	
 	return

scripts/commands/setgodmode.py

@@ -0,0 +1,10 @@
+from resources.common import PlayerFlags
+import sys
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+    ghost = actor.getSlottedObject('ghost')
+    ghost.toggleFlag(PlayerFlags.FACTIONRANK)
+    return

scripts/commands/toggledisplayingfactionrank.py

@@ -26,7 +26,7 @@ def run(core, actor, target, commandString):
         name = commandString.split(" ", 5)
         waypoint.setName(name[5])
         waypoint.setPlanetCRC(crc.StringtoCRC(planet.getName()))
-        actorPlayer.getWaypoints().add(waypoint)
+        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
         actorPlayer.waypointAdd(waypoint)
         actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
         return
@@ -40,7 +40,7 @@ def run(core, actor, target, commandString):
         name = commandString.split(" ", 3)
         waypoint.setName(name[3])
         waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        actorPlayer.getWaypoints().add(waypoint)
+        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
         actorPlayer.waypointAdd(waypoint)
         actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
         return
@@ -52,7 +52,7 @@ def run(core, actor, target, commandString):
         name = commandString.split(" ", 2)
         waypoint.setName(name[2])
         waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        actorPlayer.getWaypoints().add(waypoint)
+        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
         actorPlayer.waypointAdd(waypoint)
         actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
         return
@@ -63,7 +63,7 @@ def run(core, actor, target, commandString):
         waypoint.setColor(WaypointObject.BLUE)
         waypoint.setName("Waypoint")
         waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        actorPlayer.getWaypoints().add(waypoint)
+        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
         actorPlayer.waypointAdd(waypoint)
         actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
         return
@@ -79,19 +79,19 @@ def run(core, actor, target, commandString):
 
         waypoint.setName(name[5])
         waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        actorPlayer.getWaypoints().add(waypoint)
+        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
         actorPlayer.waypointAdd(waypoint)
         actor.sendSystemMessage('A waypoint has been created in your datapad at the location.', 0)
         return
 
-    #/wp NAME
+    #/wp
     else:
         waypoint = core.objectService.createObject('object/waypoint/shared_waypoint.iff', actor.getPlanet(), actor.getWorldPosition().x, actor.getWorldPosition().z, actor.getWorldPosition().y)
         waypoint.setActive(True)
         waypoint.setColor(WaypointObject.BLUE)
         waypoint.setName(commandString)
         waypoint.setPlanetCRC(crc.StringtoCRC(actor.getPlanet().getName()))
-        actorPlayer.getWaypoints().add(waypoint)
+        waypoint.setStringAttribute('', '') # This simply allows the attributes to display (nothing else has to be done)
         actorPlayer.waypointAdd(waypoint)
         actor.sendSystemMessage('A waypoint has been created in your datapad at your location.', 0)
         return

scripts/commands/waypoint.py

@@ -4,6 +4,7 @@ def setup(core, object):
 	objSvc = core.objectService
 	objSvc.createChildObject(object, 'object/creature/npc/theme_park/shared_player_transport.iff', 0, 7, 0, 0.707107, 0.707107)
 	objSvc.createChildObject(object, 'object/tangible/travel/ticket_collector/shared_ticket_collector.iff', 1, 0, -10, 0, 1)	
-	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_travel.iff', float(-3.12), float(0.14659503), float(-17.57), float(0.707107), float(-0.707107), 1)	
+	objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_travel.iff', float(-3.12), float(0.14659503), float(-17.57), float(0.707107), float(-0.707107), 1)
+	core.mapService.addLocation(object.getPlanet(), 'Starport', object.getPosition().x, object.getPosition().z, 15, 0, 0)	
 	return
 

scripts/object/building/military/outpost_starport.py

@@ -3,10 +3,12 @@
 def setup(core, object):
 	object.setPosture(0) # land = 0 : away = 2
 	object.setOptionsBitmask(256)
-	tp = core.travelService.getNearestTravelPoint(object)
+	
+	tp = core.travelService.getNearestTravelPoint(object, 300)
 
 	if tp and tp is not None:
 		tp.setShuttle(object)
 		tp.setShuttleAvailable(True)
 		tp.setShuttleLanding(False)
+		return
 	return

scripts/object/creature/npc/theme_park/player_shuttle.py

@@ -3,10 +3,12 @@
 def setup(core, object):
 	object.setPosture(0) # land = 0 : away = 2
 	object.setOptionsBitmask(256)
-	tp = core.travelService.getNearestTravelPoint(object)
+
+	tp = core.travelService.getNearestTravelPoint(object, 300)
 
 	if tp and tp is not None:
 		tp.setShuttle(object)
 		tp.setShuttleAvailable(True)
 		tp.setShuttleLanding(False)
+		return
 	return

scripts/object/creature/npc/theme_park/player_transport.py

@@ -3,9 +3,12 @@
 def setup(core, object):
 	object.setPosture(0) # land = 0 : away = 2
 	object.setOptionsBitmask(256)
-	tp = core.travelService.getNearestTravelPoint(object)
-	if tp:
+	
+	tp = core.travelService.getNearestTravelPoint(object, 500)
+
+	if tp and tp is not None:
 		tp.setShuttle(object)
 		tp.setShuttleAvailable(True)
 		tp.setShuttleLanding(False)
+		return
 	return

scripts/object/creature/npc/theme_park/player_transport_theed_hangar.py

@@ -1,6 +1,6 @@
 from resources.common import RadialOptions
 import sys
-from java.util import Random
+import java.util.Random
 
 def createRadial(core, owner, target, radials):
 	radials.clear()

scripts/radial/lifeday_gift.py

@@ -5,9 +5,9 @@ def createRadial(core, owner, target, radials):
 	radials.clear()
 	player = owner.getSlottedObject('ghost')
 	radials.add(RadialOptions(0, 7, 1, ''))
-	if player and core.collectionService.isComplete(owner, 'col_lifeday_tree_tracking_2010'):
+	if player and core.collectionService.isComplete(owner, 'col_lifeday_tree_tracking_2010') == False:
 		radials.add(RadialOptions(0, 21, 3, '@spam:tree_use'))
-	if player and core.collectionService.isComplete(owner, 'lifeday_badge_08'):
+	if player and core.collectionService.isComplete(owner, 'lifeday_badge_08') == False:
 		radials.add(RadialOptions(0, 115, 3, '@spam:tree_badge'))
 	return