Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-28 21:56:28 +01:00
Code Issues Projects Releases Wiki Activity

Started on next update

Browse Source 
Custom stage objective displays, chat message objectives
This commit is contained in:
Blackvein 2014-02-11 19:29:09 -08:00
parent a46ca7e0a8
commit 9cbe3663bf
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/blackvein/quests/EventFactory.java
View File

@ -490,7 +490,7 @@ public class EventFactory implements ConversationAbandonedListener, ColorUtil{
private class CreateMenuPrompt extends FixedSetPrompt { 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"); 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) { 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 { } else {
LinkedList<String> types = (LinkedList<String>) context.getSessionData(CK.E_MOB_TYPES); LinkedList<String> types = (LinkedList<String>) context.getSessionData(CK.E_MOB_TYPES);

12
src/main/java/me/blackvein/quests/Stage.java
View File

@ -117,6 +117,7 @@ public class Stage {
public LinkedList<Integer> customObjectiveCounts = new LinkedList<Integer>(); public LinkedList<Integer> customObjectiveCounts = new LinkedList<Integer>();
public LinkedList<String> customObjectiveDisplays = new LinkedList<String>(); public LinkedList<String> customObjectiveDisplays = new LinkedList<String>();
public LinkedList<Map<String, Object>> customObjectiveData = new LinkedList<Map<String, Object>>(); public LinkedList<Map<String, Object>> customObjectiveData = new LinkedList<Map<String, Object>>();
public LinkedList<String>
public String script; public String script;
public Event startEvent = null; public Event startEvent = null;
public Event deathEvent = null; public Event deathEvent = null;
@ -127,6 +128,7 @@ public class Stage {
public String delayMessage = null; public String delayMessage = null;
public String completeMessage = null; public String completeMessage = null;
public String startMessage = null; public String startMessage = null;
public String objectiveOverride = null;
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
@ -331,6 +333,16 @@ public class Stage {
return false; 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;
}
} }
return true; return true;