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

Maker-oriented commit

Browse Source 
Implemented the multiple features of the Maker skill (equip disassembly, leftover merging into monster crystal and item crafting).
Updated the DB with the Maker data featured on the WZ.
Added a new table for the strenghtening reagents gain data (compiled with the MapleSkillMakerReagentIndexer).
Fixed quests that improves the Maker skill level and some other Maker-related quests.
This commit is contained in:
ronancpl
2017-11-24 14:00:48 -02:00
parent 4dd2764776
commit 3b30244239
87 changed files with 8424 additions and 18509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
tools/MapleSkillMakerReagentIndexer/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="MapleSkillMakerReagentIndexer" default="default" basedir=".">
<description>Builds, tests, and runs the project MapleSkillMakerReagentIndexer.</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="MapleSkillMakerReagentIndexer-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>

56
tools/MapleSkillMakerReagentIndexer/lib/MakerReagentData.sql Normal file
View File

@@ -0,0 +1,56 @@
# SQL File autogenerated from the MapleSkillMakerReagentIndexer feature by Ronan Lana.
# Generated data is conformant with the Item.wz folder used to compile this.
CREATE TABLE IF NOT EXISTS `makerreagentdata` (
`itemid` int(11) NOT NULL,
`stat` varchar(20) NOT NULL,
`value` smallint(6) NOT NULL,
PRIMARY KEY (`itemid`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT IGNORE INTO `makerreagentdata` (`itemid`, `stat`, `value`) VALUES
(4250000, "incPAD", 1),
(4250001, "incPAD", 2),
(4250002, "incPAD", 3),
(4250100, "incMAD", 1),
(4250101, "incMAD", 2),
(4250102, "incMAD", 3),
(4250200, "incACC", 2),
(4250201, "incACC", 3),
(4250202, "incACC", 5),
(4250300, "incEVA", 2),
(4250301, "incEVA", 3),
(4250302, "incEVA", 5),
(4250400, "incSpeed", 2),
(4250401, "incSpeed", 3),
(4250402, "incSpeed", 5),
(4250500, "incJump", 1),
(4250501, "incJump", 2),
(4250502, "incJump", 3),
(4250600, "incMaxHP", 10),
(4250601, "incMaxHP", 20),
(4250602, "incMaxHP", 30),
(4250700, "incMaxMP", 10),
(4250701, "incMaxMP", 20),
(4250702, "incMaxMP", 30),
(4250800, "incSTR", 2),
(4250801, "incSTR", 3),
(4250802, "incSTR", 5),
(4250900, "incINT", 2),
(4250901, "incINT", 3),
(4250902, "incINT", 5),
(4251000, "incLUK", 2),
(4251001, "incLUK", 3),
(4251002, "incLUK", 5),
(4251100, "incDEX", 2),
(4251101, "incDEX", 3),
(4251102, "incDEX", 5),
(4251200, "incReqLevel", -1),
(4251201, "incReqLevel", -2),
(4251202, "incReqLevel", -3),
(4251300, "randOption", 1),
(4251301, "randOption", 2),
(4251302, "randOption", 3),
(4251400, "randStat", 2),
(4251401, "randStat", 3),
(4251402, "randStat", 5);

3
tools/MapleSkillMakerReagentIndexer/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/MapleSkillMakerReagentIndexer/nbproject/build-impl.xml Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -0,0 +1,8 @@
build.xml.data.CRC32=49f97f2c
build.xml.script.CRC32=75bbe280
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=49f97f2c
nbproject/build-impl.xml.script.CRC32=919b8bee
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

73
tools/MapleSkillMakerReagentIndexer/nbproject/project.properties Normal file
View File

@@ -0,0 +1,73 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processor.options=
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
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}/MapleSkillMakerReagentIndexer.jar
dist.javadoc.dir=${dist.dir}/javadoc
excludes=
includes=**
jar.compress=false
javac.classpath=
# 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=mapleskillmakerreagentindexer.MapleSkillMakerReagentIndexer
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/MapleSkillMakerReagentIndexer/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>MapleSkillMakerReagentIndexer</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>

226
tools/MapleSkillMakerReagentIndexer/src/mapleskillmakerreagentindexer/MapleSkillMakerReagentIndexer.java Normal file
View File

@@ -0,0 +1,226 @@
/*
* This file is part of the MapleSolaxiaV2 Maple Story Server
*
* Copyright (C) 2017 RonanLana
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package mapleskillmakerreagentindexer;
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.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/**
*
* @author RonanLana
*
* The main objective of this program is to index relevant reagent data
* from the Item.wz folder and generate a SQL table with them, to be used
* by the server source.
*
*/
public class MapleSkillMakerReagentIndexer {
static String host = "jdbc:mysql://localhost:3306/maplesolaxia";
static String driver = "com.mysql.jdbc.Driver";
static String username = "root";
static String password = "";
static String fileName = "../../wz/Item.wz/Etc/0425.img.xml";
static String newFile = "lib/MakerReagentData.sql";
static PrintWriter printWriter = null;
static InputStreamReader fileReader = null;
static BufferedReader bufferedReader = null;
static byte status = 0;
static int id = -1;
static List<Pair<Integer, Pair<String, Integer>>> reagentList = new ArrayList<>();
static int initialStringLength = 50;
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 simpleToken(String token) {
if(token.contains("/imgdir")) {
status -= 1;
}
else if(token.contains("imgdir")) {
status += 1;
}
}
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 translateToken(String token) {
String d;
if(token.contains("/imgdir")) {
status -= 1;
}
else if(token.contains("imgdir")) {
if(status == 1) { //getting id
d = getName(token);
id = Integer.parseInt(d);
System.out.println("Parsing maker reagent id " + id);
} else if(status == 2) {
d = getName(token);
if(!d.equals("info")) {
System.out.println("not info");
forwardCursor(status);
}
}
status += 1;
} else {
if(status == 3) {
if(token.contains("int")) {
d = getName(token);
if(d.contains("inc") || d.contains("rand")) {
Integer v = Integer.valueOf(getValue(token));
Pair<String, Integer> reagBuff = new Pair<>(d, v);
Pair<Integer, Pair<String, Integer>> reagItem = new Pair<>(id, reagBuff);
reagentList.add(reagItem);
}
} else {
if(token.contains("canvas")) {
forwardCursor(status + 1);
}
}
}
}
}
private static void SortReagentList() {
Collections.sort(reagentList, new Comparator<Pair<Integer, Pair<String, Integer>>>() {
@Override
public int compare(Pair<Integer, Pair<String, Integer>> p1, Pair<Integer, Pair<String, Integer>> p2) {
return p1.getLeft().compareTo(p2.getLeft());
}
});
}
private static void WriteMakerReagentTableFile() {
printWriter.println(" # SQL File autogenerated from the MapleSkillMakerReagentIndexer feature by Ronan Lana.");
printWriter.println(" # Generated data is conformant with the Item.wz folder used to compile this.");
printWriter.println();
printWriter.println("CREATE TABLE IF NOT EXISTS `makerreagentdata` (");
printWriter.println(" `itemid` int(11) NOT NULL,");
printWriter.println(" `stat` varchar(20) NOT NULL,");
printWriter.println(" `value` smallint(6) NOT NULL,");
printWriter.println(" PRIMARY KEY (`itemid`)");
printWriter.println(") ENGINE=MyISAM DEFAULT CHARSET=latin1;");
printWriter.println();
StringBuilder sb = new StringBuilder("INSERT IGNORE INTO `makerreagentdata` (`itemid`, `stat`, `value`) VALUES\r\n");
for(Pair<Integer, Pair<String, Integer>> it : reagentList) {
sb.append(" (" + it.left + ", \"" + it.right.left + "\", " + it.right.right + "),\r\n");
}
sb.setLength(sb.length() - 3);
sb.append(";");
printWriter.println(sb);
}
private static void WriteMakerReagentTableData() {
// This will reference one line at a time
String line = null;
try {
fileReader = new InputStreamReader(new FileInputStream(fileName), "UTF-8");
bufferedReader = new BufferedReader(fileReader);
while((line = bufferedReader.readLine()) != null) {
translateToken(line);
}
bufferedReader.close();
fileReader.close();
SortReagentList();
printWriter = new PrintWriter(newFile, "UTF-8");
WriteMakerReagentTableFile();
printWriter.close();
}
catch(FileNotFoundException ex) {
System.out.println("Unable to open file '" + fileName + "'");
}
catch(IOException ex) {
System.out.println("Error reading file '" + fileName + "'");
}
catch(Exception e) {
e.printStackTrace();
}
}
public static void main(String[] args) {
WriteMakerReagentTableData();
}
}

121
tools/MapleSkillMakerReagentIndexer/src/mapleskillmakerreagentindexer/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 mapleskillmakerreagentindexer;
/**
* 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;
}
}