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

Zipangu overhaul + Quest take-item & Boss HP bar patch + 3rd job quiz

Browse Source 
Added drop data on missing mobs and EXP gain on several quests around World Tour (Japan).
Added a bonus feature for the Showa expedition, accessible when there is no casualties at the time of completion.
Added missing shop data at the NPCs in Singapore.
Patched quests that should be taking some items but weren't doing that properly.
Patched some bosses with boss HP bar not having the "boss" label defined on Mob.wz, rendering some inconsistencies with the bar in-game.
Overhauled the 3rd job quiz mechanic, adding missed questions to the pool.
This commit is contained in:
ronancpl
2018-03-31 00:21:30 -03:00
parent cd16117553
commit 6da5edd837
54 changed files with 4599 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
tools/MapleQuestItemCountFetcher/build.xml Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="MapleQuestItemCountFetcher" default="default" basedir=".">
<description>Builds, tests, and runs the project MapleQuestItemCountFetcher.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="MapleQuestItemCountFetcher-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>

22
tools/MapleQuestItemCountFetcher/lib/QuestReport.txt Normal file
View File

@@ -0,0 +1,22 @@
# Report File autogenerated from the MapleQuestItemCountFetcher feature by Ronan Lana.
# Generated data takes into account several data info from the server-side WZ.xmls.
Questid 2167 : Itemid 4031841 should have qty -1
Questid 1018 : Itemid 4000142 should have qty -1
Questid 6361 : Itemid 4031870 should have qty -1
Questid 6360 : Itemid 4031869 should have qty -1
Questid 10430 : Itemid 4220152 should have qty -1
Questid 6390 : Itemid 4031874 should have qty -50
Questid 2173 : Itemid 4031846 should have qty -1
Questid 2169 : Itemid 4031843 should have qty -1
Questid 2168 : Itemid 4031842 should have qty -1
Questid 2185 : Itemid 4031852 should have qty -1
Questid 6380 : Itemid 4031873 should have qty -50
Questid 6350 : Itemid 4031871 should have qty -50
Questid 2052 : Itemid 4031025 should have qty -10
Questid 2053 : Itemid 4031026 should have qty -20
Questid 2054 : Itemid 4031028 should have qty -30
Questid 6340 : Itemid 4031872 should have qty -50
Questid 28120 : Itemid 4032306 should have qty -4
Questid 2180 : Itemid 4031850 should have qty -1
Questid 2183 : Itemid 4031851 should have qty -1

3
tools/MapleQuestItemCountFetcher/manifest.mf Normal file
View File

@@ -0,0 +1,3 @@
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build

1448
tools/MapleQuestItemCountFetcher/nbproject/build-impl.xml Normal file
View File

File diff suppressed because it is too large Load Diff

8
tools/MapleQuestItemCountFetcher/nbproject/genfiles.properties Normal file
View File

@@ -0,0 +1,8 @@
build.xml.data.CRC32=012f695b
build.xml.script.CRC32=254e2ce9
build.xml.stylesheet.CRC32=8064a381@1.75.2.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=012f695b
nbproject/build-impl.xml.script.CRC32=fa2290c4
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

79
tools/MapleQuestItemCountFetcher/nbproject/project.properties Normal file
View File

@@ -0,0 +1,79 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=MapleQuestItemCountFetcher
application.vendor=USER
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.test.classpath=\
${run.test.classpath}
# Os arquivos em build.classes.dir que devem ser exclu\u00eddos do jar de distribui\u00e7\u00e3o
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/MapleQuestItemCountFetcher.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.commons-io-2.6.jar=lib/commons-io-2.6.jar
file.reference.mysql-connector-java-bin.jar=../../cores/mysql-connector-java-bin.jar
includes=**
jar.compress=false
javac.classpath=\
${file.reference.mysql-connector-java-bin.jar}:\
${file.reference.commons-io-2.6.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.7
javac.target=1.7
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
main.class=maplequestitemcountfetcher.MapleQuestItemCountFetcher
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=JDK_1.7
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project.
# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# To set system properties for unit tests define test-sys-prop.name=value:
run.jvmargs=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
src.dir=src
test.src.dir=test

16
tools/MapleQuestItemCountFetcher/nbproject/project.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>MapleQuestItemCountFetcher</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>

331
tools/MapleQuestItemCountFetcher/src/maplequestitemcountfetcher/MapleQuestItemCountFetcher.java Normal file
View File

@@ -0,0 +1,331 @@
/*
This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
Copyleft (L) 2017 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package maplequestitemcountfetcher;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.HashSet;
import java.util.Set;
/**
*
* @author RonanLana
This application parses the Quest.wz file inputted and generates a report showing
all cases where a quest requires an item, but doesn't take them, which may happen
because the node representing the item doesn't have a "count" clause.
Running it should generate a report file under "lib" folder with the search results.
*/
public class MapleQuestItemCountFetcher {
static String actName = "../../wz/Quest.wz/Act.img.xml";
static String checkName = "../../wz/Quest.wz/Check.img.xml";
static String directoryName = "../..";
static String newFile = "lib/QuestReport.txt";
static Connection con = null;
static PrintWriter printWriter = null;
static InputStreamReader fileReader = null;
static BufferedReader bufferedReader = null;
static int initialLength = 200;
static int initialStringLength = 50;
static byte status = 0;
static int questId = -1;
static int isCompleteState = 0;
static int curItemId;
static int curItemCount;
static Map<Integer, Map<Integer, Integer>> checkItems = new HashMap<>();
static Map<Integer, Map<Integer, Integer>> actItems = new HashMap<>();
private static String getName(String token) {
int i, j;
char[] dest;
String d;
i = token.lastIndexOf("name");
i = token.indexOf("\"", i) + 1; //lower bound of the string
j = token.indexOf("\"", i); //upper bound
dest = new char[initialStringLength];
token.getChars(i, j, dest, 0);
d = new String(dest);
return(d.trim());
}
private static String getValue(String token) {
int i, j;
char[] dest;
String d;
i = token.lastIndexOf("value");
i = token.indexOf("\"", i) + 1; //lower bound of the string
j = token.indexOf("\"", i); //upper bound
dest = new char[initialStringLength];
token.getChars(i, j, dest, 0);
d = new String(dest);
return(d.trim());
}
private static void forwardCursor(int st) {
String line = null;
try {
while(status >= st && (line = bufferedReader.readLine()) != null) {
simpleToken(line);
}
}
catch(Exception e) {
e.printStackTrace();
}
}
private static void simpleToken(String token) {
if(token.contains("/imgdir")) {
status -= 1;
}
else if(token.contains("imgdir")) {
status += 1;
}
}
private static void readItemLabel(String token) {
String name = getName(token);
String value = getValue(token);
switch(name) {
case "id":
curItemId = Integer.parseInt(value);
break;
case "count":
curItemCount = Integer.parseInt(value);
break;
}
}
private static void commitQuestItemPair(Map<Integer, Map<Integer, Integer>> map) {
Map<Integer, Integer> list = map.get(questId);
if(list == null) {
list = new LinkedHashMap<>();
map.put(questId, list);
}
list.put(curItemId, curItemCount);
}
private static void translateTokenAct(String token) {
String d;
if(token.contains("/imgdir")) {
status -= 1;
if(status == 4) {
if(curItemCount == Integer.MAX_VALUE && isCompleteState == 1) {
commitQuestItemPair(actItems);
}
}
}
else if(token.contains("imgdir")) {
if(status == 1) { //getting QuestId
d = getName(token);
questId = Integer.parseInt(d);
}
else if(status == 2) { //start/complete
d = getName(token);
isCompleteState = Integer.parseInt(d);
}
else if(status == 3) {
if(!token.contains("item")) {
forwardCursor(status);
}
}
else if(status == 4) {
curItemId = Integer.MAX_VALUE;
curItemCount = Integer.MAX_VALUE;
}
status += 1;
}
else {
if(status == 5) {
readItemLabel(token);
}
}
}
private static void translateTokenCheck(String token) {
String d;
if(token.contains("/imgdir")) {
status -= 1;
if(status == 4) {
Map<Integer, Integer> missedItems = actItems.get(questId);
if(missedItems != null && missedItems.containsKey(curItemId) && isCompleteState == 1) {
commitQuestItemPair(checkItems);
}
}
}
else if(token.contains("imgdir")) {
if(status == 1) { //getting QuestId
d = getName(token);
questId = Integer.parseInt(d);
}
else if(status == 2) { //start/complete
d = getName(token);
isCompleteState = Integer.parseInt(d);
}
else if(status == 3) {
if(!token.contains("item")) {
forwardCursor(status);
}
}
else if(status == 4) {
curItemId = Integer.MAX_VALUE;
curItemCount = Integer.MAX_VALUE;
}
status += 1;
}
else {
if(status == 5) {
readItemLabel(token);
}
}
}
private static void readQuestItemCountData() throws IOException {
String line;
fileReader = new InputStreamReader(new FileInputStream(actName), "UTF-8");
bufferedReader = new BufferedReader(fileReader);
while((line = bufferedReader.readLine()) != null) {
translateTokenAct(line);
}
bufferedReader.close();
fileReader.close();
fileReader = new InputStreamReader(new FileInputStream(checkName), "UTF-8");
bufferedReader = new BufferedReader(fileReader);
while((line = bufferedReader.readLine()) != null) {
translateTokenCheck(line);
}
bufferedReader.close();
fileReader.close();
}
private static void printReportFileHeader() {
printWriter.println(" # Report File autogenerated from the MapleQuestItemCountFetcher feature by Ronan Lana.");
printWriter.println(" # Generated data takes into account several data info from the server-side WZ.xmls.");
printWriter.println();
}
private static void printReportFileResults() {
List<Pair<Integer, Pair<Integer, Integer>>> reports = new ArrayList<>();
List<Pair<Integer, Integer>> notChecked = new ArrayList<>();
for(Entry<Integer, Map<Integer, Integer>> actItem : actItems.entrySet()) {
int questid = actItem.getKey();
for(Entry<Integer, Integer> actData : actItem.getValue().entrySet()) {
int itemid = actData.getKey();
Map<Integer, Integer> checkData = checkItems.get(questid);
if(checkData != null) {
Integer count = checkData.get(itemid);
if(count != null) {
reports.add(new Pair<>(questid, new Pair<>(itemid, -count)));
}
} else {
notChecked.add(new Pair<>(questid, itemid));
}
}
}
for(Pair<Integer, Pair<Integer, Integer>> r : reports) {
printWriter.println("Questid " + r.left + " : Itemid " + r.right.left + " should have qty " + r.right.right);
}
for(Pair<Integer, Integer> r : notChecked) {
printWriter.println("Questid " + r.left + " : Itemid " + r.right + " is unchecked");
}
}
private static void ReportQuestItemCountData() {
// This will reference one line at a time
try {
System.out.println("Reading WZs...");
readQuestItemCountData();
System.out.println("Reporting results...");
printWriter = new PrintWriter(newFile, "UTF-8");
printReportFileHeader();
printReportFileResults();
printWriter.close();
System.out.println("Done!");
}
catch(FileNotFoundException ex) {
System.out.println("Unable to open quest file.");
}
catch(IOException ex) {
System.out.println("Error reading quest file.");
}
catch(Exception e) {
e.printStackTrace();
}
}
public static void main(String[] args) {
ReportQuestItemCountData();
}
}

121
tools/MapleQuestItemCountFetcher/src/maplequestitemcountfetcher/Pair.java Normal file
View File

@@ -0,0 +1,121 @@
/*
This file is part of the OdinMS Maple Story Server
Copyright (C) 2008 ~ 2010 Patrick Huy <patrick.huy@frz.cc>
Matthias Butz <matze@odinms.de>
Jan Christian Meyer <vimes@odinms.de>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License version 3
as published by the Free Software Foundation. You may not use, modify
or distribute this program under any other version of the
GNU Affero General Public License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package maplequestitemcountfetcher;
/**
* Represents a pair of values.
*
* @author Frz
* @since Revision 333
* @version 1.0
*
* @param <E> The type of the left value.
* @param <F> The type of the right value.
*/
public class Pair<E, F> {
public E left;
public F right;
/**
* Class constructor - pairs two objects together.
*
* @param left The left object.
* @param right The right object.
*/
public Pair(E left, F right) {
this.left = left;
this.right = right;
}
/**
* Gets the left value.
*
* @return The left value.
*/
public E getLeft() {
return left;
}
/**
* Gets the right value.
*
* @return The right value.
*/
public F getRight() {
return right;
}
/**
* Turns the pair into a string.
*
* @return Each value of the pair as a string joined by a colon.
*/
@Override
public String toString() {
return left.toString() + ":" + right.toString();
}
/**
* Gets the hash code of this pair.
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((left == null) ? 0 : left.hashCode());
result = prime * result + ((right == null) ? 0 : right.hashCode());
return result;
}
/**
* Checks to see if two pairs are equal.
*/
@SuppressWarnings("unchecked")
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
final Pair other = (Pair) obj;
if (left == null) {
if (other.left != null) {
return false;
}
} else if (!left.equals(other.left)) {
return false;
}
if (right == null) {
if (other.right != null) {
return false;
}
} else if (!right.equals(other.right)) {
return false;
}
return true;
}
}