From 9cbe3663bffaaaefc203c7d02664e4b259e537f8 Mon Sep 17 00:00:00 2001
From: Blackvein <alex_360_live@hotmail.com>
Date: Tue, 11 Feb 2014 19:29:09 -0800
Subject: [PATCH] Started on next update

Custom stage objective displays, chat message objectives
---
 src/main/java/me/blackvein/quests/EventFactory.java |  4 ++--
 src/main/java/me/blackvein/quests/Stage.java        | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/blackvein/quests/EventFactory.java b/src/main/java/me/blackvein/quests/EventFactory.java
index 93809aa6a..d9dc161d2 100644
--- a/src/main/java/me/blackvein/quests/EventFactory.java
+++ b/src/main/java/me/blackvein/quests/EventFactory.java
@@ -490,7 +490,7 @@ public class EventFactory implements ConversationAbandonedListener, ColorUtil{
 
     private class CreateMenuPrompt extends FixedSetPrompt {
 
-        public CreateMenuPrompt() {
+       public CreateMenuPrompt() {
 
             super("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19");
 
@@ -581,7 +581,7 @@ public class EventFactory implements ConversationAbandonedListener, ColorUtil{
 
 
             if (context.getSessionData(CK.E_MOB_TYPES) == null) {
-                text += BLUE + "" + BOLD + "19" + RESET + YELLOW + " - " + Lang.get("eventEditorSetMobSpawns") + GRAY + " (" + Lang.get("noneSet") + ")\n";
+                text += BLUE + "" + BOLD + "10" + RESET + YELLOW + " - " + Lang.get("eventEditorSetMobSpawns") + GRAY + " (" + Lang.get("noneSet") + ")\n";
             } else {
                 LinkedList<String> types = (LinkedList<String>) context.getSessionData(CK.E_MOB_TYPES);
 
diff --git a/src/main/java/me/blackvein/quests/Stage.java b/src/main/java/me/blackvein/quests/Stage.java
index e87b55143..c014c4e66 100644
--- a/src/main/java/me/blackvein/quests/Stage.java
+++ b/src/main/java/me/blackvein/quests/Stage.java
@@ -117,6 +117,7 @@ public class Stage {
     public LinkedList<Integer> customObjectiveCounts = new LinkedList<Integer>();
     public LinkedList<String> customObjectiveDisplays = new LinkedList<String>();
     public LinkedList<Map<String, Object>> customObjectiveData = new LinkedList<Map<String, Object>>();
+    public LinkedList<String> 
     public String script;
     public Event startEvent = null;
     public Event deathEvent = null;
@@ -127,6 +128,7 @@ public class Stage {
     public String delayMessage = null;
     public String completeMessage = null;
     public String startMessage = null;
+    public String objectiveOverride = null;
 
     @Override
     public boolean equals(Object o) {
@@ -330,6 +332,16 @@ public class Stage {
             } else if (other.completeMessage == null && completeMessage != null) {
                 return false;
             }
+            
+            if (other.objectiveOverride != null && objectiveOverride != null) {
+                if (other.objectiveOverride.equals(objectiveOverride) == false) {
+                    return false;
+                }
+            } else if (other.objectiveOverride != null && objectiveOverride == null) {
+                return false;
+            } else if (other.objectiveOverride == null && objectiveOverride != null) {
+                return false;
+            }
 
         }