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

Rename and clean up MapleQuest

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:42:02 +02:00
parent 75d631bebb
commit fef273ecc9
55 changed files with 436 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/client/Character.java
View File

@@ -74,7 +74,7 @@ import server.partyquest.AriantColiseum;
import server.partyquest.MonsterCarnival;
import server.partyquest.MonsterCarnivalParty;
import server.partyquest.PartyQuest;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.*;
import tools.exceptions.NotEnabledException;
import tools.packets.WeddingPackets;
@@ -195,7 +195,7 @@ public class Character extends AbstractCharacterObject {
private byte[] m_aQuickslotLoaded;
private QuickslotBinding m_pQuickslotKeyMapped;
private Door pdoor = null;
private Map<MapleQuest, Long> questExpirations = new LinkedHashMap<>();
private Map<Quest, Long> questExpirations = new LinkedHashMap<>();
private ScheduledFuture<?> dragonBloodSchedule;
private ScheduledFuture<?> hpDecreaseTask;
private ScheduledFuture<?> beholderHealingSchedule, beholderBuffSchedule, berserkSchedule;
@@ -5686,10 +5686,10 @@ public class Character extends AbstractCharacterObject {
}
public QuestStatus getQuest(final int quest) {
return getQuest(MapleQuest.getInstance(quest));
return getQuest(Quest.getInstance(quest));
}
public QuestStatus getQuest(MapleQuest quest) {
public QuestStatus getQuest(Quest quest) {
synchronized (quests) {
short questid = quest.getId();
QuestStatus qs = quests.get(questid);
@@ -5703,7 +5703,7 @@ public class Character extends AbstractCharacterObject {
//---- \/ \/ \/ \/ \/ \/ \/ NOT TESTED \/ \/ \/ \/ \/ \/ \/ \/ \/ ----
public final void setQuestAdd(final MapleQuest quest, final byte status, final String customData) {
public final void setQuestAdd(final Quest quest, final byte status, final String customData) {
synchronized (quests) {
if (!quests.containsKey(quest.getId())) {
final QuestStatus stat = new QuestStatus(quest, QuestStatus.Status.getById(status));
@@ -5713,7 +5713,7 @@ public class Character extends AbstractCharacterObject {
}
}
public final QuestStatus getQuestNAdd(final MapleQuest quest) {
public final QuestStatus getQuestNAdd(final Quest quest) {
synchronized (quests) {
if (!quests.containsKey(quest.getId())) {
final QuestStatus status = new QuestStatus(quest, QuestStatus.Status.NOT_STARTED);
@@ -5724,13 +5724,13 @@ public class Character extends AbstractCharacterObject {
}
}
public final QuestStatus getQuestNoAdd(final MapleQuest quest) {
public final QuestStatus getQuestNoAdd(final Quest quest) {
synchronized (quests) {
return quests.get(quest.getId());
}
}
public final QuestStatus getQuestRemove(final MapleQuest quest) {
public final QuestStatus getQuestRemove(final Quest quest) {
synchronized (quests) {
return quests.remove(quest.getId());
}
@@ -5745,14 +5745,14 @@ public class Character extends AbstractCharacterObject {
int amountNeeded, questStatus = this.getQuestStatus(questid);
if (questStatus == 0) {
amountNeeded = MapleQuest.getInstance(questid).getStartItemAmountNeeded(itemid);
amountNeeded = Quest.getInstance(questid).getStartItemAmountNeeded(itemid);
if (amountNeeded == Integer.MIN_VALUE) {
return false;
}
} else if (questStatus != 1) {
return false;
} else {
amountNeeded = MapleQuest.getInstance(questid).getCompleteItemAmountNeeded(itemid);
amountNeeded = Quest.getInstance(questid).getCompleteItemAmountNeeded(itemid);
if (amountNeeded == Integer.MAX_VALUE) {
return true;
}
@@ -7241,7 +7241,7 @@ public class Character extends AbstractCharacterObject {
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) {
MapleQuest q = MapleQuest.getInstance(rs.getShort("quest"));
Quest q = Quest.getInstance(rs.getShort("quest"));
QuestStatus status = new QuestStatus(q, QuestStatus.Status.getById(rs.getInt("status")));
long cTime = rs.getLong("time");
if (cTime > -1) {
@@ -9821,11 +9821,11 @@ public class Character extends AbstractCharacterObject {
}
public void setQuestProgress(int id, int infoNumber, String progress) {
MapleQuest q = MapleQuest.getInstance(id);
Quest q = Quest.getInstance(id);
QuestStatus qs = getQuest(q);
if (qs.getInfoNumber() == infoNumber && infoNumber > 0) {
MapleQuest iq = MapleQuest.getInstance(infoNumber);
Quest iq = Quest.getInstance(infoNumber);
QuestStatus iqs = getQuest(iq);
iqs.setProgress(0, progress);
} else {
@@ -9919,9 +9919,9 @@ public class Character extends AbstractCharacterObject {
}
announceUpdateQuest(DelayedQuestUpdate.INFO, qs);
} else if (qs.getStatus().equals(QuestStatus.Status.COMPLETED)) {
MapleQuest mquest = qs.getQuest();
Quest mquest = qs.getQuest();
short questid = mquest.getId();
if (!mquest.isSameDayRepeatable() && !MapleQuest.isExploitableQuest(questid)) {
if (!mquest.isSameDayRepeatable() && !Quest.isExploitableQuest(questid)) {
awardQuestPoint(YamlConfig.config.server.QUEST_POINT_PER_QUEST_COMPLETE);
}
qs.setCompleted(qs.getCompleted() + 1); // Jayd's idea - count quest completed
@@ -9937,7 +9937,7 @@ public class Character extends AbstractCharacterObject {
}
}
private void expireQuest(MapleQuest quest) {
private void expireQuest(Quest quest) {
if (quest.forfeit(this)) {
sendPacket(PacketCreator.questExpire(quest.getId()));
}
@@ -9958,7 +9958,7 @@ public class Character extends AbstractCharacterObject {
public void forfeitExpirableQuests() {
evtLock.lock();
try {
for (MapleQuest quest : questExpirations.keySet()) {
for (Quest quest : questExpirations.keySet()) {
quest.forfeit(this);
}
@@ -9990,16 +9990,16 @@ public class Character extends AbstractCharacterObject {
evtLock.lock();
try {
long timeNow = Server.getInstance().getCurrentTime();
List<MapleQuest> expireList = new LinkedList<>();
List<Quest> expireList = new LinkedList<>();
for (Entry<MapleQuest, Long> qe : questExpirations.entrySet()) {
for (Entry<Quest, Long> qe : questExpirations.entrySet()) {
if (qe.getValue() <= timeNow) {
expireList.add(qe.getKey());
}
}
if (!expireList.isEmpty()) {
for (MapleQuest quest : expireList) {
for (Quest quest : expireList) {
expireQuest(quest);
questExpirations.remove(quest);
}
@@ -10014,7 +10014,7 @@ public class Character extends AbstractCharacterObject {
}
}
private void registerQuestExpire(MapleQuest quest, long time) {
private void registerQuestExpire(Quest quest, long time) {
evtLock.lock();
try {
if (questExpireTask == null) {
@@ -10032,12 +10032,12 @@ public class Character extends AbstractCharacterObject {
}
}
public void questTimeLimit(final MapleQuest quest, int seconds) {
public void questTimeLimit(final Quest quest, int seconds) {
registerQuestExpire(quest, seconds * 1000);
sendPacket(PacketCreator.addQuestTimeLimit(quest.getId(), seconds * 1000));
}
public void questTimeLimit2(final MapleQuest quest, long expires) {
public void questTimeLimit2(final Quest quest, long expires) {
long timeLeft = expires - System.currentTimeMillis();
if (timeLeft <= 0) {

18
src/main/java/client/QuestStatus.java
View File

@@ -21,7 +21,7 @@
*/
package client;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.StringUtil;
import java.util.*;
@@ -65,7 +65,7 @@ public class QuestStatus {
private int forfeited = 0, completed = 0;
private String customData;
public QuestStatus(MapleQuest quest, Status status) {
public QuestStatus(Quest quest, Status status) {
this.questID = quest.getId();
this.setStatus(status);
this.completionTime = System.currentTimeMillis();
@@ -76,7 +76,7 @@ public class QuestStatus {
}
}
public QuestStatus(MapleQuest quest, Status status, int npc) {
public QuestStatus(Quest quest, Status status, int npc) {
this.questID = quest.getId();
this.setStatus(status);
this.setNpc(npc);
@@ -88,8 +88,8 @@ public class QuestStatus {
}
}
public MapleQuest getQuest() {
return MapleQuest.getInstance(questID);
public Quest getQuest() {
return Quest.getInstance(questID);
}
public short getQuestID() {
@@ -127,7 +127,7 @@ public class QuestStatus {
}
private void registerMobs() {
for (int i : MapleQuest.getInstance(questID).getRelevantMobs()) {
for (int i : Quest.getInstance(questID).getRelevantMobs()) {
progress.put(i, "000");
}
//this.setUpdated();
@@ -200,21 +200,21 @@ public class QuestStatus {
}
public short getInfoNumber() {
MapleQuest q = this.getQuest();
Quest q = this.getQuest();
Status s = this.getStatus();
return q.getInfoNumber(s);
}
public String getInfoEx(int index) {
MapleQuest q = this.getQuest();
Quest q = this.getQuest();
Status s = this.getStatus();
return q.getInfoEx(s, index);
}
public List<String> getInfoEx() {
MapleQuest q = this.getQuest();
Quest q = this.getQuest();
Status s = this.getStatus();
return q.getInfoEx(s);

4
src/main/java/client/command/commands/gm2/SearchCommand.java
View File

@@ -32,7 +32,7 @@ import provider.DataProviderFactory;
import provider.DataTool;
import provider.wz.WZFiles;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.Pair;
public class SearchCommand extends Command {
@@ -105,7 +105,7 @@ public class SearchCommand extends Command {
}
}
} else {
for (MapleQuest mq : MapleQuest.getMatchedQuests(search)) {
for (Quest mq : Quest.getMatchedQuests(search)) {
sb.append("#b").append(mq.getId()).append("#k - #r");
String parentName = mq.getParentName();

4
src/main/java/client/command/commands/gm3/QuestCompleteCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.Character;
import client.Client;
import client.command.Command;
import server.quest.MapleQuest;
import server.quest.Quest;
public class QuestCompleteCommand extends Command {
{
@@ -45,7 +45,7 @@ public class QuestCompleteCommand extends Command {
int questId = Integer.parseInt(params[0]);
if (player.getQuestStatus(questId) == 1) {
MapleQuest quest = MapleQuest.getInstance(questId);
Quest quest = Quest.getInstance(questId);
if (quest != null && quest.getNpcRequirement(true) != -1) {
c.getAbstractPlayerInteraction().forceCompleteQuest(questId, quest.getNpcRequirement(true));
} else {

4
src/main/java/client/command/commands/gm3/QuestResetCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.Character;
import client.Client;
import client.command.Command;
import server.quest.MapleQuest;
import server.quest.Quest;
public class QuestResetCommand extends Command {
{
@@ -45,7 +45,7 @@ public class QuestResetCommand extends Command {
int questid_ = Integer.parseInt(params[0]);
if (player.getQuestStatus(questid_) != 0) {
MapleQuest quest = MapleQuest.getInstance(questid_);
Quest quest = Quest.getInstance(questid_);
if (quest != null) {
quest.reset(player);
player.dropMessage(5, "QUEST " + questid_ + " reseted.");

4
src/main/java/client/command/commands/gm3/QuestStartCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.Character;
import client.Client;
import client.command.Command;
import server.quest.MapleQuest;
import server.quest.Quest;
public class QuestStartCommand extends Command {
{
@@ -45,7 +45,7 @@ public class QuestStartCommand extends Command {
int questid = Integer.parseInt(params[0]);
if (player.getQuestStatus(questid) == 0) {
MapleQuest quest = MapleQuest.getInstance(questid);
Quest quest = Quest.getInstance(questid);
if (quest != null && quest.getNpcRequirement(false) != -1) {
c.getAbstractPlayerInteraction().forceStartQuest(questid, quest.getNpcRequirement(false));
} else {

4
src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm6;
import client.Character;
import client.Client;
import client.command.Command;
import server.quest.MapleQuest;
import server.quest.Quest;
public class ClearQuestCacheCommand extends Command {
{
@@ -36,7 +36,7 @@ public class ClearQuestCacheCommand extends Command {
@Override
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
MapleQuest.clearCache();
Quest.clearCache();
player.dropMessage(5, "Quest Cache Cleared.");
}
}

4
src/main/java/client/command/commands/gm6/ClearQuestCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm6;
import client.Character;
import client.Client;
import client.command.Command;
import server.quest.MapleQuest;
import server.quest.Quest;
public class ClearQuestCommand extends Command {
{
@@ -40,7 +40,7 @@ public class ClearQuestCommand extends Command {
player.dropMessage(5, "Please include a quest ID.");
return;
}
MapleQuest.clearCache(Integer.parseInt(params[0]));
Quest.clearCache(Integer.parseInt(params[0]));
player.dropMessage(5, "Quest Cache for quest " + params[0] + " cleared.");
}