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

Conflict resolve

Browse Source
This commit is contained in:
CharonInferar
2014-05-20 19:45:58 +02:00
parent 2997e3eb24 f97ecc58d2
commit 4a402abfc9
713 changed files with 19834 additions and 3948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/DevService.java
+40 -1
View File
@@ -36,11 +36,11 @@ import resources.common.FileUtilities;
import resources.common.Opcodes;
import resources.common.SpawnPoint;
import resources.datatables.WeaponType;
import resources.harvest.SurveyTool;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.objects.tool.SurveyTool;
import resources.objects.weapon.WeaponObject;
import services.sui.SUIWindow;
import services.sui.SUIService.ListBoxType;
@@ -88,9 +88,20 @@ public class DevService implements INetworkDispatch {
suiOptions.put((long) 26, "Installations");
suiOptions.put((long) 110, "Survey Devices");
if(creature.getPlayerObject().getProfession().equals("bounty_hunter_1a")) suiOptions.put((long) 123, "Tracking Droids");
<<<<<<< HEAD
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) 120, "House Deeds");
suiOptions.put((long) 125, "Crafting Tools");
suiOptions.put((long) 130, "Vehicle Deeds");
suiOptions.put((long) 121, "Sandbox City");
suiOptions.put((long) 140, "Guild Registry Device (PDA)");
}
>>>>>>> origin/master
break;
case 3: // [Items] Weapons
suiOptions.put((long) 30, "Jedi Weapons");
@@ -137,8 +148,17 @@ public class DevService implements INetworkDispatch {
case 11: // Locations
suiOptions.put((long) 122, "Teleport to Jedi Ruins");
suiOptions.put((long) 124, "Teleport to Mos Eisley");
<<<<<<< HEAD
suiOptions.put((long) 153, "Teleport to Force Crystal Hunter's Cave");
suiOptions.put((long) 121, "Teleport to Sandbox City");
=======
if (creature.getClient().isGM()) {
suiOptions.put((long) 164, "Teleport to Mining Outpost");
suiOptions.put((long) 165, "Teleport to Spawn Area #1");
suiOptions.put((long) 166, "Teleport to Imperial Op");
suiOptions.put((long) 167, "Teleport to Rebel Base ");
}
>>>>>>> origin/master
break;
}
@@ -1242,6 +1262,18 @@ public class DevService implements INetworkDispatch {
case 124:
core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("tatooine"), new Point3D(3521,4,-4800), player.getOrientation(), null);
return;
case 164:
core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), new Point3D(-284,18,2853), player.getOrientation(), null);
return;
case 165:
core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), new Point3D(-1586,18,-7688), player.getOrientation(), null);
return;
case 166:
core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), new Point3D(-4211,18,-2349), player.getOrientation(), null);
return;
case 123:
TangibleObject arakydDroids = (TangibleObject) core.objectService.createObject("object/tangible/mission/shared_mission_bounty_droid_probot.iff", planet);
@@ -1264,9 +1296,16 @@ public class DevService implements INetworkDispatch {
inventory.add(swoopDeed);
inventory.add(av21deed);
return;
<<<<<<< HEAD
case 153:
Point3D position = new Point3D(-6222,1,7380);
core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), position, player.getOrientation(), null);
=======
case 140:
TangibleObject guildRegistry = (TangibleObject) core.objectService.createObject("object/tangible/furniture/technical/shared_guild_registry_initial.iff", planet);
inventory.add(guildRegistry);
>>>>>>> origin/master
return;
}
}