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

Clean-up Patch

Browse Source 
Bug correction on some quests.
This commit is contained in:
ronancpl
2017-04-04 17:14:20 -03:00
parent b2da79ff13
commit 7863994a13
53 changed files with 1291 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/scripting/AbstractPlayerInteraction.java
View File

@@ -198,13 +198,23 @@ public class AbstractPlayerInteraction {
}
public void updateQuest(int questid, int data) {
updateQuest(questid, String.valueOf(data));
MapleQuestStatus status = c.getPlayer().getQuest(MapleQuest.getInstance(questid));
updateQuest(questid, status.getAnyProgressKey(), data);
}
public void updateQuest(int questid, String data) {
public void updateQuest(int questid, String data) {
MapleQuestStatus status = c.getPlayer().getQuest(MapleQuest.getInstance(questid));
updateQuest(questid, status.getAnyProgressKey(), data);
}
public void updateQuest(int questid, int pid, int data) {
updateQuest(questid, pid, String.valueOf(data));
}
public void updateQuest(int questid, int pid, String data) {
MapleQuestStatus status = c.getPlayer().getQuest(MapleQuest.getInstance(questid));
status.setStatus(MapleQuestStatus.Status.STARTED);
status.setProgress(0, data);//override old if exists
status.setProgress(pid, data);//override old if exists
c.getPlayer().updateQuest(status);
}
@@ -233,12 +243,30 @@ public class AbstractPlayerInteraction {
return false;
}
}
public int getQuestProgress(int qid) {
if(getPlayer().getQuest(MapleQuest.getInstance(qid)).getProgress().isEmpty()) return 0;
return Integer.parseInt(getPlayer().getQuest(MapleQuest.getInstance(qid)).getProgress().get(0));
public int getQuestProgress(int qid) {
MapleQuestStatus status = c.getPlayer().getQuest(MapleQuest.getInstance(qid));
String progress = status.getProgress(status.getAnyProgressKey());
if(progress.isEmpty()) return 0;
return Integer.parseInt(progress);
}
public int getQuestProgress(int qid, int pid) {
if(getPlayer().getQuest(MapleQuest.getInstance(qid)).getProgress(pid).isEmpty()) return 0;
return Integer.parseInt(getPlayer().getQuest(MapleQuest.getInstance(qid)).getProgress(pid));
}
public void resetAllQuestProgress(int qid) {
getPlayer().getQuest(MapleQuest.getInstance(qid)).resetAllProgress();
getClient().announce(MaplePacketCreator.updateQuest(getPlayer().getQuest(MapleQuest.getInstance(qid)), false));
}
public void resetQuestProgress(int qid, int pid) {
getPlayer().getQuest(MapleQuest.getInstance(qid)).resetProgress(pid);
getClient().announce(MaplePacketCreator.updateQuest(getPlayer().getQuest(MapleQuest.getInstance(qid)), false));
}
public Item evolvePet(byte slot, int afterId) {
MaplePet evolved = null;
MaplePet target = null;