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

Masteria NPCs & Quests

Browse Source 
Added more NPCs for the Phantom Woods and Crimsonwood areas. Enabled
more quests on that area.
This commit is contained in:
ronancpl
2017-07-10 23:42:24 -03:00
parent b7c0bb6c07
commit 57125a70ce
43 changed files with 776 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/quest/MapleQuest.java
View File

@@ -135,10 +135,10 @@ public class MapleQuest {
if (startActData != null) {
for (MapleData startAct : startActData.getChildren()) {
MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(startAct.getName());
MapleQuestAction act = this.getAction(questActionType, startAct);
MapleQuestAction act = this.getAction(questActionType, startAct);
if(act == null)
continue;
if(act == null)
continue;
startActs.put(questActionType, act);
}
@@ -146,11 +146,11 @@ public class MapleQuest {
MapleData completeActData = actData.getChildByPath("1");
if (completeActData != null) {
for (MapleData completeAct : completeActData.getChildren()) {
MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(completeAct.getName());
MapleQuestAction act = this.getAction(questActionType, completeAct);
if(act == null)
continue;
MapleQuestActionType questActionType = MapleQuestActionType.getByWZName(completeAct.getName());
MapleQuestAction act = this.getAction(questActionType, completeAct);
if(act == null)
continue;
completeActs.put(questActionType, act);
}
@@ -158,11 +158,11 @@ public class MapleQuest {
}
public boolean isAutoComplete() {
return autoPreComplete || autoComplete;
return autoPreComplete || autoComplete;
}
public boolean isAutoStart() {
return autoStart;
return autoStart;
}
public static MapleQuest getInstance(int id) {

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

@@ -80,7 +80,7 @@ public class ItemAction extends MapleQuestAction {
@Override
public void run(MapleCharacter chr, Integer extSelection) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
Map<Integer, Integer> props = new HashMap<>();
Map<Integer, Integer> props = new HashMap<>();
for(ItemData item : items.values()) {
if(item.getProp() != null && item.getProp() != -1 && canGetItem(item, chr)) {
for (int i = 0; i < item.getProp(); i++) {
@@ -133,7 +133,7 @@ public class ItemAction extends MapleQuestAction {
@Override
public boolean check(MapleCharacter chr, Integer extSelection) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
EnumMap<MapleInventoryType, Integer> props = new EnumMap<>(MapleInventoryType.class);
EnumMap<MapleInventoryType, Integer> props = new EnumMap<>(MapleInventoryType.class);
List<Pair<Item, MapleInventoryType>> itemList = new ArrayList<>();
for(ItemData item : items.values()) {
if (!canGetItem(item, chr)) {