From 8f54b3e5de5d9c05c8f68796f80c8b2cc2de4d58 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:44:34 +0200 Subject: [PATCH] Rename and clean up MapleQuestRequirementType --- src/main/java/server/quest/Quest.java | 44 +++++++++---------- ...entType.java => QuestRequirementType.java} | 38 +++++++++++++--- .../requirements/BuffExceptRequirement.java | 4 +- .../quest/requirements/BuffRequirement.java | 4 +- .../CompletedQuestRequirement.java | 4 +- .../requirements/EndDateRequirement.java | 4 +- .../requirements/FieldEnterRequirement.java | 4 +- .../quest/requirements/InfoExRequirement.java | 4 +- .../requirements/InfoNumberRequirement.java | 4 +- .../requirements/IntervalRequirement.java | 4 +- .../quest/requirements/ItemRequirement.java | 4 +- .../quest/requirements/JobRequirement.java | 4 +- .../requirements/MapleQuestRequirement.java | 8 ++-- .../requirements/MaxLevelRequirement.java | 4 +- .../quest/requirements/MesoRequirement.java | 4 +- .../requirements/MinLevelRequirement.java | 4 +- .../requirements/MinTamenessRequirement.java | 4 +- .../quest/requirements/MobRequirement.java | 4 +- .../MonsterBookCountRequirement.java | 4 +- .../quest/requirements/NpcRequirement.java | 4 +- .../quest/requirements/PetRequirement.java | 4 +- .../quest/requirements/QuestRequirement.java | 4 +- .../quest/requirements/ScriptRequirement.java | 4 +- 23 files changed, 97 insertions(+), 73 deletions(-) rename src/main/java/server/quest/{MapleQuestRequirementType.java => QuestRequirementType.java} (81%) diff --git a/src/main/java/server/quest/Quest.java b/src/main/java/server/quest/Quest.java index 36e3498e46..3e39778669 100644 --- a/src/main/java/server/quest/Quest.java +++ b/src/main/java/server/quest/Quest.java @@ -58,8 +58,8 @@ public class Quest { protected short id; protected int timeLimit, timeLimit2; - protected Map startReqs = new EnumMap<>(MapleQuestRequirementType.class); - protected Map completeReqs = new EnumMap<>(MapleQuestRequirementType.class); + protected Map startReqs = new EnumMap<>(QuestRequirementType.class); + protected Map completeReqs = new EnumMap<>(QuestRequirementType.class); protected Map startActs = new EnumMap<>(QuestActionType.class); protected Map completeActs = new EnumMap<>(QuestActionType.class); protected List relevantMobs = new LinkedList<>(); @@ -104,10 +104,10 @@ public class Quest { Data startReqData = reqData.getChildByPath("0"); if (startReqData != null) { for (Data startReq : startReqData.getChildren()) { - MapleQuestRequirementType type = MapleQuestRequirementType.getByWZName(startReq.getName()); - if (type.equals(MapleQuestRequirementType.INTERVAL)) { + QuestRequirementType type = QuestRequirementType.getByWZName(startReq.getName()); + if (type.equals(QuestRequirementType.INTERVAL)) { repeatable = true; - } else if (type.equals(MapleQuestRequirementType.MOB)) { + } else if (type.equals(QuestRequirementType.MOB)) { for (Data mob : startReq.getChildren()) { relevantMobs.add(DataTool.getInt(mob.getChildByPath("id"))); } @@ -125,14 +125,14 @@ public class Quest { Data completeReqData = reqData.getChildByPath("1"); if (completeReqData != null) { for (Data completeReq : completeReqData.getChildren()) { - MapleQuestRequirementType type = MapleQuestRequirementType.getByWZName(completeReq.getName()); + QuestRequirementType type = QuestRequirementType.getByWZName(completeReq.getName()); MapleQuestRequirement req = this.getRequirement(type, completeReq); if (req == null) { continue; } - if (type.equals(MapleQuestRequirementType.MOB)) { + if (type.equals(QuestRequirementType.MOB)) { for (Data mob : completeReq.getChildren()) { relevantMobs.add(DataTool.getInt(mob.getChildByPath("id"))); } @@ -203,7 +203,7 @@ public class Quest { return false; } - IntervalRequirement ir = (IntervalRequirement) startReqs.get(MapleQuestRequirementType.INTERVAL); + IntervalRequirement ir = (IntervalRequirement) startReqs.get(QuestRequirementType.INTERVAL); return ir.getInterval() < YamlConfig.config.server.QUEST_POINT_REPEATABLE_INTERVAL * 60 * 60 * 1000; } @@ -381,7 +381,7 @@ public class Quest { } public int getStartItemAmountNeeded(int itemid) { - MapleQuestRequirement req = startReqs.get(MapleQuestRequirementType.ITEM); + MapleQuestRequirement req = startReqs.get(QuestRequirementType.ITEM); if (req == null) { return Integer.MIN_VALUE; } @@ -391,7 +391,7 @@ public class Quest { } public int getCompleteItemAmountNeeded(int itemid) { - MapleQuestRequirement req = completeReqs.get(MapleQuestRequirementType.ITEM); + MapleQuestRequirement req = completeReqs.get(QuestRequirementType.ITEM); if (req == null) { return Integer.MAX_VALUE; } @@ -401,7 +401,7 @@ public class Quest { } public int getMobAmountNeeded(int mid) { - MapleQuestRequirement req = completeReqs.get(MapleQuestRequirementType.MOB); + MapleQuestRequirement req = completeReqs.get(QuestRequirementType.MOB); if (req == null) { return 0; } @@ -413,9 +413,9 @@ public class Quest { public short getInfoNumber(Status qs) { boolean checkEnd = qs.equals(Status.STARTED); - Map reqs = !checkEnd ? startReqs : completeReqs; + Map reqs = !checkEnd ? startReqs : completeReqs; - MapleQuestRequirement req = reqs.get(MapleQuestRequirementType.INFO_NUMBER); + MapleQuestRequirement req = reqs.get(QuestRequirementType.INFO_NUMBER); if (req != null) { InfoNumberRequirement inReq = (InfoNumberRequirement) req; return inReq.getInfoNumber(); @@ -426,9 +426,9 @@ public class Quest { public String getInfoEx(Status qs, int index) { boolean checkEnd = qs.equals(Status.STARTED); - Map reqs = !checkEnd ? startReqs : completeReqs; + Map reqs = !checkEnd ? startReqs : completeReqs; try { - MapleQuestRequirement req = reqs.get(MapleQuestRequirementType.INFO_EX); + MapleQuestRequirement req = reqs.get(QuestRequirementType.INFO_EX); InfoExRequirement ixReq = (InfoExRequirement) req; return ixReq.getInfo().get(index); } catch (Exception e) { @@ -438,9 +438,9 @@ public class Quest { public List getInfoEx(Status qs) { boolean checkEnd = qs.equals(Status.STARTED); - Map reqs = !checkEnd ? startReqs : completeReqs; + Map reqs = !checkEnd ? startReqs : completeReqs; try { - MapleQuestRequirement req = reqs.get(MapleQuestRequirementType.INFO_EX); + MapleQuestRequirement req = reqs.get(QuestRequirementType.INFO_EX); InfoExRequirement ixReq = (InfoExRequirement) req; return ixReq.getInfo(); } catch (Exception e) { @@ -460,7 +460,7 @@ public class Quest { quests.clear(); } - private MapleQuestRequirement getRequirement(MapleQuestRequirementType type, Data data) { + private MapleQuestRequirement getRequirement(QuestRequirementType type, Data data) { MapleQuestRequirement ret = null; switch (type) { case END_DATE: @@ -597,8 +597,8 @@ public class Quest { } public int getNpcRequirement(boolean checkEnd) { - Map reqs = !checkEnd ? startReqs : completeReqs; - MapleQuestRequirement mqr = reqs.get(MapleQuestRequirementType.NPC); + Map reqs = !checkEnd ? startReqs : completeReqs; + MapleQuestRequirement mqr = reqs.get(QuestRequirementType.NPC); if (mqr != null) { return ((NpcRequirement) mqr).get(); } else { @@ -607,8 +607,8 @@ public class Quest { } public boolean hasScriptRequirement(boolean checkEnd) { - Map reqs = !checkEnd ? startReqs : completeReqs; - MapleQuestRequirement mqr = reqs.get(MapleQuestRequirementType.SCRIPT); + Map reqs = !checkEnd ? startReqs : completeReqs; + MapleQuestRequirement mqr = reqs.get(QuestRequirementType.SCRIPT); if (mqr != null) { return ((ScriptRequirement) mqr).get(); diff --git a/src/main/java/server/quest/MapleQuestRequirementType.java b/src/main/java/server/quest/QuestRequirementType.java similarity index 81% rename from src/main/java/server/quest/MapleQuestRequirementType.java rename to src/main/java/server/quest/QuestRequirementType.java index ced6f1d847..cd33da7b4d 100644 --- a/src/main/java/server/quest/MapleQuestRequirementType.java +++ b/src/main/java/server/quest/QuestRequirementType.java @@ -22,14 +22,38 @@ package server.quest; /** - * * @author Matze */ -public enum MapleQuestRequirementType { - UNDEFINED(-1), JOB(0), ITEM(1), QUEST(2), MIN_LEVEL(3), MAX_LEVEL(4), END_DATE(5), MOB(6), NPC(7), FIELD_ENTER(8), INTERVAL(9), SCRIPT(10), PET(11), MIN_PET_TAMENESS(12), MONSTER_BOOK(13), NORMAL_AUTO_START(14), INFO_NUMBER(15), INFO_EX(16), COMPLETED_QUEST(17), START(18), END(19), DAY_BY_DAY(20), MESO(21), BUFF(22), EXCEPT_BUFF(23); +public enum QuestRequirementType { + UNDEFINED(-1), + JOB(0), + ITEM(1), + QUEST(2), + MIN_LEVEL(3), + MAX_LEVEL(4), + END_DATE(5), + MOB(6), + NPC(7), + FIELD_ENTER(8), + INTERVAL(9), + SCRIPT(10), + PET(11), + MIN_PET_TAMENESS(12), + MONSTER_BOOK(13), + NORMAL_AUTO_START(14), + INFO_NUMBER(15), + INFO_EX(16), + COMPLETED_QUEST(17), + START(18), + END(19), + DAY_BY_DAY(20), + MESO(21), + BUFF(22), + EXCEPT_BUFF(23); + final byte type; - private MapleQuestRequirementType(int type) { + QuestRequirementType(int type) { this.type = (byte) type; } @@ -37,7 +61,7 @@ public enum MapleQuestRequirementType { return type; } - public static MapleQuestRequirementType getByWZName(String name) { + public static QuestRequirementType getByWZName(String name) { if (name.equals("job")) { return JOB; } else if (name.equals("quest")) { @@ -76,11 +100,11 @@ public enum MapleQuestRequirementType { return INFO_EX; } else if (name.equals("questComplete")) { return COMPLETED_QUEST; - } else if(name.equals("start")) { + } else if (name.equals("start")) { return START; /*} else if(name.equals("end")) { already coded return END;*/ - } else if(name.equals("daybyday")) { + } else if (name.equals("daybyday")) { return DAY_BY_DAY; } else if (name.equals("money")) { return MESO; diff --git a/src/main/java/server/quest/requirements/BuffExceptRequirement.java b/src/main/java/server/quest/requirements/BuffExceptRequirement.java index 09f5382988..5879f4d970 100644 --- a/src/main/java/server/quest/requirements/BuffExceptRequirement.java +++ b/src/main/java/server/quest/requirements/BuffExceptRequirement.java @@ -22,8 +22,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -33,7 +33,7 @@ public class BuffExceptRequirement extends MapleQuestRequirement { private int buffId = -1; public BuffExceptRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.BUFF); + super(QuestRequirementType.BUFF); processData(data); } diff --git a/src/main/java/server/quest/requirements/BuffRequirement.java b/src/main/java/server/quest/requirements/BuffRequirement.java index 1a49e9314b..03730ad038 100644 --- a/src/main/java/server/quest/requirements/BuffRequirement.java +++ b/src/main/java/server/quest/requirements/BuffRequirement.java @@ -22,8 +22,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -33,7 +33,7 @@ public class BuffRequirement extends MapleQuestRequirement { private int buffId = 1; public BuffRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.BUFF); + super(QuestRequirementType.BUFF); processData(data); } diff --git a/src/main/java/server/quest/requirements/CompletedQuestRequirement.java b/src/main/java/server/quest/requirements/CompletedQuestRequirement.java index 5f81f7f222..e6d404ca3a 100644 --- a/src/main/java/server/quest/requirements/CompletedQuestRequirement.java +++ b/src/main/java/server/quest/requirements/CompletedQuestRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -36,7 +36,7 @@ public class CompletedQuestRequirement extends MapleQuestRequirement { public CompletedQuestRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.COMPLETED_QUEST); + super(QuestRequirementType.COMPLETED_QUEST); processData(data); } diff --git a/src/main/java/server/quest/requirements/EndDateRequirement.java b/src/main/java/server/quest/requirements/EndDateRequirement.java index 184a3bf961..fb9b9dabc3 100644 --- a/src/main/java/server/quest/requirements/EndDateRequirement.java +++ b/src/main/java/server/quest/requirements/EndDateRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; import java.util.Calendar; @@ -38,7 +38,7 @@ public class EndDateRequirement extends MapleQuestRequirement { public EndDateRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.END_DATE); + super(QuestRequirementType.END_DATE); processData(data); } diff --git a/src/main/java/server/quest/requirements/FieldEnterRequirement.java b/src/main/java/server/quest/requirements/FieldEnterRequirement.java index b6540fc1d4..5fd58e74bd 100644 --- a/src/main/java/server/quest/requirements/FieldEnterRequirement.java +++ b/src/main/java/server/quest/requirements/FieldEnterRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -36,7 +36,7 @@ public class FieldEnterRequirement extends MapleQuestRequirement { public FieldEnterRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.FIELD_ENTER); + super(QuestRequirementType.FIELD_ENTER); processData(data); } diff --git a/src/main/java/server/quest/requirements/InfoExRequirement.java b/src/main/java/server/quest/requirements/InfoExRequirement.java index 29a043aaf5..6180d80c08 100644 --- a/src/main/java/server/quest/requirements/InfoExRequirement.java +++ b/src/main/java/server/quest/requirements/InfoExRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; import java.util.ArrayList; import java.util.List; @@ -40,7 +40,7 @@ public class InfoExRequirement extends MapleQuestRequirement { public InfoExRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.INFO_EX); + super(QuestRequirementType.INFO_EX); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/requirements/InfoNumberRequirement.java b/src/main/java/server/quest/requirements/InfoNumberRequirement.java index d2ca95f051..ccae12a3ec 100644 --- a/src/main/java/server/quest/requirements/InfoNumberRequirement.java +++ b/src/main/java/server/quest/requirements/InfoNumberRequirement.java @@ -22,8 +22,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -35,7 +35,7 @@ public class InfoNumberRequirement extends MapleQuestRequirement { private int questID; public InfoNumberRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.INFO_NUMBER); + super(QuestRequirementType.INFO_NUMBER); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/requirements/IntervalRequirement.java b/src/main/java/server/quest/requirements/IntervalRequirement.java index 155c65558b..bfa70eac0f 100644 --- a/src/main/java/server/quest/requirements/IntervalRequirement.java +++ b/src/main/java/server/quest/requirements/IntervalRequirement.java @@ -25,8 +25,8 @@ import client.Character; import client.QuestStatus; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -37,7 +37,7 @@ public class IntervalRequirement extends MapleQuestRequirement { private int questID; public IntervalRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.INTERVAL); + super(QuestRequirementType.INTERVAL); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/requirements/ItemRequirement.java b/src/main/java/server/quest/requirements/ItemRequirement.java index 1f26b244ce..22ba1425b6 100644 --- a/src/main/java/server/quest/requirements/ItemRequirement.java +++ b/src/main/java/server/quest/requirements/ItemRequirement.java @@ -28,8 +28,8 @@ import constants.inventory.ItemConstants; import provider.Data; import provider.DataTool; import server.MapleItemInformationProvider; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; import java.util.HashMap; import java.util.Map; @@ -43,7 +43,7 @@ public class ItemRequirement extends MapleQuestRequirement { public ItemRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.ITEM); + super(QuestRequirementType.ITEM); processData(data); } diff --git a/src/main/java/server/quest/requirements/JobRequirement.java b/src/main/java/server/quest/requirements/JobRequirement.java index 23e30dfa70..ae77e9a9e1 100644 --- a/src/main/java/server/quest/requirements/JobRequirement.java +++ b/src/main/java/server/quest/requirements/JobRequirement.java @@ -25,8 +25,8 @@ import client.Character; import client.Job; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; import java.util.ArrayList; import java.util.List; @@ -39,7 +39,7 @@ public class JobRequirement extends MapleQuestRequirement { List jobs = new ArrayList<>(); public JobRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.JOB); + super(QuestRequirementType.JOB); processData(data); } diff --git a/src/main/java/server/quest/requirements/MapleQuestRequirement.java b/src/main/java/server/quest/requirements/MapleQuestRequirement.java index 8f6f2d8bac..a62bbd2ab4 100644 --- a/src/main/java/server/quest/requirements/MapleQuestRequirement.java +++ b/src/main/java/server/quest/requirements/MapleQuestRequirement.java @@ -23,16 +23,16 @@ package server.quest.requirements; import client.Character; import provider.Data; -import server.quest.MapleQuestRequirementType; +import server.quest.QuestRequirementType; /** * Base class for a Quest Requirement. Quest system uses it for all requirements. * @author Tyler (Twdtwd) */ public abstract class MapleQuestRequirement { - private final MapleQuestRequirementType type; + private final QuestRequirementType type; - public MapleQuestRequirement(MapleQuestRequirementType type) { + public MapleQuestRequirement(QuestRequirementType type) { this.type = type; } @@ -50,7 +50,7 @@ public abstract class MapleQuestRequirement { */ public abstract void processData(Data data); - public MapleQuestRequirementType getType() { + public QuestRequirementType getType() { return type; } } \ No newline at end of file diff --git a/src/main/java/server/quest/requirements/MaxLevelRequirement.java b/src/main/java/server/quest/requirements/MaxLevelRequirement.java index f4413c01ba..74287d139f 100644 --- a/src/main/java/server/quest/requirements/MaxLevelRequirement.java +++ b/src/main/java/server/quest/requirements/MaxLevelRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -36,7 +36,7 @@ public class MaxLevelRequirement extends MapleQuestRequirement { public MaxLevelRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.MAX_LEVEL); + super(QuestRequirementType.MAX_LEVEL); processData(data); } diff --git a/src/main/java/server/quest/requirements/MesoRequirement.java b/src/main/java/server/quest/requirements/MesoRequirement.java index 37d81d50cf..afd593ca6e 100644 --- a/src/main/java/server/quest/requirements/MesoRequirement.java +++ b/src/main/java/server/quest/requirements/MesoRequirement.java @@ -22,8 +22,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -33,7 +33,7 @@ public class MesoRequirement extends MapleQuestRequirement { private int meso = 0; public MesoRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.MESO); + super(QuestRequirementType.MESO); processData(data); } diff --git a/src/main/java/server/quest/requirements/MinLevelRequirement.java b/src/main/java/server/quest/requirements/MinLevelRequirement.java index 20ec7a539a..3d5952a848 100644 --- a/src/main/java/server/quest/requirements/MinLevelRequirement.java +++ b/src/main/java/server/quest/requirements/MinLevelRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -36,7 +36,7 @@ public class MinLevelRequirement extends MapleQuestRequirement { public MinLevelRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.MIN_LEVEL); + super(QuestRequirementType.MIN_LEVEL); processData(data); } diff --git a/src/main/java/server/quest/requirements/MinTamenessRequirement.java b/src/main/java/server/quest/requirements/MinTamenessRequirement.java index 1608d154e8..8969d77f71 100644 --- a/src/main/java/server/quest/requirements/MinTamenessRequirement.java +++ b/src/main/java/server/quest/requirements/MinTamenessRequirement.java @@ -25,8 +25,8 @@ import client.Character; import client.inventory.Pet; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -37,7 +37,7 @@ public class MinTamenessRequirement extends MapleQuestRequirement { public MinTamenessRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.MIN_PET_TAMENESS); + super(QuestRequirementType.MIN_PET_TAMENESS); processData(data); } diff --git a/src/main/java/server/quest/requirements/MobRequirement.java b/src/main/java/server/quest/requirements/MobRequirement.java index 4536807305..9fb4154833 100644 --- a/src/main/java/server/quest/requirements/MobRequirement.java +++ b/src/main/java/server/quest/requirements/MobRequirement.java @@ -25,8 +25,8 @@ import client.Character; import client.QuestStatus; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; import tools.FilePrinter; import java.util.HashMap; @@ -41,7 +41,7 @@ public class MobRequirement extends MapleQuestRequirement { private int questID; public MobRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.MOB); + super(QuestRequirementType.MOB); questID = quest.getId(); processData(data); } diff --git a/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java b/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java index f515c65c63..b7af68c228 100644 --- a/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java +++ b/src/main/java/server/quest/requirements/MonsterBookCountRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -36,7 +36,7 @@ public class MonsterBookCountRequirement extends MapleQuestRequirement { public MonsterBookCountRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.MONSTER_BOOK); + super(QuestRequirementType.MONSTER_BOOK); processData(data); } diff --git a/src/main/java/server/quest/requirements/NpcRequirement.java b/src/main/java/server/quest/requirements/NpcRequirement.java index 171189535c..55834aa91a 100644 --- a/src/main/java/server/quest/requirements/NpcRequirement.java +++ b/src/main/java/server/quest/requirements/NpcRequirement.java @@ -24,8 +24,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -35,7 +35,7 @@ public class NpcRequirement extends MapleQuestRequirement { private int reqNPC; public NpcRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.NPC); + super(QuestRequirementType.NPC); processData(data); } diff --git a/src/main/java/server/quest/requirements/PetRequirement.java b/src/main/java/server/quest/requirements/PetRequirement.java index cca35e5bed..4a310fdacb 100644 --- a/src/main/java/server/quest/requirements/PetRequirement.java +++ b/src/main/java/server/quest/requirements/PetRequirement.java @@ -25,8 +25,8 @@ import client.Character; import client.inventory.Pet; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; import java.util.ArrayList; import java.util.List; @@ -40,7 +40,7 @@ public class PetRequirement extends MapleQuestRequirement { public PetRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.PET); + super(QuestRequirementType.PET); processData(data); } diff --git a/src/main/java/server/quest/requirements/QuestRequirement.java b/src/main/java/server/quest/requirements/QuestRequirement.java index 3cb8adbddc..6fff9ae723 100644 --- a/src/main/java/server/quest/requirements/QuestRequirement.java +++ b/src/main/java/server/quest/requirements/QuestRequirement.java @@ -22,8 +22,8 @@ import client.Character; import client.QuestStatus; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; import java.util.HashMap; import java.util.Map; @@ -36,7 +36,7 @@ public class QuestRequirement extends MapleQuestRequirement { Map quests = new HashMap<>(); public QuestRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.QUEST); + super(QuestRequirementType.QUEST); processData(data); } diff --git a/src/main/java/server/quest/requirements/ScriptRequirement.java b/src/main/java/server/quest/requirements/ScriptRequirement.java index c8d183c640..bab9055f1c 100644 --- a/src/main/java/server/quest/requirements/ScriptRequirement.java +++ b/src/main/java/server/quest/requirements/ScriptRequirement.java @@ -22,8 +22,8 @@ package server.quest.requirements; import client.Character; import provider.Data; import provider.DataTool; -import server.quest.MapleQuestRequirementType; import server.quest.Quest; +import server.quest.QuestRequirementType; /** * @@ -33,7 +33,7 @@ public class ScriptRequirement extends MapleQuestRequirement { private boolean reqScript; public ScriptRequirement(Quest quest, Data data) { - super(MapleQuestRequirementType.BUFF); + super(QuestRequirementType.BUFF); processData(data); }