Code Coupons + Worldmap update + Mini-games + Player Interaction wrap
Fixed several cases on the Cash Shop that would freeze some player actions when triggered, requiring exit Cash Shop to unstuck. Implemented Code Coupons, supporting several items bundled on the same code, and also devised a way to automate code generation. Added a current status on-demand option on the Buyback command. Info such as "current fee" or "time remaining" are available now. Reviewed several cases where non-owned items would get stacked with owner-tagged items. Added Door support for Happyville, Crimsonwood Keep. Added worldmap tooltip support for some maps in Masteria's C. Keep and H. House. Added Masteria region to the world map. C. Keep interiors no longer relocates players to entrance after actions such as logout. Overhauled minigame mechanics: from player boxes tooltip and in-match improvements to deploy different minigame types, accordingly with item description or player choice. Fixed Amoria outskirts not relocating players to city after getting KO'ed. Fixed issues with pets, rings and cash items being assigned the same cash unique ids leading to some quirks on the cash shop inventory. Fixed an issue with the recently added HP/MP ratio update, arbitrarily taking off 1 point in certain cases. Answer positions on the explorer's 3rd job quiz are now randomed. Fixed several issues that showed up when the bcrypt system is disabled. DOT from maps such as El Nath and Aqua Road now procs at a 5sec interval, GMS-like. Improved performance of Whodrops and Search commands. Concurrently protected player interaction handlers, thus mitigating several exploits on these lines. Adjusted several expedition timers, such as Horntail, now having a more sane deadline. Concurrently protected chair modules. Fixed "seduce" debuff not working on chairs.
This commit is contained in:
ronancpl
@@ -1996,9 +1996,9 @@ public class MaplePacketCreator {
|
||||
MapleMiniGame miniGame = chr.getMiniGame();
|
||||
if (miniGame != null && miniGame.isOwner(chr)) {
|
||||
if (miniGame.hasFreeSlot()) {
|
||||
spawnAnnounceBox(mplew, miniGame, 0, 1, 0);
|
||||
addAnnounceBox(mplew, miniGame, 1, 0);
|
||||
} else {
|
||||
spawnAnnounceBox(mplew, miniGame, 0, 2, 1);
|
||||
addAnnounceBox(mplew, miniGame, 2, miniGame.isMatchInProgress() ? 1 : 0);
|
||||
}
|
||||
} else {
|
||||
mplew.write(0);
|
||||
@@ -2170,23 +2170,12 @@ public class MaplePacketCreator {
|
||||
mplew.write(0);
|
||||
}
|
||||
|
||||
private static void addAnnounceBox(final MaplePacketLittleEndianWriter mplew, MapleMiniGame game, int type, int ammount, int joinable) {
|
||||
mplew.write(game.getGameType().getValue());
|
||||
mplew.writeInt(game.getObjectId()); // gameid/shopid
|
||||
mplew.writeMapleAsciiString(game.getDescription()); // desc
|
||||
mplew.writeMapleAsciiString(game.getPassword());
|
||||
mplew.write(type);
|
||||
mplew.write(ammount);
|
||||
mplew.write(2);
|
||||
mplew.write(joinable);
|
||||
}
|
||||
|
||||
private static void spawnAnnounceBox(final MaplePacketLittleEndianWriter mplew, MapleMiniGame game, int type, int ammount, int joinable) {
|
||||
private static void addAnnounceBox(final MaplePacketLittleEndianWriter mplew, MapleMiniGame game, int ammount, int joinable) {
|
||||
mplew.write(game.getGameType().getValue());
|
||||
mplew.writeInt(game.getObjectId()); // gameid/shopid
|
||||
mplew.writeMapleAsciiString(game.getDescription()); // desc
|
||||
mplew.writeBool(!game.getPassword().isEmpty()); // password here, thanks GabrielSin!
|
||||
mplew.write(type);
|
||||
mplew.write(game.getPieceType());
|
||||
mplew.write(ammount);
|
||||
mplew.write(2); //player capacity
|
||||
mplew.write(joinable);
|
||||
@@ -5016,7 +5005,7 @@ public class MaplePacketCreator {
|
||||
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.WIN, true));
|
||||
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.TIE, true));
|
||||
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.LOSS, true));
|
||||
mplew.writeInt(2000);
|
||||
mplew.writeInt(minigame.getOwnerScore());
|
||||
if (minigame.getVisitor() != null) {
|
||||
MapleCharacter visitor = minigame.getVisitor();
|
||||
mplew.write(1);
|
||||
@@ -5024,7 +5013,7 @@ public class MaplePacketCreator {
|
||||
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.WIN, true));
|
||||
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.TIE, true));
|
||||
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.LOSS, true));
|
||||
mplew.writeInt(2000);
|
||||
mplew.writeInt(minigame.getVisitorScore());
|
||||
}
|
||||
mplew.write(0xFF);
|
||||
mplew.writeMapleAsciiString(minigame.getDescription());
|
||||
@@ -5115,7 +5104,7 @@ public class MaplePacketCreator {
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
public static byte[] getMiniGameNewVisitor(MapleCharacter c, int slot) {
|
||||
public static byte[] getMiniGameNewVisitor(MapleMiniGame minigame, MapleCharacter c, int slot) {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.writeShort(SendOpcode.PLAYER_INTERACTION.getValue());
|
||||
mplew.write(PlayerInteractionHandler.Action.VISIT.getCode());
|
||||
@@ -5126,7 +5115,7 @@ public class MaplePacketCreator {
|
||||
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.WIN, true));
|
||||
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.TIE, true));
|
||||
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.LOSS, true));
|
||||
mplew.writeInt(2000);
|
||||
mplew.writeInt(minigame.getVisitorScore());
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
@@ -5138,50 +5127,64 @@ public class MaplePacketCreator {
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
private static byte[] getMiniGameResult(MapleMiniGame game, int win, int lose, int tie, int result, int forfeit, boolean omok) {
|
||||
private static byte[] getMiniGameResult(MapleMiniGame game, int tie, int result, int forfeit) {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.writeShort(SendOpcode.PLAYER_INTERACTION.getValue());
|
||||
mplew.write(PlayerInteractionHandler.Action.GET_RESULT.getCode());
|
||||
|
||||
int matchResultType;
|
||||
if (tie == 0 && forfeit != 1) {
|
||||
mplew.write(0);
|
||||
} else if (tie == 1) {
|
||||
mplew.write(1);
|
||||
} else if (forfeit == 1) {
|
||||
mplew.write(2);
|
||||
matchResultType = 0;
|
||||
} else if (tie != 0) {
|
||||
matchResultType = 1;
|
||||
} else {
|
||||
matchResultType = 2;
|
||||
}
|
||||
mplew.write(0); // owner
|
||||
mplew.writeInt(1); // unknown
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.WIN, omok) + win); // wins
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.TIE, omok) + tie); // ties
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.LOSS, omok) + lose); // losses
|
||||
mplew.writeInt(2000); // points
|
||||
mplew.writeInt(1); // start of visitor; unknown
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.WIN, omok) + lose); // wins
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.TIE, omok) + tie); // ties
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.LOSS, omok) + win); // losses
|
||||
mplew.writeInt(2000); // points
|
||||
game.getOwner().setMiniGamePoints(game.getVisitor(), result, omok);
|
||||
|
||||
mplew.write(matchResultType);
|
||||
mplew.writeBool(result == 2); // host/visitor wins
|
||||
|
||||
boolean omok = game.isOmok();
|
||||
if (matchResultType == 1) {
|
||||
mplew.write(0);
|
||||
mplew.writeShort(0);
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.WIN, omok)); // wins
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.TIE, omok)); // ties
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.LOSS, omok)); // losses
|
||||
mplew.writeInt(game.getOwnerScore()); // points
|
||||
|
||||
mplew.writeInt(0); // unknown
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.WIN, omok)); // wins
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.TIE, omok)); // ties
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.LOSS, omok)); // losses
|
||||
mplew.writeInt(game.getVisitorScore()); // points
|
||||
mplew.write(0);
|
||||
} else {
|
||||
mplew.writeInt(0);
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.WIN, omok)); // wins
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.TIE, omok)); // ties
|
||||
mplew.writeInt(game.getOwner().getMiniGamePoints(MiniGameResult.LOSS, omok)); // losses
|
||||
mplew.writeInt(game.getOwnerScore()); // points
|
||||
mplew.writeInt(0);
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.WIN, omok)); // wins
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.TIE, omok)); // ties
|
||||
mplew.writeInt(game.getVisitor().getMiniGamePoints(MiniGameResult.LOSS, omok)); // losses
|
||||
mplew.writeInt(game.getVisitorScore()); // points
|
||||
}
|
||||
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
public static byte[] getMiniGameOwnerWin(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 0, 1, 0, 1, 0, true);
|
||||
public static byte[] getMiniGameOwnerWin(MapleMiniGame game, boolean forfeit) {
|
||||
return getMiniGameResult(game, 0, 1, forfeit ? 1 : 0);
|
||||
}
|
||||
|
||||
public static byte[] getMiniGameVisitorWin(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 1, 0, 0, 2, 0, true);
|
||||
public static byte[] getMiniGameVisitorWin(MapleMiniGame game, boolean forfeit) {
|
||||
return getMiniGameResult(game, 0, 2, forfeit ? 1 : 0);
|
||||
}
|
||||
|
||||
public static byte[] getMiniGameTie(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 0, 0, 1, 3, 0, true);
|
||||
}
|
||||
|
||||
public static byte[] getMiniGameOwnerForfeit(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 0, 1, 0, 2, 1, true);
|
||||
}
|
||||
|
||||
public static byte[] getMiniGameVisitorForfeit(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 1, 0, 0, 1, 1, true);
|
||||
return getMiniGameResult(game, 1, 3, 0);
|
||||
}
|
||||
|
||||
public static byte[] getMiniGameClose(int type) {
|
||||
@@ -5215,7 +5218,9 @@ public class MaplePacketCreator {
|
||||
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.WIN, false));
|
||||
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.TIE, false));
|
||||
mplew.writeInt(minigame.getOwner().getMiniGamePoints(MiniGameResult.LOSS, false));
|
||||
mplew.writeInt(2000);
|
||||
|
||||
//set vs
|
||||
mplew.writeInt(minigame.getOwnerScore());
|
||||
if (minigame.getVisitor() != null) {
|
||||
MapleCharacter visitor = minigame.getVisitor();
|
||||
mplew.write(1);
|
||||
@@ -5223,7 +5228,7 @@ public class MaplePacketCreator {
|
||||
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.WIN, false));
|
||||
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.TIE, false));
|
||||
mplew.writeInt(visitor.getMiniGamePoints(MiniGameResult.LOSS, false));
|
||||
mplew.writeInt(2000);
|
||||
mplew.writeInt(minigame.getVisitorScore());
|
||||
}
|
||||
mplew.write(0xFF);
|
||||
mplew.writeMapleAsciiString(minigame.getDescription());
|
||||
@@ -5237,20 +5242,24 @@ public class MaplePacketCreator {
|
||||
mplew.writeShort(SendOpcode.PLAYER_INTERACTION.getValue());
|
||||
mplew.write(PlayerInteractionHandler.Action.START.getCode());
|
||||
mplew.write(loser);
|
||||
mplew.write(0x0C);
|
||||
int last = 13;
|
||||
|
||||
int last;
|
||||
if (game.getMatchesToWin() > 10) {
|
||||
last = 31;
|
||||
last = 30;
|
||||
} else if (game.getMatchesToWin() > 6) {
|
||||
last = 21;
|
||||
last = 20;
|
||||
} else {
|
||||
last = 12;
|
||||
}
|
||||
for (int i = 1; i < last; i++) {
|
||||
|
||||
mplew.write(last);
|
||||
for (int i = 0; i < last; i++) {
|
||||
mplew.writeInt(game.getCardId(i));
|
||||
}
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
public static byte[] getMatchCardNewVisitor(MapleCharacter c, int slot) {
|
||||
public static byte[] getMatchCardNewVisitor(MapleMiniGame minigame, MapleCharacter c, int slot) {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.writeShort(SendOpcode.PLAYER_INTERACTION.getValue());
|
||||
mplew.write(PlayerInteractionHandler.Action.VISIT.getCode());
|
||||
@@ -5261,7 +5270,7 @@ public class MaplePacketCreator {
|
||||
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.WIN, false));
|
||||
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.TIE, false));
|
||||
mplew.writeInt(c.getMiniGamePoints(MiniGameResult.LOSS, false));
|
||||
mplew.writeInt(2000);
|
||||
mplew.writeInt(minigame.getVisitorScore());
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
@@ -5280,18 +5289,6 @@ public class MaplePacketCreator {
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
public static byte[] getMatchCardOwnerWin(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 1, 0, 0, 1, 0, false);
|
||||
}
|
||||
|
||||
public static byte[] getMatchCardVisitorWin(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 0, 1, 0, 2, 0, false);
|
||||
}
|
||||
|
||||
public static byte[] getMatchCardTie(MapleMiniGame game) {
|
||||
return getMiniGameResult(game, 0, 0, 1, 3, 0, false);
|
||||
}
|
||||
|
||||
public static byte[] fredrickMessage(byte operation) {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.writeShort(SendOpcode.FREDRICK_MESSAGE.getValue());
|
||||
@@ -5343,7 +5340,7 @@ public class MaplePacketCreator {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.writeShort(SendOpcode.UPDATE_CHAR_BOX.getValue());
|
||||
mplew.writeInt(c.getId());
|
||||
addAnnounceBox(mplew, c.getMiniGame(), 0, ammount, type);
|
||||
addAnnounceBox(mplew, c.getMiniGame(), ammount, type);
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
@@ -5351,7 +5348,7 @@ public class MaplePacketCreator {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.writeShort(SendOpcode.UPDATE_CHAR_BOX.getValue());
|
||||
mplew.writeInt(c.getId());
|
||||
addAnnounceBox(mplew, c.getMiniGame(), 0, ammount, type);
|
||||
addAnnounceBox(mplew, c.getMiniGame(), ammount, type);
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
@@ -6005,7 +6002,7 @@ public class MaplePacketCreator {
|
||||
mplew.write(new byte[]{-1, -1, -1, 0});
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
|
||||
public static byte[] showCouponRedeemedItem(int itemid) {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.writeShort(SendOpcode.CASHSHOP_OPERATION.getValue());
|
||||
@@ -6030,11 +6027,8 @@ public class MaplePacketCreator {
|
||||
return mplew.getPacket();
|
||||
}
|
||||
|
||||
public static byte[] enableCSUse() {
|
||||
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
|
||||
mplew.write(0x12);
|
||||
mplew.skip(6);
|
||||
return mplew.getPacket();
|
||||
public static byte[] enableCSUse(MapleCharacter mc) {
|
||||
return showCash(mc);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,129 +0,0 @@
|
||||
/*
|
||||
* To change this template, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
package tools.dropspider;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import provider.MapleData;
|
||||
import provider.MapleDataDirectoryEntry;
|
||||
import provider.MapleDataFileEntry;
|
||||
import provider.MapleDataProvider;
|
||||
import provider.MapleDataProviderFactory;
|
||||
import provider.MapleDataTool;
|
||||
import server.MapleItemInformationProvider;
|
||||
import tools.Pair;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Simon
|
||||
*/
|
||||
public class DataTool {
|
||||
private static Map<String, Integer> hardcodedMobs = new HashMap<>();
|
||||
|
||||
private static ArrayList<Pair<Integer, String>> npc_list = null;
|
||||
private static LinkedList<Pair<Integer, String>> mob_pairs = null;
|
||||
private static MapleDataProvider data = MapleDataProviderFactory.getDataProvider(MapleDataProviderFactory.fileInWZPath("Mob.wz"));
|
||||
private static HashSet<Integer> bosses = null;
|
||||
|
||||
public static void setHardcodedMobNames() {
|
||||
hardcodedMobs.put("Red Slime [2]", 7120103);
|
||||
hardcodedMobs.put("Gold Slime", 7120105);
|
||||
hardcodedMobs.put("Nibelung [3]", 8220015);
|
||||
}
|
||||
|
||||
public static void addMonsterIdsFromHardcodedName(List<Integer> monster_ids, String monster_name) {
|
||||
Integer id = hardcodedMobs.get(monster_name);
|
||||
if(id != null) {
|
||||
monster_ids.add(id);
|
||||
}
|
||||
}
|
||||
|
||||
public static ArrayList<Integer> monsterIdsFromName(String name) {
|
||||
MapleData data = null;
|
||||
MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "String.wz"));
|
||||
ArrayList<Integer> ret = new ArrayList<>();
|
||||
data = dataProvider.getData("Mob.img");
|
||||
if (mob_pairs == null) {
|
||||
mob_pairs = new LinkedList<>();
|
||||
for (MapleData mobIdData : data.getChildren()) {
|
||||
int mobIdFromData = Integer.parseInt(mobIdData.getName());
|
||||
String mobNameFromData = MapleDataTool.getString(mobIdData.getChildByPath("name"), "NO-NAME");
|
||||
mob_pairs.add(new Pair<>(mobIdFromData, mobNameFromData));
|
||||
}
|
||||
}
|
||||
for (Pair<Integer, String> mobPair : mob_pairs) {
|
||||
if (mobPair.getRight().toLowerCase().equals(name.toLowerCase())) {
|
||||
ret.add(mobPair.getLeft());
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
private static void populateBossList() {
|
||||
bosses = new HashSet<>();
|
||||
MapleDataDirectoryEntry mob_data = data.getRoot();
|
||||
for (MapleDataFileEntry mdfe : mob_data.getFiles()) {
|
||||
MapleData boss_candidate = data.getData(mdfe.getName());
|
||||
MapleData monsterInfoData = boss_candidate.getChildByPath("info");
|
||||
int mid = Integer.valueOf(boss_candidate.getName().replaceAll("[^0-9]", ""));
|
||||
boolean boss = MapleDataTool.getIntConvert("boss", monsterInfoData, 0) > 0 || mid == 8810018 || mid == 9410066;
|
||||
if (boss) {
|
||||
bosses.add(mid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isBoss(int mid) {
|
||||
if (bosses == null) {
|
||||
populateBossList();
|
||||
}
|
||||
return bosses.contains(mid);
|
||||
}
|
||||
|
||||
public static ArrayList<Integer> itemIdsFromName(String name) {
|
||||
|
||||
ArrayList<Integer> ret = new ArrayList<>();
|
||||
for (Pair<Integer, String> itemPair : MapleItemInformationProvider.getInstance().getAllItems()) {
|
||||
String item_name = itemPair.getRight().toLowerCase().replaceAll("\\"", "");
|
||||
item_name = item_name.replaceAll("'", "");
|
||||
item_name = item_name.replaceAll("\\'", "");
|
||||
|
||||
name = name.toLowerCase().replaceAll("\\"", "");
|
||||
name = name.replaceAll("'", "");
|
||||
name = name.replaceAll("\\'", "");
|
||||
|
||||
if (item_name.equals(name)) {
|
||||
ret.add(itemPair.getLeft());
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
public static ArrayList<Integer> npcIdsFromName(String name) {
|
||||
MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "String.wz"));
|
||||
ArrayList<Integer> ret = new ArrayList<>();
|
||||
if (npc_list == null) {
|
||||
ArrayList<Pair<Integer, String>> searchList = new ArrayList<>();
|
||||
for (MapleData searchData : dataProvider.getData("Npc.img").getChildren()) {
|
||||
int searchFromData = Integer.parseInt(searchData.getName());
|
||||
String infoFromData = MapleDataTool.getString(searchData.getChildByPath("name"), "NO-NAME");
|
||||
searchList.add(new Pair<>(searchFromData, infoFromData));
|
||||
}
|
||||
npc_list = searchList;
|
||||
}
|
||||
for (Pair<Integer, String> searched : npc_list) {
|
||||
if (searched.getRight().toLowerCase().contains(name.toLowerCase())) {
|
||||
ret.add(searched.getLeft());
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -1,177 +0,0 @@
|
||||
/*
|
||||
* To change this template, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
package tools.dropspider;
|
||||
|
||||
import client.inventory.MapleInventoryType;
|
||||
import constants.ItemConstants;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Simon
|
||||
*/
|
||||
public class DropEntry {
|
||||
private int version;
|
||||
private int item_id;
|
||||
private int monster_id;
|
||||
private int chance;
|
||||
private int mindrop;
|
||||
private int maxdrop;
|
||||
|
||||
public DropEntry(int item_id, int monster_id, int version) {
|
||||
this.item_id = item_id;
|
||||
this.monster_id = monster_id;
|
||||
mindrop = 1;
|
||||
maxdrop = 1;
|
||||
chance = calculateChance(item_id);
|
||||
this.version = version;
|
||||
}
|
||||
|
||||
private int calculateChance(int item_id) {
|
||||
MapleInventoryType mit = ItemConstants.getInventoryType(item_id);
|
||||
boolean boss = DataTool.isBoss(monster_id);
|
||||
int number = (item_id / 1000) % 1000;
|
||||
switch (mit) {
|
||||
case EQUIP:
|
||||
if (boss) {
|
||||
return 40000;
|
||||
}
|
||||
return 700;
|
||||
case USE:
|
||||
if (boss) {
|
||||
mindrop = 1;
|
||||
maxdrop = 4;
|
||||
}
|
||||
switch (number) {
|
||||
case 0: // normal potions
|
||||
mindrop = 1;
|
||||
if (version > 98) {
|
||||
maxdrop = 5;
|
||||
}
|
||||
return 40000;
|
||||
case 1: // watermelons, pills, speed potions, etc
|
||||
case 2: // same thing
|
||||
return 10000;
|
||||
case 3: // advanced potions from crafting (should not drop)
|
||||
case 4: // same thing
|
||||
case 11: // poison mushroom
|
||||
case 28: // cool items
|
||||
case 30: // return scrolls
|
||||
case 46: // gallant scrolls
|
||||
return 0;
|
||||
case 10: // strange potions like apples, eggs
|
||||
case 12: // drakes blood, sap of ancient tree (rare use)
|
||||
case 20: // salad, fried chicken, dews
|
||||
case 22: // air bubbles and stuff. ALSO nependeath honey but oh well
|
||||
case 50: // antidotes and stuff
|
||||
return 3000;
|
||||
case 290: // mastery books
|
||||
if(boss)
|
||||
return 40000;
|
||||
else
|
||||
return 1000;
|
||||
case 40: // Scrolls
|
||||
case 41: // Scrolls
|
||||
case 43: // Scrolls
|
||||
case 44: // Scrolls
|
||||
case 48: // pet scrolls
|
||||
if(boss)
|
||||
return 10000;
|
||||
else
|
||||
return 750;
|
||||
case 100: // summon bags
|
||||
case 101: // summon bags
|
||||
case 102: // summon bags
|
||||
case 109: // summon bags
|
||||
case 120: // pet food
|
||||
case 211: // cliffs special potion
|
||||
case 240: // rings
|
||||
case 270: // pheromone, additional weird stuff
|
||||
case 310: // teleport rock
|
||||
case 320: // weird drops
|
||||
case 390: // weird
|
||||
case 430: // Scripted items
|
||||
case 440: // jukebox
|
||||
case 460: // magnifying glass
|
||||
case 470: // golden hammer
|
||||
case 490: // crystanol
|
||||
case 500: // sp reset
|
||||
return 0;
|
||||
case 47: // tablets from dragon rider
|
||||
return 220000;
|
||||
case 49: // clean slats, potential scroll, ees
|
||||
case 70: // throwing stars
|
||||
case 210: // rare monster piece drops
|
||||
case 330: // bullets
|
||||
if(boss)
|
||||
return 2500;
|
||||
else
|
||||
return 400;
|
||||
case 60: // bow arrows
|
||||
case 61: // crossbow arrows
|
||||
mindrop = 10;
|
||||
maxdrop = 50;
|
||||
return 10000;
|
||||
case 213: // boss transfrom
|
||||
return 100000;
|
||||
case 280: // skill books
|
||||
if(boss)
|
||||
return 20000;
|
||||
else
|
||||
return 1000;
|
||||
case 381: // monster book things
|
||||
case 382:
|
||||
case 383:
|
||||
case 384:
|
||||
case 385:
|
||||
case 386:
|
||||
case 387:
|
||||
case 388:
|
||||
return 20000;
|
||||
case 510: // recipes
|
||||
case 511:
|
||||
case 512:
|
||||
return 10000;
|
||||
default:
|
||||
return 0;
|
||||
|
||||
}
|
||||
case ETC:
|
||||
switch (number) {
|
||||
case 0: // monster pieces
|
||||
return 200000;
|
||||
case 4: // crystal ores
|
||||
case 130: // simulators
|
||||
case 131: // manuals
|
||||
return 3000;
|
||||
case 30: // game pieces
|
||||
return 10000;
|
||||
case 32: // misc items
|
||||
return 10000;
|
||||
default:
|
||||
return 7000;
|
||||
}
|
||||
default:
|
||||
return 7000;
|
||||
}
|
||||
}
|
||||
|
||||
public String getQuerySegment() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("(");
|
||||
sb.append(monster_id);
|
||||
sb.append(", ");
|
||||
sb.append(item_id);
|
||||
sb.append(", ");
|
||||
sb.append(mindrop);//min
|
||||
sb.append(", ");
|
||||
sb.append(maxdrop);//max
|
||||
sb.append(", ");
|
||||
sb.append(0);//quest
|
||||
sb.append(", ");
|
||||
sb.append(chance);
|
||||
sb.append(")");
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package tools.dropspider;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
public class Errors {
|
||||
|
||||
public String mobName;
|
||||
public LinkedList<String> wrong = new LinkedList<>();
|
||||
|
||||
public String createErrorLog() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
for (String w : wrong) {
|
||||
sb.append(mobName).append(" : ").append(w).append("\r\n");
|
||||
}
|
||||
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
@@ -1,339 +0,0 @@
|
||||
/*
|
||||
* To change this template, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
package tools.dropspider;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.PrintWriter;
|
||||
import java.net.Authenticator;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.Scanner;
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Simon
|
||||
*/
|
||||
|
||||
//NOTE: this tool is currently unsupported since HS started using HTTPS. Missing proper SSL certificates to access Hidden-Street's website.
|
||||
public class Main {
|
||||
|
||||
private static ArrayList<DropEntry> drop_entries = new ArrayList<>();
|
||||
private static HashMap<String, Errors> problems = new HashMap<>();
|
||||
// private static final String TEST_STRING = " <a href=\"/items/leftover/ligator-skin\" alt=\"/tip.php?nid=2138\">Ligator Skin</a>, <a href=\"/items/leftover/the-magic-rock\" alt=\"/tip.php?nid=3954\">The Magic Rock</a>, <a href=\"/items/quest/witch-grass-leaves\" alt=\"/tip.php?nid=6129\">Witch Grass Leaves</a> </td> ";
|
||||
private static final String BASE_URL = "https://bbb.hidden-street.net";
|
||||
private static final int VERSION = 83;
|
||||
private static String[] pages = {"1-10", "11-20", "21-30", "31-40", "41-50", "51-60", "61-70", "71-80", "81-90", "91-100"};
|
||||
private static String[] additionalPages88 = {"101-150", "151-200"};
|
||||
private static String[] additionalPagesBB = {"101-120,", "121-140", "141-160", "161-180", "181-200"};
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.setProperty("wzpath", "wz");
|
||||
|
||||
//DataTool.setHardcodedMobNames();
|
||||
//parsePage("https://bbb.hidden-street.net/monster/nibelung-3");
|
||||
|
||||
crawlProgram();
|
||||
|
||||
dumpQuery();
|
||||
dumpErrors();
|
||||
}
|
||||
|
||||
private static void crawlProgram() {
|
||||
//parseMonsterSection(TEST_STRING);
|
||||
for (String s : pages) {
|
||||
crawlPage("https://bbb.hidden-street.net/monster/" + s);
|
||||
}
|
||||
if (VERSION > 92) { // big bang
|
||||
for (String s : additionalPagesBB) {
|
||||
crawlPage("https://bbb.hidden-street.net/monster/" + s);
|
||||
}
|
||||
crawlPage("https://bbb.hidden-street.net/monster/101-120?page=1"); //page 1's bugged
|
||||
} else {
|
||||
for (String s : additionalPages88) {
|
||||
crawlPage("https://bbb.hidden-street.net/monster/" + s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void crawlPage(String url) { //recursive method
|
||||
try {
|
||||
URL page = new URL(url);
|
||||
//Authenticator.setDefault( new MyAuthenticator()); // todo keystore/truststore pass
|
||||
HttpsURLConnection http = (HttpsURLConnection)page.openConnection();
|
||||
http.setAllowUserInteraction(true);
|
||||
http.setRequestMethod("GET");
|
||||
http.connect();
|
||||
|
||||
InputStream is = http.getInputStream();
|
||||
Scanner s = new Scanner(is);
|
||||
String temp_data = "";
|
||||
while (s.hasNext()) {
|
||||
temp_data += s.nextLine() + "\n";
|
||||
}
|
||||
s.close();
|
||||
is.close();
|
||||
while (temp_data.contains("class=\"monster\">")) {
|
||||
String monster_section = getStringBetween(temp_data, "class=\"monster\">", "</table>");
|
||||
parseMonsterSection(monster_section);
|
||||
temp_data = trimUntil(temp_data, "</table>");
|
||||
}
|
||||
if (temp_data.contains("Go to next page")) {
|
||||
String next_url_segment = getStringBetween(temp_data, "<li class=\"pager-next\"><a href=\"", "\" title=\"Go to next page");
|
||||
String next_url = BASE_URL + next_url_segment;
|
||||
crawlPage(next_url);
|
||||
} else {
|
||||
System.out.println("Finished crawling section.");
|
||||
}
|
||||
} catch (MalformedURLException mue) {
|
||||
mue.printStackTrace();
|
||||
System.out.println("Error parsing URL: " + url);
|
||||
return;
|
||||
} catch (IOException ioe) {
|
||||
ioe.printStackTrace();
|
||||
System.out.println("Error reading from URL: " + ioe.getLocalizedMessage());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private static void parsePage(String url) { //unit method
|
||||
try {
|
||||
URL page = new URL(url);
|
||||
InputStream is = page.openStream();
|
||||
Scanner s = new Scanner(is);
|
||||
String temp_data = "";
|
||||
while (s.hasNext()) {
|
||||
temp_data += s.nextLine() + "\n";
|
||||
}
|
||||
s.close();
|
||||
is.close();
|
||||
while (temp_data.contains("class=\"monster\">")) {
|
||||
String monster_section = getStringBetween(temp_data, "class=\"monster\">", "</table>");
|
||||
parseMonsterSection(monster_section);
|
||||
temp_data = trimUntil(temp_data, "</table>");
|
||||
}
|
||||
if (temp_data.contains("Go to next page")) {
|
||||
String next_url_segment = getStringBetween(temp_data, "<li class=\"pager-next\"><a href=\"", "\" title=\"Go to next page");
|
||||
String next_url = BASE_URL + next_url_segment;
|
||||
//crawlPage(next_url);
|
||||
} else {
|
||||
System.out.println("Finished parsing section.");
|
||||
}
|
||||
} catch (MalformedURLException mue) {
|
||||
mue.printStackTrace();
|
||||
System.out.println("Error parsing URL: " + url);
|
||||
return;
|
||||
} catch (IOException ioe) {
|
||||
ioe.printStackTrace();
|
||||
System.out.println("Error reading from URL: " + ioe.getLocalizedMessage());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private static void parseMonsterSection(String html_data) {
|
||||
String monster_name = getStringBetween(html_data, "alt=\"", "\" title=");
|
||||
System.out.println(monster_name);
|
||||
// System.out.println(html_data);
|
||||
//parse etc drop
|
||||
parseItemSection(getStringBetween(html_data, "Etc. drop:</strong>", "</td>"), monster_name);
|
||||
|
||||
//parse useable drop
|
||||
parseItemSection(getStringBetween(html_data, "Useable drop:</strong>", "</td>"), monster_name);
|
||||
|
||||
//parse ore drop
|
||||
parseItemSection(getStringBetween(html_data, "Ore drop:</strong>", "</td>"), monster_name);
|
||||
|
||||
//parse equips
|
||||
parseItemSection(getStringBetween(html_data, "Common equipment:</strong>", "</div>"), monster_name);
|
||||
parseItemSection(getStringBetween(html_data, "Warrior equipment:</strong>", "</div>"), monster_name);
|
||||
parseItemSection(getStringBetween(html_data, "Magician equipment:</strong>", "</div>"), monster_name);
|
||||
parseItemSection(getStringBetween(html_data, "Bowman equipment:</strong>", "</div>"), monster_name);
|
||||
parseItemSection(getStringBetween(html_data, "Thief equipment:</strong>", "</div>"), monster_name);
|
||||
parseItemSection(getStringBetween(html_data, "Pirate equipment:</strong>", "</div>"), monster_name);
|
||||
|
||||
//System.out.println(monster_name);
|
||||
}
|
||||
|
||||
private static void parseItemSection(String html_data, String monster_name) {
|
||||
String temp_data = html_data;
|
||||
while (temp_data.contains("<a href")) {
|
||||
// System.out.println("Temp_data: " + temp_data);
|
||||
String s1 = trimUntil(temp_data, ">");
|
||||
String item_name = getStringBetween(s1, "", "</a>");
|
||||
temp_data = trimUntil(temp_data, "</a>");
|
||||
|
||||
boolean gender_equip = false;
|
||||
if (item_name.contains("(M)") || item_name.contains("(F)")) {
|
||||
item_name = item_name.replaceAll("(\\(M\\))|(\\(F\\))", "");
|
||||
gender_equip = true;
|
||||
}
|
||||
item_name = item_name.replaceAll("Throwing-Star", "Throwing-Stars").trim();
|
||||
item_name = item_name.replaceAll("for Magic Attack", "for Magic Att.").trim();
|
||||
item_name = item_name.replaceAll("\\(50%\\)", "").trim();
|
||||
item_name = item_name.replaceAll("\\(70%\\)", "").trim();
|
||||
item_name = item_name.replaceAll("\\'s", "").trim();
|
||||
|
||||
|
||||
monster_name = monster_name.replaceAll("Horntail\\'s Head B", "Horntail");
|
||||
// Process scrolls, nexon doesn't have the % on most of the scrolls. So we need to remove it
|
||||
// Unfortunately they do for some, so we have to handle that too.
|
||||
boolean scroll = false;
|
||||
int scrollType = 0;
|
||||
|
||||
if(item_name.contains("100%")) {
|
||||
scroll = true;
|
||||
item_name = item_name.replaceAll("100%", "").trim();
|
||||
item_name = item_name.replaceAll("\\(\\)", "").trim(); // Hidden Street has a few scroll %'s with ()s around them.. sigh
|
||||
} else if(item_name.contains("60%")) {
|
||||
scroll = true;
|
||||
scrollType = 1;
|
||||
item_name = item_name.replaceAll("60%", "").trim();
|
||||
item_name = item_name.replaceAll("\\(\\)", "").trim();
|
||||
} else if(item_name.contains("10%")) {
|
||||
scroll = true;
|
||||
scrollType = 2;
|
||||
item_name = item_name.replaceAll("10%", "").trim();
|
||||
item_name = item_name.replaceAll("\\(\\)", "").trim();
|
||||
//f(item_name.contains(" ()")) item_name = item_name.substring(0, item_name.lastIndexOf(" ("));
|
||||
} else if(item_name.contains("70%")) {
|
||||
scroll = true;
|
||||
scrollType = 4;
|
||||
item_name = item_name.replaceAll("70%", "").trim();
|
||||
item_name = item_name.replaceAll("\\(\\)", "").trim();
|
||||
} else if(item_name.contains("30%")) {
|
||||
scroll = true;
|
||||
scrollType = 5;
|
||||
item_name = item_name.replaceAll("30%", "").trim();
|
||||
item_name = item_name.replaceAll("\\(\\)", "").trim();
|
||||
}
|
||||
|
||||
|
||||
// System.out.println("Item name: " + item_name);
|
||||
|
||||
//drop entry
|
||||
ArrayList<Integer> monster_ids = DataTool.monsterIdsFromName(monster_name);
|
||||
//DataTool.addMonsterIdsFromHardcodedName(monster_ids, monster_name);
|
||||
|
||||
ArrayList<Integer> item_ids = DataTool.itemIdsFromName(item_name);
|
||||
|
||||
if(scroll && item_ids.isEmpty()) {
|
||||
// Try adding on the % again. Thanks nexon...
|
||||
if(scrollType == 0) item_name += " 100%";
|
||||
if(scrollType == 1) item_name += " 60%";
|
||||
if(scrollType == 2) item_name += " 10%";
|
||||
if(scrollType == 4) item_name += " 70%";
|
||||
if(scrollType == 5) item_name += " 30%";
|
||||
|
||||
item_ids = DataTool.itemIdsFromName(item_name);
|
||||
}
|
||||
|
||||
if (!monster_ids.isEmpty() && !item_ids.isEmpty()) {
|
||||
int item_id = item_ids.get(0);
|
||||
if(scroll) {
|
||||
item_id += scrollType;
|
||||
}
|
||||
int item_id_2 = -1;
|
||||
for (Integer mob_id : monster_ids) {
|
||||
System.out.println("Monster ID: " + mob_id + ", Item ID: " + item_id);
|
||||
drop_entries.add(new DropEntry(item_id, mob_id, VERSION));
|
||||
if (gender_equip && item_ids.size() > 1) {
|
||||
item_id_2 = item_ids.get(1);
|
||||
drop_entries.add(new DropEntry(item_id_2, mob_id, VERSION));
|
||||
|
||||
}
|
||||
}
|
||||
} else {
|
||||
System.out.println("Error parsing item " + item_name + " dropped by " + monster_name + ".");
|
||||
|
||||
if (!monster_ids.isEmpty()) {
|
||||
if (!problems.containsKey(monster_name)) {
|
||||
Errors e = new Errors();
|
||||
e.mobName = monster_name;
|
||||
|
||||
problems.put(monster_name, e);
|
||||
}
|
||||
|
||||
problems.get(monster_name).wrong.add(item_name);
|
||||
}
|
||||
//System.out.println("Monster ids size: " + monster_ids.size() + ", Item IDs size: " + item_ids.size());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the string lying between the two specified strings.
|
||||
*
|
||||
* @param line The string to parse
|
||||
* @param start The first string
|
||||
* @param end The last string
|
||||
* @return The string between the two specified strings
|
||||
*/
|
||||
public static String getStringBetween(String line, String start, String end) {
|
||||
int start_offset = line.indexOf(start) + start.length();
|
||||
return line.substring(start_offset, line.substring(start_offset).indexOf(end) + start_offset);
|
||||
}
|
||||
|
||||
public static String trimUntil(String line, String until) {
|
||||
int until_pos = line.indexOf(until);
|
||||
if (until_pos == -1) {
|
||||
return null;
|
||||
} else {
|
||||
return line.substring(until_pos + until.length());
|
||||
}
|
||||
}
|
||||
|
||||
public static void dumpErrors() {
|
||||
String file = "errors.txt";
|
||||
try {
|
||||
File f = new File(file);
|
||||
BufferedWriter bw = new BufferedWriter(new FileWriter(f));
|
||||
PrintWriter pw = new PrintWriter(bw);
|
||||
|
||||
for (Errors err : problems.values()) {
|
||||
pw.write(err.createErrorLog());
|
||||
}
|
||||
|
||||
pw.flush();
|
||||
|
||||
pw.close();
|
||||
bw.close();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public static void dumpQuery() {
|
||||
String filename = "drops.sql";
|
||||
try {
|
||||
File output = new File(filename);
|
||||
BufferedWriter bw = new BufferedWriter(new FileWriter(output));
|
||||
PrintWriter pw = new PrintWriter(bw);
|
||||
StringBuilder sb = new StringBuilder();
|
||||
pw.write("TRUNCATE TABLE `drop_data`;\r\n");
|
||||
pw.write("INSERT INTO `drop_data` (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) VALUES ");
|
||||
for (Iterator<DropEntry> i = drop_entries.iterator(); i.hasNext();) {
|
||||
DropEntry de = i.next();
|
||||
pw.write(de.getQuerySegment());
|
||||
if (i.hasNext()) {
|
||||
pw.write(", \r\n");
|
||||
}
|
||||
}
|
||||
pw.write(sb.toString());
|
||||
pw.close();
|
||||
bw.close();
|
||||
} catch (IOException ioe) {
|
||||
ioe.printStackTrace();
|
||||
System.out.println("Error writing to file: " + ioe.getLocalizedMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user