From b7ec88bd5c279db713a59bad88d388acf70d9052 Mon Sep 17 00:00:00 2001
From: Seefo <rezen1911@gmail.com>
Date: Mon, 5 May 2014 20:44:31 -0400
Subject: [PATCH] Added a Locations category to frog to teleport

---
 scripts/radial/deeds/vehicleDeed.py          |  2 +-
 scripts/static_spawns/dantooine/dantooine.py | 21 ++++++++++++++++++++
 src/services/DevService.java                 | 19 +++++++++++++-----
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 scripts/static_spawns/dantooine/dantooine.py

diff --git a/scripts/radial/deeds/vehicleDeed.py b/scripts/radial/deeds/vehicleDeed.py
index 033462ad..ad08a40f 100644
--- a/scripts/radial/deeds/vehicleDeed.py
+++ b/scripts/radial/deeds/vehicleDeed.py
@@ -4,7 +4,7 @@ import sys
 def createRadial(core, owner, target, radials):
 	radials.add(RadialOptions(0, 7, 1, ''))
 	radials.add(RadialOptions(0, 15, 1, ''))
-	radials.add(RadialOptions(0, 61, 3, '@pet_menu:menu_generate'))
+	radials.add(RadialOptions(0, 61, 3, '@pet/pet_menu:menu_generate'))
 	return
 	
 def handleSelection(core, owner, target, option):
diff --git a/scripts/static_spawns/dantooine/dantooine.py b/scripts/static_spawns/dantooine/dantooine.py
new file mode 100644
index 00000000..ad56f992
--- /dev/null
+++ b/scripts/static_spawns/dantooine/dantooine.py
@@ -0,0 +1,21 @@
+import sys
+from resources.datatables import Options
+from resources.datatables import State
+
+def addPlanetSpawns(core, planet):
+########################################################	
+# DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE
+# SUBFOLDERS FOR EACH PLANET AND CREATE NEW SCRIPTS FOR
+# EACH AREA OF A PLANET.  - LEVARRIS	
+########################################################	
+	stcSvc = core.staticService
+	# Blue Frog: Uncomment only when needed for testing.
+	stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'dantooine', long(0), float(4196), float(9), float(5206), float(0.70), float(0.71))
+
+########################################################	
+# DO NOT ADD ANYTHING ELSE TO THIS SCRIPT, PLEASE USE THE
+# SUBFOLDERS FOR EACH PLANET AND CREATE NEW SCRIPTS FOR
+# EACH AREA OF A PLANET.  - LEVARRIS	
+########################################################	
+	return
+	
diff --git a/src/services/DevService.java b/src/services/DevService.java
index 845af82b..596659fa 100644
--- a/src/services/DevService.java
+++ b/src/services/DevService.java
@@ -74,6 +74,7 @@ public class DevService implements INetworkDispatch {
 			case 0: // Root
 				suiOptions.put((long) 1, "Character");
 				suiOptions.put((long) 2, "Items");
+				suiOptions.put((long) 3, "Locations");
 				break;
 			case 1: // Character
 				suiOptions.put((long) 10, "Set combat level to 90");
@@ -90,9 +91,7 @@ public class DevService implements INetworkDispatch {
 				if(creature.getClient().isGM()) suiOptions.put((long) 120, "House Deeds");
 				if(creature.getClient().isGM()) suiOptions.put((long) 125, "Crafting Tools");
 				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) 121, "Sandbox City");	
 				break;
 			case 3: // [Items] Weapons
 				suiOptions.put((long) 30, "Jedi Weapons");
@@ -136,6 +135,10 @@ public class DevService implements INetworkDispatch {
 				suiOptions.put((long) 111, "Harvesters");
 				suiOptions.put((long) 112, "Energy resources");
 				break;
+			case 11: // Locations
+				suiOptions.put((long) 122, "Teleport to Jedi Ruins");
+				suiOptions.put((long) 124, "Teleport to Mos Eisley");
+				break;
 		
 		}
 		
@@ -164,6 +167,9 @@ public class DevService implements INetworkDispatch {
 					case 2: // Items
 						sendCharacterBuilderSUI(player, 2);
 						return; 
+					case 3: // Locations
+						sendCharacterBuilderSUI(player, 11);
+						return; 
 					
 					// Character
 					case 10: // Set combat level to 90
@@ -1222,8 +1228,11 @@ public class DevService implements INetworkDispatch {
 						return;
 						
 					case 122:
-						Point3D position = new Point3D(4086,15,5554);
-						core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), position, player.getOrientation(), null);
+						core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), new Point3D(4198,9,5210), player.getOrientation(), null);
+						return;
+						
+					case 124:
+						core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("tatooine"), new Point3D(3521,4,-4800), player.getOrientation(), null);
 						return;
 
 					case 123: