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

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/server/quest/MapleQuest.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest;
import client.MapleCharacter;
import client.Character;
import client.MapleQuestStatus;
import client.MapleQuestStatus.Status;
import config.YamlConfig;
@@ -202,12 +202,12 @@ public class MapleQuest {
return ir.getInterval() < YamlConfig.config.server.QUEST_POINT_REPEATABLE_INTERVAL * 60 * 60 * 1000;
}
public boolean canStartQuestByStatus(MapleCharacter chr) {
public boolean canStartQuestByStatus(Character chr) {
MapleQuestStatus mqs = chr.getQuest(this);
return !(!mqs.getStatus().equals(Status.NOT_STARTED) && !(mqs.getStatus().equals(Status.COMPLETED) && repeatable));
}
public boolean canQuestByInfoProgress(MapleCharacter chr) {
public boolean canQuestByInfoProgress(Character chr) {
MapleQuestStatus mqs = chr.getQuest(this);
List<String> ix = mqs.getInfoEx();
if (!ix.isEmpty()) {
@@ -231,7 +231,7 @@ public class MapleQuest {
return true;
}
public boolean canStart(MapleCharacter chr, int npcid) {
public boolean canStart(Character chr, int npcid) {
if (!canStartQuestByStatus(chr)) {
return false;
}
@@ -249,7 +249,7 @@ public class MapleQuest {
return true;
}
public boolean canComplete(MapleCharacter chr, Integer npcid) {
public boolean canComplete(Character chr, Integer npcid) {
MapleQuestStatus mqs = chr.getQuest(this);
if (!mqs.getStatus().equals(Status.STARTED)) {
return false;
@@ -268,7 +268,7 @@ public class MapleQuest {
return true;
}
public void start(MapleCharacter chr, int npc) {
public void start(Character chr, int npc) {
if (autoStart || canStart(chr, npc)) {
Collection<MapleQuestAction> acts = startActs.values();
for (MapleQuestAction a : acts) {
@@ -283,11 +283,11 @@ public class MapleQuest {
}
}
public void complete(MapleCharacter chr, int npc) {
public void complete(Character chr, int npc) {
complete(chr, npc, null);
}
public void complete(MapleCharacter chr, int npc, Integer selection) {
public void complete(Character chr, int npc, Integer selection) {
if (autoPreComplete || canComplete(chr, npc)) {
Collection<MapleQuestAction> acts = completeActs.values();
for (MapleQuestAction a : acts) {
@@ -300,17 +300,17 @@ public class MapleQuest {
a.run(chr, selection);
}
if (!this.hasNextQuestAction()) {
chr.announceUpdateQuest(MapleCharacter.DelayedQuestUpdate.INFO, chr.getQuest(this));
chr.announceUpdateQuest(Character.DelayedQuestUpdate.INFO, chr.getQuest(this));
}
}
}
public void reset(MapleCharacter chr) {
public void reset(Character chr) {
MapleQuestStatus newStatus = new MapleQuestStatus(this, MapleQuestStatus.Status.NOT_STARTED);
chr.updateQuestStatus(newStatus);
}
public boolean forfeit(MapleCharacter chr) {
public boolean forfeit(Character chr) {
if (!chr.getQuest(this).getStatus().equals(Status.STARTED)) {
return false;
}
@@ -323,7 +323,7 @@ public class MapleQuest {
return true;
}
public boolean forceStart(MapleCharacter chr, int npc) {
public boolean forceStart(Character chr, int npc) {
MapleQuestStatus newStatus = new MapleQuestStatus(this, MapleQuestStatus.Status.STARTED, npc);
MapleQuestStatus oldStatus = chr.getQuest(this.getId());
@@ -359,7 +359,7 @@ public class MapleQuest {
return true;
}
public boolean forceComplete(MapleCharacter chr, int npc) {
public boolean forceComplete(Character chr, int npc) {
if (timeLimit > 0) {
chr.sendPacket(PacketCreator.removeQuestTimeLimit(id));
}
@@ -580,7 +580,7 @@ public class MapleQuest {
return ret;
}
public boolean restoreLostItem(MapleCharacter chr, int itemid) {
public boolean restoreLostItem(Character chr, int itemid) {
if (chr.getQuest(this).getStatus().equals(MapleQuestStatus.Status.STARTED)) {
ItemAction itemAct = (ItemAction) startActs.get(MapleQuestActionType.ITEM);
if (itemAct != null) {

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

@@ -21,7 +21,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.MapleItemInformationProvider;
@@ -41,7 +41,7 @@ public class BuffAction extends MapleQuestAction {
}
@Override
public boolean check(MapleCharacter chr, Integer extSelection) {
public boolean check(Character chr, Integer extSelection) {
return true;
}
@@ -51,7 +51,7 @@ public class BuffAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
MapleItemInformationProvider.getInstance().getItemEffect(itemEffect).applyTo(chr);
}
}

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

@@ -21,7 +21,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import config.YamlConfig;
import provider.MapleData;
import provider.MapleDataTool;
@@ -47,11 +47,11 @@ public class ExpAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
runAction(chr, exp);
}
public static void runAction(MapleCharacter chr, int gain) {
public static void runAction(Character chr, int gain) {
if (!YamlConfig.config.server.USE_QUEST_RATE) {
chr.gainExp(gain * chr.getExpRate(), true, true);
} else {

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

@@ -21,7 +21,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -47,7 +47,7 @@ public class FameAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
chr.gainFame(fame);
}
}

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

@@ -19,8 +19,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.MapleQuestStatus;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -48,7 +47,7 @@ public class InfoAction extends MapleQuestAction {
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
chr.getAbstractPlayerInteraction().setQuestProgress(questID, info);
}

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

@@ -21,7 +21,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.InventoryType;
import client.inventory.Item;
@@ -83,7 +83,7 @@ public class ItemAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
List<ItemData> takeItem = new LinkedList<>();
List<ItemData> giveItem = new LinkedList<>();
@@ -155,7 +155,7 @@ public class ItemAction extends MapleQuestAction {
}
@Override
public boolean check(MapleCharacter chr, Integer extSelection) {
public boolean check(Character chr, Integer extSelection) {
List<Pair<Item, InventoryType>> gainList = new LinkedList<>();
List<Pair<Item, InventoryType>> selectList = new LinkedList<>();
List<Pair<Item, InventoryType>> randomList = new LinkedList<>();
@@ -239,7 +239,7 @@ public class ItemAction extends MapleQuestAction {
return true;
}
private void announceInventoryLimit(List<Integer> itemids, MapleCharacter chr) {
private void announceInventoryLimit(List<Integer> itemids, Character chr) {
for (Integer id : itemids) {
if (MapleItemInformationProvider.getInstance().isPickupRestricted(id) && chr.haveItemWithId(id, true)) {
chr.dropMessage(1, "Please check if you already have a similar one-of-a-kind item in your inventory.");
@@ -250,7 +250,7 @@ public class ItemAction extends MapleQuestAction {
chr.dropMessage(1, "Please check if you have enough space in your inventory.");
}
private boolean canHold(MapleCharacter chr, List<Pair<Item, InventoryType>> gainList) {
private boolean canHold(Character chr, List<Pair<Item, InventoryType>> gainList) {
List<Integer> toAddItemids = new LinkedList<>();
List<Integer> toAddQuantity = new LinkedList<>();
List<Integer> toRemoveItemids = new LinkedList<>();
@@ -272,7 +272,7 @@ public class ItemAction extends MapleQuestAction {
return chr.getAbstractPlayerInteraction().canHoldAllAfterRemoving(toAddItemids, toAddQuantity, toRemoveItemids, toRemoveQuantity);
}
private boolean canGetItem(ItemData item, MapleCharacter chr) {
private boolean canGetItem(ItemData item, Character chr) {
if (item.getGender() != 2 && item.getGender() != chr.getGender()) {
return false;
}
@@ -292,7 +292,7 @@ public class ItemAction extends MapleQuestAction {
return true;
}
public boolean restoreLostItem(MapleCharacter chr, int itemid) {
public boolean restoreLostItem(Character chr, int itemid) {
if (!MapleItemInformationProvider.getInstance().isQuestItem(itemid)) {
return false;
}

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

@@ -18,7 +18,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
@@ -39,10 +39,10 @@ public abstract class MapleQuestAction {
this.questID = quest.getId();
}
public abstract void run(MapleCharacter chr, Integer extSelection);
public abstract void run(Character chr, Integer extSelection);
public abstract void processData(MapleData data);
public boolean check(MapleCharacter chr, Integer extSelection) {
public boolean check(Character chr, Integer extSelection) {
return true;
}

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

@@ -21,7 +21,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import config.YamlConfig;
import provider.MapleData;
import provider.MapleDataTool;
@@ -48,11 +48,11 @@ public class MesoAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
runAction(chr, mesos);
}
public static void runAction(MapleCharacter chr, int gain) {
public static void runAction(Character chr, int gain) {
if (gain < 0) {
chr.gainMeso(gain, true, false, true);
} else {

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

@@ -21,7 +21,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import client.MapleQuestStatus;
import provider.MapleData;
import provider.MapleDataTool;
@@ -48,7 +48,7 @@ public class NextQuestAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
MapleQuestStatus status = chr.getQuest(MapleQuest.getInstance(questID));
chr.sendPacket(PacketCreator.updateQuestFinish((short) questID, status.getNpc(), (short) nextQuest));
}

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

@@ -21,7 +21,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import client.MapleQuestStatus;
import constants.inventory.ItemConstants;
import provider.MapleData;
@@ -49,7 +49,7 @@ public class PetSkillAction extends MapleQuestAction {
}
@Override
public boolean check(MapleCharacter chr, Integer extSelection) {
public boolean check(Character chr, Integer extSelection) {
MapleQuestStatus status = chr.getQuest(MapleQuest.getInstance(questID));
if(!(status.getStatus() == MapleQuestStatus.Status.NOT_STARTED && status.getForfeited() > 0))
return false;
@@ -58,7 +58,7 @@ public class PetSkillAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
chr.getPet(0).setFlag((byte) ItemConstants.getFlagByInt(flag));
}
}

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

@@ -19,7 +19,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Pet;
import provider.MapleData;
@@ -42,7 +42,7 @@ public class PetSpeedAction extends MapleQuestAction {
public void processData(MapleData data) {}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
MapleClient c = chr.getClient();
Pet pet = chr.getPet(0); // assuming here only the pet leader will gain owner speed

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

@@ -19,7 +19,7 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.inventory.Pet;
import provider.MapleData;
@@ -47,7 +47,7 @@ public class PetTamenessAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
MapleClient c = chr.getClient();
Pet pet = chr.getPet(0); // assuming here only the pet leader will gain tameness

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

@@ -21,15 +21,16 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import client.MapleQuestStatus;
import java.util.HashMap;
import java.util.Map;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
import java.util.HashMap;
import java.util.Map;
/**
*
* @author Tyler (Twdtwd)
@@ -55,7 +56,7 @@ public class QuestAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
for(Integer questID : quests.keySet()) {
int stat = quests.get(questID);
chr.updateQuestStatus(new MapleQuestStatus(MapleQuest.getInstance(questID), MapleQuestStatus.Status.getById(stat)));

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

@@ -21,19 +21,20 @@
*/
package server.quest.actions;
import client.MapleCharacter;
import client.Character;
import client.MapleJob;
import client.Skill;
import client.SkillFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
* @author Tyler (Twdtwd)
@@ -71,7 +72,7 @@ public class SkillAction extends MapleQuestAction {
}
@Override
public void run(MapleCharacter chr, Integer extSelection) {
public void run(Character chr, Integer extSelection) {
for(SkillData skill : skillData.values()) {
Skill skillObject = SkillFactory.getSkill(skill.getId());
if(skillObject == null) continue;

4
src/main/java/server/quest/requirements/BuffExceptRequirement.java
View File

@@ -19,7 +19,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -44,7 +44,7 @@ public class BuffExceptRequirement extends MapleQuestRequirement {
}
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return !chr.hasBuffFromSourceid(buffId);
}
}

4
src/main/java/server/quest/requirements/BuffRequirement.java
View File

@@ -19,7 +19,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -44,7 +44,7 @@ public class BuffRequirement extends MapleQuestRequirement {
}
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return chr.hasBuffFromSourceid(buffId);
}
}

4
src/main/java/server/quest/requirements/CompletedQuestRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -47,7 +47,7 @@ public class CompletedQuestRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return chr.getCompletedQuests().size() >= reqQuest;
}
}

7
src/main/java/server/quest/requirements/EndDateRequirement.java
View File

@@ -21,13 +21,14 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import java.util.Calendar;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import java.util.Calendar;
/**
*
* @author Tyler (Twdtwd)
@@ -52,7 +53,7 @@ public class EndDateRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
Calendar cal = Calendar.getInstance();
cal.set(Integer.parseInt(timeStr.substring(0, 4)), Integer.parseInt(timeStr.substring(4, 6)), Integer.parseInt(timeStr.substring(6, 8)), Integer.parseInt(timeStr.substring(8, 10)), 0);
return cal.getTimeInMillis() >= System.currentTimeMillis();

4
src/main/java/server/quest/requirements/FieldEnterRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -50,7 +50,7 @@ public class FieldEnterRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return mapId == chr.getMapId();
}
}

9
src/main/java/server/quest/requirements/InfoExRequirement.java
View File

@@ -21,14 +21,15 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import java.util.ArrayList;
import java.util.List;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author Tyler (Twdtwd)
@@ -55,7 +56,7 @@ public class InfoExRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return true;
}

4
src/main/java/server/quest/requirements/InfoNumberRequirement.java
View File

@@ -19,7 +19,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -47,7 +47,7 @@ public class InfoNumberRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return true;
}

6
src/main/java/server/quest/requirements/IntervalRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import client.MapleQuestStatus;
import provider.MapleData;
import provider.MapleDataTool;
@@ -51,7 +51,7 @@ public class IntervalRequirement extends MapleQuestRequirement {
interval = MapleDataTool.getInt(data) * 60 * 1000;
}
private static String getIntervalTimeLeft(MapleCharacter chr, IntervalRequirement r) {
private static String getIntervalTimeLeft(Character chr, IntervalRequirement r) {
StringBuilder str = new StringBuilder();
long futureTime = chr.getQuest(MapleQuest.getInstance(r.questID)).getCompletionTime() + r.getInterval();
@@ -83,7 +83,7 @@ public class IntervalRequirement extends MapleQuestRequirement {
}
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
boolean check = !chr.getQuest(MapleQuest.getInstance(questID)).getStatus().equals(MapleQuestStatus.Status.COMPLETED);
boolean check2 = chr.getQuest(MapleQuest.getInstance(questID)).getCompletionTime() <= System.currentTimeMillis() - interval;

4
src/main/java/server/quest/requirements/ItemRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import client.inventory.InventoryType;
import client.inventory.Item;
import constants.inventory.ItemConstants;
@@ -59,7 +59,7 @@ public class ItemRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for(Integer itemId : items.keySet()) {
int countNeeded = items.get(itemId);

12
src/main/java/server/quest/requirements/JobRequirement.java
View File

@@ -21,15 +21,15 @@
*/
package server.quest.requirements;
import java.util.ArrayList;
import java.util.List;
import client.Character;
import client.MapleJob;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import client.MapleCharacter;
import client.MapleJob;
import java.util.ArrayList;
import java.util.List;
/**
*
@@ -56,7 +56,7 @@ public class JobRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
for(Integer job : jobs) {
if (chr.getJob().equals(MapleJob.getById(job)) || chr.isGM()) {
return true;

6
src/main/java/server/quest/requirements/MapleQuestRequirement.java
View File

@@ -21,9 +21,9 @@
*/
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import server.quest.MapleQuestRequirementType;
import client.MapleCharacter;
/**
* Base class for a Quest Requirement. Quest system uses it for all requirements.
@@ -38,11 +38,11 @@ public abstract class MapleQuestRequirement {
/**
* Checks the requirement to see if the player currently meets it.
* @param chr The {@link MapleCharacter} to check on.
* @param chr The {@link Character} to check on.
* @param npcid The NPC ID it was called from.
* @return boolean If the check was passed or not.
*/
public abstract boolean check(MapleCharacter chr, Integer npcid);
public abstract boolean check(Character chr, Integer npcid);
/**
* Processes the data and stores it in the class for future use.

4
src/main/java/server/quest/requirements/MaxLevelRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -51,7 +51,7 @@ public class MaxLevelRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return maxLevel >= chr.getLevel();
}
}

4
src/main/java/server/quest/requirements/MesoRequirement.java
View File

@@ -19,11 +19,11 @@
*/
package server.quest.requirements;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import client.MapleCharacter;
/**
*
@@ -44,7 +44,7 @@ public class MesoRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
if (chr.getMeso() >= meso) {
return true;
} else {

4
src/main/java/server/quest/requirements/MinLevelRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -48,7 +48,7 @@ public class MinLevelRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return chr.getLevel() >= minLevel;
}
}

4
src/main/java/server/quest/requirements/MinTamenessRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import client.inventory.Pet;
import provider.MapleData;
import provider.MapleDataTool;
@@ -52,7 +52,7 @@ public class MinTamenessRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
int curCloseness = 0;
for(Pet pet : chr.getPets()) {

12
src/main/java/server/quest/requirements/MobRequirement.java
View File

@@ -21,16 +21,16 @@
*/
package server.quest.requirements;
import java.util.HashMap;
import java.util.Map;
import client.Character;
import client.MapleQuestStatus;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import tools.FilePrinter;
import client.MapleCharacter;
import client.MapleQuestStatus;
import java.util.HashMap;
import java.util.Map;
/**
*
@@ -61,7 +61,7 @@ public class MobRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
MapleQuestStatus status = chr.getQuest(MapleQuest.getInstance(questID));
for(Integer mobID : mobs.keySet()) {
int countReq = mobs.get(mobID);

4
src/main/java/server/quest/requirements/MonsterBookCountRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -47,7 +47,7 @@ public class MonsterBookCountRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return chr.getMonsterBook().getTotalCards() >= reqCards;
}
}

4
src/main/java/server/quest/requirements/NpcRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -46,7 +46,7 @@ public class NpcRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return npcid != null && npcid == reqNPC;
}

4
src/main/java/server/quest/requirements/PetRequirement.java
View File

@@ -21,7 +21,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import client.inventory.Pet;
import provider.MapleData;
import provider.MapleDataTool;
@@ -54,7 +54,7 @@ public class PetRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
for(Pet pet : chr.getPets()) {
if(pet == null) continue; // thanks Arufonsu for showing a NPE occurring here

12
src/main/java/server/quest/requirements/QuestRequirement.java
View File

@@ -18,15 +18,15 @@
*/
package server.quest.requirements;
import java.util.HashMap;
import java.util.Map;
import client.Character;
import client.MapleQuestStatus;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestRequirementType;
import client.MapleCharacter;
import client.MapleQuestStatus;
import java.util.HashMap;
import java.util.Map;
/**
*
@@ -55,7 +55,7 @@ public class QuestRequirement extends MapleQuestRequirement {
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
for(Integer questID : quests.keySet()) {
int stateReq = quests.get(questID);
MapleQuestStatus qs = chr.getQuest(MapleQuest.getInstance(questID));

4
src/main/java/server/quest/requirements/ScriptRequirement.java
View File

@@ -19,7 +19,7 @@
*/
package server.quest.requirements;
import client.MapleCharacter;
import client.Character;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -43,7 +43,7 @@ public class ScriptRequirement extends MapleQuestRequirement {
}
@Override
public boolean check(MapleCharacter chr, Integer npcid) {
public boolean check(Character chr, Integer npcid) {
return true;
}