Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleQuestActionType

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:43:23 +02:00
parent fef273ecc9
commit 473ab19034
15 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/server/quest/Quest.java
View File

@@ -60,8 +60,8 @@ public class Quest {
protected int timeLimit, timeLimit2; protected int timeLimit, timeLimit2;
protected Map<MapleQuestRequirementType, MapleQuestRequirement> startReqs = new EnumMap<>(MapleQuestRequirementType.class); protected Map<MapleQuestRequirementType, MapleQuestRequirement> startReqs = new EnumMap<>(MapleQuestRequirementType.class);
protected Map<MapleQuestRequirementType, MapleQuestRequirement> completeReqs = new EnumMap<>(MapleQuestRequirementType.class); protected Map<MapleQuestRequirementType, MapleQuestRequirement> completeReqs = new EnumMap<>(MapleQuestRequirementType.class);
protected Map<MapleQuestActionType, MapleQuestAction> startActs = new EnumMap<>(MapleQuestActionType.class); protected Map<QuestActionType, MapleQuestAction> startActs = new EnumMap<>(QuestActionType.class);
protected Map<MapleQuestActionType, MapleQuestAction> completeActs = new EnumMap<>(MapleQuestActionType.class); protected Map<QuestActionType, MapleQuestAction> completeActs = new EnumMap<>(QuestActionType.class);
protected List<Integer> relevantMobs = new LinkedList<>(); protected List<Integer> relevantMobs = new LinkedList<>();
private boolean autoStart; private boolean autoStart;
private boolean autoPreComplete, autoComplete; private boolean autoPreComplete, autoComplete;
@@ -147,7 +147,7 @@ public class Quest {
final Data startActData = actData.getChildByPath("0"); final Data startActData = actData.getChildByPath("0");
if (startActData != null) { if (startActData != null) {
for (Data startAct : startActData.getChildren()) { for (Data startAct : startActData.getChildren()) {
MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(startAct.getName()); QuestActionType questActionType = QuestActionType.getByWZName(startAct.getName());
MapleQuestAction act = this.getAction(questActionType, startAct); MapleQuestAction act = this.getAction(questActionType, startAct);
if (act == null) { if (act == null) {
@@ -160,7 +160,7 @@ public class Quest {
Data completeActData = actData.getChildByPath("1"); Data completeActData = actData.getChildByPath("1");
if (completeActData != null) { if (completeActData != null) {
for (Data completeAct : completeActData.getChildren()) { for (Data completeAct : completeActData.getChildren()) {
MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(completeAct.getName()); QuestActionType questActionType = QuestActionType.getByWZName(completeAct.getName());
MapleQuestAction act = this.getAction(questActionType, completeAct); MapleQuestAction act = this.getAction(questActionType, completeAct);
if (act == null) { if (act == null) {
@@ -534,7 +534,7 @@ public class Quest {
return ret; return ret;
} }
private MapleQuestAction getAction(MapleQuestActionType type, Data data) { private MapleQuestAction getAction(QuestActionType type, Data data) {
MapleQuestAction ret = null; MapleQuestAction ret = null;
switch (type) { switch (type) {
case BUFF: case BUFF:
@@ -582,7 +582,7 @@ public class Quest {
public boolean restoreLostItem(Character chr, int itemid) { public boolean restoreLostItem(Character chr, int itemid) {
if (chr.getQuest(this).getStatus().equals(QuestStatus.Status.STARTED)) { if (chr.getQuest(this).getStatus().equals(QuestStatus.Status.STARTED)) {
ItemAction itemAct = (ItemAction) startActs.get(MapleQuestActionType.ITEM); ItemAction itemAct = (ItemAction) startActs.get(QuestActionType.ITEM);
if (itemAct != null) { if (itemAct != null) {
return itemAct.restoreLostItem(chr, itemid); return itemAct.restoreLostItem(chr, itemid);
} }
@@ -618,8 +618,8 @@ public class Quest {
} }
public boolean hasNextQuestAction() { public boolean hasNextQuestAction() {
Map<MapleQuestActionType, MapleQuestAction> acts = completeActs; Map<QuestActionType, MapleQuestAction> acts = completeActs;
MapleQuestAction mqa = acts.get(MapleQuestActionType.NEXTQUEST); MapleQuestAction mqa = acts.get(QuestActionType.NEXTQUEST);
return mqa != null; return mqa != null;
} }

28
src/main/java/server/quest/MapleQuestActionType.java → src/main/java/server/quest/QuestActionType.java
View File

@@ -22,18 +22,36 @@
package server.quest; package server.quest;
/** /**
*
* @author Matze * @author Matze
*/ */
public enum MapleQuestActionType { public enum QuestActionType {
UNDEFINED(-1), EXP(0), ITEM(1), NEXTQUEST(2), MESO(3), QUEST(4), SKILL(5), FAME(6), BUFF(7), PETSKILL(8), YES(9), NO(10), NPC(11), MIN_LEVEL(12), NORMAL_AUTO_START(13), PETTAMENESS(14), PETSPEED(15), INFO(16), ZERO(16); UNDEFINED(-1),
EXP(0),
ITEM(1),
NEXTQUEST(2),
MESO(3),
QUEST(4),
SKILL(5),
FAME(6),
BUFF(7),
PETSKILL(8),
YES(9),
NO(10),
NPC(11),
MIN_LEVEL(12),
NORMAL_AUTO_START(13),
PETTAMENESS(14),
PETSPEED(15),
INFO(16),
ZERO(16);
final byte type; final byte type;
private MapleQuestActionType(int type) { QuestActionType(int type) {
this.type = (byte) type; this.type = (byte) type;
} }
public static MapleQuestActionType getByWZName(String name) { public static QuestActionType getByWZName(String name) {
if (name.equals("exp")) { if (name.equals("exp")) {
return EXP; return EXP;
} else if (name.equals("money")) { } else if (name.equals("money")) {

4
src/main/java/server/quest/actions/BuffAction.java
View File

@@ -25,8 +25,8 @@ import client.Character;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.MapleItemInformationProvider; import server.MapleItemInformationProvider;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -36,7 +36,7 @@ public class BuffAction extends MapleQuestAction {
int itemEffect; int itemEffect;
public BuffAction(Quest quest, Data data) { public BuffAction(Quest quest, Data data) {
super(MapleQuestActionType.BUFF, quest); super(QuestActionType.BUFF, quest);
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/ExpAction.java
View File

@@ -25,8 +25,8 @@ import client.Character;
import config.YamlConfig; import config.YamlConfig;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -36,7 +36,7 @@ public class ExpAction extends MapleQuestAction {
int exp; int exp;
public ExpAction(Quest quest, Data data) { public ExpAction(Quest quest, Data data) {
super(MapleQuestActionType.EXP, quest); super(QuestActionType.EXP, quest);
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/FameAction.java
View File

@@ -24,8 +24,8 @@ package server.quest.actions;
import client.Character; import client.Character;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -35,7 +35,7 @@ public class FameAction extends MapleQuestAction {
int fame; int fame;
public FameAction(Quest quest, Data data) { public FameAction(Quest quest, Data data) {
super(MapleQuestActionType.FAME, quest); super(QuestActionType.FAME, quest);
questID = quest.getId(); questID = quest.getId();
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/InfoAction.java
View File

@@ -22,8 +22,8 @@ package server.quest.actions;
import client.Character; import client.Character;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -35,7 +35,7 @@ public class InfoAction extends MapleQuestAction {
private int questID; private int questID;
public InfoAction(Quest quest, Data data) { public InfoAction(Quest quest, Data data) {
super(MapleQuestActionType.INFO, quest); super(QuestActionType.INFO, quest);
questID = quest.getId(); questID = quest.getId();
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/ItemAction.java
View File

@@ -30,8 +30,8 @@ import constants.inventory.ItemConstants;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.MapleItemInformationProvider; import server.MapleItemInformationProvider;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
import tools.FilePrinter; import tools.FilePrinter;
import tools.PacketCreator; import tools.PacketCreator;
import tools.Pair; import tools.Pair;
@@ -51,7 +51,7 @@ public class ItemAction extends MapleQuestAction {
List<ItemData> items = new ArrayList<>(); List<ItemData> items = new ArrayList<>();
public ItemAction(Quest quest, Data data) { public ItemAction(Quest quest, Data data) {
super(MapleQuestActionType.ITEM, quest); super(QuestActionType.ITEM, quest);
processData(data); processData(data);
} }

8
src/main/java/server/quest/actions/MapleQuestAction.java
View File

@@ -20,8 +20,8 @@ package server.quest.actions;
import client.Character; import client.Character;
import provider.Data; import provider.Data;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -31,10 +31,10 @@ import java.util.List;
* @author Tyler (Twdtwd) * @author Tyler (Twdtwd)
*/ */
public abstract class MapleQuestAction { public abstract class MapleQuestAction {
private final MapleQuestActionType type; private final QuestActionType type;
protected int questID; protected int questID;
public MapleQuestAction(MapleQuestActionType action, Quest quest) { public MapleQuestAction(QuestActionType action, Quest quest) {
this.type = action; this.type = action;
this.questID = quest.getId(); this.questID = quest.getId();
} }
@@ -46,7 +46,7 @@ public abstract class MapleQuestAction {
return true; return true;
} }
public MapleQuestActionType getType() { public QuestActionType getType() {
return type; return type;
} }

4
src/main/java/server/quest/actions/MesoAction.java
View File

@@ -25,8 +25,8 @@ import client.Character;
import config.YamlConfig; import config.YamlConfig;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -36,7 +36,7 @@ public class MesoAction extends MapleQuestAction {
int mesos; int mesos;
public MesoAction(Quest quest, Data data) { public MesoAction(Quest quest, Data data) {
super(MapleQuestActionType.MESO, quest); super(QuestActionType.MESO, quest);
questID = quest.getId(); questID = quest.getId();
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/NextQuestAction.java
View File

@@ -25,8 +25,8 @@ import client.Character;
import client.QuestStatus; import client.QuestStatus;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
import tools.PacketCreator; import tools.PacketCreator;
/** /**
@@ -37,7 +37,7 @@ public class NextQuestAction extends MapleQuestAction {
int nextQuest; int nextQuest;
public NextQuestAction(Quest quest, Data data) { public NextQuestAction(Quest quest, Data data) {
super(MapleQuestActionType.NEXTQUEST, quest); super(QuestActionType.NEXTQUEST, quest);
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/PetSkillAction.java
View File

@@ -26,8 +26,8 @@ import client.QuestStatus;
import constants.inventory.ItemConstants; import constants.inventory.ItemConstants;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -37,7 +37,7 @@ public class PetSkillAction extends MapleQuestAction {
int flag; int flag;
public PetSkillAction(Quest quest, Data data) { public PetSkillAction(Quest quest, Data data) {
super(MapleQuestActionType.PETSKILL, quest); super(QuestActionType.PETSKILL, quest);
questID = quest.getId(); questID = quest.getId();
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/PetSpeedAction.java
View File

@@ -23,8 +23,8 @@ import client.Character;
import client.Client; import client.Client;
import client.inventory.Pet; import client.inventory.Pet;
import provider.Data; import provider.Data;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -33,7 +33,7 @@ import server.quest.Quest;
public class PetSpeedAction extends MapleQuestAction { public class PetSpeedAction extends MapleQuestAction {
public PetSpeedAction(Quest quest, Data data) { public PetSpeedAction(Quest quest, Data data) {
super(MapleQuestActionType.PETTAMENESS, quest); super(QuestActionType.PETTAMENESS, quest);
questID = quest.getId(); questID = quest.getId();
} }

4
src/main/java/server/quest/actions/PetTamenessAction.java
View File

@@ -24,8 +24,8 @@ import client.Client;
import client.inventory.Pet; import client.inventory.Pet;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
/** /**
* *
@@ -35,7 +35,7 @@ public class PetTamenessAction extends MapleQuestAction {
int tameness; int tameness;
public PetTamenessAction(Quest quest, Data data) { public PetTamenessAction(Quest quest, Data data) {
super(MapleQuestActionType.PETTAMENESS, quest); super(QuestActionType.PETTAMENESS, quest);
questID = quest.getId(); questID = quest.getId();
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/QuestAction.java
View File

@@ -25,8 +25,8 @@ import client.Character;
import client.QuestStatus; import client.QuestStatus;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -40,7 +40,7 @@ public class QuestAction extends MapleQuestAction {
Map<Integer, Integer> quests = new HashMap<>(); Map<Integer, Integer> quests = new HashMap<>();
public QuestAction(Quest quest, Data data) { public QuestAction(Quest quest, Data data) {
super(MapleQuestActionType.QUEST, quest); super(QuestActionType.QUEST, quest);
questID = quest.getId(); questID = quest.getId();
processData(data); processData(data);
} }

4
src/main/java/server/quest/actions/SkillAction.java
View File

@@ -27,8 +27,8 @@ import client.Skill;
import client.SkillFactory; import client.SkillFactory;
import provider.Data; import provider.Data;
import provider.DataTool; import provider.DataTool;
import server.quest.MapleQuestActionType;
import server.quest.Quest; import server.quest.Quest;
import server.quest.QuestActionType;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -44,7 +44,7 @@ public class SkillAction extends MapleQuestAction {
Map<Integer, SkillData> skillData = new HashMap<>(); Map<Integer, SkillData> skillData = new HashMap<>();
public SkillAction(Quest quest, Data data) { public SkillAction(Quest quest, Data data) {
super(MapleQuestActionType.SKILL, quest); super(QuestActionType.SKILL, quest);
processData(data); processData(data);
} }