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

Merge pull request #1191 from Waverunner/master

Browse Source 
Added waypoints to retrieve item tasks
This commit is contained in:
Lewis Morgan
2014-08-23 09:29:56 -04:00
parent 8375302192 409c6b4ab0
commit 49d493633a
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/quest/QuestService.java
+27 -2
View File
@@ -44,12 +44,14 @@ import resources.objects.SWGMap;
import resources.objects.creature.CreatureObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.objects.waypoint.WaypointObject;
import resources.quest.Quest;
import main.NGECore;
import engine.clientdata.ClientFileManager;
import engine.clientdata.visitors.DatatableVisitor;
import engine.resources.common.CRC;
import engine.resources.objects.SWGObject;
import engine.resources.scene.Point3D;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
@@ -142,8 +144,8 @@ public class QuestService implements INetworkDispatch {
if (player == null)
return;
if (quest.getWaypointId() != 0)
core.objectService.destroyObject(quest.getWaypointId());
//if (quest.getWaypointId() != 0)
//core.objectService.destroyObject(quest.getWaypointId());
int activeStep = quest.getActiveStep();
@@ -169,6 +171,11 @@ public class QuestService implements INetworkDispatch {
// TODO: add item count
ObjControllerMessage itemCount = new ObjControllerMessage(11, new QuestTaskCounterMessage(quester.getObjectID(), quest.getCrcName(), "@quest/groundquests:retrieve_item_counter"));
quester.getClient().getSession().write(itemCount.serialize());
WaypointObject waypoint = createWaypoint(task.getWaypointName(), new Point3D(task.getLocationX(), task.getLocationY(), task.getLocationZ()), task.getPlanet());
player.getWaypoints().put(waypoint.getObjectID(), waypoint);
quest.setWaypointId(waypoint.getObjectID());
break;
case "timer":
@@ -177,6 +184,9 @@ public class QuestService implements INetworkDispatch {
System.out.println("Sent timer.");
break;
case "show_message_box":
break;
default:
//System.out.println("Don't know what to do for quest task: " + type);
break;
@@ -367,6 +377,21 @@ public class QuestService implements INetworkDispatch {
}
public WaypointObject createWaypoint(String name, Point3D location, String planet) {
WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", core.terrainService.getPlanetByName(planet));
if (waypoint == null)
return null;
waypoint.setActive(true);
waypoint.setColor(WaypointObject.BLUE);
waypoint.setName(name);
waypoint.setPlanetCrc(CRC.StringtoCRC(planet));
waypoint.setStringAttribute("", ""); //This simply allows the attributes to display (nothing else has to be done)
waypoint.setPosition(location);
return waypoint;
}
public QuestData getQuestData(String questName) {
if (questMap.containsKey(questName))
return questMap.get(questName);