merge conflict

src/resources/objectives/BountyMissionObjective.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /*******************************************************************************
  * Copyright (c) 2013 <Project SWG>
  * 
@@ -78,3 +79,85 @@ public class BountyMissionObjective extends MissionObjective {
 	public void setMarkObjId(long markObjId) { this.markObjId = markObjId; }
 
 }
+=======
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
+package resources.objectives;
+
+import java.util.Random;
+
+import engine.resources.scene.Point3D;
+import main.NGECore;
+import resources.common.BountyListItem;
+import resources.objects.creature.CreatureObject;
+import resources.objects.mission.MissionObject;
+import services.mission.MissionObjective;
+
+public class BountyMissionObjective extends MissionObjective {
+
+	private Point3D lastKnownLocation;
+	private long markObjId;
+
+	public BountyMissionObjective(MissionObject parent) {
+		super(parent);
+	}
+	
+	@Override
+	public void activate(NGECore core, CreatureObject player) {
+		if (isActivated())
+			return;
+		
+		BountyListItem bountyTarget = core.missionService.getBountyListItem(getMissionObject().getBountyObjId());
+		
+		setMarkObjId(bountyTarget.getObjectId());
+		
+		// TODO: Change this to a comm message.
+		player.sendSystemMessage("@mission/mission_bounty_informant:target_hard_" + Integer.toString(new Random().nextInt(5)), (byte) 0);
+		
+		
+	}
+
+	@Override
+	public void complete(NGECore core, CreatureObject player) {
+
+	}
+
+	@Override
+	public void abort(NGECore core, CreatureObject player) {
+
+	}
+
+	@Override
+	public void update(NGECore core, CreatureObject player) {
+
+	}
+
+	public Point3D getLastKnownLocation() { return lastKnownLocation; }
+
+	public void setLastKnownLocation(Point3D lastKnownLocation) { this.lastKnownLocation = lastKnownLocation; }
+
+	public long getMarkObjId() { return markObjId; }
+
+	public void setMarkObjId(long markObjId) { this.markObjId = markObjId; }
+
+}
+>>>>>>> origin/master