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

22
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -47,7 +47,7 @@ import server.maps.MapObjectType;
import server.maps.MapleMap;
import server.partyquest.PartyQuest;
import server.partyquest.Pyramid;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.PacketCreator;
import tools.Pair;
@@ -320,11 +320,11 @@ public class AbstractPlayerInteraction {
//---- \/ \/ \/ \/ \/ \/ \/ NOT TESTED \/ \/ \/ \/ \/ \/ \/ \/ \/ ----
public final QuestStatus getQuestRecord(final int id) {
return c.getPlayer().getQuestNAdd(MapleQuest.getInstance(id));
return c.getPlayer().getQuestNAdd(Quest.getInstance(id));
}
public final QuestStatus getQuestNoRecord(final int id) {
return c.getPlayer().getQuestNoAdd(MapleQuest.getInstance(id));
return c.getPlayer().getQuestNoAdd(Quest.getInstance(id));
}
//---- /\ /\ /\ /\ /\ /\ /\ NOT TESTED /\ /\ /\ /\ /\ /\ /\ /\ /\ ----
@@ -344,11 +344,11 @@ public class AbstractPlayerInteraction {
}
public int getQuestStatus(int id) {
return c.getPlayer().getQuest(MapleQuest.getInstance(id)).getStatus().getId();
return c.getPlayer().getQuest(Quest.getInstance(id)).getStatus().getId();
}
private QuestStatus.Status getQuestStat(int id) {
return c.getPlayer().getQuest(MapleQuest.getInstance(id)).getStatus();
return c.getPlayer().getQuest(Quest.getInstance(id)).getStatus();
}
public boolean isQuestCompleted(int id) {
@@ -394,10 +394,10 @@ public class AbstractPlayerInteraction {
}
public String getQuestProgress(int id, int infoNumber) {
QuestStatus qs = getPlayer().getQuest(MapleQuest.getInstance(id));
QuestStatus qs = getPlayer().getQuest(Quest.getInstance(id));
if (qs.getInfoNumber() == infoNumber && infoNumber > 0) {
qs = getPlayer().getQuest(MapleQuest.getInstance(infoNumber));
qs = getPlayer().getQuest(Quest.getInstance(infoNumber));
infoNumber = 0;
}
@@ -425,7 +425,7 @@ public class AbstractPlayerInteraction {
}
public void resetAllQuestProgress(int id) {
QuestStatus qs = getPlayer().getQuest(MapleQuest.getInstance(id));
QuestStatus qs = getPlayer().getQuest(Quest.getInstance(id));
if (qs != null) {
qs.resetAllProgress();
getPlayer().announceUpdateQuest(DelayedQuestUpdate.UPDATE, qs, false);
@@ -433,7 +433,7 @@ public class AbstractPlayerInteraction {
}
public void resetQuestProgress(int id, int infoNumber) {
QuestStatus qs = getPlayer().getQuest(MapleQuest.getInstance(id));
QuestStatus qs = getPlayer().getQuest(Quest.getInstance(id));
if (qs != null) {
qs.resetProgress(infoNumber);
getPlayer().announceUpdateQuest(DelayedQuestUpdate.UPDATE, qs, false);
@@ -482,7 +482,7 @@ public class AbstractPlayerInteraction {
public boolean startQuest(int id, int npc) {
try {
return MapleQuest.getInstance(id).forceStart(getPlayer(), npc);
return Quest.getInstance(id).forceStart(getPlayer(), npc);
} catch (NullPointerException ex) {
ex.printStackTrace();
return false;
@@ -491,7 +491,7 @@ public class AbstractPlayerInteraction {
public boolean completeQuest(int id, int npc) {
try {
return MapleQuest.getInstance(id).forceComplete(getPlayer(), npc);
return Quest.getInstance(id).forceComplete(getPlayer(), npc);
} catch (NullPointerException ex) {
ex.printStackTrace();
return false;

6
src/main/java/scripting/event/EventManager.java
View File

@@ -41,7 +41,7 @@ import server.expeditions.Expedition;
import server.life.LifeFactory;
import server.life.Monster;
import server.maps.MapleMap;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.exceptions.EventInstanceInProgressException;
import javax.script.Invocable;
@@ -846,7 +846,7 @@ public class EventManager {
public void startQuest(Character chr, int id, int npcid) {
try {
MapleQuest.getInstance(id).forceStart(chr, npcid);
Quest.getInstance(id).forceStart(chr, npcid);
} catch (NullPointerException ex) {
ex.printStackTrace();
}
@@ -854,7 +854,7 @@ public class EventManager {
public void completeQuest(Character chr, int id, int npcid) {
try {
MapleQuest.getInstance(id).forceComplete(chr, npcid);
Quest.getInstance(id).forceComplete(chr, npcid);
} catch (NullPointerException ex) {
ex.printStackTrace();
}

6
src/main/java/scripting/map/MapScriptMethods.java
View File

@@ -25,7 +25,7 @@ import client.Character.DelayedQuestUpdate;
import client.Client;
import client.QuestStatus;
import scripting.AbstractPlayerInteraction;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.PacketCreator;
public class MapScriptMethods extends AbstractPlayerInteraction {
@@ -116,7 +116,7 @@ public class MapScriptMethods extends AbstractPlayerInteraction {
}
public void explorerQuest(short questid, String questName) {
MapleQuest quest = MapleQuest.getInstance(questid);
Quest quest = Quest.getInstance(questid);
if (!isQuestStarted(questid)) {
if (!quest.forceStart(getPlayer(), 9000066)) {
return;
@@ -145,7 +145,7 @@ public class MapScriptMethods extends AbstractPlayerInteraction {
}
public void touchTheSky() { //29004
MapleQuest quest = MapleQuest.getInstance(29004);
Quest quest = Quest.getInstance(29004);
if (!isQuestStarted(29004)) {
if (!quest.forceStart(getPlayer(), 9000066)) {
return;

4
src/main/java/scripting/quest/QuestActionManager.java
View File

@@ -24,7 +24,7 @@ package scripting.quest;
import client.Client;
import scripting.npc.NPCConversationManager;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
import server.quest.Quest;
import server.quest.actions.ExpAction;
import server.quest.actions.MesoAction;
@@ -84,7 +84,7 @@ public class QuestActionManager extends NPCConversationManager {
}
public String getMedalName() { // usable only for medal quests (id 299XX)
MapleQuest q = MapleQuest.getInstance(quest);
Quest q = Quest.getInstance(quest);
return MapleItemInformationProvider.getInstance().getName(q.getMedalRequirement());
}
}

6
src/main/java/scripting/quest/QuestScriptManager.java
View File

@@ -25,7 +25,7 @@ import client.Client;
import client.QuestStatus;
import constants.game.GameConstants;
import scripting.AbstractScriptManager;
import server.quest.MapleQuest;
import server.quest.Quest;
import tools.FilePrinter;
import javax.script.Invocable;
@@ -58,7 +58,7 @@ public class QuestScriptManager extends AbstractScriptManager {
}
public void start(Client c, short questid, int npc) {
MapleQuest quest = MapleQuest.getInstance(questid);
Quest quest = Quest.getInstance(questid);
try {
QuestActionManager qm = new QuestActionManager(c, questid, npc, true);
if (qms.containsKey(c)) {
@@ -109,7 +109,7 @@ public class QuestScriptManager extends AbstractScriptManager {
}
public void end(Client c, short questid, int npc) {
MapleQuest quest = MapleQuest.getInstance(questid);
Quest quest = Quest.getInstance(questid);
if (!c.getPlayer().getQuest(quest).getStatus().equals(QuestStatus.Status.STARTED) || !c.getPlayer().getMap().containsNPC(npc)) {
dispose(c);
return;