diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java index bfc923c4f..510666403 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java @@ -186,7 +186,8 @@ public class SoftCacheService extends AbstractService implements CacheService { while ((en = (SoftEntry) refQueue.poll()) != null) { K key = en.getKey(); if (log.isDebugEnabled()) - log.debug("{} : cleaned up value for key: {}", cacheName, key); + log.debug("{} : cleaned up value for key: {}", cacheName, + key); cacheMap.remove(key); } } diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java index d408676a3..ca38a6758 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java @@ -185,7 +185,8 @@ public class WeakCacheService extends AbstractService implements CacheService { while ((en = (Entry) refQueue.poll()) != null) { K key = en.getKey(); if (log.isDebugEnabled()) - log.debug("{}: cleaned up value for key: {}", cacheName, key); + log.debug("{}: cleaned up value for key: {}", cacheName, + key); cacheMap.remove(key); } } diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/logging/Log4JLoggingService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/logging/Log4JLoggingService.java index d0074b0be..593bd293d 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/logging/Log4JLoggingService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/logging/Log4JLoggingService.java @@ -52,8 +52,7 @@ public class Log4JLoggingService extends @Override protected void doStart() throws ServiceStartException { - final Layout layout = new PatternLayout( - "[%p %d] %c{1} - %m%n"); + final Layout layout = new PatternLayout("[%p %d] %c{1} - %m%n"); rootLogger = Logger.getRootLogger(); rootLogger.removeAllAppenders(); diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPoolPriority.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPoolPriority.java index 6b534b9a3..5db2c3bce 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPoolPriority.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPoolPriority.java @@ -50,7 +50,8 @@ public enum ThreadPoolPriority { public final int threadPriority; /** - * @param threadPriority the {@link Thread} priority {@link Integer} index + * @param threadPriority + * the {@link Thread} priority {@link Integer} index */ ThreadPoolPriority(int threadPriority) { this.threadPriority = threadPriority; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java index 54cb23b11..38cf82481 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java @@ -70,7 +70,7 @@ public class Java7VFSService extends public Path resolve(String path) { return resolve(Paths.get(path)); } - + @Override public Path resolve(Path path) { log.debug("Resolving file {}", path); @@ -81,14 +81,13 @@ public class Java7VFSService extends public Path resolveDataFile(String path) { return resolveDataFile(Paths.get(path)); } - + @Override public Path resolveDataFile(Path path) { log.debug("Resolving data file {}", path); return dataRoot.resolve(path); } - @Override protected void doStop() throws ServiceStopException { root = null; diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/TrueZipVFSService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/TrueZipVFSService.java index 9fe01c65b..d36b3577c 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/TrueZipVFSService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/TrueZipVFSService.java @@ -75,7 +75,7 @@ public class TrueZipVFSService extends public Path resolve(String path) { return resolve(Paths.get(path)); } - + @Override public Path resolve(Path path) { log.debug("Resolving file {}", path); @@ -86,7 +86,7 @@ public class TrueZipVFSService extends public Path resolveDataFile(String path) { return resolveDataFile(Paths.get(path)); } - + @Override public Path resolveDataFile(Path path) { log.debug("Resolving data file {}", path); diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java index e647afa96..f58846d7b 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java @@ -38,7 +38,7 @@ public interface VFSService extends Service { * @return the resolved file. Will return null if could not resolve. */ Path resolve(String path); - + /** * Resolves an file. If the file cannot be resolved, null will be returned. *

@@ -63,7 +63,7 @@ public interface VFSService extends Service { * @return the resolved file. Will return null if could not resolve. */ Path resolveDataFile(String path); - + /** * Resolves an file inside the data storage file system. If the file cannot * be resolved, null will be returned. diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/QueryFactory.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/QueryFactory.java index 155d9b0af..5fa5f2b9d 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/QueryFactory.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/QueryFactory.java @@ -19,10 +19,10 @@ package com.l2jserver.service.database.ddl; import java.util.List; import com.l2jserver.service.database.ddl.struct.Column; +import com.l2jserver.service.database.ddl.struct.Column.ColumnType; import com.l2jserver.service.database.ddl.struct.ForeignKey; import com.l2jserver.service.database.ddl.struct.PrimaryKey; import com.l2jserver.service.database.ddl.struct.Table; -import com.l2jserver.service.database.ddl.struct.Column.ColumnType; import com.l2jserver.util.factory.CollectionFactory; /** diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/struct/Table.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/struct/Table.java index 23dac1101..ce2edbdda 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/struct/Table.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/struct/Table.java @@ -47,10 +47,14 @@ public class Table { private final List foreignKeys = CollectionFactory.newList(); /** - * @param name the table name - * @param columns the column - * @param primaryKey the primary key - * @param foreignKeys the foreign keys + * @param name + * the table name + * @param columns + * the column + * @param primaryKey + * the primary key + * @param foreignKeys + * the foreign keys */ public Table(String name, Map columns, PrimaryKey primaryKey, List foreignKeys) { @@ -62,8 +66,10 @@ public class Table { } /** - * @param name the table name - * @param primaryKey the primary key + * @param name + * the table name + * @param primaryKey + * the primary key */ public Table(String name, PrimaryKey primaryKey) { this.name = name; @@ -104,7 +110,8 @@ public class Table { } /** - * @param name the column name + * @param name + * the column name * @return the column represented by name */ public Column getColumn(String name) { diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/sql/AbstractSQLDatabaseService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/sql/AbstractSQLDatabaseService.java index 836772ce1..ed4f2712a 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/sql/AbstractSQLDatabaseService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/sql/AbstractSQLDatabaseService.java @@ -1103,7 +1103,8 @@ public abstract class AbstractSQLDatabaseService extends * * @param q * the query clause - * @param e the entity + * @param e + * the entity */ protected abstract void query(AbstractSQLQuery q, E e); } diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/QPathUtils.java b/l2jserver2-common/src/main/java/com/l2jserver/util/QPathUtils.java index ef5342c46..2196011d5 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/QPathUtils.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/QPathUtils.java @@ -57,7 +57,8 @@ public class QPathUtils { * @return the {@link Field} holding path */ public static Field getReflectionField(Path path) { - return ClassUtils.getFieldWithValue(path.getMetadata().getParent(), path); + return ClassUtils.getFieldWithValue(path.getMetadata().getParent(), + path); } /** @@ -81,7 +82,7 @@ public class QPathUtils { */ public static int getColumnSize(Path path) { final Field field = getReflectionField(path); - if(field == null) + if (field == null) return 0; final ColumnSize size = field.getAnnotation(ColumnSize.class); if (size != null) @@ -96,7 +97,7 @@ public class QPathUtils { */ public static boolean isAutoIncrementable(Path path) { final Field field = getReflectionField(path); - if(field == null) + if (field == null) return false; final ColumnAutoIncrement autoInc = field .getAnnotation(ColumnAutoIncrement.class); @@ -112,7 +113,7 @@ public class QPathUtils { */ public static boolean isNullable(Path path) { final Field field = getReflectionField(path); - if(field == null) + if (field == null) return false; final ColumnNullable nullable = field .getAnnotation(ColumnNullable.class); @@ -130,7 +131,7 @@ public class QPathUtils { */ public static boolean hasDefaultValue(Path path) { final Field field = getReflectionField(path); - if(field == null) + if (field == null) return false; final ColumnDefault def = field.getAnnotation(ColumnDefault.class); if (def == null) { @@ -147,7 +148,7 @@ public class QPathUtils { */ public static String getDefaultUntransformedValue(Path path) { final Field field = getReflectionField(path); - if(field == null) + if (field == null) return null; final ColumnDefault def = field.getAnnotation(ColumnDefault.class); if (def != null) diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java index 3230c7a73..04b447626 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java @@ -82,7 +82,7 @@ public class TransformerFactory { return PathTransformer.SHARED_INSTANCE; } else if (type.isEnum()) { return EnumTransformer.SHARED_INSTANCE; - } else if(type.isArray()) { + } else if (type.isArray()) { return ArrayTransformer.SHARED_INSTANCE; } else if (type == String.class) return StringTransformer.SHARED_INSTANCE; diff --git a/l2jserver2-common/src/test/java/com/l2jserver/util/ArrayUtilsTest.java b/l2jserver2-common/src/test/java/com/l2jserver/util/ArrayUtilsTest.java index f7138985d..990d3eacc 100644 --- a/l2jserver2-common/src/test/java/com/l2jserver/util/ArrayUtilsTest.java +++ b/l2jserver2-common/src/test/java/com/l2jserver/util/ArrayUtilsTest.java @@ -47,6 +47,7 @@ public class ArrayUtilsTest extends ArrayUtils { /** * Simple test class + * * @author Rogiel */ private static class TestClass { @@ -56,7 +57,8 @@ public class ArrayUtilsTest extends ArrayUtils { private String name; /** - * @param string the name + * @param string + * the name */ public TestClass(String string) { this.name = string; diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java index 919dca3a2..bcd8c8f7d 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java @@ -5,7 +5,6 @@ // Generated on: 2012.03.25 at 01:03:28 PM BRT // - package com.l2jserver.model.template; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; - /** - *

Java class for AbstractTemplate complex type. + *

+ * Java class for AbstractTemplate complex type. * - *

The following schema fragment specifies the expected content contained within this class. + *

+ * The following schema fragment specifies the expected content contained within + * this class. * * 

  * <complexType name="AbstractTemplate">
@@ -34,15 +35,8 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AbstractTemplate")
-@XmlSeeAlso({
-    ItemTemplate.class,
-    ActorTemplate.class,
-    SkillTemplate.class,
-    com.l2jserver.model.template.Teleports.Teleport.class
-})
-public abstract class AbstractTemplate
-    implements Template
-{
-
+@XmlSeeAlso({ ItemTemplate.class, ActorTemplate.class, SkillTemplate.class,
+		com.l2jserver.model.template.Teleports.Teleport.class })
+public abstract class AbstractTemplate implements Template {
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
index a912c76b3..65db073f8 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * 
Java class for ActorTemplate complex type.
+ * 

+ * Java class for ActorTemplate complex type.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <complexType name="ActorTemplate">
@@ -32,13 +33,7 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ActorTemplate")
-@XmlSeeAlso({
-    CharacterTemplate.class,
-    NPCTemplate.class
-})
-public abstract class ActorTemplate
-    extends AbstractTemplate
-{
-
+@XmlSeeAlso({ CharacterTemplate.class, NPCTemplate.class })
+public abstract class ActorTemplate extends AbstractTemplate {
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java
index 1d284966e..afd8009c8 100644
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java
@@ -5,18 +5,19 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * 
Java class for CalculatorFunction complex type.
+ * 

+ * Java class for CalculatorFunction complex type.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <complexType name="CalculatorFunction">
@@ -36,113 +37,97 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculatorFunction", propOrder = {
-    "set",
-    "add",
-    "subtract",
-    "random"
-})
+@XmlType(name = "CalculatorFunction", propOrder = { "set", "add", "subtract",
+		"random" })
 public class CalculatorFunction {
 
-    protected CalculatorFunctionOperation set;
-    protected CalculatorFunctionOperation add;
-    protected CalculatorFunctionOperation subtract;
-    protected CalculatorFunctionOperation random;
+	protected CalculatorFunctionOperation set;
+	protected CalculatorFunctionOperation add;
+	protected CalculatorFunctionOperation subtract;
+	protected CalculatorFunctionOperation random;
 
-    /**
-     * Gets the value of the set property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public CalculatorFunctionOperation getSet() {
-        return set;
-    }
+	/**
+	 * Gets the value of the set property.
+	 * 
+	 * @return possible object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public CalculatorFunctionOperation getSet() {
+		return set;
+	}
 
-    /**
-     * Sets the value of the set property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public void setSet(CalculatorFunctionOperation value) {
-        this.set = value;
-    }
+	/**
+	 * Sets the value of the set property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public void setSet(CalculatorFunctionOperation value) {
+		this.set = value;
+	}
 
-    /**
-     * Gets the value of the add property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public CalculatorFunctionOperation getAdd() {
-        return add;
-    }
+	/**
+	 * Gets the value of the add property.
+	 * 
+	 * @return possible object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public CalculatorFunctionOperation getAdd() {
+		return add;
+	}
 
-    /**
-     * Sets the value of the add property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public void setAdd(CalculatorFunctionOperation value) {
-        this.add = value;
-    }
+	/**
+	 * Sets the value of the add property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public void setAdd(CalculatorFunctionOperation value) {
+		this.add = value;
+	}
 
-    /**
-     * Gets the value of the subtract property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public CalculatorFunctionOperation getSubtract() {
-        return subtract;
-    }
+	/**
+	 * Gets the value of the subtract property.
+	 * 
+	 * @return possible object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public CalculatorFunctionOperation getSubtract() {
+		return subtract;
+	}
 
-    /**
-     * Sets the value of the subtract property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public void setSubtract(CalculatorFunctionOperation value) {
-        this.subtract = value;
-    }
+	/**
+	 * Sets the value of the subtract property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public void setSubtract(CalculatorFunctionOperation value) {
+		this.subtract = value;
+	}
 
-    /**
-     * Gets the value of the random property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public CalculatorFunctionOperation getRandom() {
-        return random;
-    }
+	/**
+	 * Gets the value of the random property.
+	 * 
+	 * @return possible object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public CalculatorFunctionOperation getRandom() {
+		return random;
+	}
 
-    /**
-     * Sets the value of the random property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CalculatorFunctionOperation }
-     *     
-     */
-    public void setRandom(CalculatorFunctionOperation value) {
-        this.random = value;
-    }
+	/**
+	 * Sets the value of the random property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public void setRandom(CalculatorFunctionOperation value) {
+		this.random = value;
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java
index 9d9de8d40..655e639ce 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java
@@ -5,20 +5,22 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import java.math.BigInteger;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * 
Java class for CalculatorFunctionOperation complex type.
+ * 

+ * Java class for CalculatorFunctionOperation complex type.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <complexType name="CalculatorFunctionOperation">
@@ -37,49 +39,46 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CalculatorFunctionOperation")
 public class CalculatorFunctionOperation {
 
-    @XmlAttribute(name = "order", required = true)
-    protected BigInteger order;
-    @XmlAttribute(name = "value", required = true)
-    protected double value;
+	@XmlAttribute(name = "order", required = true)
+	protected BigInteger order;
+	@XmlAttribute(name = "value", required = true)
+	protected double value;
 
-    /**
-     * Gets the value of the order property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getOrder() {
-        return order;
-    }
+	/**
+	 * Gets the value of the order property.
+	 * 
+	 * @return possible object is {@link BigInteger }
+	 * 
+	 */
+	public BigInteger getOrder() {
+		return order;
+	}
 
-    /**
-     * Sets the value of the order property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setOrder(BigInteger value) {
-        this.order = value;
-    }
+	/**
+	 * Sets the value of the order property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigInteger }
+	 * 
+	 */
+	public void setOrder(BigInteger value) {
+		this.order = value;
+	}
 
-    /**
-     * Gets the value of the value property.
-     * 
-     */
-    public double getValue() {
-        return value;
-    }
+	/**
+	 * Gets the value of the value property.
+	 * 
+	 */
+	public double getValue() {
+		return value;
+	}
 
-    /**
-     * Sets the value of the value property.
-     * 
-     */
-    public void setValue(double value) {
-        this.value = value;
-    }
+	/**
+	 * Sets the value of the value property.
+	 * 
+	 */
+	public void setValue(double value) {
+		this.value = value;
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
index 8731265ff..900e264ac 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,14 +14,17 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.l2jserver.model.id.template.CharacterTemplateID;
 import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
 
-
 /**
- * 
Java class for character element declaration.
+ * 

+ * Java class for character element declaration.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <element name="character">
@@ -224,1671 +226,1642 @@ import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "stats",
-    "collision"
-})
+@XmlType(name = "", propOrder = { "stats", "collision" })
 @XmlRootElement(name = "character", namespace = "http://schemas.l2jserver2.com/character")
-public class CharacterTemplate
-    extends ActorTemplate
-{
-
-    @XmlElement(required = true)
-    protected CharacterTemplate.Stats stats;
-    @XmlElement(required = true)
-    protected CharacterTemplate.Collision collision;
-    @XmlAttribute(name = "class", required = true)
-    @XmlJavaTypeAdapter(CharacterTemplateIDAdapter.class)
-    protected CharacterTemplateID id;
-
-    /**
-     * Gets the value of the stats property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CharacterTemplate.Stats }
-     *     
-     */
-    public CharacterTemplate.Stats getStats() {
-        return stats;
-    }
-
-    /**
-     * Sets the value of the stats property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CharacterTemplate.Stats }
-     *     
-     */
-    public void setStats(CharacterTemplate.Stats value) {
-        this.stats = value;
-    }
-
-    /**
-     * Gets the value of the collision property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CharacterTemplate.Collision }
-     *     
-     */
-    public CharacterTemplate.Collision getCollision() {
-        return collision;
-    }
-
-    /**
-     * Sets the value of the collision property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CharacterTemplate.Collision }
-     *     
-     */
-    public void setCollision(CharacterTemplate.Collision value) {
-        this.collision = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public CharacterTemplateID getID() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setID(CharacterTemplateID value) {
-        this.id = value;
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="male">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="female">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "male",
-        "female"
-    })
-    public static class Collision {
-
-        @XmlElement(required = true)
-        protected CharacterTemplate.Collision.Male male;
-        @XmlElement(required = true)
-        protected CharacterTemplate.Collision.Female female;
-
-        /**
-         * Gets the value of the male property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Collision.Male }
-         *     
-         */
-        public CharacterTemplate.Collision.Male getMale() {
-            return male;
-        }
-
-        /**
-         * Sets the value of the male property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Collision.Male }
-         *     
-         */
-        public void setMale(CharacterTemplate.Collision.Male value) {
-            this.male = value;
-        }
-
-        /**
-         * Gets the value of the female property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Collision.Female }
-         *     
-         */
-        public CharacterTemplate.Collision.Female getFemale() {
-            return female;
-        }
-
-        /**
-         * Sets the value of the female property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Collision.Female }
-         *     
-         */
-        public void setFemale(CharacterTemplate.Collision.Female value) {
-            this.female = value;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Female {
-
-            @XmlAttribute(name = "radius", required = true)
-            protected double radius;
-            @XmlAttribute(name = "heigth", required = true)
-            protected double heigth;
-
-            /**
-             * Gets the value of the radius property.
-             * 
-             */
-            public double getRadius() {
-                return radius;
-            }
-
-            /**
-             * Sets the value of the radius property.
-             * 
-             */
-            public void setRadius(double value) {
-                this.radius = value;
-            }
-
-            /**
-             * Gets the value of the heigth property.
-             * 
-             */
-            public double getHeigth() {
-                return heigth;
-            }
-
-            /**
-             * Sets the value of the heigth property.
-             * 
-             */
-            public void setHeigth(double value) {
-                this.heigth = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Male {
-
-            @XmlAttribute(name = "radius", required = true)
-            protected double radius;
-            @XmlAttribute(name = "heigth", required = true)
-            protected double heigth;
-
-            /**
-             * Gets the value of the radius property.
-             * 
-             */
-            public double getRadius() {
-                return radius;
-            }
-
-            /**
-             * Sets the value of the radius property.
-             * 
-             */
-            public void setRadius(double value) {
-                this.radius = value;
-            }
-
-            /**
-             * Gets the value of the heigth property.
-             * 
-             */
-            public double getHeigth() {
-                return heigth;
-            }
-
-            /**
-             * Sets the value of the heigth property.
-             * 
-             */
-            public void setHeigth(double value) {
-                this.heigth = value;
-            }
-
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="hp">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="mp">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="cp">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="attack">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="physical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="magical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="defense">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="physical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="magical">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="move">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="base">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *       </sequence>
-     *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "hp",
-        "mp",
-        "cp",
-        "attack",
-        "defense",
-        "move",
-        "base",
-        "maxload"
-    })
-    public static class Stats {
-
-        @XmlElement(required = true)
-        protected CharacterTemplate.Stats.Hp hp;
-        @XmlElement(required = true)
-        protected CharacterTemplate.Stats.Mp mp;
-        @XmlElement(required = true)
-        protected CharacterTemplate.Stats.Cp cp;
-        @XmlElement(required = true)
-        protected CharacterTemplate.Stats.Attack attack;
-        @XmlElement(required = true)
-        protected CharacterTemplate.Stats.Defense defense;
-        @XmlElement(required = true)
-        protected CharacterTemplate.Stats.Move move;
-        @XmlElement(required = true)
-        protected CharacterTemplate.Stats.Base base;
-        protected int maxload;
-        @XmlAttribute(name = "level", required = true)
-        protected int level;
-        @XmlAttribute(name = "crafter", required = true)
-        protected boolean crafter;
-
-        /**
-         * Gets the value of the hp property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Stats.Hp }
-         *     
-         */
-        public CharacterTemplate.Stats.Hp getHp() {
-            return hp;
-        }
-
-        /**
-         * Sets the value of the hp property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Stats.Hp }
-         *     
-         */
-        public void setHp(CharacterTemplate.Stats.Hp value) {
-            this.hp = value;
-        }
-
-        /**
-         * Gets the value of the mp property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Stats.Mp }
-         *     
-         */
-        public CharacterTemplate.Stats.Mp getMp() {
-            return mp;
-        }
-
-        /**
-         * Sets the value of the mp property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Stats.Mp }
-         *     
-         */
-        public void setMp(CharacterTemplate.Stats.Mp value) {
-            this.mp = value;
-        }
-
-        /**
-         * Gets the value of the cp property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Stats.Cp }
-         *     
-         */
-        public CharacterTemplate.Stats.Cp getCp() {
-            return cp;
-        }
-
-        /**
-         * Sets the value of the cp property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Stats.Cp }
-         *     
-         */
-        public void setCp(CharacterTemplate.Stats.Cp value) {
-            this.cp = value;
-        }
-
-        /**
-         * Gets the value of the attack property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Stats.Attack }
-         *     
-         */
-        public CharacterTemplate.Stats.Attack getAttack() {
-            return attack;
-        }
-
-        /**
-         * Sets the value of the attack property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Stats.Attack }
-         *     
-         */
-        public void setAttack(CharacterTemplate.Stats.Attack value) {
-            this.attack = value;
-        }
-
-        /**
-         * Gets the value of the defense property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Stats.Defense }
-         *     
-         */
-        public CharacterTemplate.Stats.Defense getDefense() {
-            return defense;
-        }
-
-        /**
-         * Sets the value of the defense property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Stats.Defense }
-         *     
-         */
-        public void setDefense(CharacterTemplate.Stats.Defense value) {
-            this.defense = value;
-        }
-
-        /**
-         * Gets the value of the move property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Stats.Move }
-         *     
-         */
-        public CharacterTemplate.Stats.Move getMove() {
-            return move;
-        }
-
-        /**
-         * Sets the value of the move property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Stats.Move }
-         *     
-         */
-        public void setMove(CharacterTemplate.Stats.Move value) {
-            this.move = value;
-        }
-
-        /**
-         * Gets the value of the base property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CharacterTemplate.Stats.Base }
-         *     
-         */
-        public CharacterTemplate.Stats.Base getBase() {
-            return base;
-        }
-
-        /**
-         * Sets the value of the base property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CharacterTemplate.Stats.Base }
-         *     
-         */
-        public void setBase(CharacterTemplate.Stats.Base value) {
-            this.base = value;
-        }
-
-        /**
-         * Gets the value of the maxload property.
-         * 
-         */
-        public int getMaxload() {
-            return maxload;
-        }
-
-        /**
-         * Sets the value of the maxload property.
-         * 
-         */
-        public void setMaxload(int value) {
-            this.maxload = value;
-        }
-
-        /**
-         * Gets the value of the level property.
-         * 
-         */
-        public int getLevel() {
-            return level;
-        }
-
-        /**
-         * Sets the value of the level property.
-         * 
-         */
-        public void setLevel(int value) {
-            this.level = value;
-        }
-
-        /**
-         * Gets the value of the crafter property.
-         * 
-         */
-        public boolean isCrafter() {
-            return crafter;
-        }
-
-        /**
-         * Sets the value of the crafter property.
-         * 
-         */
-        public void setCrafter(boolean value) {
-            this.crafter = value;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="physical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="magical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "physical",
-            "magical"
-        })
-        public static class Attack {
-
-            @XmlElement(required = true)
-            protected CharacterTemplate.Stats.Attack.Physical physical;
-            @XmlElement(required = true)
-            protected CharacterTemplate.Stats.Attack.Magical magical;
-            @XmlAttribute(name = "evasion", required = true)
-            protected int evasion;
-            @XmlAttribute(name = "critical", required = true)
-            protected int critical;
-            @XmlAttribute(name = "accuracy", required = true)
-            protected int accuracy;
-
-            /**
-             * Gets the value of the physical property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link CharacterTemplate.Stats.Attack.Physical }
-             *     
-             */
-            public CharacterTemplate.Stats.Attack.Physical getPhysical() {
-                return physical;
-            }
-
-            /**
-             * Sets the value of the physical property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link CharacterTemplate.Stats.Attack.Physical }
-             *     
-             */
-            public void setPhysical(CharacterTemplate.Stats.Attack.Physical value) {
-                this.physical = value;
-            }
-
-            /**
-             * Gets the value of the magical property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link CharacterTemplate.Stats.Attack.Magical }
-             *     
-             */
-            public CharacterTemplate.Stats.Attack.Magical getMagical() {
-                return magical;
-            }
-
-            /**
-             * Sets the value of the magical property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link CharacterTemplate.Stats.Attack.Magical }
-             *     
-             */
-            public void setMagical(CharacterTemplate.Stats.Attack.Magical value) {
-                this.magical = value;
-            }
-
-            /**
-             * Gets the value of the evasion property.
-             * 
-             */
-            public int getEvasion() {
-                return evasion;
-            }
-
-            /**
-             * Sets the value of the evasion property.
-             * 
-             */
-            public void setEvasion(int value) {
-                this.evasion = value;
-            }
-
-            /**
-             * Gets the value of the critical property.
-             * 
-             */
-            public int getCritical() {
-                return critical;
-            }
-
-            /**
-             * Sets the value of the critical property.
-             * 
-             */
-            public void setCritical(int value) {
-                this.critical = value;
-            }
-
-            /**
-             * Gets the value of the accuracy property.
-             * 
-             */
-            public int getAccuracy() {
-                return accuracy;
-            }
-
-            /**
-             * Sets the value of the accuracy property.
-             * 
-             */
-            public void setAccuracy(int value) {
-                this.accuracy = value;
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Magical {
-
-                @XmlAttribute(name = "damage", required = true)
-                protected double damage;
-                @XmlAttribute(name = "speed", required = true)
-                protected double speed;
-
-                /**
-                 * Gets the value of the damage property.
-                 * 
-                 */
-                public double getDamage() {
-                    return damage;
-                }
-
-                /**
-                 * Sets the value of the damage property.
-                 * 
-                 */
-                public void setDamage(double value) {
-                    this.damage = value;
-                }
-
-                /**
-                 * Gets the value of the speed property.
-                 * 
-                 */
-                public double getSpeed() {
-                    return speed;
-                }
-
-                /**
-                 * Sets the value of the speed property.
-                 * 
-                 */
-                public void setSpeed(double value) {
-                    this.speed = value;
-                }
-
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Physical {
-
-                @XmlAttribute(name = "damage", required = true)
-                protected double damage;
-                @XmlAttribute(name = "speed", required = true)
-                protected double speed;
-
-                /**
-                 * Gets the value of the damage property.
-                 * 
-                 */
-                public double getDamage() {
-                    return damage;
-                }
-
-                /**
-                 * Sets the value of the damage property.
-                 * 
-                 */
-                public void setDamage(double value) {
-                    this.damage = value;
-                }
-
-                /**
-                 * Gets the value of the speed property.
-                 * 
-                 */
-                public double getSpeed() {
-                    return speed;
-                }
-
-                /**
-                 * Sets the value of the speed property.
-                 * 
-                 */
-                public void setSpeed(double value) {
-                    this.speed = value;
-                }
-
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Base {
-
-            @XmlAttribute(name = "int", required = true)
-            protected int _int;
-            @XmlAttribute(name = "str", required = true)
-            protected int str;
-            @XmlAttribute(name = "con", required = true)
-            protected int con;
-            @XmlAttribute(name = "men", required = true)
-            protected int men;
-            @XmlAttribute(name = "dex", required = true)
-            protected int dex;
-            @XmlAttribute(name = "wit", required = true)
-            protected int wit;
-
-            /**
-             * Gets the value of the int property.
-             * 
-             */
-            public int getInt() {
-                return _int;
-            }
-
-            /**
-             * Sets the value of the int property.
-             * 
-             */
-            public void setInt(int value) {
-                this._int = value;
-            }
-
-            /**
-             * Gets the value of the str property.
-             * 
-             */
-            public int getStr() {
-                return str;
-            }
-
-            /**
-             * Sets the value of the str property.
-             * 
-             */
-            public void setStr(int value) {
-                this.str = value;
-            }
-
-            /**
-             * Gets the value of the con property.
-             * 
-             */
-            public int getCon() {
-                return con;
-            }
-
-            /**
-             * Sets the value of the con property.
-             * 
-             */
-            public void setCon(int value) {
-                this.con = value;
-            }
-
-            /**
-             * Gets the value of the men property.
-             * 
-             */
-            public int getMen() {
-                return men;
-            }
-
-            /**
-             * Sets the value of the men property.
-             * 
-             */
-            public void setMen(int value) {
-                this.men = value;
-            }
-
-            /**
-             * Gets the value of the dex property.
-             * 
-             */
-            public int getDex() {
-                return dex;
-            }
-
-            /**
-             * Sets the value of the dex property.
-             * 
-             */
-            public void setDex(int value) {
-                this.dex = value;
-            }
-
-            /**
-             * Gets the value of the wit property.
-             * 
-             */
-            public int getWit() {
-                return wit;
-            }
-
-            /**
-             * Sets the value of the wit property.
-             * 
-             */
-            public void setWit(int value) {
-                this.wit = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Cp {
-
-            @XmlAttribute(name = "base", required = true)
-            protected double base;
-            @XmlAttribute(name = "modifier", required = true)
-            protected double modifier;
-            @XmlAttribute(name = "add", required = true)
-            protected double add;
-
-            /**
-             * Gets the value of the base property.
-             * 
-             */
-            public double getBase() {
-                return base;
-            }
-
-            /**
-             * Sets the value of the base property.
-             * 
-             */
-            public void setBase(double value) {
-                this.base = value;
-            }
-
-            /**
-             * Gets the value of the modifier property.
-             * 
-             */
-            public double getModifier() {
-                return modifier;
-            }
-
-            /**
-             * Sets the value of the modifier property.
-             * 
-             */
-            public void setModifier(double value) {
-                this.modifier = value;
-            }
-
-            /**
-             * Gets the value of the add property.
-             * 
-             */
-            public double getAdd() {
-                return add;
-            }
-
-            /**
-             * Sets the value of the add property.
-             * 
-             */
-            public void setAdd(double value) {
-                this.add = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="physical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="magical">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "physical",
-            "magical"
-        })
-        public static class Defense {
-
-            @XmlElement(required = true)
-            protected CharacterTemplate.Stats.Defense.Physical physical;
-            @XmlElement(required = true)
-            protected CharacterTemplate.Stats.Defense.Magical magical;
-
-            /**
-             * Gets the value of the physical property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link CharacterTemplate.Stats.Defense.Physical }
-             *     
-             */
-            public CharacterTemplate.Stats.Defense.Physical getPhysical() {
-                return physical;
-            }
-
-            /**
-             * Sets the value of the physical property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link CharacterTemplate.Stats.Defense.Physical }
-             *     
-             */
-            public void setPhysical(CharacterTemplate.Stats.Defense.Physical value) {
-                this.physical = value;
-            }
-
-            /**
-             * Gets the value of the magical property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link CharacterTemplate.Stats.Defense.Magical }
-             *     
-             */
-            public CharacterTemplate.Stats.Defense.Magical getMagical() {
-                return magical;
-            }
-
-            /**
-             * Sets the value of the magical property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link CharacterTemplate.Stats.Defense.Magical }
-             *     
-             */
-            public void setMagical(CharacterTemplate.Stats.Defense.Magical value) {
-                this.magical = value;
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Magical {
-
-                @XmlAttribute(name = "value", required = true)
-                protected double value;
-
-                /**
-                 * Gets the value of the value property.
-                 * 
-                 */
-                public double getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 */
-                public void setValue(double value) {
-                    this.value = value;
-                }
-
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Physical {
-
-                @XmlAttribute(name = "value", required = true)
-                protected double value;
-
-                /**
-                 * Gets the value of the value property.
-                 * 
-                 */
-                public double getValue() {
-                    return value;
-                }
-
-                /**
-                 * Sets the value of the value property.
-                 * 
-                 */
-                public void setValue(double value) {
-                    this.value = value;
-                }
-
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Hp {
-
-            @XmlAttribute(name = "base", required = true)
-            protected double base;
-            @XmlAttribute(name = "modifier", required = true)
-            protected double modifier;
-            @XmlAttribute(name = "add", required = true)
-            protected double add;
-
-            /**
-             * Gets the value of the base property.
-             * 
-             */
-            public double getBase() {
-                return base;
-            }
-
-            /**
-             * Sets the value of the base property.
-             * 
-             */
-            public void setBase(double value) {
-                this.base = value;
-            }
-
-            /**
-             * Gets the value of the modifier property.
-             * 
-             */
-            public double getModifier() {
-                return modifier;
-            }
-
-            /**
-             * Sets the value of the modifier property.
-             * 
-             */
-            public void setModifier(double value) {
-                this.modifier = value;
-            }
-
-            /**
-             * Gets the value of the add property.
-             * 
-             */
-            public double getAdd() {
-                return add;
-            }
-
-            /**
-             * Sets the value of the add property.
-             * 
-             */
-            public void setAdd(double value) {
-                this.add = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Move {
-
-            @XmlAttribute(name = "run", required = true)
-            protected double run;
-            @XmlAttribute(name = "walk", required = true)
-            protected double walk;
-
-            /**
-             * Gets the value of the run property.
-             * 
-             */
-            public double getRun() {
-                return run;
-            }
-
-            /**
-             * Sets the value of the run property.
-             * 
-             */
-            public void setRun(double value) {
-                this.run = value;
-            }
-
-            /**
-             * Gets the value of the walk property.
-             * 
-             */
-            public double getWalk() {
-                return walk;
-            }
-
-            /**
-             * Sets the value of the walk property.
-             * 
-             */
-            public void setWalk(double value) {
-                this.walk = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Mp {
-
-            @XmlAttribute(name = "base", required = true)
-            protected double base;
-            @XmlAttribute(name = "modifier", required = true)
-            protected double modifier;
-            @XmlAttribute(name = "add", required = true)
-            protected double add;
-
-            /**
-             * Gets the value of the base property.
-             * 
-             */
-            public double getBase() {
-                return base;
-            }
-
-            /**
-             * Sets the value of the base property.
-             * 
-             */
-            public void setBase(double value) {
-                this.base = value;
-            }
-
-            /**
-             * Gets the value of the modifier property.
-             * 
-             */
-            public double getModifier() {
-                return modifier;
-            }
-
-            /**
-             * Sets the value of the modifier property.
-             * 
-             */
-            public void setModifier(double value) {
-                this.modifier = value;
-            }
-
-            /**
-             * Gets the value of the add property.
-             * 
-             */
-            public double getAdd() {
-                return add;
-            }
-
-            /**
-             * Sets the value of the add property.
-             * 
-             */
-            public void setAdd(double value) {
-                this.add = value;
-            }
-
-        }
-
-    }
+public class CharacterTemplate extends ActorTemplate {
+
+	@XmlElement(required = true)
+	protected CharacterTemplate.Stats stats;
+	@XmlElement(required = true)
+	protected CharacterTemplate.Collision collision;
+	@XmlAttribute(name = "class", required = true)
+	@XmlJavaTypeAdapter(CharacterTemplateIDAdapter.class)
+	protected CharacterTemplateID id;
+
+	/**
+	 * Gets the value of the stats property.
+	 * 
+	 * @return possible object is {@link CharacterTemplate.Stats }
+	 * 
+	 */
+	public CharacterTemplate.Stats getStats() {
+		return stats;
+	}
+
+	/**
+	 * Sets the value of the stats property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CharacterTemplate.Stats }
+	 * 
+	 */
+	public void setStats(CharacterTemplate.Stats value) {
+		this.stats = value;
+	}
+
+	/**
+	 * Gets the value of the collision property.
+	 * 
+	 * @return possible object is {@link CharacterTemplate.Collision }
+	 * 
+	 */
+	public CharacterTemplate.Collision getCollision() {
+		return collision;
+	}
+
+	/**
+	 * Sets the value of the collision property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CharacterTemplate.Collision }
+	 * 
+	 */
+	public void setCollision(CharacterTemplate.Collision value) {
+		this.collision = value;
+	}
+
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public CharacterTemplateID getID() {
+		return id;
+	}
+
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setID(CharacterTemplateID value) {
+		this.id = value;
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="male">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="female">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "male", "female" })
+	public static class Collision {
+
+		@XmlElement(required = true)
+		protected CharacterTemplate.Collision.Male male;
+		@XmlElement(required = true)
+		protected CharacterTemplate.Collision.Female female;
+
+		/**
+		 * Gets the value of the male property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Collision.Male }
+		 * 
+		 */
+		public CharacterTemplate.Collision.Male getMale() {
+			return male;
+		}
+
+		/**
+		 * Sets the value of the male property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Collision.Male }
+		 * 
+		 */
+		public void setMale(CharacterTemplate.Collision.Male value) {
+			this.male = value;
+		}
+
+		/**
+		 * Gets the value of the female property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Collision.Female }
+		 * 
+		 */
+		public CharacterTemplate.Collision.Female getFemale() {
+			return female;
+		}
+
+		/**
+		 * Sets the value of the female property.
+		 * 
+		 * @param value
+		 *            allowed object is
+		 *            {@link CharacterTemplate.Collision.Female }
+		 * 
+		 */
+		public void setFemale(CharacterTemplate.Collision.Female value) {
+			this.female = value;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Female {
+
+			@XmlAttribute(name = "radius", required = true)
+			protected double radius;
+			@XmlAttribute(name = "heigth", required = true)
+			protected double heigth;
+
+			/**
+			 * Gets the value of the radius property.
+			 * 
+			 */
+			public double getRadius() {
+				return radius;
+			}
+
+			/**
+			 * Sets the value of the radius property.
+			 * 
+			 */
+			public void setRadius(double value) {
+				this.radius = value;
+			}
+
+			/**
+			 * Gets the value of the heigth property.
+			 * 
+			 */
+			public double getHeigth() {
+				return heigth;
+			}
+
+			/**
+			 * Sets the value of the heigth property.
+			 * 
+			 */
+			public void setHeigth(double value) {
+				this.heigth = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Male {
+
+			@XmlAttribute(name = "radius", required = true)
+			protected double radius;
+			@XmlAttribute(name = "heigth", required = true)
+			protected double heigth;
+
+			/**
+			 * Gets the value of the radius property.
+			 * 
+			 */
+			public double getRadius() {
+				return radius;
+			}
+
+			/**
+			 * Sets the value of the radius property.
+			 * 
+			 */
+			public void setRadius(double value) {
+				this.radius = value;
+			}
+
+			/**
+			 * Gets the value of the heigth property.
+			 * 
+			 */
+			public double getHeigth() {
+				return heigth;
+			}
+
+			/**
+			 * Sets the value of the heigth property.
+			 * 
+			 */
+			public void setHeigth(double value) {
+				this.heigth = value;
+			}
+
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="hp">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="mp">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="cp">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="attack">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                   <element name="physical">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                   <element name="magical">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                 </sequence>
+	 *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="defense">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                   <element name="physical">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                   <element name="magical">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                 </sequence>
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="move">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="base">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="maxload" type="{http://www.w3.org/2001/XMLSchema}int"/>
+	 *       </sequence>
+	 *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *       <attribute name="crafter" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "hp", "mp", "cp", "attack", "defense",
+			"move", "base", "maxload" })
+	public static class Stats {
+
+		@XmlElement(required = true)
+		protected CharacterTemplate.Stats.Hp hp;
+		@XmlElement(required = true)
+		protected CharacterTemplate.Stats.Mp mp;
+		@XmlElement(required = true)
+		protected CharacterTemplate.Stats.Cp cp;
+		@XmlElement(required = true)
+		protected CharacterTemplate.Stats.Attack attack;
+		@XmlElement(required = true)
+		protected CharacterTemplate.Stats.Defense defense;
+		@XmlElement(required = true)
+		protected CharacterTemplate.Stats.Move move;
+		@XmlElement(required = true)
+		protected CharacterTemplate.Stats.Base base;
+		protected int maxload;
+		@XmlAttribute(name = "level", required = true)
+		protected int level;
+		@XmlAttribute(name = "crafter", required = true)
+		protected boolean crafter;
+
+		/**
+		 * Gets the value of the hp property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Stats.Hp }
+		 * 
+		 */
+		public CharacterTemplate.Stats.Hp getHp() {
+			return hp;
+		}
+
+		/**
+		 * Sets the value of the hp property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Stats.Hp }
+		 * 
+		 */
+		public void setHp(CharacterTemplate.Stats.Hp value) {
+			this.hp = value;
+		}
+
+		/**
+		 * Gets the value of the mp property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Stats.Mp }
+		 * 
+		 */
+		public CharacterTemplate.Stats.Mp getMp() {
+			return mp;
+		}
+
+		/**
+		 * Sets the value of the mp property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Stats.Mp }
+		 * 
+		 */
+		public void setMp(CharacterTemplate.Stats.Mp value) {
+			this.mp = value;
+		}
+
+		/**
+		 * Gets the value of the cp property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Stats.Cp }
+		 * 
+		 */
+		public CharacterTemplate.Stats.Cp getCp() {
+			return cp;
+		}
+
+		/**
+		 * Sets the value of the cp property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Stats.Cp }
+		 * 
+		 */
+		public void setCp(CharacterTemplate.Stats.Cp value) {
+			this.cp = value;
+		}
+
+		/**
+		 * Gets the value of the attack property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Stats.Attack }
+		 * 
+		 */
+		public CharacterTemplate.Stats.Attack getAttack() {
+			return attack;
+		}
+
+		/**
+		 * Sets the value of the attack property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Stats.Attack }
+		 * 
+		 */
+		public void setAttack(CharacterTemplate.Stats.Attack value) {
+			this.attack = value;
+		}
+
+		/**
+		 * Gets the value of the defense property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Stats.Defense }
+		 * 
+		 */
+		public CharacterTemplate.Stats.Defense getDefense() {
+			return defense;
+		}
+
+		/**
+		 * Sets the value of the defense property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Stats.Defense }
+		 * 
+		 */
+		public void setDefense(CharacterTemplate.Stats.Defense value) {
+			this.defense = value;
+		}
+
+		/**
+		 * Gets the value of the move property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Stats.Move }
+		 * 
+		 */
+		public CharacterTemplate.Stats.Move getMove() {
+			return move;
+		}
+
+		/**
+		 * Sets the value of the move property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Stats.Move }
+		 * 
+		 */
+		public void setMove(CharacterTemplate.Stats.Move value) {
+			this.move = value;
+		}
+
+		/**
+		 * Gets the value of the base property.
+		 * 
+		 * @return possible object is {@link CharacterTemplate.Stats.Base }
+		 * 
+		 */
+		public CharacterTemplate.Stats.Base getBase() {
+			return base;
+		}
+
+		/**
+		 * Sets the value of the base property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CharacterTemplate.Stats.Base }
+		 * 
+		 */
+		public void setBase(CharacterTemplate.Stats.Base value) {
+			this.base = value;
+		}
+
+		/**
+		 * Gets the value of the maxload property.
+		 * 
+		 */
+		public int getMaxload() {
+			return maxload;
+		}
+
+		/**
+		 * Sets the value of the maxload property.
+		 * 
+		 */
+		public void setMaxload(int value) {
+			this.maxload = value;
+		}
+
+		/**
+		 * Gets the value of the level property.
+		 * 
+		 */
+		public int getLevel() {
+			return level;
+		}
+
+		/**
+		 * Sets the value of the level property.
+		 * 
+		 */
+		public void setLevel(int value) {
+			this.level = value;
+		}
+
+		/**
+		 * Gets the value of the crafter property.
+		 * 
+		 */
+		public boolean isCrafter() {
+			return crafter;
+		}
+
+		/**
+		 * Sets the value of the crafter property.
+		 * 
+		 */
+		public void setCrafter(boolean value) {
+			this.crafter = value;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *         <element name="physical">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *         <element name="magical">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *       </sequence>
+		 *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="accuracy" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "physical", "magical" })
+		public static class Attack {
+
+			@XmlElement(required = true)
+			protected CharacterTemplate.Stats.Attack.Physical physical;
+			@XmlElement(required = true)
+			protected CharacterTemplate.Stats.Attack.Magical magical;
+			@XmlAttribute(name = "evasion", required = true)
+			protected int evasion;
+			@XmlAttribute(name = "critical", required = true)
+			protected int critical;
+			@XmlAttribute(name = "accuracy", required = true)
+			protected int accuracy;
+
+			/**
+			 * Gets the value of the physical property.
+			 * 
+			 * @return possible object is
+			 *         {@link CharacterTemplate.Stats.Attack.Physical }
+			 * 
+			 */
+			public CharacterTemplate.Stats.Attack.Physical getPhysical() {
+				return physical;
+			}
+
+			/**
+			 * Sets the value of the physical property.
+			 * 
+			 * @param value
+			 *            allowed object is
+			 *            {@link CharacterTemplate.Stats.Attack.Physical }
+			 * 
+			 */
+			public void setPhysical(
+					CharacterTemplate.Stats.Attack.Physical value) {
+				this.physical = value;
+			}
+
+			/**
+			 * Gets the value of the magical property.
+			 * 
+			 * @return possible object is
+			 *         {@link CharacterTemplate.Stats.Attack.Magical }
+			 * 
+			 */
+			public CharacterTemplate.Stats.Attack.Magical getMagical() {
+				return magical;
+			}
+
+			/**
+			 * Sets the value of the magical property.
+			 * 
+			 * @param value
+			 *            allowed object is
+			 *            {@link CharacterTemplate.Stats.Attack.Magical }
+			 * 
+			 */
+			public void setMagical(CharacterTemplate.Stats.Attack.Magical value) {
+				this.magical = value;
+			}
+
+			/**
+			 * Gets the value of the evasion property.
+			 * 
+			 */
+			public int getEvasion() {
+				return evasion;
+			}
+
+			/**
+			 * Sets the value of the evasion property.
+			 * 
+			 */
+			public void setEvasion(int value) {
+				this.evasion = value;
+			}
+
+			/**
+			 * Gets the value of the critical property.
+			 * 
+			 */
+			public int getCritical() {
+				return critical;
+			}
+
+			/**
+			 * Sets the value of the critical property.
+			 * 
+			 */
+			public void setCritical(int value) {
+				this.critical = value;
+			}
+
+			/**
+			 * Gets the value of the accuracy property.
+			 * 
+			 */
+			public int getAccuracy() {
+				return accuracy;
+			}
+
+			/**
+			 * Sets the value of the accuracy property.
+			 * 
+			 */
+			public void setAccuracy(int value) {
+				this.accuracy = value;
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Magical {
+
+				@XmlAttribute(name = "damage", required = true)
+				protected double damage;
+				@XmlAttribute(name = "speed", required = true)
+				protected double speed;
+
+				/**
+				 * Gets the value of the damage property.
+				 * 
+				 */
+				public double getDamage() {
+					return damage;
+				}
+
+				/**
+				 * Sets the value of the damage property.
+				 * 
+				 */
+				public void setDamage(double value) {
+					this.damage = value;
+				}
+
+				/**
+				 * Gets the value of the speed property.
+				 * 
+				 */
+				public double getSpeed() {
+					return speed;
+				}
+
+				/**
+				 * Sets the value of the speed property.
+				 * 
+				 */
+				public void setSpeed(double value) {
+					this.speed = value;
+				}
+
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Physical {
+
+				@XmlAttribute(name = "damage", required = true)
+				protected double damage;
+				@XmlAttribute(name = "speed", required = true)
+				protected double speed;
+
+				/**
+				 * Gets the value of the damage property.
+				 * 
+				 */
+				public double getDamage() {
+					return damage;
+				}
+
+				/**
+				 * Sets the value of the damage property.
+				 * 
+				 */
+				public void setDamage(double value) {
+					this.damage = value;
+				}
+
+				/**
+				 * Gets the value of the speed property.
+				 * 
+				 */
+				public double getSpeed() {
+					return speed;
+				}
+
+				/**
+				 * Sets the value of the speed property.
+				 * 
+				 */
+				public void setSpeed(double value) {
+					this.speed = value;
+				}
+
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Base {
+
+			@XmlAttribute(name = "int", required = true)
+			protected int _int;
+			@XmlAttribute(name = "str", required = true)
+			protected int str;
+			@XmlAttribute(name = "con", required = true)
+			protected int con;
+			@XmlAttribute(name = "men", required = true)
+			protected int men;
+			@XmlAttribute(name = "dex", required = true)
+			protected int dex;
+			@XmlAttribute(name = "wit", required = true)
+			protected int wit;
+
+			/**
+			 * Gets the value of the int property.
+			 * 
+			 */
+			public int getInt() {
+				return _int;
+			}
+
+			/**
+			 * Sets the value of the int property.
+			 * 
+			 */
+			public void setInt(int value) {
+				this._int = value;
+			}
+
+			/**
+			 * Gets the value of the str property.
+			 * 
+			 */
+			public int getStr() {
+				return str;
+			}
+
+			/**
+			 * Sets the value of the str property.
+			 * 
+			 */
+			public void setStr(int value) {
+				this.str = value;
+			}
+
+			/**
+			 * Gets the value of the con property.
+			 * 
+			 */
+			public int getCon() {
+				return con;
+			}
+
+			/**
+			 * Sets the value of the con property.
+			 * 
+			 */
+			public void setCon(int value) {
+				this.con = value;
+			}
+
+			/**
+			 * Gets the value of the men property.
+			 * 
+			 */
+			public int getMen() {
+				return men;
+			}
+
+			/**
+			 * Sets the value of the men property.
+			 * 
+			 */
+			public void setMen(int value) {
+				this.men = value;
+			}
+
+			/**
+			 * Gets the value of the dex property.
+			 * 
+			 */
+			public int getDex() {
+				return dex;
+			}
+
+			/**
+			 * Sets the value of the dex property.
+			 * 
+			 */
+			public void setDex(int value) {
+				this.dex = value;
+			}
+
+			/**
+			 * Gets the value of the wit property.
+			 * 
+			 */
+			public int getWit() {
+				return wit;
+			}
+
+			/**
+			 * Sets the value of the wit property.
+			 * 
+			 */
+			public void setWit(int value) {
+				this.wit = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Cp {
+
+			@XmlAttribute(name = "base", required = true)
+			protected double base;
+			@XmlAttribute(name = "modifier", required = true)
+			protected double modifier;
+			@XmlAttribute(name = "add", required = true)
+			protected double add;
+
+			/**
+			 * Gets the value of the base property.
+			 * 
+			 */
+			public double getBase() {
+				return base;
+			}
+
+			/**
+			 * Sets the value of the base property.
+			 * 
+			 */
+			public void setBase(double value) {
+				this.base = value;
+			}
+
+			/**
+			 * Gets the value of the modifier property.
+			 * 
+			 */
+			public double getModifier() {
+				return modifier;
+			}
+
+			/**
+			 * Sets the value of the modifier property.
+			 * 
+			 */
+			public void setModifier(double value) {
+				this.modifier = value;
+			}
+
+			/**
+			 * Gets the value of the add property.
+			 * 
+			 */
+			public double getAdd() {
+				return add;
+			}
+
+			/**
+			 * Sets the value of the add property.
+			 * 
+			 */
+			public void setAdd(double value) {
+				this.add = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *         <element name="physical">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *         <element name="magical">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *       </sequence>
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "physical", "magical" })
+		public static class Defense {
+
+			@XmlElement(required = true)
+			protected CharacterTemplate.Stats.Defense.Physical physical;
+			@XmlElement(required = true)
+			protected CharacterTemplate.Stats.Defense.Magical magical;
+
+			/**
+			 * Gets the value of the physical property.
+			 * 
+			 * @return possible object is
+			 *         {@link CharacterTemplate.Stats.Defense.Physical }
+			 * 
+			 */
+			public CharacterTemplate.Stats.Defense.Physical getPhysical() {
+				return physical;
+			}
+
+			/**
+			 * Sets the value of the physical property.
+			 * 
+			 * @param value
+			 *            allowed object is
+			 *            {@link CharacterTemplate.Stats.Defense.Physical }
+			 * 
+			 */
+			public void setPhysical(
+					CharacterTemplate.Stats.Defense.Physical value) {
+				this.physical = value;
+			}
+
+			/**
+			 * Gets the value of the magical property.
+			 * 
+			 * @return possible object is
+			 *         {@link CharacterTemplate.Stats.Defense.Magical }
+			 * 
+			 */
+			public CharacterTemplate.Stats.Defense.Magical getMagical() {
+				return magical;
+			}
+
+			/**
+			 * Sets the value of the magical property.
+			 * 
+			 * @param value
+			 *            allowed object is
+			 *            {@link CharacterTemplate.Stats.Defense.Magical }
+			 * 
+			 */
+			public void setMagical(CharacterTemplate.Stats.Defense.Magical value) {
+				this.magical = value;
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Magical {
+
+				@XmlAttribute(name = "value", required = true)
+				protected double value;
+
+				/**
+				 * Gets the value of the value property.
+				 * 
+				 */
+				public double getValue() {
+					return value;
+				}
+
+				/**
+				 * Sets the value of the value property.
+				 * 
+				 */
+				public void setValue(double value) {
+					this.value = value;
+				}
+
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Physical {
+
+				@XmlAttribute(name = "value", required = true)
+				protected double value;
+
+				/**
+				 * Gets the value of the value property.
+				 * 
+				 */
+				public double getValue() {
+					return value;
+				}
+
+				/**
+				 * Sets the value of the value property.
+				 * 
+				 */
+				public void setValue(double value) {
+					this.value = value;
+				}
+
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Hp {
+
+			@XmlAttribute(name = "base", required = true)
+			protected double base;
+			@XmlAttribute(name = "modifier", required = true)
+			protected double modifier;
+			@XmlAttribute(name = "add", required = true)
+			protected double add;
+
+			/**
+			 * Gets the value of the base property.
+			 * 
+			 */
+			public double getBase() {
+				return base;
+			}
+
+			/**
+			 * Sets the value of the base property.
+			 * 
+			 */
+			public void setBase(double value) {
+				this.base = value;
+			}
+
+			/**
+			 * Gets the value of the modifier property.
+			 * 
+			 */
+			public double getModifier() {
+				return modifier;
+			}
+
+			/**
+			 * Sets the value of the modifier property.
+			 * 
+			 */
+			public void setModifier(double value) {
+				this.modifier = value;
+			}
+
+			/**
+			 * Gets the value of the add property.
+			 * 
+			 */
+			public double getAdd() {
+				return add;
+			}
+
+			/**
+			 * Sets the value of the add property.
+			 * 
+			 */
+			public void setAdd(double value) {
+				this.add = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Move {
+
+			@XmlAttribute(name = "run", required = true)
+			protected double run;
+			@XmlAttribute(name = "walk", required = true)
+			protected double walk;
+
+			/**
+			 * Gets the value of the run property.
+			 * 
+			 */
+			public double getRun() {
+				return run;
+			}
+
+			/**
+			 * Sets the value of the run property.
+			 * 
+			 */
+			public void setRun(double value) {
+				this.run = value;
+			}
+
+			/**
+			 * Gets the value of the walk property.
+			 * 
+			 */
+			public double getWalk() {
+				return walk;
+			}
+
+			/**
+			 * Sets the value of the walk property.
+			 * 
+			 */
+			public void setWalk(double value) {
+				this.walk = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="base" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="modifier" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="add" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Mp {
+
+			@XmlAttribute(name = "base", required = true)
+			protected double base;
+			@XmlAttribute(name = "modifier", required = true)
+			protected double modifier;
+			@XmlAttribute(name = "add", required = true)
+			protected double add;
+
+			/**
+			 * Gets the value of the base property.
+			 * 
+			 */
+			public double getBase() {
+				return base;
+			}
+
+			/**
+			 * Sets the value of the base property.
+			 * 
+			 */
+			public void setBase(double value) {
+				this.base = value;
+			}
+
+			/**
+			 * Gets the value of the modifier property.
+			 * 
+			 */
+			public double getModifier() {
+				return modifier;
+			}
+
+			/**
+			 * Sets the value of the modifier property.
+			 * 
+			 */
+			public void setModifier(double value) {
+				this.modifier = value;
+			}
+
+			/**
+			 * Gets the value of the add property.
+			 * 
+			 */
+			public double getAdd() {
+				return add;
+			}
+
+			/**
+			 * Sets the value of the add property.
+			 * 
+			 */
+			public void setAdd(double value) {
+				this.add = value;
+			}
+
+		}
+
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java
index ea4669f71..33bb080cc 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java
@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * 
Java class for Coordinate complex type.
+ * 

+ * Java class for Coordinate complex type.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <complexType name="Coordinate">
@@ -39,59 +40,59 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "Coordinate")
 public class Coordinate {
 
-    @XmlAttribute(name = "x", required = true)
-    protected int x;
-    @XmlAttribute(name = "y", required = true)
-    protected int y;
-    @XmlAttribute(name = "z", required = true)
-    protected int z;
+	@XmlAttribute(name = "x", required = true)
+	protected int x;
+	@XmlAttribute(name = "y", required = true)
+	protected int y;
+	@XmlAttribute(name = "z", required = true)
+	protected int z;
 
-    /**
-     * Gets the value of the x property.
-     * 
-     */
-    public int getX() {
-        return x;
-    }
+	/**
+	 * Gets the value of the x property.
+	 * 
+	 */
+	public int getX() {
+		return x;
+	}
 
-    /**
-     * Sets the value of the x property.
-     * 
-     */
-    public void setX(int value) {
-        this.x = value;
-    }
+	/**
+	 * Sets the value of the x property.
+	 * 
+	 */
+	public void setX(int value) {
+		this.x = value;
+	}
 
-    /**
-     * Gets the value of the y property.
-     * 
-     */
-    public int getY() {
-        return y;
-    }
+	/**
+	 * Gets the value of the y property.
+	 * 
+	 */
+	public int getY() {
+		return y;
+	}
 
-    /**
-     * Sets the value of the y property.
-     * 
-     */
-    public void setY(int value) {
-        this.y = value;
-    }
+	/**
+	 * Sets the value of the y property.
+	 * 
+	 */
+	public void setY(int value) {
+		this.y = value;
+	}
 
-    /**
-     * Gets the value of the z property.
-     * 
-     */
-    public int getZ() {
-        return z;
-    }
+	/**
+	 * Gets the value of the z property.
+	 * 
+	 */
+	public int getZ() {
+		return z;
+	}
 
-    /**
-     * Sets the value of the z property.
-     * 
-     */
-    public void setZ(int value) {
-        this.z = value;
-    }
+	/**
+	 * Sets the value of the z property.
+	 * 
+	 */
+	public void setZ(int value) {
+		this.z = value;
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
index ecc6a68ae..03f0b2f46 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,6 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.l2jserver.model.id.template.ItemTemplateID;
 import com.l2jserver.model.template.item.ArmorType;
 import com.l2jserver.model.template.item.ItemMaterial;
@@ -27,11 +27,13 @@ import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
 import com.l2jserver.util.jaxb.ItemTypeAdapter;
 import com.l2jserver.util.jaxb.WeaponTypeAdapter;
 
-
 /**
- * 
Java class for item element declaration.
+ * 

+ * Java class for item element declaration.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <element name="item">
@@ -154,1034 +156,951 @@ import com.l2jserver.util.jaxb.WeaponTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "attributes",
-    "controller",
-    "effect",
-    "etcItem",
-    "weapon",
-    "armor"
-})
+@XmlType(name = "", propOrder = { "attributes", "controller", "effect",
+		"etcItem", "weapon", "armor" })
 @XmlRootElement(name = "item", namespace = "http://schemas.l2jserver2.com/item")
-public class ItemTemplate
-    extends AbstractTemplate
-{
-
-    @XmlElement(required = true)
-    protected ItemTemplate.Attributes attributes;
-    @XmlElement(required = true)
-    protected ItemTemplate.Controller controller;
-    @XmlElement(required = true)
-    protected ItemTemplate.Effect effect;
-    protected ItemTemplate.EtcItem etcItem;
-    protected ItemTemplate.Weapon weapon;
-    protected ItemTemplate.Armor armor;
-    @XmlAttribute(name = "id", required = true)
-    @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
-    protected ItemTemplateID id;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "icon")
-    protected String icon;
-
-    /**
-     * Gets the value of the attributes property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ItemTemplate.Attributes }
-     *     
-     */
-    public ItemTemplate.Attributes getAttributes() {
-        return attributes;
-    }
-
-    /**
-     * Sets the value of the attributes property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ItemTemplate.Attributes }
-     *     
-     */
-    public void setAttributes(ItemTemplate.Attributes value) {
-        this.attributes = value;
-    }
-
-    /**
-     * Gets the value of the controller property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ItemTemplate.Controller }
-     *     
-     */
-    public ItemTemplate.Controller getController() {
-        return controller;
-    }
-
-    /**
-     * Sets the value of the controller property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ItemTemplate.Controller }
-     *     
-     */
-    public void setController(ItemTemplate.Controller value) {
-        this.controller = value;
-    }
-
-    /**
-     * Gets the value of the effect property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ItemTemplate.Effect }
-     *     
-     */
-    public ItemTemplate.Effect getEffect() {
-        return effect;
-    }
-
-    /**
-     * Sets the value of the effect property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ItemTemplate.Effect }
-     *     
-     */
-    public void setEffect(ItemTemplate.Effect value) {
-        this.effect = value;
-    }
-
-    /**
-     * Gets the value of the etcItem property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ItemTemplate.EtcItem }
-     *     
-     */
-    public ItemTemplate.EtcItem getEtcItem() {
-        return etcItem;
-    }
-
-    /**
-     * Sets the value of the etcItem property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ItemTemplate.EtcItem }
-     *     
-     */
-    public void setEtcItem(ItemTemplate.EtcItem value) {
-        this.etcItem = value;
-    }
-
-    /**
-     * Gets the value of the weapon property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ItemTemplate.Weapon }
-     *     
-     */
-    public ItemTemplate.Weapon getWeapon() {
-        return weapon;
-    }
-
-    /**
-     * Sets the value of the weapon property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ItemTemplate.Weapon }
-     *     
-     */
-    public void setWeapon(ItemTemplate.Weapon value) {
-        this.weapon = value;
-    }
-
-    /**
-     * Gets the value of the armor property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ItemTemplate.Armor }
-     *     
-     */
-    public ItemTemplate.Armor getArmor() {
-        return armor;
-    }
-
-    /**
-     * Sets the value of the armor property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ItemTemplate.Armor }
-     *     
-     */
-    public void setArmor(ItemTemplate.Armor value) {
-        this.armor = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public ItemTemplateID getID() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setID(ItemTemplateID value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the icon property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIcon() {
-        return icon;
-    }
-
-    /**
-     * Sets the value of the icon property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIcon(String value) {
-        this.icon = value;
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="cost">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="equipment">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "cost",
-        "equipment"
-    })
-    public static class Armor {
-
-        @XmlElement(required = true)
-        protected ItemTemplate.Armor.Cost cost;
-        @XmlElement(required = true)
-        protected ItemTemplate.Armor.Equipment equipment;
-        @XmlAttribute(name = "weigth")
-        @XmlSchemaType(name = "anySimpleType")
-        protected String weigth;
-        @XmlAttribute(name = "type")
-        @XmlJavaTypeAdapter(ArmorTypeAdapter.class)
-        protected ArmorType type;
-
-        /**
-         * Gets the value of the cost property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ItemTemplate.Armor.Cost }
-         *     
-         */
-        public ItemTemplate.Armor.Cost getCost() {
-            return cost;
-        }
-
-        /**
-         * Sets the value of the cost property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ItemTemplate.Armor.Cost }
-         *     
-         */
-        public void setCost(ItemTemplate.Armor.Cost value) {
-            this.cost = value;
-        }
-
-        /**
-         * Gets the value of the equipment property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ItemTemplate.Armor.Equipment }
-         *     
-         */
-        public ItemTemplate.Armor.Equipment getEquipment() {
-            return equipment;
-        }
-
-        /**
-         * Sets the value of the equipment property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ItemTemplate.Armor.Equipment }
-         *     
-         */
-        public void setEquipment(ItemTemplate.Armor.Equipment value) {
-            this.equipment = value;
-        }
-
-        /**
-         * Gets the value of the weigth property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getWeigth() {
-            return weigth;
-        }
-
-        /**
-         * Sets the value of the weigth property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setWeigth(String value) {
-            this.weigth = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public ArmorType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(ArmorType value) {
-            this.type = value;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Cost {
-
-            @XmlAttribute(name = "adena")
-            @XmlSchemaType(name = "anySimpleType")
-            protected String adena;
-
-            /**
-             * Gets the value of the adena property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getAdena() {
-                return adena;
-            }
-
-            /**
-             * Sets the value of the adena property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setAdena(String value) {
-                this.adena = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Equipment {
-
-            @XmlAttribute(name = "part")
-            @XmlSchemaType(name = "anySimpleType")
-            protected String part;
-
-            /**
-             * Gets the value of the part property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getPart() {
-                return part;
-            }
-
-            /**
-             * Sets the value of the part property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setPart(String value) {
-                this.part = value;
-            }
-
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="cost">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "cost"
-    })
-    public static class Attributes {
-
-        @XmlElement(required = true)
-        protected ItemTemplate.Attributes.Cost cost;
-        @XmlAttribute(name = "weigth")
-        protected Integer weigth;
-        @XmlAttribute(name = "material")
-        @XmlJavaTypeAdapter(ItemMaterialAdapter.class)
-        protected ItemMaterial material;
-
-        /**
-         * Gets the value of the cost property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ItemTemplate.Attributes.Cost }
-         *     
-         */
-        public ItemTemplate.Attributes.Cost getCost() {
-            return cost;
-        }
-
-        /**
-         * Sets the value of the cost property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ItemTemplate.Attributes.Cost }
-         *     
-         */
-        public void setCost(ItemTemplate.Attributes.Cost value) {
-            this.cost = value;
-        }
-
-        /**
-         * Gets the value of the weigth property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getWeigth() {
-            return weigth;
-        }
-
-        /**
-         * Sets the value of the weigth property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setWeigth(Integer value) {
-            this.weigth = value;
-        }
-
-        /**
-         * Gets the value of the material property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public ItemMaterial getMaterial() {
-            return material;
-        }
-
-        /**
-         * Sets the value of the material property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setMaterial(ItemMaterial value) {
-            this.material = value;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Cost {
-
-            @XmlAttribute(name = "adena")
-            protected Integer adena;
-
-            /**
-             * Gets the value of the adena property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Integer }
-             *     
-             */
-            public Integer getAdena() {
-                return adena;
-            }
-
-            /**
-             * Sets the value of the adena property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Integer }
-             *     
-             */
-            public void setAdena(Integer value) {
-                this.adena = value;
-            }
-
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Controller {
-
-        @XmlAttribute(name = "defaultAction")
-        @XmlSchemaType(name = "anySimpleType")
-        protected String defaultAction;
-
-        /**
-         * Gets the value of the defaultAction property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDefaultAction() {
-            return defaultAction;
-        }
-
-        /**
-         * Sets the value of the defaultAction property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDefaultAction(String value) {
-            this.defaultAction = value;
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="type">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *             <enumeration value="IMMEDIATE"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Effect {
-
-        @XmlAttribute(name = "type")
-        protected String type;
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(String value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class EtcItem {
-
-        @XmlAttribute(name = "type")
-        @XmlJavaTypeAdapter(ItemTypeAdapter.class)
-        protected ItemType type;
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public ItemType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(ItemType value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="physicalDamage" type="{}CalculatorFunction"/>
-     *         <element name="magicalDamage" type="{}CalculatorFunction"/>
-     *         <element name="criticalChance" type="{}CalculatorFunction"/>
-     *         <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
-     *       </sequence>
-     *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
-     *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "physicalDamage",
-        "magicalDamage",
-        "criticalChance",
-        "physicalAttackSpeed"
-    })
-    public static class Weapon {
-
-        @XmlElement(required = true)
-        protected CalculatorFunction physicalDamage;
-        @XmlElement(required = true)
-        protected CalculatorFunction magicalDamage;
-        @XmlElement(required = true)
-        protected CalculatorFunction criticalChance;
-        @XmlElement(required = true)
-        protected CalculatorFunction physicalAttackSpeed;
-        @XmlAttribute(name = "part")
-        @XmlSchemaType(name = "anySimpleType")
-        protected String part;
-        @XmlAttribute(name = "type")
-        @XmlJavaTypeAdapter(WeaponTypeAdapter.class)
-        protected WeaponType type;
-
-        /**
-         * Gets the value of the physicalDamage property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public CalculatorFunction getPhysicalDamage() {
-            return physicalDamage;
-        }
-
-        /**
-         * Sets the value of the physicalDamage property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public void setPhysicalDamage(CalculatorFunction value) {
-            this.physicalDamage = value;
-        }
-
-        /**
-         * Gets the value of the magicalDamage property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public CalculatorFunction getMagicalDamage() {
-            return magicalDamage;
-        }
-
-        /**
-         * Sets the value of the magicalDamage property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public void setMagicalDamage(CalculatorFunction value) {
-            this.magicalDamage = value;
-        }
-
-        /**
-         * Gets the value of the criticalChance property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public CalculatorFunction getCriticalChance() {
-            return criticalChance;
-        }
-
-        /**
-         * Sets the value of the criticalChance property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public void setCriticalChance(CalculatorFunction value) {
-            this.criticalChance = value;
-        }
-
-        /**
-         * Gets the value of the physicalAttackSpeed property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public CalculatorFunction getPhysicalAttackSpeed() {
-            return physicalAttackSpeed;
-        }
-
-        /**
-         * Sets the value of the physicalAttackSpeed property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CalculatorFunction }
-         *     
-         */
-        public void setPhysicalAttackSpeed(CalculatorFunction value) {
-            this.physicalAttackSpeed = value;
-        }
-
-        /**
-         * Gets the value of the part property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPart() {
-            return part;
-        }
-
-        /**
-         * Sets the value of the part property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPart(String value) {
-            this.part = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public WeaponType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setType(WeaponType value) {
-            this.type = value;
-        }
-
-    }
+public class ItemTemplate extends AbstractTemplate {
+
+	@XmlElement(required = true)
+	protected ItemTemplate.Attributes attributes;
+	@XmlElement(required = true)
+	protected ItemTemplate.Controller controller;
+	@XmlElement(required = true)
+	protected ItemTemplate.Effect effect;
+	protected ItemTemplate.EtcItem etcItem;
+	protected ItemTemplate.Weapon weapon;
+	protected ItemTemplate.Armor armor;
+	@XmlAttribute(name = "id", required = true)
+	@XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
+	protected ItemTemplateID id;
+	@XmlAttribute(name = "name", required = true)
+	protected String name;
+	@XmlAttribute(name = "icon")
+	protected String icon;
+
+	/**
+	 * Gets the value of the attributes property.
+	 * 
+	 * @return possible object is {@link ItemTemplate.Attributes }
+	 * 
+	 */
+	public ItemTemplate.Attributes getAttributes() {
+		return attributes;
+	}
+
+	/**
+	 * Sets the value of the attributes property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ItemTemplate.Attributes }
+	 * 
+	 */
+	public void setAttributes(ItemTemplate.Attributes value) {
+		this.attributes = value;
+	}
+
+	/**
+	 * Gets the value of the controller property.
+	 * 
+	 * @return possible object is {@link ItemTemplate.Controller }
+	 * 
+	 */
+	public ItemTemplate.Controller getController() {
+		return controller;
+	}
+
+	/**
+	 * Sets the value of the controller property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ItemTemplate.Controller }
+	 * 
+	 */
+	public void setController(ItemTemplate.Controller value) {
+		this.controller = value;
+	}
+
+	/**
+	 * Gets the value of the effect property.
+	 * 
+	 * @return possible object is {@link ItemTemplate.Effect }
+	 * 
+	 */
+	public ItemTemplate.Effect getEffect() {
+		return effect;
+	}
+
+	/**
+	 * Sets the value of the effect property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ItemTemplate.Effect }
+	 * 
+	 */
+	public void setEffect(ItemTemplate.Effect value) {
+		this.effect = value;
+	}
+
+	/**
+	 * Gets the value of the etcItem property.
+	 * 
+	 * @return possible object is {@link ItemTemplate.EtcItem }
+	 * 
+	 */
+	public ItemTemplate.EtcItem getEtcItem() {
+		return etcItem;
+	}
+
+	/**
+	 * Sets the value of the etcItem property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ItemTemplate.EtcItem }
+	 * 
+	 */
+	public void setEtcItem(ItemTemplate.EtcItem value) {
+		this.etcItem = value;
+	}
+
+	/**
+	 * Gets the value of the weapon property.
+	 * 
+	 * @return possible object is {@link ItemTemplate.Weapon }
+	 * 
+	 */
+	public ItemTemplate.Weapon getWeapon() {
+		return weapon;
+	}
+
+	/**
+	 * Sets the value of the weapon property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ItemTemplate.Weapon }
+	 * 
+	 */
+	public void setWeapon(ItemTemplate.Weapon value) {
+		this.weapon = value;
+	}
+
+	/**
+	 * Gets the value of the armor property.
+	 * 
+	 * @return possible object is {@link ItemTemplate.Armor }
+	 * 
+	 */
+	public ItemTemplate.Armor getArmor() {
+		return armor;
+	}
+
+	/**
+	 * Sets the value of the armor property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ItemTemplate.Armor }
+	 * 
+	 */
+	public void setArmor(ItemTemplate.Armor value) {
+		this.armor = value;
+	}
+
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public ItemTemplateID getID() {
+		return id;
+	}
+
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setID(ItemTemplateID value) {
+		this.id = value;
+	}
+
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
+
+	/**
+	 * Gets the value of the icon property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getIcon() {
+		return icon;
+	}
+
+	/**
+	 * Sets the value of the icon property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setIcon(String value) {
+		this.icon = value;
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="cost">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="equipment">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+	 *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ArmorType" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "cost", "equipment" })
+	public static class Armor {
+
+		@XmlElement(required = true)
+		protected ItemTemplate.Armor.Cost cost;
+		@XmlElement(required = true)
+		protected ItemTemplate.Armor.Equipment equipment;
+		@XmlAttribute(name = "weigth")
+		@XmlSchemaType(name = "anySimpleType")
+		protected String weigth;
+		@XmlAttribute(name = "type")
+		@XmlJavaTypeAdapter(ArmorTypeAdapter.class)
+		protected ArmorType type;
+
+		/**
+		 * Gets the value of the cost property.
+		 * 
+		 * @return possible object is {@link ItemTemplate.Armor.Cost }
+		 * 
+		 */
+		public ItemTemplate.Armor.Cost getCost() {
+			return cost;
+		}
+
+		/**
+		 * Sets the value of the cost property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link ItemTemplate.Armor.Cost }
+		 * 
+		 */
+		public void setCost(ItemTemplate.Armor.Cost value) {
+			this.cost = value;
+		}
+
+		/**
+		 * Gets the value of the equipment property.
+		 * 
+		 * @return possible object is {@link ItemTemplate.Armor.Equipment }
+		 * 
+		 */
+		public ItemTemplate.Armor.Equipment getEquipment() {
+			return equipment;
+		}
+
+		/**
+		 * Sets the value of the equipment property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link ItemTemplate.Armor.Equipment }
+		 * 
+		 */
+		public void setEquipment(ItemTemplate.Armor.Equipment value) {
+			this.equipment = value;
+		}
+
+		/**
+		 * Gets the value of the weigth property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getWeigth() {
+			return weigth;
+		}
+
+		/**
+		 * Sets the value of the weigth property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setWeigth(String value) {
+			this.weigth = value;
+		}
+
+		/**
+		 * Gets the value of the type property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public ArmorType getType() {
+			return type;
+		}
+
+		/**
+		 * Sets the value of the type property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setType(ArmorType value) {
+			this.type = value;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Cost {
+
+			@XmlAttribute(name = "adena")
+			@XmlSchemaType(name = "anySimpleType")
+			protected String adena;
+
+			/**
+			 * Gets the value of the adena property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public String getAdena() {
+				return adena;
+			}
+
+			/**
+			 * Sets the value of the adena property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setAdena(String value) {
+				this.adena = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Equipment {
+
+			@XmlAttribute(name = "part")
+			@XmlSchemaType(name = "anySimpleType")
+			protected String part;
+
+			/**
+			 * Gets the value of the part property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public String getPart() {
+				return part;
+			}
+
+			/**
+			 * Sets the value of the part property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setPart(String value) {
+				this.part = value;
+			}
+
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="cost">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *       <attribute name="weigth" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *       <attribute name="material" type="{http://schemas.l2jserver2.com/item}ItemMaterial" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "cost" })
+	public static class Attributes {
+
+		@XmlElement(required = true)
+		protected ItemTemplate.Attributes.Cost cost;
+		@XmlAttribute(name = "weigth")
+		protected Integer weigth;
+		@XmlAttribute(name = "material")
+		@XmlJavaTypeAdapter(ItemMaterialAdapter.class)
+		protected ItemMaterial material;
+
+		/**
+		 * Gets the value of the cost property.
+		 * 
+		 * @return possible object is {@link ItemTemplate.Attributes.Cost }
+		 * 
+		 */
+		public ItemTemplate.Attributes.Cost getCost() {
+			return cost;
+		}
+
+		/**
+		 * Sets the value of the cost property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link ItemTemplate.Attributes.Cost }
+		 * 
+		 */
+		public void setCost(ItemTemplate.Attributes.Cost value) {
+			this.cost = value;
+		}
+
+		/**
+		 * Gets the value of the weigth property.
+		 * 
+		 * @return possible object is {@link Integer }
+		 * 
+		 */
+		public Integer getWeigth() {
+			return weigth;
+		}
+
+		/**
+		 * Sets the value of the weigth property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Integer }
+		 * 
+		 */
+		public void setWeigth(Integer value) {
+			this.weigth = value;
+		}
+
+		/**
+		 * Gets the value of the material property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public ItemMaterial getMaterial() {
+			return material;
+		}
+
+		/**
+		 * Sets the value of the material property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setMaterial(ItemMaterial value) {
+			this.material = value;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <attribute name="adena" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Cost {
+
+			@XmlAttribute(name = "adena")
+			protected Integer adena;
+
+			/**
+			 * Gets the value of the adena property.
+			 * 
+			 * @return possible object is {@link Integer }
+			 * 
+			 */
+			public Integer getAdena() {
+				return adena;
+			}
+
+			/**
+			 * Sets the value of the adena property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link Integer }
+			 * 
+			 */
+			public void setAdena(Integer value) {
+				this.adena = value;
+			}
+
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <attribute name="defaultAction" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Controller {
+
+		@XmlAttribute(name = "defaultAction")
+		@XmlSchemaType(name = "anySimpleType")
+		protected String defaultAction;
+
+		/**
+		 * Gets the value of the defaultAction property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getDefaultAction() {
+			return defaultAction;
+		}
+
+		/**
+		 * Sets the value of the defaultAction property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setDefaultAction(String value) {
+			this.defaultAction = value;
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <attribute name="type">
+	 *         <simpleType>
+	 *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+	 *             <enumeration value="IMMEDIATE"/>
+	 *           </restriction>
+	 *         </simpleType>
+	 *       </attribute>
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Effect {
+
+		@XmlAttribute(name = "type")
+		protected String type;
+
+		/**
+		 * Gets the value of the type property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getType() {
+			return type;
+		}
+
+		/**
+		 * Sets the value of the type property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setType(String value) {
+			this.type = value;
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}ItemType" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class EtcItem {
+
+		@XmlAttribute(name = "type")
+		@XmlJavaTypeAdapter(ItemTypeAdapter.class)
+		protected ItemType type;
+
+		/**
+		 * Gets the value of the type property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public ItemType getType() {
+			return type;
+		}
+
+		/**
+		 * Sets the value of the type property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setType(ItemType value) {
+			this.type = value;
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="physicalDamage" type="{}CalculatorFunction"/>
+	 *         <element name="magicalDamage" type="{}CalculatorFunction"/>
+	 *         <element name="criticalChance" type="{}CalculatorFunction"/>
+	 *         <element name="physicalAttackSpeed" type="{}CalculatorFunction"/>
+	 *       </sequence>
+	 *       <attribute name="part" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+	 *       <attribute name="type" type="{http://schemas.l2jserver2.com/item}WeaponType" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "physicalDamage", "magicalDamage",
+			"criticalChance", "physicalAttackSpeed" })
+	public static class Weapon {
+
+		@XmlElement(required = true)
+		protected CalculatorFunction physicalDamage;
+		@XmlElement(required = true)
+		protected CalculatorFunction magicalDamage;
+		@XmlElement(required = true)
+		protected CalculatorFunction criticalChance;
+		@XmlElement(required = true)
+		protected CalculatorFunction physicalAttackSpeed;
+		@XmlAttribute(name = "part")
+		@XmlSchemaType(name = "anySimpleType")
+		protected String part;
+		@XmlAttribute(name = "type")
+		@XmlJavaTypeAdapter(WeaponTypeAdapter.class)
+		protected WeaponType type;
+
+		/**
+		 * Gets the value of the physicalDamage property.
+		 * 
+		 * @return possible object is {@link CalculatorFunction }
+		 * 
+		 */
+		public CalculatorFunction getPhysicalDamage() {
+			return physicalDamage;
+		}
+
+		/**
+		 * Sets the value of the physicalDamage property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CalculatorFunction }
+		 * 
+		 */
+		public void setPhysicalDamage(CalculatorFunction value) {
+			this.physicalDamage = value;
+		}
+
+		/**
+		 * Gets the value of the magicalDamage property.
+		 * 
+		 * @return possible object is {@link CalculatorFunction }
+		 * 
+		 */
+		public CalculatorFunction getMagicalDamage() {
+			return magicalDamage;
+		}
+
+		/**
+		 * Sets the value of the magicalDamage property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CalculatorFunction }
+		 * 
+		 */
+		public void setMagicalDamage(CalculatorFunction value) {
+			this.magicalDamage = value;
+		}
+
+		/**
+		 * Gets the value of the criticalChance property.
+		 * 
+		 * @return possible object is {@link CalculatorFunction }
+		 * 
+		 */
+		public CalculatorFunction getCriticalChance() {
+			return criticalChance;
+		}
+
+		/**
+		 * Sets the value of the criticalChance property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CalculatorFunction }
+		 * 
+		 */
+		public void setCriticalChance(CalculatorFunction value) {
+			this.criticalChance = value;
+		}
+
+		/**
+		 * Gets the value of the physicalAttackSpeed property.
+		 * 
+		 * @return possible object is {@link CalculatorFunction }
+		 * 
+		 */
+		public CalculatorFunction getPhysicalAttackSpeed() {
+			return physicalAttackSpeed;
+		}
+
+		/**
+		 * Sets the value of the physicalAttackSpeed property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CalculatorFunction }
+		 * 
+		 */
+		public void setPhysicalAttackSpeed(CalculatorFunction value) {
+			this.physicalAttackSpeed = value;
+		}
+
+		/**
+		 * Gets the value of the part property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getPart() {
+			return part;
+		}
+
+		/**
+		 * Sets the value of the part property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setPart(String value) {
+			this.part = value;
+		}
+
+		/**
+		 * Gets the value of the type property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public WeaponType getType() {
+			return type;
+		}
+
+		/**
+		 * Sets the value of the type property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setType(WeaponType value) {
+			this.type = value;
+		}
+
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
index 835730ecd..29d913919 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
@@ -5,11 +5,11 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -19,6 +19,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.l2jserver.model.id.template.ItemTemplateID;
 import com.l2jserver.model.id.template.NPCTemplateID;
 import com.l2jserver.model.id.template.SkillTemplateID;
@@ -31,11 +32,13 @@ import com.l2jserver.util.jaxb.NPCRaceAdapter;
 import com.l2jserver.util.jaxb.NPCTemplateIDAdapter;
 import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
 
-
 /**
- * 
Java class for npc element declaration.
+ * 

+ * Java class for npc element declaration.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <element name="npc">
@@ -377,2944 +380,2816 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "info",
-    "ai",
-    "talk",
-    "droplist",
-    "skills"
-})
+@XmlType(name = "", propOrder = { "info", "ai", "talk", "droplist", "skills" })
 @XmlRootElement(name = "npc", namespace = "http://schemas.l2jserver2.com/npc")
-public class NPCTemplate
-    extends ActorTemplate
-{
-
-    @XmlElement(required = true)
-    protected NPCTemplate.Info info;
-    protected NPCTemplate.Ai ai;
-    protected NPCTemplate.Talk talk;
-    protected NPCTemplate.Droplist droplist;
-    protected NPCTemplate.Skills skills;
-    @XmlAttribute(name = "id", required = true)
-    @XmlJavaTypeAdapter(NPCTemplateIDAdapter.class)
-    protected NPCTemplateID id;
-    @XmlAttribute(name = "controller", required = true)
-    @XmlJavaTypeAdapter(ClassAdapter.class)
-    protected Class controller;
-
-    /**
-     * Gets the value of the info property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NPCTemplate.Info }
-     *     
-     */
-    public NPCTemplate.Info getInfo() {
-        return info;
-    }
-
-    /**
-     * Sets the value of the info property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NPCTemplate.Info }
-     *     
-     */
-    public void setInfo(NPCTemplate.Info value) {
-        this.info = value;
-    }
-
-    /**
-     * Gets the value of the ai property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NPCTemplate.Ai }
-     *     
-     */
-    public NPCTemplate.Ai getAi() {
-        return ai;
-    }
-
-    /**
-     * Sets the value of the ai property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NPCTemplate.Ai }
-     *     
-     */
-    public void setAi(NPCTemplate.Ai value) {
-        this.ai = value;
-    }
-
-    /**
-     * Gets the value of the talk property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NPCTemplate.Talk }
-     *     
-     */
-    public NPCTemplate.Talk getTalk() {
-        return talk;
-    }
-
-    /**
-     * Sets the value of the talk property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NPCTemplate.Talk }
-     *     
-     */
-    public void setTalk(NPCTemplate.Talk value) {
-        this.talk = value;
-    }
-
-    /**
-     * Gets the value of the droplist property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NPCTemplate.Droplist }
-     *     
-     */
-    public NPCTemplate.Droplist getDroplist() {
-        return droplist;
-    }
-
-    /**
-     * Sets the value of the droplist property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NPCTemplate.Droplist }
-     *     
-     */
-    public void setDroplist(NPCTemplate.Droplist value) {
-        this.droplist = value;
-    }
-
-    /**
-     * Gets the value of the skills property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NPCTemplate.Skills }
-     *     
-     */
-    public NPCTemplate.Skills getSkills() {
-        return skills;
-    }
-
-    /**
-     * Sets the value of the skills property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NPCTemplate.Skills }
-     *     
-     */
-    public void setSkills(NPCTemplate.Skills value) {
-        this.skills = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public NPCTemplateID getID() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setID(NPCTemplateID value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the controller property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public Class getController() {
-        return controller;
-    }
-
-    /**
-     * Sets the value of the controller property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setController(Class value) {
-        this.controller = value;
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *       </sequence>
-     *       <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Ai {
-
-        @XmlAttribute(name = "script", required = true)
-        protected String script;
-
-        /**
-         * Gets the value of the script property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getScript() {
-            return script;
-        }
-
-        /**
-         * Sets the value of the script property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setScript(String value) {
-            this.script = value;
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="item" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-     *                 <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                 <attribute name="category" use="required">
-     *                   <simpleType>
-     *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                       <enumeration value="DROP"/>
-     *                       <enumeration value="SPOIL"/>
-     *                       <enumeration value="UNK_1"/>
-     *                       <enumeration value="UNK_2"/>
-     *                       <enumeration value="UNK_3"/>
-     *                       <enumeration value="UNK_4"/>
-     *                       <enumeration value="UNK_5"/>
-     *                       <enumeration value="UNK_6"/>
-     *                       <enumeration value="UNK_7"/>
-     *                       <enumeration value="UNK_8"/>
-     *                       <enumeration value="UNK_9"/>
-     *                       <enumeration value="UNK_10"/>
-     *                       <enumeration value="UNK_11"/>
-     *                       <enumeration value="UNK_12"/>
-     *                       <enumeration value="UNK_13"/>
-     *                       <enumeration value="UNK_14"/>
-     *                       <enumeration value="UNK_15"/>
-     *                       <enumeration value="UNK_16"/>
-     *                       <enumeration value="UNK_17"/>
-     *                       <enumeration value="UNK_18"/>
-     *                       <enumeration value="UNK_19"/>
-     *                       <enumeration value="UNK_20"/>
-     *                       <enumeration value="UNK_21"/>
-     *                       <enumeration value="UNK_22"/>
-     *                       <enumeration value="UNK_23"/>
-     *                       <enumeration value="UNK_24"/>
-     *                       <enumeration value="UNK_25"/>
-     *                       <enumeration value="UNK_26"/>
-     *                       <enumeration value="UNK_27"/>
-     *                       <enumeration value="UNK_28"/>
-     *                       <enumeration value="UNK_29"/>
-     *                       <enumeration value="UNK_30"/>
-     *                       <enumeration value="UNK_31"/>
-     *                       <enumeration value="UNK_32"/>
-     *                       <enumeration value="UNK_33"/>
-     *                       <enumeration value="UNK_34"/>
-     *                       <enumeration value="UNK_35"/>
-     *                       <enumeration value="UNK_36"/>
-     *                       <enumeration value="UNK_100"/>
-     *                       <enumeration value="UNK_101"/>
-     *                       <enumeration value="UNK_102"/>
-     *                       <enumeration value="UNK_200"/>
-     *                     </restriction>
-     *                   </simpleType>
-     *                 </attribute>
-     *                 <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "item"
-    })
-    public static class Droplist {
-
-        @XmlElement(required = true)
-        protected List item;
-
-        /**
-         * Gets the value of the item property.
-         * 
-         * 

-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a set method for the item property.
-         * 
-         * 

-         * For example, to add a new item, do as follows:
-         * 
-         *    getItem().add(newItem);
-         * 

-         * 
-         * 
-         * 

-         * Objects of the following type(s) are allowed in the list
-         * {@link NPCTemplate.Droplist.Item }
-         * 
-         * 
-         */
-        public List getItem() {
-            if (item == null) {
-                item = new ArrayList();
-            }
-            return this.item;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-         *       <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *       <attribute name="category" use="required">
-         *         <simpleType>
-         *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *             <enumeration value="DROP"/>
-         *             <enumeration value="SPOIL"/>
-         *             <enumeration value="UNK_1"/>
-         *             <enumeration value="UNK_2"/>
-         *             <enumeration value="UNK_3"/>
-         *             <enumeration value="UNK_4"/>
-         *             <enumeration value="UNK_5"/>
-         *             <enumeration value="UNK_6"/>
-         *             <enumeration value="UNK_7"/>
-         *             <enumeration value="UNK_8"/>
-         *             <enumeration value="UNK_9"/>
-         *             <enumeration value="UNK_10"/>
-         *             <enumeration value="UNK_11"/>
-         *             <enumeration value="UNK_12"/>
-         *             <enumeration value="UNK_13"/>
-         *             <enumeration value="UNK_14"/>
-         *             <enumeration value="UNK_15"/>
-         *             <enumeration value="UNK_16"/>
-         *             <enumeration value="UNK_17"/>
-         *             <enumeration value="UNK_18"/>
-         *             <enumeration value="UNK_19"/>
-         *             <enumeration value="UNK_20"/>
-         *             <enumeration value="UNK_21"/>
-         *             <enumeration value="UNK_22"/>
-         *             <enumeration value="UNK_23"/>
-         *             <enumeration value="UNK_24"/>
-         *             <enumeration value="UNK_25"/>
-         *             <enumeration value="UNK_26"/>
-         *             <enumeration value="UNK_27"/>
-         *             <enumeration value="UNK_28"/>
-         *             <enumeration value="UNK_29"/>
-         *             <enumeration value="UNK_30"/>
-         *             <enumeration value="UNK_31"/>
-         *             <enumeration value="UNK_32"/>
-         *             <enumeration value="UNK_33"/>
-         *             <enumeration value="UNK_34"/>
-         *             <enumeration value="UNK_35"/>
-         *             <enumeration value="UNK_36"/>
-         *             <enumeration value="UNK_100"/>
-         *             <enumeration value="UNK_101"/>
-         *             <enumeration value="UNK_102"/>
-         *             <enumeration value="UNK_200"/>
-         *           </restriction>
-         *         </simpleType>
-         *       </attribute>
-         *       <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Item {
-
-            @XmlAttribute(name = "id", required = true)
-            @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
-            protected ItemTemplateID id;
-            @XmlAttribute(name = "min", required = true)
-            protected int min;
-            @XmlAttribute(name = "max", required = true)
-            protected int max;
-            @XmlAttribute(name = "category", required = true)
-            protected NPCTemplate.Droplist.Item.DropCategory category;
-            @XmlAttribute(name = "chance", required = true)
-            protected int chance;
-
-            /**
-             * Gets the value of the id property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public ItemTemplateID getId() {
-                return id;
-            }
-
-            /**
-             * Sets the value of the id property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setId(ItemTemplateID value) {
-                this.id = value;
-            }
-
-            /**
-             * Gets the value of the min property.
-             * 
-             */
-            public int getMin() {
-                return min;
-            }
-
-            /**
-             * Sets the value of the min property.
-             * 
-             */
-            public void setMin(int value) {
-                this.min = value;
-            }
-
-            /**
-             * Gets the value of the max property.
-             * 
-             */
-            public int getMax() {
-                return max;
-            }
-
-            /**
-             * Sets the value of the max property.
-             * 
-             */
-            public void setMax(int value) {
-                this.max = value;
-            }
-
-            /**
-             * Gets the value of the category property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NPCTemplate.Droplist.Item.DropCategory }
-             *     
-             */
-            public NPCTemplate.Droplist.Item.DropCategory getCategory() {
-                return category;
-            }
-
-            /**
-             * Sets the value of the category property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NPCTemplate.Droplist.Item.DropCategory }
-             *     
-             */
-            public void setCategory(NPCTemplate.Droplist.Item.DropCategory value) {
-                this.category = value;
-            }
-
-            /**
-             * Gets the value of the chance property.
-             * 
-             */
-            public int getChance() {
-                return chance;
-            }
-
-            /**
-             * Sets the value of the chance property.
-             * 
-             */
-            public void setChance(int value) {
-                this.chance = value;
-            }
-
-
-            /**
-             * 
Java class for null.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 

-             * 
-             * <simpleType>
-             *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-             *     <enumeration value="DROP"/>
-             *     <enumeration value="SPOIL"/>
-             *     <enumeration value="UNK_1"/>
-             *     <enumeration value="UNK_2"/>
-             *     <enumeration value="UNK_3"/>
-             *     <enumeration value="UNK_4"/>
-             *     <enumeration value="UNK_5"/>
-             *     <enumeration value="UNK_6"/>
-             *     <enumeration value="UNK_7"/>
-             *     <enumeration value="UNK_8"/>
-             *     <enumeration value="UNK_9"/>
-             *     <enumeration value="UNK_10"/>
-             *     <enumeration value="UNK_11"/>
-             *     <enumeration value="UNK_12"/>
-             *     <enumeration value="UNK_13"/>
-             *     <enumeration value="UNK_14"/>
-             *     <enumeration value="UNK_15"/>
-             *     <enumeration value="UNK_16"/>
-             *     <enumeration value="UNK_17"/>
-             *     <enumeration value="UNK_18"/>
-             *     <enumeration value="UNK_19"/>
-             *     <enumeration value="UNK_20"/>
-             *     <enumeration value="UNK_21"/>
-             *     <enumeration value="UNK_22"/>
-             *     <enumeration value="UNK_23"/>
-             *     <enumeration value="UNK_24"/>
-             *     <enumeration value="UNK_25"/>
-             *     <enumeration value="UNK_26"/>
-             *     <enumeration value="UNK_27"/>
-             *     <enumeration value="UNK_28"/>
-             *     <enumeration value="UNK_29"/>
-             *     <enumeration value="UNK_30"/>
-             *     <enumeration value="UNK_31"/>
-             *     <enumeration value="UNK_32"/>
-             *     <enumeration value="UNK_33"/>
-             *     <enumeration value="UNK_34"/>
-             *     <enumeration value="UNK_35"/>
-             *     <enumeration value="UNK_36"/>
-             *     <enumeration value="UNK_100"/>
-             *     <enumeration value="UNK_101"/>
-             *     <enumeration value="UNK_102"/>
-             *     <enumeration value="UNK_200"/>
-             *   </restriction>
-             * </simpleType>
-             * 

-             * 
-             */
-            @XmlType(name = "")
-            @XmlEnum
-            public enum DropCategory {
-
-                DROP,
-                SPOIL,
-                UNK_1,
-                UNK_2,
-                UNK_3,
-                UNK_4,
-                UNK_5,
-                UNK_6,
-                UNK_7,
-                UNK_8,
-                UNK_9,
-                UNK_10,
-                UNK_11,
-                UNK_12,
-                UNK_13,
-                UNK_14,
-                UNK_15,
-                UNK_16,
-                UNK_17,
-                UNK_18,
-                UNK_19,
-                UNK_20,
-                UNK_21,
-                UNK_22,
-                UNK_23,
-                UNK_24,
-                UNK_25,
-                UNK_26,
-                UNK_27,
-                UNK_28,
-                UNK_29,
-                UNK_30,
-                UNK_31,
-                UNK_32,
-                UNK_33,
-                UNK_34,
-                UNK_35,
-                UNK_36,
-                UNK_100,
-                UNK_101,
-                UNK_102,
-                UNK_200;
-
-                public String value() {
-                    return name();
-                }
-
-                public static NPCTemplate.Droplist.Item.DropCategory fromValue(String v) {
-                    return valueOf(v);
-                }
-
-            }
-
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="name" minOccurs="0">
-     *           <complexType>
-     *             <simpleContent>
-     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *                 <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *               </extension>
-     *             </simpleContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="title" minOccurs="0">
-     *           <complexType>
-     *             <simpleContent>
-     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *               </extension>
-     *             </simpleContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *         <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
-     *         <element name="sex" type="{}ActorSexType" minOccurs="0"/>
-     *         <element name="stats">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="hp">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="mp">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="attack" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="physical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                             <element name="magical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                           </sequence>
-     *                           <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="defense" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                             <element name="physical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                             <element name="magical">
-     *                               <complexType>
-     *                                 <complexContent>
-     *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                                     <sequence>
-     *                                     </sequence>
-     *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                                   </restriction>
-     *                                 </complexContent>
-     *                               </complexType>
-     *                             </element>
-     *                           </sequence>
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="move" minOccurs="0">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                           <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                   <element name="base">
-     *                     <complexType>
-     *                       <complexContent>
-     *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                           <sequence>
-     *                           </sequence>
-     *                           <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                           <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *                         </restriction>
-     *                       </complexContent>
-     *                     </complexType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
-     *         <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
-     *         <element name="item" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-     *                 <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="collision" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *       <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *       <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "name",
-        "title",
-        "level",
-        "race",
-        "sex",
-        "stats",
-        "experience",
-        "sp",
-        "item",
-        "collision"
-    })
-    public static class Info {
-
-        protected NPCTemplate.Info.Name name;
-        protected NPCTemplate.Info.Title title;
-        protected int level;
-        @XmlElement(type = String.class)
-        @XmlJavaTypeAdapter(NPCRaceAdapter.class)
-        protected NPCRace race;
-        @XmlElement(type = String.class)
-        @XmlJavaTypeAdapter(ActorSexAdapter.class)
-        protected ActorSex sex;
-        @XmlElement(required = true)
-        protected NPCTemplate.Info.Stats stats;
-        protected long experience;
-        protected int sp;
-        protected NPCTemplate.Info.Item item;
-        protected NPCTemplate.Info.Collision collision;
-        @XmlAttribute(name = "attackable", required = true)
-        protected boolean attackable;
-        @XmlAttribute(name = "targetable", required = true)
-        protected boolean targetable;
-        @XmlAttribute(name = "aggressive", required = true)
-        protected boolean aggressive;
-
-        /**
-         * Gets the value of the name property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link NPCTemplate.Info.Name }
-         *     
-         */
-        public NPCTemplate.Info.Name getName() {
-            return name;
-        }
-
-        /**
-         * Sets the value of the name property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link NPCTemplate.Info.Name }
-         *     
-         */
-        public void setName(NPCTemplate.Info.Name value) {
-            this.name = value;
-        }
-
-        /**
-         * Gets the value of the title property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link NPCTemplate.Info.Title }
-         *     
-         */
-        public NPCTemplate.Info.Title getTitle() {
-            return title;
-        }
-
-        /**
-         * Sets the value of the title property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link NPCTemplate.Info.Title }
-         *     
-         */
-        public void setTitle(NPCTemplate.Info.Title value) {
-            this.title = value;
-        }
-
-        /**
-         * Gets the value of the level property.
-         * 
-         */
-        public int getLevel() {
-            return level;
-        }
-
-        /**
-         * Sets the value of the level property.
-         * 
-         */
-        public void setLevel(int value) {
-            this.level = value;
-        }
-
-        /**
-         * Gets the value of the race property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public NPCRace getRace() {
-            return race;
-        }
-
-        /**
-         * Sets the value of the race property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setRace(NPCRace value) {
-            this.race = value;
-        }
-
-        /**
-         * Gets the value of the sex property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public ActorSex getSex() {
-            return sex;
-        }
-
-        /**
-         * Sets the value of the sex property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setSex(ActorSex value) {
-            this.sex = value;
-        }
-
-        /**
-         * Gets the value of the stats property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link NPCTemplate.Info.Stats }
-         *     
-         */
-        public NPCTemplate.Info.Stats getStats() {
-            return stats;
-        }
-
-        /**
-         * Sets the value of the stats property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link NPCTemplate.Info.Stats }
-         *     
-         */
-        public void setStats(NPCTemplate.Info.Stats value) {
-            this.stats = value;
-        }
-
-        /**
-         * Gets the value of the experience property.
-         * 
-         */
-        public long getExperience() {
-            return experience;
-        }
-
-        /**
-         * Sets the value of the experience property.
-         * 
-         */
-        public void setExperience(long value) {
-            this.experience = value;
-        }
-
-        /**
-         * Gets the value of the sp property.
-         * 
-         */
-        public int getSp() {
-            return sp;
-        }
-
-        /**
-         * Sets the value of the sp property.
-         * 
-         */
-        public void setSp(int value) {
-            this.sp = value;
-        }
-
-        /**
-         * Gets the value of the item property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link NPCTemplate.Info.Item }
-         *     
-         */
-        public NPCTemplate.Info.Item getItem() {
-            return item;
-        }
-
-        /**
-         * Sets the value of the item property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link NPCTemplate.Info.Item }
-         *     
-         */
-        public void setItem(NPCTemplate.Info.Item value) {
-            this.item = value;
-        }
-
-        /**
-         * Gets the value of the collision property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link NPCTemplate.Info.Collision }
-         *     
-         */
-        public NPCTemplate.Info.Collision getCollision() {
-            return collision;
-        }
-
-        /**
-         * Sets the value of the collision property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link NPCTemplate.Info.Collision }
-         *     
-         */
-        public void setCollision(NPCTemplate.Info.Collision value) {
-            this.collision = value;
-        }
-
-        /**
-         * Gets the value of the attackable property.
-         * 
-         */
-        public boolean isAttackable() {
-            return attackable;
-        }
-
-        /**
-         * Sets the value of the attackable property.
-         * 
-         */
-        public void setAttackable(boolean value) {
-            this.attackable = value;
-        }
-
-        /**
-         * Gets the value of the targetable property.
-         * 
-         */
-        public boolean isTargetable() {
-            return targetable;
-        }
-
-        /**
-         * Sets the value of the targetable property.
-         * 
-         */
-        public void setTargetable(boolean value) {
-            this.targetable = value;
-        }
-
-        /**
-         * Gets the value of the aggressive property.
-         * 
-         */
-        public boolean isAggressive() {
-            return aggressive;
-        }
-
-        /**
-         * Sets the value of the aggressive property.
-         * 
-         */
-        public void setAggressive(boolean value) {
-            this.aggressive = value;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Collision {
-
-            @XmlAttribute(name = "radius", required = true)
-            protected double radius;
-            @XmlAttribute(name = "heigth", required = true)
-            protected double heigth;
-
-            /**
-             * Gets the value of the radius property.
-             * 
-             */
-            public double getRadius() {
-                return radius;
-            }
-
-            /**
-             * Sets the value of the radius property.
-             * 
-             */
-            public void setRadius(double value) {
-                this.radius = value;
-            }
-
-            /**
-             * Gets the value of the heigth property.
-             * 
-             */
-            public double getHeigth() {
-                return heigth;
-            }
-
-            /**
-             * Sets the value of the heigth property.
-             * 
-             */
-            public void setHeigth(double value) {
-                this.heigth = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-         *       <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Item {
-
-            @XmlAttribute(name = "rightHand")
-            @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
-            protected ItemTemplateID rightHand;
-            @XmlAttribute(name = "leftHand")
-            @XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
-            protected ItemTemplateID leftHand;
-
-            /**
-             * Gets the value of the rightHand property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public ItemTemplateID getRightHand() {
-                return rightHand;
-            }
-
-            /**
-             * Sets the value of the rightHand property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setRightHand(ItemTemplateID value) {
-                this.rightHand = value;
-            }
-
-            /**
-             * Gets the value of the leftHand property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public ItemTemplateID getLeftHand() {
-                return leftHand;
-            }
-
-            /**
-             * Sets the value of the leftHand property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setLeftHand(ItemTemplateID value) {
-                this.leftHand = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <simpleContent>
-         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-         *       <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-         *     </extension>
-         *   </simpleContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "value"
-        })
-        public static class Name {
-
-            @XmlValue
-            protected String value;
-            @XmlAttribute(name = "send")
-            protected Boolean send;
-            @XmlAttribute(name = "display")
-            protected Boolean display;
-
-            /**
-             * Gets the value of the value property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-            /**
-             * Gets the value of the send property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Boolean }
-             *     
-             */
-            public Boolean isSend() {
-                return send;
-            }
-
-            /**
-             * Sets the value of the send property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Boolean }
-             *     
-             */
-            public void setSend(Boolean value) {
-                this.send = value;
-            }
-
-            /**
-             * Gets the value of the display property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Boolean }
-             *     
-             */
-            public Boolean isDisplay() {
-                return display;
-            }
-
-            /**
-             * Sets the value of the display property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Boolean }
-             *     
-             */
-            public void setDisplay(Boolean value) {
-                this.display = value;
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="hp">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="mp">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="attack" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="physical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                   <element name="magical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                 </sequence>
-         *                 <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="defense" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                   <element name="physical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                   <element name="magical">
-         *                     <complexType>
-         *                       <complexContent>
-         *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                           <sequence>
-         *                           </sequence>
-         *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                         </restriction>
-         *                       </complexContent>
-         *                     </complexType>
-         *                   </element>
-         *                 </sequence>
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="move" minOccurs="0">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *         <element name="base">
-         *           <complexType>
-         *             <complexContent>
-         *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *                 <sequence>
-         *                 </sequence>
-         *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *               </restriction>
-         *             </complexContent>
-         *           </complexType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "hp",
-            "mp",
-            "attack",
-            "defense",
-            "move",
-            "base"
-        })
-        public static class Stats {
-
-            @XmlElement(required = true)
-            protected NPCTemplate.Info.Stats.Hp hp;
-            @XmlElement(required = true)
-            protected NPCTemplate.Info.Stats.Mp mp;
-            protected NPCTemplate.Info.Stats.Attack attack;
-            protected NPCTemplate.Info.Stats.Defense defense;
-            protected NPCTemplate.Info.Stats.Move move;
-            @XmlElement(required = true)
-            protected NPCTemplate.Info.Stats.Base base;
-
-            /**
-             * Gets the value of the hp property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NPCTemplate.Info.Stats.Hp }
-             *     
-             */
-            public NPCTemplate.Info.Stats.Hp getHp() {
-                return hp;
-            }
-
-            /**
-             * Sets the value of the hp property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NPCTemplate.Info.Stats.Hp }
-             *     
-             */
-            public void setHp(NPCTemplate.Info.Stats.Hp value) {
-                this.hp = value;
-            }
-
-            /**
-             * Gets the value of the mp property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NPCTemplate.Info.Stats.Mp }
-             *     
-             */
-            public NPCTemplate.Info.Stats.Mp getMp() {
-                return mp;
-            }
-
-            /**
-             * Sets the value of the mp property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NPCTemplate.Info.Stats.Mp }
-             *     
-             */
-            public void setMp(NPCTemplate.Info.Stats.Mp value) {
-                this.mp = value;
-            }
-
-            /**
-             * Gets the value of the attack property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NPCTemplate.Info.Stats.Attack }
-             *     
-             */
-            public NPCTemplate.Info.Stats.Attack getAttack() {
-                return attack;
-            }
-
-            /**
-             * Sets the value of the attack property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NPCTemplate.Info.Stats.Attack }
-             *     
-             */
-            public void setAttack(NPCTemplate.Info.Stats.Attack value) {
-                this.attack = value;
-            }
-
-            /**
-             * Gets the value of the defense property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NPCTemplate.Info.Stats.Defense }
-             *     
-             */
-            public NPCTemplate.Info.Stats.Defense getDefense() {
-                return defense;
-            }
-
-            /**
-             * Sets the value of the defense property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NPCTemplate.Info.Stats.Defense }
-             *     
-             */
-            public void setDefense(NPCTemplate.Info.Stats.Defense value) {
-                this.defense = value;
-            }
-
-            /**
-             * Gets the value of the move property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NPCTemplate.Info.Stats.Move }
-             *     
-             */
-            public NPCTemplate.Info.Stats.Move getMove() {
-                return move;
-            }
-
-            /**
-             * Sets the value of the move property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NPCTemplate.Info.Stats.Move }
-             *     
-             */
-            public void setMove(NPCTemplate.Info.Stats.Move value) {
-                this.move = value;
-            }
-
-            /**
-             * Gets the value of the base property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link NPCTemplate.Info.Stats.Base }
-             *     
-             */
-            public NPCTemplate.Info.Stats.Base getBase() {
-                return base;
-            }
-
-            /**
-             * Sets the value of the base property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link NPCTemplate.Info.Stats.Base }
-             *     
-             */
-            public void setBase(NPCTemplate.Info.Stats.Base value) {
-                this.base = value;
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="physical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *         <element name="magical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *       </sequence>
-             *       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "physical",
-                "magical"
-            })
-            public static class Attack {
-
-                @XmlElement(required = true)
-                protected NPCTemplate.Info.Stats.Attack.Physical physical;
-                @XmlElement(required = true)
-                protected NPCTemplate.Info.Stats.Attack.Magical magical;
-                @XmlAttribute(name = "range", required = true)
-                protected int range;
-                @XmlAttribute(name = "evasion", required = true)
-                protected int evasion;
-                @XmlAttribute(name = "critical", required = true)
-                protected int critical;
-
-                /**
-                 * Gets the value of the physical property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link NPCTemplate.Info.Stats.Attack.Physical }
-                 *     
-                 */
-                public NPCTemplate.Info.Stats.Attack.Physical getPhysical() {
-                    return physical;
-                }
-
-                /**
-                 * Sets the value of the physical property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link NPCTemplate.Info.Stats.Attack.Physical }
-                 *     
-                 */
-                public void setPhysical(NPCTemplate.Info.Stats.Attack.Physical value) {
-                    this.physical = value;
-                }
-
-                /**
-                 * Gets the value of the magical property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link NPCTemplate.Info.Stats.Attack.Magical }
-                 *     
-                 */
-                public NPCTemplate.Info.Stats.Attack.Magical getMagical() {
-                    return magical;
-                }
-
-                /**
-                 * Sets the value of the magical property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link NPCTemplate.Info.Stats.Attack.Magical }
-                 *     
-                 */
-                public void setMagical(NPCTemplate.Info.Stats.Attack.Magical value) {
-                    this.magical = value;
-                }
-
-                /**
-                 * Gets the value of the range property.
-                 * 
-                 */
-                public int getRange() {
-                    return range;
-                }
-
-                /**
-                 * Sets the value of the range property.
-                 * 
-                 */
-                public void setRange(int value) {
-                    this.range = value;
-                }
-
-                /**
-                 * Gets the value of the evasion property.
-                 * 
-                 */
-                public int getEvasion() {
-                    return evasion;
-                }
-
-                /**
-                 * Sets the value of the evasion property.
-                 * 
-                 */
-                public void setEvasion(int value) {
-                    this.evasion = value;
-                }
-
-                /**
-                 * Gets the value of the critical property.
-                 * 
-                 */
-                public int getCritical() {
-                    return critical;
-                }
-
-                /**
-                 * Sets the value of the critical property.
-                 * 
-                 */
-                public void setCritical(int value) {
-                    this.critical = value;
-                }
-
-
-                /**
-                 * 
Java class for anonymous complex type.
-                 * 
-                 * 
The following schema fragment specifies the expected content contained within this class.
-                 * 
-                 * 
-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 

-                 * 
-                 * 
-                 */
-                @XmlAccessorType(XmlAccessType.FIELD)
-                @XmlType(name = "")
-                public static class Magical {
-
-                    @XmlAttribute(name = "damage", required = true)
-                    protected double damage;
-                    @XmlAttribute(name = "speed", required = true)
-                    protected double speed;
-
-                    /**
-                     * Gets the value of the damage property.
-                     * 
-                     */
-                    public double getDamage() {
-                        return damage;
-                    }
-
-                    /**
-                     * Sets the value of the damage property.
-                     * 
-                     */
-                    public void setDamage(double value) {
-                        this.damage = value;
-                    }
-
-                    /**
-                     * Gets the value of the speed property.
-                     * 
-                     */
-                    public double getSpeed() {
-                        return speed;
-                    }
-
-                    /**
-                     * Sets the value of the speed property.
-                     * 
-                     */
-                    public void setSpeed(double value) {
-                        this.speed = value;
-                    }
-
-                }
-
-
-                /**
-                 * 
Java class for anonymous complex type.
-                 * 
-                 * 
The following schema fragment specifies the expected content contained within this class.
-                 * 
-                 * 
-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 

-                 * 
-                 * 
-                 */
-                @XmlAccessorType(XmlAccessType.FIELD)
-                @XmlType(name = "")
-                public static class Physical {
-
-                    @XmlAttribute(name = "damage", required = true)
-                    protected double damage;
-                    @XmlAttribute(name = "speed", required = true)
-                    protected double speed;
-
-                    /**
-                     * Gets the value of the damage property.
-                     * 
-                     */
-                    public double getDamage() {
-                        return damage;
-                    }
-
-                    /**
-                     * Sets the value of the damage property.
-                     * 
-                     */
-                    public void setDamage(double value) {
-                        this.damage = value;
-                    }
-
-                    /**
-                     * Gets the value of the speed property.
-                     * 
-                     */
-                    public double getSpeed() {
-                        return speed;
-                    }
-
-                    /**
-                     * Sets the value of the speed property.
-                     * 
-                     */
-                    public void setSpeed(double value) {
-                        this.speed = value;
-                    }
-
-                }
-
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Base {
-
-                @XmlAttribute(name = "int", required = true)
-                protected int _int;
-                @XmlAttribute(name = "str", required = true)
-                protected int str;
-                @XmlAttribute(name = "con", required = true)
-                protected int con;
-                @XmlAttribute(name = "men", required = true)
-                protected int men;
-                @XmlAttribute(name = "dex", required = true)
-                protected int dex;
-                @XmlAttribute(name = "wit", required = true)
-                protected int wit;
-
-                /**
-                 * Gets the value of the int property.
-                 * 
-                 */
-                public int getInt() {
-                    return _int;
-                }
-
-                /**
-                 * Sets the value of the int property.
-                 * 
-                 */
-                public void setInt(int value) {
-                    this._int = value;
-                }
-
-                /**
-                 * Gets the value of the str property.
-                 * 
-                 */
-                public int getStr() {
-                    return str;
-                }
-
-                /**
-                 * Sets the value of the str property.
-                 * 
-                 */
-                public void setStr(int value) {
-                    this.str = value;
-                }
-
-                /**
-                 * Gets the value of the con property.
-                 * 
-                 */
-                public int getCon() {
-                    return con;
-                }
-
-                /**
-                 * Sets the value of the con property.
-                 * 
-                 */
-                public void setCon(int value) {
-                    this.con = value;
-                }
-
-                /**
-                 * Gets the value of the men property.
-                 * 
-                 */
-                public int getMen() {
-                    return men;
-                }
-
-                /**
-                 * Sets the value of the men property.
-                 * 
-                 */
-                public void setMen(int value) {
-                    this.men = value;
-                }
-
-                /**
-                 * Gets the value of the dex property.
-                 * 
-                 */
-                public int getDex() {
-                    return dex;
-                }
-
-                /**
-                 * Sets the value of the dex property.
-                 * 
-                 */
-                public void setDex(int value) {
-                    this.dex = value;
-                }
-
-                /**
-                 * Gets the value of the wit property.
-                 * 
-                 */
-                public int getWit() {
-                    return wit;
-                }
-
-                /**
-                 * Sets the value of the wit property.
-                 * 
-                 */
-                public void setWit(int value) {
-                    this.wit = value;
-                }
-
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *         <element name="physical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *         <element name="magical">
-             *           <complexType>
-             *             <complexContent>
-             *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *                 <sequence>
-             *                 </sequence>
-             *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *               </restriction>
-             *             </complexContent>
-             *           </complexType>
-             *         </element>
-             *       </sequence>
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "", propOrder = {
-                "physical",
-                "magical"
-            })
-            public static class Defense {
-
-                @XmlElement(required = true)
-                protected NPCTemplate.Info.Stats.Defense.Physical physical;
-                @XmlElement(required = true)
-                protected NPCTemplate.Info.Stats.Defense.Magical magical;
-
-                /**
-                 * Gets the value of the physical property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link NPCTemplate.Info.Stats.Defense.Physical }
-                 *     
-                 */
-                public NPCTemplate.Info.Stats.Defense.Physical getPhysical() {
-                    return physical;
-                }
-
-                /**
-                 * Sets the value of the physical property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link NPCTemplate.Info.Stats.Defense.Physical }
-                 *     
-                 */
-                public void setPhysical(NPCTemplate.Info.Stats.Defense.Physical value) {
-                    this.physical = value;
-                }
-
-                /**
-                 * Gets the value of the magical property.
-                 * 
-                 * @return
-                 *     possible object is
-                 *     {@link NPCTemplate.Info.Stats.Defense.Magical }
-                 *     
-                 */
-                public NPCTemplate.Info.Stats.Defense.Magical getMagical() {
-                    return magical;
-                }
-
-                /**
-                 * Sets the value of the magical property.
-                 * 
-                 * @param value
-                 *     allowed object is
-                 *     {@link NPCTemplate.Info.Stats.Defense.Magical }
-                 *     
-                 */
-                public void setMagical(NPCTemplate.Info.Stats.Defense.Magical value) {
-                    this.magical = value;
-                }
-
-
-                /**
-                 * 
Java class for anonymous complex type.
-                 * 
-                 * 
The following schema fragment specifies the expected content contained within this class.
-                 * 
-                 * 
-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 

-                 * 
-                 * 
-                 */
-                @XmlAccessorType(XmlAccessType.FIELD)
-                @XmlType(name = "")
-                public static class Magical {
-
-                    @XmlAttribute(name = "value", required = true)
-                    protected double value;
-
-                    /**
-                     * Gets the value of the value property.
-                     * 
-                     */
-                    public double getValue() {
-                        return value;
-                    }
-
-                    /**
-                     * Sets the value of the value property.
-                     * 
-                     */
-                    public void setValue(double value) {
-                        this.value = value;
-                    }
-
-                }
-
-
-                /**
-                 * 
Java class for anonymous complex type.
-                 * 
-                 * 
The following schema fragment specifies the expected content contained within this class.
-                 * 
-                 * 
-                 * <complexType>
-                 *   <complexContent>
-                 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-                 *       <sequence>
-                 *       </sequence>
-                 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-                 *     </restriction>
-                 *   </complexContent>
-                 * </complexType>
-                 * 

-                 * 
-                 * 
-                 */
-                @XmlAccessorType(XmlAccessType.FIELD)
-                @XmlType(name = "")
-                public static class Physical {
-
-                    @XmlAttribute(name = "value", required = true)
-                    protected double value;
-
-                    /**
-                     * Gets the value of the value property.
-                     * 
-                     */
-                    public double getValue() {
-                        return value;
-                    }
-
-                    /**
-                     * Sets the value of the value property.
-                     * 
-                     */
-                    public void setValue(double value) {
-                        this.value = value;
-                    }
-
-                }
-
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Hp {
-
-                @XmlAttribute(name = "max", required = true)
-                protected double max;
-                @XmlAttribute(name = "regen", required = true)
-                protected double regen;
-
-                /**
-                 * Gets the value of the max property.
-                 * 
-                 */
-                public double getMax() {
-                    return max;
-                }
-
-                /**
-                 * Sets the value of the max property.
-                 * 
-                 */
-                public void setMax(double value) {
-                    this.max = value;
-                }
-
-                /**
-                 * Gets the value of the regen property.
-                 * 
-                 */
-                public double getRegen() {
-                    return regen;
-                }
-
-                /**
-                 * Sets the value of the regen property.
-                 * 
-                 */
-                public void setRegen(double value) {
-                    this.regen = value;
-                }
-
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Move {
-
-                @XmlAttribute(name = "run", required = true)
-                protected double run;
-                @XmlAttribute(name = "walk", required = true)
-                protected double walk;
-
-                /**
-                 * Gets the value of the run property.
-                 * 
-                 */
-                public double getRun() {
-                    return run;
-                }
-
-                /**
-                 * Sets the value of the run property.
-                 * 
-                 */
-                public void setRun(double value) {
-                    this.run = value;
-                }
-
-                /**
-                 * Gets the value of the walk property.
-                 * 
-                 */
-                public double getWalk() {
-                    return walk;
-                }
-
-                /**
-                 * Sets the value of the walk property.
-                 * 
-                 */
-                public void setWalk(double value) {
-                    this.walk = value;
-                }
-
-            }
-
-
-            /**
-             * 
Java class for anonymous complex type.
-             * 
-             * 
The following schema fragment specifies the expected content contained within this class.
-             * 
-             * 
-             * <complexType>
-             *   <complexContent>
-             *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-             *       <sequence>
-             *       </sequence>
-             *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
-             *     </restriction>
-             *   </complexContent>
-             * </complexType>
-             * 

-             * 
-             * 
-             */
-            @XmlAccessorType(XmlAccessType.FIELD)
-            @XmlType(name = "")
-            public static class Mp {
-
-                @XmlAttribute(name = "max", required = true)
-                protected double max;
-                @XmlAttribute(name = "regen", required = true)
-                protected double regen;
-
-                /**
-                 * Gets the value of the max property.
-                 * 
-                 */
-                public double getMax() {
-                    return max;
-                }
-
-                /**
-                 * Sets the value of the max property.
-                 * 
-                 */
-                public void setMax(double value) {
-                    this.max = value;
-                }
-
-                /**
-                 * Gets the value of the regen property.
-                 * 
-                 */
-                public double getRegen() {
-                    return regen;
-                }
-
-                /**
-                 * Sets the value of the regen property.
-                 * 
-                 */
-                public void setRegen(double value) {
-                    this.regen = value;
-                }
-
-            }
-
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <simpleContent>
-         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-         *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-         *     </extension>
-         *   </simpleContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "value"
-        })
-        public static class Title {
-
-            @XmlValue
-            protected String value;
-            @XmlAttribute(name = "send")
-            protected Boolean send;
-
-            /**
-             * Gets the value of the value property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-            /**
-             * Gets the value of the send property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link Boolean }
-             *     
-             */
-            public Boolean isSend() {
-                return send;
-            }
-
-            /**
-             * Sets the value of the send property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link Boolean }
-             *     
-             */
-            public void setSend(Boolean value) {
-                this.send = value;
-            }
-
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="skill" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                 </sequence>
-     *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
-     *                 <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "skill"
-    })
-    public static class Skills {
-
-        @XmlElement(required = true)
-        protected List skill;
-
-        /**
-         * Gets the value of the skill property.
-         * 
-         * 

-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a set method for the skill property.
-         * 
-         * 

-         * For example, to add a new item, do as follows:
-         * 
-         *    getSkill().add(newItem);
-         * 

-         * 
-         * 
-         * 

-         * Objects of the following type(s) are allowed in the list
-         * {@link NPCTemplate.Skills.Skill }
-         * 
-         * 
-         */
-        public List getSkill() {
-            if (skill == null) {
-                skill = new ArrayList();
-            }
-            return this.skill;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *       </sequence>
-         *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
-         *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "")
-        public static class Skill {
-
-            @XmlAttribute(name = "id", required = true)
-            @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
-            protected SkillTemplateID id;
-            @XmlAttribute(name = "level", required = true)
-            protected int level;
-
-            /**
-             * Gets the value of the id property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public SkillTemplateID getId() {
-                return id;
-            }
-
-            /**
-             * Sets the value of the id property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setId(SkillTemplateID value) {
-                this.id = value;
-            }
-
-            /**
-             * Gets the value of the level property.
-             * 
-             */
-            public int getLevel() {
-                return level;
-            }
-
-            /**
-             * Sets the value of the level property.
-             * 
-             */
-            public void setLevel(int value) {
-                this.level = value;
-            }
-
-        }
-
-    }
-
-
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="chat" maxOccurs="unbounded">
-     *           <complexType>
-     *             <simpleContent>
-     *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *               </extension>
-     *             </simpleContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "chat"
-    })
-    public static class Talk {
-
-        @XmlElement(required = true)
-        protected List chat;
-        @XmlAttribute(name = "default", required = true)
-        protected String _default;
-
-        /**
-         * Gets the value of the chat property.
-         * 
-         * 

-         * This accessor method returns a reference to the live list,
-         * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
-         * This is why there is not a set method for the chat property.
-         * 
-         * 

-         * For example, to add a new item, do as follows:
-         * 
-         *    getChat().add(newItem);
-         * 

-         * 
-         * 
-         * 

-         * Objects of the following type(s) are allowed in the list
-         * {@link NPCTemplate.Talk.Chat }
-         * 
-         * 
-         */
-        public List getChat() {
-            if (chat == null) {
-                chat = new ArrayList();
-            }
-            return this.chat;
-        }
-
-        /**
-         * Gets the value of the default property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getDefault() {
-            return _default;
-        }
-
-        /**
-         * Sets the value of the default property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setDefault(String value) {
-            this._default = value;
-        }
-
-
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <simpleContent>
-         *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-         *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-         *     </extension>
-         *   </simpleContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "value"
-        })
-        public static class Chat {
-
-            @XmlValue
-            protected String value;
-            @XmlAttribute(name = "id", required = true)
-            protected String id;
-
-            /**
-             * Gets the value of the value property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getValue() {
-                return value;
-            }
-
-            /**
-             * Sets the value of the value property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setValue(String value) {
-                this.value = value;
-            }
-
-            /**
-             * Gets the value of the id property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link String }
-             *     
-             */
-            public String getId() {
-                return id;
-            }
-
-            /**
-             * Sets the value of the id property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link String }
-             *     
-             */
-            public void setId(String value) {
-                this.id = value;
-            }
-
-        }
-
-    }
+public class NPCTemplate extends ActorTemplate {
+
+	@XmlElement(required = true)
+	protected NPCTemplate.Info info;
+	protected NPCTemplate.Ai ai;
+	protected NPCTemplate.Talk talk;
+	protected NPCTemplate.Droplist droplist;
+	protected NPCTemplate.Skills skills;
+	@XmlAttribute(name = "id", required = true)
+	@XmlJavaTypeAdapter(NPCTemplateIDAdapter.class)
+	protected NPCTemplateID id;
+	@XmlAttribute(name = "controller", required = true)
+	@XmlJavaTypeAdapter(ClassAdapter.class)
+	protected Class controller;
+
+	/**
+	 * Gets the value of the info property.
+	 * 
+	 * @return possible object is {@link NPCTemplate.Info }
+	 * 
+	 */
+	public NPCTemplate.Info getInfo() {
+		return info;
+	}
+
+	/**
+	 * Sets the value of the info property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NPCTemplate.Info }
+	 * 
+	 */
+	public void setInfo(NPCTemplate.Info value) {
+		this.info = value;
+	}
+
+	/**
+	 * Gets the value of the ai property.
+	 * 
+	 * @return possible object is {@link NPCTemplate.Ai }
+	 * 
+	 */
+	public NPCTemplate.Ai getAi() {
+		return ai;
+	}
+
+	/**
+	 * Sets the value of the ai property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NPCTemplate.Ai }
+	 * 
+	 */
+	public void setAi(NPCTemplate.Ai value) {
+		this.ai = value;
+	}
+
+	/**
+	 * Gets the value of the talk property.
+	 * 
+	 * @return possible object is {@link NPCTemplate.Talk }
+	 * 
+	 */
+	public NPCTemplate.Talk getTalk() {
+		return talk;
+	}
+
+	/**
+	 * Sets the value of the talk property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NPCTemplate.Talk }
+	 * 
+	 */
+	public void setTalk(NPCTemplate.Talk value) {
+		this.talk = value;
+	}
+
+	/**
+	 * Gets the value of the droplist property.
+	 * 
+	 * @return possible object is {@link NPCTemplate.Droplist }
+	 * 
+	 */
+	public NPCTemplate.Droplist getDroplist() {
+		return droplist;
+	}
+
+	/**
+	 * Sets the value of the droplist property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NPCTemplate.Droplist }
+	 * 
+	 */
+	public void setDroplist(NPCTemplate.Droplist value) {
+		this.droplist = value;
+	}
+
+	/**
+	 * Gets the value of the skills property.
+	 * 
+	 * @return possible object is {@link NPCTemplate.Skills }
+	 * 
+	 */
+	public NPCTemplate.Skills getSkills() {
+		return skills;
+	}
+
+	/**
+	 * Sets the value of the skills property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NPCTemplate.Skills }
+	 * 
+	 */
+	public void setSkills(NPCTemplate.Skills value) {
+		this.skills = value;
+	}
+
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public NPCTemplateID getID() {
+		return id;
+	}
+
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setID(NPCTemplateID value) {
+		this.id = value;
+	}
+
+	/**
+	 * Gets the value of the controller property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public Class getController() {
+		return controller;
+	}
+
+	/**
+	 * Sets the value of the controller property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setController(Class value) {
+		this.controller = value;
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *       </sequence>
+	 *       <attribute name="script" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Ai {
+
+		@XmlAttribute(name = "script", required = true)
+		protected String script;
+
+		/**
+		 * Gets the value of the script property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getScript() {
+			return script;
+		}
+
+		/**
+		 * Sets the value of the script property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setScript(String value) {
+			this.script = value;
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="item" maxOccurs="unbounded">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+	 *                 <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                 <attribute name="category" use="required">
+	 *                   <simpleType>
+	 *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+	 *                       <enumeration value="DROP"/>
+	 *                       <enumeration value="SPOIL"/>
+	 *                       <enumeration value="UNK_1"/>
+	 *                       <enumeration value="UNK_2"/>
+	 *                       <enumeration value="UNK_3"/>
+	 *                       <enumeration value="UNK_4"/>
+	 *                       <enumeration value="UNK_5"/>
+	 *                       <enumeration value="UNK_6"/>
+	 *                       <enumeration value="UNK_7"/>
+	 *                       <enumeration value="UNK_8"/>
+	 *                       <enumeration value="UNK_9"/>
+	 *                       <enumeration value="UNK_10"/>
+	 *                       <enumeration value="UNK_11"/>
+	 *                       <enumeration value="UNK_12"/>
+	 *                       <enumeration value="UNK_13"/>
+	 *                       <enumeration value="UNK_14"/>
+	 *                       <enumeration value="UNK_15"/>
+	 *                       <enumeration value="UNK_16"/>
+	 *                       <enumeration value="UNK_17"/>
+	 *                       <enumeration value="UNK_18"/>
+	 *                       <enumeration value="UNK_19"/>
+	 *                       <enumeration value="UNK_20"/>
+	 *                       <enumeration value="UNK_21"/>
+	 *                       <enumeration value="UNK_22"/>
+	 *                       <enumeration value="UNK_23"/>
+	 *                       <enumeration value="UNK_24"/>
+	 *                       <enumeration value="UNK_25"/>
+	 *                       <enumeration value="UNK_26"/>
+	 *                       <enumeration value="UNK_27"/>
+	 *                       <enumeration value="UNK_28"/>
+	 *                       <enumeration value="UNK_29"/>
+	 *                       <enumeration value="UNK_30"/>
+	 *                       <enumeration value="UNK_31"/>
+	 *                       <enumeration value="UNK_32"/>
+	 *                       <enumeration value="UNK_33"/>
+	 *                       <enumeration value="UNK_34"/>
+	 *                       <enumeration value="UNK_35"/>
+	 *                       <enumeration value="UNK_36"/>
+	 *                       <enumeration value="UNK_100"/>
+	 *                       <enumeration value="UNK_101"/>
+	 *                       <enumeration value="UNK_102"/>
+	 *                       <enumeration value="UNK_200"/>
+	 *                     </restriction>
+	 *                   </simpleType>
+	 *                 </attribute>
+	 *                 <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "item" })
+	public static class Droplist {
+
+		@XmlElement(required = true)
+		protected List item;
+
+		/**
+		 * Gets the value of the item property.
+		 * 
+		 * 

+		 * This accessor method returns a reference to the live list, not a
+		 * snapshot. Therefore any modification you make to the returned list
+		 * will be present inside the JAXB object. This is why there is not a
+		 * set method for the item property.
+		 * 
+		 * 

+		 * For example, to add a new item, do as follows:
+		 * 
+		 * 
+		 * getItem().add(newItem);
+		 * 

+		 * 
+		 * 
+		 * 

+		 * Objects of the following type(s) are allowed in the list
+		 * {@link NPCTemplate.Droplist.Item }
+		 * 
+		 * 
+		 */
+		public List getItem() {
+			if (item == null) {
+				item = new ArrayList();
+			}
+			return this.item;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+		 *       <attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *       <attribute name="category" use="required">
+		 *         <simpleType>
+		 *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+		 *             <enumeration value="DROP"/>
+		 *             <enumeration value="SPOIL"/>
+		 *             <enumeration value="UNK_1"/>
+		 *             <enumeration value="UNK_2"/>
+		 *             <enumeration value="UNK_3"/>
+		 *             <enumeration value="UNK_4"/>
+		 *             <enumeration value="UNK_5"/>
+		 *             <enumeration value="UNK_6"/>
+		 *             <enumeration value="UNK_7"/>
+		 *             <enumeration value="UNK_8"/>
+		 *             <enumeration value="UNK_9"/>
+		 *             <enumeration value="UNK_10"/>
+		 *             <enumeration value="UNK_11"/>
+		 *             <enumeration value="UNK_12"/>
+		 *             <enumeration value="UNK_13"/>
+		 *             <enumeration value="UNK_14"/>
+		 *             <enumeration value="UNK_15"/>
+		 *             <enumeration value="UNK_16"/>
+		 *             <enumeration value="UNK_17"/>
+		 *             <enumeration value="UNK_18"/>
+		 *             <enumeration value="UNK_19"/>
+		 *             <enumeration value="UNK_20"/>
+		 *             <enumeration value="UNK_21"/>
+		 *             <enumeration value="UNK_22"/>
+		 *             <enumeration value="UNK_23"/>
+		 *             <enumeration value="UNK_24"/>
+		 *             <enumeration value="UNK_25"/>
+		 *             <enumeration value="UNK_26"/>
+		 *             <enumeration value="UNK_27"/>
+		 *             <enumeration value="UNK_28"/>
+		 *             <enumeration value="UNK_29"/>
+		 *             <enumeration value="UNK_30"/>
+		 *             <enumeration value="UNK_31"/>
+		 *             <enumeration value="UNK_32"/>
+		 *             <enumeration value="UNK_33"/>
+		 *             <enumeration value="UNK_34"/>
+		 *             <enumeration value="UNK_35"/>
+		 *             <enumeration value="UNK_36"/>
+		 *             <enumeration value="UNK_100"/>
+		 *             <enumeration value="UNK_101"/>
+		 *             <enumeration value="UNK_102"/>
+		 *             <enumeration value="UNK_200"/>
+		 *           </restriction>
+		 *         </simpleType>
+		 *       </attribute>
+		 *       <attribute name="chance" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Item {
+
+			@XmlAttribute(name = "id", required = true)
+			@XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
+			protected ItemTemplateID id;
+			@XmlAttribute(name = "min", required = true)
+			protected int min;
+			@XmlAttribute(name = "max", required = true)
+			protected int max;
+			@XmlAttribute(name = "category", required = true)
+			protected NPCTemplate.Droplist.Item.DropCategory category;
+			@XmlAttribute(name = "chance", required = true)
+			protected int chance;
+
+			/**
+			 * Gets the value of the id property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public ItemTemplateID getId() {
+				return id;
+			}
+
+			/**
+			 * Sets the value of the id property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setId(ItemTemplateID value) {
+				this.id = value;
+			}
+
+			/**
+			 * Gets the value of the min property.
+			 * 
+			 */
+			public int getMin() {
+				return min;
+			}
+
+			/**
+			 * Sets the value of the min property.
+			 * 
+			 */
+			public void setMin(int value) {
+				this.min = value;
+			}
+
+			/**
+			 * Gets the value of the max property.
+			 * 
+			 */
+			public int getMax() {
+				return max;
+			}
+
+			/**
+			 * Sets the value of the max property.
+			 * 
+			 */
+			public void setMax(int value) {
+				this.max = value;
+			}
+
+			/**
+			 * Gets the value of the category property.
+			 * 
+			 * @return possible object is
+			 *         {@link NPCTemplate.Droplist.Item.DropCategory }
+			 * 
+			 */
+			public NPCTemplate.Droplist.Item.DropCategory getCategory() {
+				return category;
+			}
+
+			/**
+			 * Sets the value of the category property.
+			 * 
+			 * @param value
+			 *            allowed object is
+			 *            {@link NPCTemplate.Droplist.Item.DropCategory }
+			 * 
+			 */
+			public void setCategory(NPCTemplate.Droplist.Item.DropCategory value) {
+				this.category = value;
+			}
+
+			/**
+			 * Gets the value of the chance property.
+			 * 
+			 */
+			public int getChance() {
+				return chance;
+			}
+
+			/**
+			 * Sets the value of the chance property.
+			 * 
+			 */
+			public void setChance(int value) {
+				this.chance = value;
+			}
+
+			/**
+			 * 

+			 * Java class for null.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 

+			 * 
+			 * 
+			 * <simpleType>
+			 *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+			 *     <enumeration value="DROP"/>
+			 *     <enumeration value="SPOIL"/>
+			 *     <enumeration value="UNK_1"/>
+			 *     <enumeration value="UNK_2"/>
+			 *     <enumeration value="UNK_3"/>
+			 *     <enumeration value="UNK_4"/>
+			 *     <enumeration value="UNK_5"/>
+			 *     <enumeration value="UNK_6"/>
+			 *     <enumeration value="UNK_7"/>
+			 *     <enumeration value="UNK_8"/>
+			 *     <enumeration value="UNK_9"/>
+			 *     <enumeration value="UNK_10"/>
+			 *     <enumeration value="UNK_11"/>
+			 *     <enumeration value="UNK_12"/>
+			 *     <enumeration value="UNK_13"/>
+			 *     <enumeration value="UNK_14"/>
+			 *     <enumeration value="UNK_15"/>
+			 *     <enumeration value="UNK_16"/>
+			 *     <enumeration value="UNK_17"/>
+			 *     <enumeration value="UNK_18"/>
+			 *     <enumeration value="UNK_19"/>
+			 *     <enumeration value="UNK_20"/>
+			 *     <enumeration value="UNK_21"/>
+			 *     <enumeration value="UNK_22"/>
+			 *     <enumeration value="UNK_23"/>
+			 *     <enumeration value="UNK_24"/>
+			 *     <enumeration value="UNK_25"/>
+			 *     <enumeration value="UNK_26"/>
+			 *     <enumeration value="UNK_27"/>
+			 *     <enumeration value="UNK_28"/>
+			 *     <enumeration value="UNK_29"/>
+			 *     <enumeration value="UNK_30"/>
+			 *     <enumeration value="UNK_31"/>
+			 *     <enumeration value="UNK_32"/>
+			 *     <enumeration value="UNK_33"/>
+			 *     <enumeration value="UNK_34"/>
+			 *     <enumeration value="UNK_35"/>
+			 *     <enumeration value="UNK_36"/>
+			 *     <enumeration value="UNK_100"/>
+			 *     <enumeration value="UNK_101"/>
+			 *     <enumeration value="UNK_102"/>
+			 *     <enumeration value="UNK_200"/>
+			 *   </restriction>
+			 * </simpleType>
+			 * 

+			 * 
+			 */
+			@XmlType(name = "")
+			@XmlEnum
+			public enum DropCategory {
+
+				DROP, SPOIL, UNK_1, UNK_2, UNK_3, UNK_4, UNK_5, UNK_6, UNK_7, UNK_8, UNK_9, UNK_10, UNK_11, UNK_12, UNK_13, UNK_14, UNK_15, UNK_16, UNK_17, UNK_18, UNK_19, UNK_20, UNK_21, UNK_22, UNK_23, UNK_24, UNK_25, UNK_26, UNK_27, UNK_28, UNK_29, UNK_30, UNK_31, UNK_32, UNK_33, UNK_34, UNK_35, UNK_36, UNK_100, UNK_101, UNK_102, UNK_200;
+
+				public String value() {
+					return name();
+				}
+
+				public static NPCTemplate.Droplist.Item.DropCategory fromValue(
+						String v) {
+					return valueOf(v);
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="name" minOccurs="0">
+	 *           <complexType>
+	 *             <simpleContent>
+	 *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+	 *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *                 <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *               </extension>
+	 *             </simpleContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="title" minOccurs="0">
+	 *           <complexType>
+	 *             <simpleContent>
+	 *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+	 *                 <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *               </extension>
+	 *             </simpleContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="level" type="{http://www.w3.org/2001/XMLSchema}int"/>
+	 *         <element name="race" type="{http://schemas.l2jserver2.com/npc}NPCRace" minOccurs="0"/>
+	 *         <element name="sex" type="{}ActorSexType" minOccurs="0"/>
+	 *         <element name="stats">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                   <element name="hp">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                   <element name="mp">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                           <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                   <element name="attack" minOccurs="0">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                             <element name="physical">
+	 *                               <complexType>
+	 *                                 <complexContent>
+	 *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                                     <sequence>
+	 *                                     </sequence>
+	 *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                                   </restriction>
+	 *                                 </complexContent>
+	 *                               </complexType>
+	 *                             </element>
+	 *                             <element name="magical">
+	 *                               <complexType>
+	 *                                 <complexContent>
+	 *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                                     <sequence>
+	 *                                     </sequence>
+	 *                                     <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                                     <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                                   </restriction>
+	 *                                 </complexContent>
+	 *                               </complexType>
+	 *                             </element>
+	 *                           </sequence>
+	 *                           <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                           <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                           <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                   <element name="defense" minOccurs="0">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                             <element name="physical">
+	 *                               <complexType>
+	 *                                 <complexContent>
+	 *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                                     <sequence>
+	 *                                     </sequence>
+	 *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                                   </restriction>
+	 *                                 </complexContent>
+	 *                               </complexType>
+	 *                             </element>
+	 *                             <element name="magical">
+	 *                               <complexType>
+	 *                                 <complexContent>
+	 *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                                     <sequence>
+	 *                                     </sequence>
+	 *                                     <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                                   </restriction>
+	 *                                 </complexContent>
+	 *                               </complexType>
+	 *                             </element>
+	 *                           </sequence>
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                   <element name="move" minOccurs="0">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                           <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                   <element name="base">
+	 *                     <complexType>
+	 *                       <complexContent>
+	 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                           <sequence>
+	 *                           </sequence>
+	 *                           <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                           <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                           <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                           <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                           <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                           <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *                         </restriction>
+	 *                       </complexContent>
+	 *                     </complexType>
+	 *                   </element>
+	 *                 </sequence>
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="experience" type="{http://www.w3.org/2001/XMLSchema}long"/>
+	 *         <element name="sp" type="{http://www.w3.org/2001/XMLSchema}int"/>
+	 *         <element name="item" minOccurs="0">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+	 *                 <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *         <element name="collision" minOccurs="0">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *                 <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *       <attribute name="attackable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *       <attribute name="targetable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *       <attribute name="aggressive" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "name", "title", "level", "race", "sex",
+			"stats", "experience", "sp", "item", "collision" })
+	public static class Info {
+
+		protected NPCTemplate.Info.Name name;
+		protected NPCTemplate.Info.Title title;
+		protected int level;
+		@XmlElement(type = String.class)
+		@XmlJavaTypeAdapter(NPCRaceAdapter.class)
+		protected NPCRace race;
+		@XmlElement(type = String.class)
+		@XmlJavaTypeAdapter(ActorSexAdapter.class)
+		protected ActorSex sex;
+		@XmlElement(required = true)
+		protected NPCTemplate.Info.Stats stats;
+		protected long experience;
+		protected int sp;
+		protected NPCTemplate.Info.Item item;
+		protected NPCTemplate.Info.Collision collision;
+		@XmlAttribute(name = "attackable", required = true)
+		protected boolean attackable;
+		@XmlAttribute(name = "targetable", required = true)
+		protected boolean targetable;
+		@XmlAttribute(name = "aggressive", required = true)
+		protected boolean aggressive;
+
+		/**
+		 * Gets the value of the name property.
+		 * 
+		 * @return possible object is {@link NPCTemplate.Info.Name }
+		 * 
+		 */
+		public NPCTemplate.Info.Name getName() {
+			return name;
+		}
+
+		/**
+		 * Sets the value of the name property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link NPCTemplate.Info.Name }
+		 * 
+		 */
+		public void setName(NPCTemplate.Info.Name value) {
+			this.name = value;
+		}
+
+		/**
+		 * Gets the value of the title property.
+		 * 
+		 * @return possible object is {@link NPCTemplate.Info.Title }
+		 * 
+		 */
+		public NPCTemplate.Info.Title getTitle() {
+			return title;
+		}
+
+		/**
+		 * Sets the value of the title property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link NPCTemplate.Info.Title }
+		 * 
+		 */
+		public void setTitle(NPCTemplate.Info.Title value) {
+			this.title = value;
+		}
+
+		/**
+		 * Gets the value of the level property.
+		 * 
+		 */
+		public int getLevel() {
+			return level;
+		}
+
+		/**
+		 * Sets the value of the level property.
+		 * 
+		 */
+		public void setLevel(int value) {
+			this.level = value;
+		}
+
+		/**
+		 * Gets the value of the race property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public NPCRace getRace() {
+			return race;
+		}
+
+		/**
+		 * Sets the value of the race property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setRace(NPCRace value) {
+			this.race = value;
+		}
+
+		/**
+		 * Gets the value of the sex property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public ActorSex getSex() {
+			return sex;
+		}
+
+		/**
+		 * Sets the value of the sex property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setSex(ActorSex value) {
+			this.sex = value;
+		}
+
+		/**
+		 * Gets the value of the stats property.
+		 * 
+		 * @return possible object is {@link NPCTemplate.Info.Stats }
+		 * 
+		 */
+		public NPCTemplate.Info.Stats getStats() {
+			return stats;
+		}
+
+		/**
+		 * Sets the value of the stats property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link NPCTemplate.Info.Stats }
+		 * 
+		 */
+		public void setStats(NPCTemplate.Info.Stats value) {
+			this.stats = value;
+		}
+
+		/**
+		 * Gets the value of the experience property.
+		 * 
+		 */
+		public long getExperience() {
+			return experience;
+		}
+
+		/**
+		 * Sets the value of the experience property.
+		 * 
+		 */
+		public void setExperience(long value) {
+			this.experience = value;
+		}
+
+		/**
+		 * Gets the value of the sp property.
+		 * 
+		 */
+		public int getSp() {
+			return sp;
+		}
+
+		/**
+		 * Sets the value of the sp property.
+		 * 
+		 */
+		public void setSp(int value) {
+			this.sp = value;
+		}
+
+		/**
+		 * Gets the value of the item property.
+		 * 
+		 * @return possible object is {@link NPCTemplate.Info.Item }
+		 * 
+		 */
+		public NPCTemplate.Info.Item getItem() {
+			return item;
+		}
+
+		/**
+		 * Sets the value of the item property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link NPCTemplate.Info.Item }
+		 * 
+		 */
+		public void setItem(NPCTemplate.Info.Item value) {
+			this.item = value;
+		}
+
+		/**
+		 * Gets the value of the collision property.
+		 * 
+		 * @return possible object is {@link NPCTemplate.Info.Collision }
+		 * 
+		 */
+		public NPCTemplate.Info.Collision getCollision() {
+			return collision;
+		}
+
+		/**
+		 * Sets the value of the collision property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link NPCTemplate.Info.Collision }
+		 * 
+		 */
+		public void setCollision(NPCTemplate.Info.Collision value) {
+			this.collision = value;
+		}
+
+		/**
+		 * Gets the value of the attackable property.
+		 * 
+		 */
+		public boolean isAttackable() {
+			return attackable;
+		}
+
+		/**
+		 * Sets the value of the attackable property.
+		 * 
+		 */
+		public void setAttackable(boolean value) {
+			this.attackable = value;
+		}
+
+		/**
+		 * Gets the value of the targetable property.
+		 * 
+		 */
+		public boolean isTargetable() {
+			return targetable;
+		}
+
+		/**
+		 * Sets the value of the targetable property.
+		 * 
+		 */
+		public void setTargetable(boolean value) {
+			this.targetable = value;
+		}
+
+		/**
+		 * Gets the value of the aggressive property.
+		 * 
+		 */
+		public boolean isAggressive() {
+			return aggressive;
+		}
+
+		/**
+		 * Sets the value of the aggressive property.
+		 * 
+		 */
+		public void setAggressive(boolean value) {
+			this.aggressive = value;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="radius" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *       <attribute name="heigth" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Collision {
+
+			@XmlAttribute(name = "radius", required = true)
+			protected double radius;
+			@XmlAttribute(name = "heigth", required = true)
+			protected double heigth;
+
+			/**
+			 * Gets the value of the radius property.
+			 * 
+			 */
+			public double getRadius() {
+				return radius;
+			}
+
+			/**
+			 * Sets the value of the radius property.
+			 * 
+			 */
+			public void setRadius(double value) {
+				this.radius = value;
+			}
+
+			/**
+			 * Gets the value of the heigth property.
+			 * 
+			 */
+			public double getHeigth() {
+				return heigth;
+			}
+
+			/**
+			 * Sets the value of the heigth property.
+			 * 
+			 */
+			public void setHeigth(double value) {
+				this.heigth = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="rightHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+		 *       <attribute name="leftHand" type="{http://schemas.l2jserver2.com/item}ItemTemplateID" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Item {
+
+			@XmlAttribute(name = "rightHand")
+			@XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
+			protected ItemTemplateID rightHand;
+			@XmlAttribute(name = "leftHand")
+			@XmlJavaTypeAdapter(ItemTemplateIDAdapter.class)
+			protected ItemTemplateID leftHand;
+
+			/**
+			 * Gets the value of the rightHand property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public ItemTemplateID getRightHand() {
+				return rightHand;
+			}
+
+			/**
+			 * Sets the value of the rightHand property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setRightHand(ItemTemplateID value) {
+				this.rightHand = value;
+			}
+
+			/**
+			 * Gets the value of the leftHand property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public ItemTemplateID getLeftHand() {
+				return leftHand;
+			}
+
+			/**
+			 * Sets the value of the leftHand property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setLeftHand(ItemTemplateID value) {
+				this.leftHand = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <simpleContent>
+		 *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+		 *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+		 *       <attribute name="display" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+		 *     </extension>
+		 *   </simpleContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "value" })
+		public static class Name {
+
+			@XmlValue
+			protected String value;
+			@XmlAttribute(name = "send")
+			protected Boolean send;
+			@XmlAttribute(name = "display")
+			protected Boolean display;
+
+			/**
+			 * Gets the value of the value property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public String getValue() {
+				return value;
+			}
+
+			/**
+			 * Sets the value of the value property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setValue(String value) {
+				this.value = value;
+			}
+
+			/**
+			 * Gets the value of the send property.
+			 * 
+			 * @return possible object is {@link Boolean }
+			 * 
+			 */
+			public Boolean isSend() {
+				return send;
+			}
+
+			/**
+			 * Sets the value of the send property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link Boolean }
+			 * 
+			 */
+			public void setSend(Boolean value) {
+				this.send = value;
+			}
+
+			/**
+			 * Gets the value of the display property.
+			 * 
+			 * @return possible object is {@link Boolean }
+			 * 
+			 */
+			public Boolean isDisplay() {
+				return display;
+			}
+
+			/**
+			 * Sets the value of the display property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link Boolean }
+			 * 
+			 */
+			public void setDisplay(Boolean value) {
+				this.display = value;
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *         <element name="hp">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *         <element name="mp">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                 <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *         <element name="attack" minOccurs="0">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                   <element name="physical">
+		 *                     <complexType>
+		 *                       <complexContent>
+		 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                           <sequence>
+		 *                           </sequence>
+		 *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                         </restriction>
+		 *                       </complexContent>
+		 *                     </complexType>
+		 *                   </element>
+		 *                   <element name="magical">
+		 *                     <complexType>
+		 *                       <complexContent>
+		 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                           <sequence>
+		 *                           </sequence>
+		 *                           <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                           <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                         </restriction>
+		 *                       </complexContent>
+		 *                     </complexType>
+		 *                   </element>
+		 *                 </sequence>
+		 *                 <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *                 <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *                 <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *         <element name="defense" minOccurs="0">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                   <element name="physical">
+		 *                     <complexType>
+		 *                       <complexContent>
+		 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                           <sequence>
+		 *                           </sequence>
+		 *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                         </restriction>
+		 *                       </complexContent>
+		 *                     </complexType>
+		 *                   </element>
+		 *                   <element name="magical">
+		 *                     <complexType>
+		 *                       <complexContent>
+		 *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                           <sequence>
+		 *                           </sequence>
+		 *                           <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                         </restriction>
+		 *                       </complexContent>
+		 *                     </complexType>
+		 *                   </element>
+		 *                 </sequence>
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *         <element name="move" minOccurs="0">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *                 <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *         <element name="base">
+		 *           <complexType>
+		 *             <complexContent>
+		 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *                 <sequence>
+		 *                 </sequence>
+		 *                 <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *                 <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *                 <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *                 <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *                 <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *                 <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *               </restriction>
+		 *             </complexContent>
+		 *           </complexType>
+		 *         </element>
+		 *       </sequence>
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "hp", "mp", "attack", "defense",
+				"move", "base" })
+		public static class Stats {
+
+			@XmlElement(required = true)
+			protected NPCTemplate.Info.Stats.Hp hp;
+			@XmlElement(required = true)
+			protected NPCTemplate.Info.Stats.Mp mp;
+			protected NPCTemplate.Info.Stats.Attack attack;
+			protected NPCTemplate.Info.Stats.Defense defense;
+			protected NPCTemplate.Info.Stats.Move move;
+			@XmlElement(required = true)
+			protected NPCTemplate.Info.Stats.Base base;
+
+			/**
+			 * Gets the value of the hp property.
+			 * 
+			 * @return possible object is {@link NPCTemplate.Info.Stats.Hp }
+			 * 
+			 */
+			public NPCTemplate.Info.Stats.Hp getHp() {
+				return hp;
+			}
+
+			/**
+			 * Sets the value of the hp property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link NPCTemplate.Info.Stats.Hp }
+			 * 
+			 */
+			public void setHp(NPCTemplate.Info.Stats.Hp value) {
+				this.hp = value;
+			}
+
+			/**
+			 * Gets the value of the mp property.
+			 * 
+			 * @return possible object is {@link NPCTemplate.Info.Stats.Mp }
+			 * 
+			 */
+			public NPCTemplate.Info.Stats.Mp getMp() {
+				return mp;
+			}
+
+			/**
+			 * Sets the value of the mp property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link NPCTemplate.Info.Stats.Mp }
+			 * 
+			 */
+			public void setMp(NPCTemplate.Info.Stats.Mp value) {
+				this.mp = value;
+			}
+
+			/**
+			 * Gets the value of the attack property.
+			 * 
+			 * @return possible object is {@link NPCTemplate.Info.Stats.Attack }
+			 * 
+			 */
+			public NPCTemplate.Info.Stats.Attack getAttack() {
+				return attack;
+			}
+
+			/**
+			 * Sets the value of the attack property.
+			 * 
+			 * @param value
+			 *            allowed object is
+			 *            {@link NPCTemplate.Info.Stats.Attack }
+			 * 
+			 */
+			public void setAttack(NPCTemplate.Info.Stats.Attack value) {
+				this.attack = value;
+			}
+
+			/**
+			 * Gets the value of the defense property.
+			 * 
+			 * @return possible object is {@link NPCTemplate.Info.Stats.Defense }
+			 * 
+			 */
+			public NPCTemplate.Info.Stats.Defense getDefense() {
+				return defense;
+			}
+
+			/**
+			 * Sets the value of the defense property.
+			 * 
+			 * @param value
+			 *            allowed object is
+			 *            {@link NPCTemplate.Info.Stats.Defense }
+			 * 
+			 */
+			public void setDefense(NPCTemplate.Info.Stats.Defense value) {
+				this.defense = value;
+			}
+
+			/**
+			 * Gets the value of the move property.
+			 * 
+			 * @return possible object is {@link NPCTemplate.Info.Stats.Move }
+			 * 
+			 */
+			public NPCTemplate.Info.Stats.Move getMove() {
+				return move;
+			}
+
+			/**
+			 * Sets the value of the move property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link NPCTemplate.Info.Stats.Move }
+			 * 
+			 */
+			public void setMove(NPCTemplate.Info.Stats.Move value) {
+				this.move = value;
+			}
+
+			/**
+			 * Gets the value of the base property.
+			 * 
+			 * @return possible object is {@link NPCTemplate.Info.Stats.Base }
+			 * 
+			 */
+			public NPCTemplate.Info.Stats.Base getBase() {
+				return base;
+			}
+
+			/**
+			 * Sets the value of the base property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link NPCTemplate.Info.Stats.Base }
+			 * 
+			 */
+			public void setBase(NPCTemplate.Info.Stats.Base value) {
+				this.base = value;
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *         <element name="physical">
+			 *           <complexType>
+			 *             <complexContent>
+			 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *                 <sequence>
+			 *                 </sequence>
+			 *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *               </restriction>
+			 *             </complexContent>
+			 *           </complexType>
+			 *         </element>
+			 *         <element name="magical">
+			 *           <complexType>
+			 *             <complexContent>
+			 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *                 <sequence>
+			 *                 </sequence>
+			 *                 <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *                 <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *               </restriction>
+			 *             </complexContent>
+			 *           </complexType>
+			 *         </element>
+			 *       </sequence>
+			 *       <attribute name="range" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *       <attribute name="evasion" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *       <attribute name="critical" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "", propOrder = { "physical", "magical" })
+			public static class Attack {
+
+				@XmlElement(required = true)
+				protected NPCTemplate.Info.Stats.Attack.Physical physical;
+				@XmlElement(required = true)
+				protected NPCTemplate.Info.Stats.Attack.Magical magical;
+				@XmlAttribute(name = "range", required = true)
+				protected int range;
+				@XmlAttribute(name = "evasion", required = true)
+				protected int evasion;
+				@XmlAttribute(name = "critical", required = true)
+				protected int critical;
+
+				/**
+				 * Gets the value of the physical property.
+				 * 
+				 * @return possible object is
+				 *         {@link NPCTemplate.Info.Stats.Attack.Physical }
+				 * 
+				 */
+				public NPCTemplate.Info.Stats.Attack.Physical getPhysical() {
+					return physical;
+				}
+
+				/**
+				 * Sets the value of the physical property.
+				 * 
+				 * @param value
+				 *            allowed object is
+				 *            {@link NPCTemplate.Info.Stats.Attack.Physical }
+				 * 
+				 */
+				public void setPhysical(
+						NPCTemplate.Info.Stats.Attack.Physical value) {
+					this.physical = value;
+				}
+
+				/**
+				 * Gets the value of the magical property.
+				 * 
+				 * @return possible object is
+				 *         {@link NPCTemplate.Info.Stats.Attack.Magical }
+				 * 
+				 */
+				public NPCTemplate.Info.Stats.Attack.Magical getMagical() {
+					return magical;
+				}
+
+				/**
+				 * Sets the value of the magical property.
+				 * 
+				 * @param value
+				 *            allowed object is
+				 *            {@link NPCTemplate.Info.Stats.Attack.Magical }
+				 * 
+				 */
+				public void setMagical(
+						NPCTemplate.Info.Stats.Attack.Magical value) {
+					this.magical = value;
+				}
+
+				/**
+				 * Gets the value of the range property.
+				 * 
+				 */
+				public int getRange() {
+					return range;
+				}
+
+				/**
+				 * Sets the value of the range property.
+				 * 
+				 */
+				public void setRange(int value) {
+					this.range = value;
+				}
+
+				/**
+				 * Gets the value of the evasion property.
+				 * 
+				 */
+				public int getEvasion() {
+					return evasion;
+				}
+
+				/**
+				 * Sets the value of the evasion property.
+				 * 
+				 */
+				public void setEvasion(int value) {
+					this.evasion = value;
+				}
+
+				/**
+				 * Gets the value of the critical property.
+				 * 
+				 */
+				public int getCritical() {
+					return critical;
+				}
+
+				/**
+				 * Sets the value of the critical property.
+				 * 
+				 */
+				public void setCritical(int value) {
+					this.critical = value;
+				}
+
+				/**
+				 * 

+				 * Java class for anonymous complex type.
+				 * 
+				 * 

+				 * The following schema fragment specifies the expected content
+				 * contained within this class.
+				 * 
+				 * 
+				 * <complexType>
+				 *   <complexContent>
+				 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+				 *       <sequence>
+				 *       </sequence>
+				 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+				 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+				 *     </restriction>
+				 *   </complexContent>
+				 * </complexType>
+				 * 

+				 * 
+				 * 
+				 */
+				@XmlAccessorType(XmlAccessType.FIELD)
+				@XmlType(name = "")
+				public static class Magical {
+
+					@XmlAttribute(name = "damage", required = true)
+					protected double damage;
+					@XmlAttribute(name = "speed", required = true)
+					protected double speed;
+
+					/**
+					 * Gets the value of the damage property.
+					 * 
+					 */
+					public double getDamage() {
+						return damage;
+					}
+
+					/**
+					 * Sets the value of the damage property.
+					 * 
+					 */
+					public void setDamage(double value) {
+						this.damage = value;
+					}
+
+					/**
+					 * Gets the value of the speed property.
+					 * 
+					 */
+					public double getSpeed() {
+						return speed;
+					}
+
+					/**
+					 * Sets the value of the speed property.
+					 * 
+					 */
+					public void setSpeed(double value) {
+						this.speed = value;
+					}
+
+				}
+
+				/**
+				 * 

+				 * Java class for anonymous complex type.
+				 * 
+				 * 

+				 * The following schema fragment specifies the expected content
+				 * contained within this class.
+				 * 
+				 * 
+				 * <complexType>
+				 *   <complexContent>
+				 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+				 *       <sequence>
+				 *       </sequence>
+				 *       <attribute name="damage" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+				 *       <attribute name="speed" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+				 *     </restriction>
+				 *   </complexContent>
+				 * </complexType>
+				 * 

+				 * 
+				 * 
+				 */
+				@XmlAccessorType(XmlAccessType.FIELD)
+				@XmlType(name = "")
+				public static class Physical {
+
+					@XmlAttribute(name = "damage", required = true)
+					protected double damage;
+					@XmlAttribute(name = "speed", required = true)
+					protected double speed;
+
+					/**
+					 * Gets the value of the damage property.
+					 * 
+					 */
+					public double getDamage() {
+						return damage;
+					}
+
+					/**
+					 * Sets the value of the damage property.
+					 * 
+					 */
+					public void setDamage(double value) {
+						this.damage = value;
+					}
+
+					/**
+					 * Gets the value of the speed property.
+					 * 
+					 */
+					public double getSpeed() {
+						return speed;
+					}
+
+					/**
+					 * Sets the value of the speed property.
+					 * 
+					 */
+					public void setSpeed(double value) {
+						this.speed = value;
+					}
+
+				}
+
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="int" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *       <attribute name="str" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *       <attribute name="con" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *       <attribute name="men" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *       <attribute name="dex" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *       <attribute name="wit" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Base {
+
+				@XmlAttribute(name = "int", required = true)
+				protected int _int;
+				@XmlAttribute(name = "str", required = true)
+				protected int str;
+				@XmlAttribute(name = "con", required = true)
+				protected int con;
+				@XmlAttribute(name = "men", required = true)
+				protected int men;
+				@XmlAttribute(name = "dex", required = true)
+				protected int dex;
+				@XmlAttribute(name = "wit", required = true)
+				protected int wit;
+
+				/**
+				 * Gets the value of the int property.
+				 * 
+				 */
+				public int getInt() {
+					return _int;
+				}
+
+				/**
+				 * Sets the value of the int property.
+				 * 
+				 */
+				public void setInt(int value) {
+					this._int = value;
+				}
+
+				/**
+				 * Gets the value of the str property.
+				 * 
+				 */
+				public int getStr() {
+					return str;
+				}
+
+				/**
+				 * Sets the value of the str property.
+				 * 
+				 */
+				public void setStr(int value) {
+					this.str = value;
+				}
+
+				/**
+				 * Gets the value of the con property.
+				 * 
+				 */
+				public int getCon() {
+					return con;
+				}
+
+				/**
+				 * Sets the value of the con property.
+				 * 
+				 */
+				public void setCon(int value) {
+					this.con = value;
+				}
+
+				/**
+				 * Gets the value of the men property.
+				 * 
+				 */
+				public int getMen() {
+					return men;
+				}
+
+				/**
+				 * Sets the value of the men property.
+				 * 
+				 */
+				public void setMen(int value) {
+					this.men = value;
+				}
+
+				/**
+				 * Gets the value of the dex property.
+				 * 
+				 */
+				public int getDex() {
+					return dex;
+				}
+
+				/**
+				 * Sets the value of the dex property.
+				 * 
+				 */
+				public void setDex(int value) {
+					this.dex = value;
+				}
+
+				/**
+				 * Gets the value of the wit property.
+				 * 
+				 */
+				public int getWit() {
+					return wit;
+				}
+
+				/**
+				 * Sets the value of the wit property.
+				 * 
+				 */
+				public void setWit(int value) {
+					this.wit = value;
+				}
+
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *         <element name="physical">
+			 *           <complexType>
+			 *             <complexContent>
+			 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *                 <sequence>
+			 *                 </sequence>
+			 *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *               </restriction>
+			 *             </complexContent>
+			 *           </complexType>
+			 *         </element>
+			 *         <element name="magical">
+			 *           <complexType>
+			 *             <complexContent>
+			 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *                 <sequence>
+			 *                 </sequence>
+			 *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *               </restriction>
+			 *             </complexContent>
+			 *           </complexType>
+			 *         </element>
+			 *       </sequence>
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "", propOrder = { "physical", "magical" })
+			public static class Defense {
+
+				@XmlElement(required = true)
+				protected NPCTemplate.Info.Stats.Defense.Physical physical;
+				@XmlElement(required = true)
+				protected NPCTemplate.Info.Stats.Defense.Magical magical;
+
+				/**
+				 * Gets the value of the physical property.
+				 * 
+				 * @return possible object is
+				 *         {@link NPCTemplate.Info.Stats.Defense.Physical }
+				 * 
+				 */
+				public NPCTemplate.Info.Stats.Defense.Physical getPhysical() {
+					return physical;
+				}
+
+				/**
+				 * Sets the value of the physical property.
+				 * 
+				 * @param value
+				 *            allowed object is
+				 *            {@link NPCTemplate.Info.Stats.Defense.Physical }
+				 * 
+				 */
+				public void setPhysical(
+						NPCTemplate.Info.Stats.Defense.Physical value) {
+					this.physical = value;
+				}
+
+				/**
+				 * Gets the value of the magical property.
+				 * 
+				 * @return possible object is
+				 *         {@link NPCTemplate.Info.Stats.Defense.Magical }
+				 * 
+				 */
+				public NPCTemplate.Info.Stats.Defense.Magical getMagical() {
+					return magical;
+				}
+
+				/**
+				 * Sets the value of the magical property.
+				 * 
+				 * @param value
+				 *            allowed object is
+				 *            {@link NPCTemplate.Info.Stats.Defense.Magical }
+				 * 
+				 */
+				public void setMagical(
+						NPCTemplate.Info.Stats.Defense.Magical value) {
+					this.magical = value;
+				}
+
+				/**
+				 * 

+				 * Java class for anonymous complex type.
+				 * 
+				 * 

+				 * The following schema fragment specifies the expected content
+				 * contained within this class.
+				 * 
+				 * 
+				 * <complexType>
+				 *   <complexContent>
+				 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+				 *       <sequence>
+				 *       </sequence>
+				 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+				 *     </restriction>
+				 *   </complexContent>
+				 * </complexType>
+				 * 

+				 * 
+				 * 
+				 */
+				@XmlAccessorType(XmlAccessType.FIELD)
+				@XmlType(name = "")
+				public static class Magical {
+
+					@XmlAttribute(name = "value", required = true)
+					protected double value;
+
+					/**
+					 * Gets the value of the value property.
+					 * 
+					 */
+					public double getValue() {
+						return value;
+					}
+
+					/**
+					 * Sets the value of the value property.
+					 * 
+					 */
+					public void setValue(double value) {
+						this.value = value;
+					}
+
+				}
+
+				/**
+				 * 

+				 * Java class for anonymous complex type.
+				 * 
+				 * 

+				 * The following schema fragment specifies the expected content
+				 * contained within this class.
+				 * 
+				 * 
+				 * <complexType>
+				 *   <complexContent>
+				 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+				 *       <sequence>
+				 *       </sequence>
+				 *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+				 *     </restriction>
+				 *   </complexContent>
+				 * </complexType>
+				 * 

+				 * 
+				 * 
+				 */
+				@XmlAccessorType(XmlAccessType.FIELD)
+				@XmlType(name = "")
+				public static class Physical {
+
+					@XmlAttribute(name = "value", required = true)
+					protected double value;
+
+					/**
+					 * Gets the value of the value property.
+					 * 
+					 */
+					public double getValue() {
+						return value;
+					}
+
+					/**
+					 * Sets the value of the value property.
+					 * 
+					 */
+					public void setValue(double value) {
+						this.value = value;
+					}
+
+				}
+
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Hp {
+
+				@XmlAttribute(name = "max", required = true)
+				protected double max;
+				@XmlAttribute(name = "regen", required = true)
+				protected double regen;
+
+				/**
+				 * Gets the value of the max property.
+				 * 
+				 */
+				public double getMax() {
+					return max;
+				}
+
+				/**
+				 * Sets the value of the max property.
+				 * 
+				 */
+				public void setMax(double value) {
+					this.max = value;
+				}
+
+				/**
+				 * Gets the value of the regen property.
+				 * 
+				 */
+				public double getRegen() {
+					return regen;
+				}
+
+				/**
+				 * Sets the value of the regen property.
+				 * 
+				 */
+				public void setRegen(double value) {
+					this.regen = value;
+				}
+
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="run" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *       <attribute name="walk" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Move {
+
+				@XmlAttribute(name = "run", required = true)
+				protected double run;
+				@XmlAttribute(name = "walk", required = true)
+				protected double walk;
+
+				/**
+				 * Gets the value of the run property.
+				 * 
+				 */
+				public double getRun() {
+					return run;
+				}
+
+				/**
+				 * Sets the value of the run property.
+				 * 
+				 */
+				public void setRun(double value) {
+					this.run = value;
+				}
+
+				/**
+				 * Gets the value of the walk property.
+				 * 
+				 */
+				public double getWalk() {
+					return walk;
+				}
+
+				/**
+				 * Sets the value of the walk property.
+				 * 
+				 */
+				public void setWalk(double value) {
+					this.walk = value;
+				}
+
+			}
+
+			/**
+			 * 

+			 * Java class for anonymous complex type.
+			 * 
+			 * 

+			 * The following schema fragment specifies the expected content
+			 * contained within this class.
+			 * 
+			 * 
+			 * <complexType>
+			 *   <complexContent>
+			 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 *       <sequence>
+			 *       </sequence>
+			 *       <attribute name="max" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *       <attribute name="regen" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
+			 *     </restriction>
+			 *   </complexContent>
+			 * </complexType>
+			 * 

+			 * 
+			 * 
+			 */
+			@XmlAccessorType(XmlAccessType.FIELD)
+			@XmlType(name = "")
+			public static class Mp {
+
+				@XmlAttribute(name = "max", required = true)
+				protected double max;
+				@XmlAttribute(name = "regen", required = true)
+				protected double regen;
+
+				/**
+				 * Gets the value of the max property.
+				 * 
+				 */
+				public double getMax() {
+					return max;
+				}
+
+				/**
+				 * Sets the value of the max property.
+				 * 
+				 */
+				public void setMax(double value) {
+					this.max = value;
+				}
+
+				/**
+				 * Gets the value of the regen property.
+				 * 
+				 */
+				public double getRegen() {
+					return regen;
+				}
+
+				/**
+				 * Sets the value of the regen property.
+				 * 
+				 */
+				public void setRegen(double value) {
+					this.regen = value;
+				}
+
+			}
+
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <simpleContent>
+		 *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+		 *       <attribute name="send" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+		 *     </extension>
+		 *   </simpleContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "value" })
+		public static class Title {
+
+			@XmlValue
+			protected String value;
+			@XmlAttribute(name = "send")
+			protected Boolean send;
+
+			/**
+			 * Gets the value of the value property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public String getValue() {
+				return value;
+			}
+
+			/**
+			 * Sets the value of the value property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setValue(String value) {
+				this.value = value;
+			}
+
+			/**
+			 * Gets the value of the send property.
+			 * 
+			 * @return possible object is {@link Boolean }
+			 * 
+			 */
+			public Boolean isSend() {
+				return send;
+			}
+
+			/**
+			 * Sets the value of the send property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link Boolean }
+			 * 
+			 */
+			public void setSend(Boolean value) {
+				this.send = value;
+			}
+
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="skill" maxOccurs="unbounded">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                 </sequence>
+	 *                 <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+	 *                 <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "skill" })
+	public static class Skills {
+
+		@XmlElement(required = true)
+		protected List skill;
+
+		/**
+		 * Gets the value of the skill property.
+		 * 
+		 * 

+		 * This accessor method returns a reference to the live list, not a
+		 * snapshot. Therefore any modification you make to the returned list
+		 * will be present inside the JAXB object. This is why there is not a
+		 * set method for the skill property.
+		 * 
+		 * 

+		 * For example, to add a new item, do as follows:
+		 * 
+		 * 
+		 * getSkill().add(newItem);
+		 * 

+		 * 
+		 * 
+		 * 

+		 * Objects of the following type(s) are allowed in the list
+		 * {@link NPCTemplate.Skills.Skill }
+		 * 
+		 * 
+		 */
+		public List getSkill() {
+			if (skill == null) {
+				skill = new ArrayList();
+			}
+			return this.skill;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *       </sequence>
+		 *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
+		 *       <attribute name="level" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "")
+		public static class Skill {
+
+			@XmlAttribute(name = "id", required = true)
+			@XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
+			protected SkillTemplateID id;
+			@XmlAttribute(name = "level", required = true)
+			protected int level;
+
+			/**
+			 * Gets the value of the id property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public SkillTemplateID getId() {
+				return id;
+			}
+
+			/**
+			 * Sets the value of the id property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setId(SkillTemplateID value) {
+				this.id = value;
+			}
+
+			/**
+			 * Gets the value of the level property.
+			 * 
+			 */
+			public int getLevel() {
+				return level;
+			}
+
+			/**
+			 * Sets the value of the level property.
+			 * 
+			 */
+			public void setLevel(int value) {
+				this.level = value;
+			}
+
+		}
+
+	}
+
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="chat" maxOccurs="unbounded">
+	 *           <complexType>
+	 *             <simpleContent>
+	 *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+	 *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+	 *               </extension>
+	 *             </simpleContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *       <attribute name="default" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "chat" })
+	public static class Talk {
+
+		@XmlElement(required = true)
+		protected List chat;
+		@XmlAttribute(name = "default", required = true)
+		protected String _default;
+
+		/**
+		 * Gets the value of the chat property.
+		 * 
+		 * 

+		 * This accessor method returns a reference to the live list, not a
+		 * snapshot. Therefore any modification you make to the returned list
+		 * will be present inside the JAXB object. This is why there is not a
+		 * set method for the chat property.
+		 * 
+		 * 

+		 * For example, to add a new item, do as follows:
+		 * 
+		 * 
+		 * getChat().add(newItem);
+		 * 

+		 * 
+		 * 
+		 * 

+		 * Objects of the following type(s) are allowed in the list
+		 * {@link NPCTemplate.Talk.Chat }
+		 * 
+		 * 
+		 */
+		public List getChat() {
+			if (chat == null) {
+				chat = new ArrayList();
+			}
+			return this.chat;
+		}
+
+		/**
+		 * Gets the value of the default property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getDefault() {
+			return _default;
+		}
+
+		/**
+		 * Sets the value of the default property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setDefault(String value) {
+			this._default = value;
+		}
+
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <simpleContent>
+		 *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+		 *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+		 *     </extension>
+		 *   </simpleContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "value" })
+		public static class Chat {
+
+			@XmlValue
+			protected String value;
+			@XmlAttribute(name = "id", required = true)
+			protected String id;
+
+			/**
+			 * Gets the value of the value property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public String getValue() {
+				return value;
+			}
+
+			/**
+			 * Sets the value of the value property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setValue(String value) {
+				this.value = value;
+			}
+
+			/**
+			 * Gets the value of the id property.
+			 * 
+			 * @return possible object is {@link String }
+			 * 
+			 */
+			public String getId() {
+				return id;
+			}
+
+			/**
+			 * Sets the value of the id property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link String }
+			 * 
+			 */
+			public void setId(String value) {
+				this.id = value;
+			}
+
+		}
+
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java
index c8c15cb71..f217d3ac6 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java
@@ -5,531 +5,526 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
-
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.l2jserver.model.template package. 
- * 
An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
+ * This object contains factory methods for each Java content interface and Java
+ * element interface generated in the com.l2jserver.model.template package.
+ * 

+ * An ObjectFactory allows you to programatically construct new instances of the
+ * Java representation for XML content. The Java representation of XML content
+ * can consist of schema derived interfaces and classes representing the binding
+ * of schema type definitions, element declarations and model groups. Factory
+ * methods for each of these are provided in this class.
  * 
  */
 @XmlRegistry
 public class ObjectFactory {
 
+	/**
+	 * Create a new ObjectFactory that can be used to create new instances of
+	 * schema derived classes for package: com.l2jserver.model.template
+	 * 
+	 */
+	public ObjectFactory() {
+	}
 
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template
-     * 
-     */
-    public ObjectFactory() {
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate }
+	 * 
+	 */
+	public NPCTemplate createNPCTemplate() {
+		return new NPCTemplate();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate }
-     * 
-     */
-    public NPCTemplate createNPCTemplate() {
-        return new NPCTemplate();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Droplist }
+	 * 
+	 */
+	public NPCTemplate.Droplist createNPCTemplateDroplist() {
+		return new NPCTemplate.Droplist();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Droplist }
-     * 
-     */
-    public NPCTemplate.Droplist createNPCTemplateDroplist() {
-        return new NPCTemplate.Droplist();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Droplist.Item }
+	 * 
+	 */
+	public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() {
+		return new NPCTemplate.Droplist.Item();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Droplist.Item }
-     * 
-     */
-    public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() {
-        return new NPCTemplate.Droplist.Item();
-    }
+	/**
+	 * Create an instance of {@link Teleports }
+	 * 
+	 */
+	public Teleports createTeleports() {
+		return new Teleports();
+	}
 
-    /**
-     * Create an instance of {@link Teleports }
-     * 
-     */
-    public Teleports createTeleports() {
-        return new Teleports();
-    }
+	/**
+	 * Create an instance of {@link Zones }
+	 * 
+	 */
+	public Zones createZones() {
+		return new Zones();
+	}
 
-    /**
-     * Create an instance of {@link Zones }
-     * 
-     */
-    public Zones createZones() {
-        return new Zones();
-    }
+	/**
+	 * Create an instance of {@link ZoneType }
+	 * 
+	 */
+	public ZoneType createZoneType() {
+		return new ZoneType();
+	}
 
-    /**
-     * Create an instance of {@link ZoneType }
-     * 
-     */
-    public ZoneType createZoneType() {
-        return new ZoneType();
-    }
+	/**
+	 * Create an instance of {@link Zones.Castle }
+	 * 
+	 */
+	public Zones.Castle createZonesCastle() {
+		return new Zones.Castle();
+	}
 
-    /**
-     * Create an instance of {@link Zones.Castle }
-     * 
-     */
-    public Zones.Castle createZonesCastle() {
-        return new Zones.Castle();
-    }
+	/**
+	 * Create an instance of {@link Teleports.Teleport }
+	 * 
+	 */
+	public Teleports.Teleport createTeleportsTeleport() {
+		return new Teleports.Teleport();
+	}
 
-    /**
-     * Create an instance of {@link Teleports.Teleport }
-     * 
-     */
-    public Teleports.Teleport createTeleportsTeleport() {
-        return new Teleports.Teleport();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Skills }
+	 * 
+	 */
+	public NPCTemplate.Skills createNPCTemplateSkills() {
+		return new NPCTemplate.Skills();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Skills }
-     * 
-     */
-    public NPCTemplate.Skills createNPCTemplateSkills() {
-        return new NPCTemplate.Skills();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Talk }
+	 * 
+	 */
+	public NPCTemplate.Talk createNPCTemplateTalk() {
+		return new NPCTemplate.Talk();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Talk }
-     * 
-     */
-    public NPCTemplate.Talk createNPCTemplateTalk() {
-        return new NPCTemplate.Talk();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info }
+	 * 
+	 */
+	public NPCTemplate.Info createNPCTemplateInfo() {
+		return new NPCTemplate.Info();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info }
-     * 
-     */
-    public NPCTemplate.Info createNPCTemplateInfo() {
-        return new NPCTemplate.Info();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats createNPCTemplateInfoStats() {
+		return new NPCTemplate.Info.Stats();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats }
-     * 
-     */
-    public NPCTemplate.Info.Stats createNPCTemplateInfoStats() {
-        return new NPCTemplate.Info.Stats();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Defense }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() {
+		return new NPCTemplate.Info.Stats.Defense();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Defense }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() {
-        return new NPCTemplate.Info.Stats.Defense();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Attack }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() {
+		return new NPCTemplate.Info.Stats.Attack();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Attack }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() {
-        return new NPCTemplate.Info.Stats.Attack();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate }
+	 * 
+	 */
+	public ItemTemplate createItemTemplate() {
+		return new ItemTemplate();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate }
-     * 
-     */
-    public ItemTemplate createItemTemplate() {
-        return new ItemTemplate();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Armor }
+	 * 
+	 */
+	public ItemTemplate.Armor createItemTemplateArmor() {
+		return new ItemTemplate.Armor();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Armor }
-     * 
-     */
-    public ItemTemplate.Armor createItemTemplateArmor() {
-        return new ItemTemplate.Armor();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Attributes }
+	 * 
+	 */
+	public ItemTemplate.Attributes createItemTemplateAttributes() {
+		return new ItemTemplate.Attributes();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Attributes }
-     * 
-     */
-    public ItemTemplate.Attributes createItemTemplateAttributes() {
-        return new ItemTemplate.Attributes();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate }
+	 * 
+	 */
+	public CharacterTemplate createCharacterTemplate() {
+		return new CharacterTemplate();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate }
-     * 
-     */
-    public CharacterTemplate createCharacterTemplate() {
-        return new CharacterTemplate();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Collision }
+	 * 
+	 */
+	public CharacterTemplate.Collision createCharacterTemplateCollision() {
+		return new CharacterTemplate.Collision();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Collision }
-     * 
-     */
-    public CharacterTemplate.Collision createCharacterTemplateCollision() {
-        return new CharacterTemplate.Collision();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats }
+	 * 
+	 */
+	public CharacterTemplate.Stats createCharacterTemplateStats() {
+		return new CharacterTemplate.Stats();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats }
-     * 
-     */
-    public CharacterTemplate.Stats createCharacterTemplateStats() {
-        return new CharacterTemplate.Stats();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Defense }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() {
+		return new CharacterTemplate.Stats.Defense();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Defense }
-     * 
-     */
-    public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() {
-        return new CharacterTemplate.Stats.Defense();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Attack }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() {
+		return new CharacterTemplate.Stats.Attack();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Attack }
-     * 
-     */
-    public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() {
-        return new CharacterTemplate.Stats.Attack();
-    }
+	/**
+	 * Create an instance of {@link CalculatorFunction }
+	 * 
+	 */
+	public CalculatorFunction createCalculatorFunction() {
+		return new CalculatorFunction();
+	}
 
-    /**
-     * Create an instance of {@link CalculatorFunction }
-     * 
-     */
-    public CalculatorFunction createCalculatorFunction() {
-        return new CalculatorFunction();
-    }
+	/**
+	 * Create an instance of {@link Coordinate }
+	 * 
+	 */
+	public Coordinate createCoordinate() {
+		return new Coordinate();
+	}
 
-    /**
-     * Create an instance of {@link Coordinate }
-     * 
-     */
-    public Coordinate createCoordinate() {
-        return new Coordinate();
-    }
+	/**
+	 * Create an instance of {@link CalculatorFunctionOperation }
+	 * 
+	 */
+	public CalculatorFunctionOperation createCalculatorFunctionOperation() {
+		return new CalculatorFunctionOperation();
+	}
 
-    /**
-     * Create an instance of {@link CalculatorFunctionOperation }
-     * 
-     */
-    public CalculatorFunctionOperation createCalculatorFunctionOperation() {
-        return new CalculatorFunctionOperation();
-    }
+	/**
+	 * Create an instance of {@link SkillTemplate }
+	 * 
+	 */
+	public SkillTemplate createSkillTemplate() {
+		return new SkillTemplate();
+	}
 
-    /**
-     * Create an instance of {@link SkillTemplate }
-     * 
-     */
-    public SkillTemplate createSkillTemplate() {
-        return new SkillTemplate();
-    }
+	/**
+	 * Create an instance of {@link ZoneType.Point }
+	 * 
+	 */
+	public ZoneType.Point createZoneTypePoint() {
+		return new ZoneType.Point();
+	}
 
-    /**
-     * Create an instance of {@link ZoneType.Point }
-     * 
-     */
-    public ZoneType.Point createZoneTypePoint() {
-        return new ZoneType.Point();
-    }
+	/**
+	 * Create an instance of {@link Zones.Castle.Siege }
+	 * 
+	 */
+	public Zones.Castle.Siege createZonesCastleSiege() {
+		return new Zones.Castle.Siege();
+	}
 
-    /**
-     * Create an instance of {@link Zones.Castle.Siege }
-     * 
-     */
-    public Zones.Castle.Siege createZonesCastleSiege() {
-        return new Zones.Castle.Siege();
-    }
+	/**
+	 * Create an instance of {@link Teleports.Teleport.Restrictions }
+	 * 
+	 */
+	public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
+		return new Teleports.Teleport.Restrictions();
+	}
 
-    /**
-     * Create an instance of {@link Teleports.Teleport.Restrictions }
-     * 
-     */
-    public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
-        return new Teleports.Teleport.Restrictions();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Ai }
+	 * 
+	 */
+	public NPCTemplate.Ai createNPCTemplateAi() {
+		return new NPCTemplate.Ai();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Ai }
-     * 
-     */
-    public NPCTemplate.Ai createNPCTemplateAi() {
-        return new NPCTemplate.Ai();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Skills.Skill }
+	 * 
+	 */
+	public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() {
+		return new NPCTemplate.Skills.Skill();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Skills.Skill }
-     * 
-     */
-    public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() {
-        return new NPCTemplate.Skills.Skill();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Talk.Chat }
+	 * 
+	 */
+	public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() {
+		return new NPCTemplate.Talk.Chat();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Talk.Chat }
-     * 
-     */
-    public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() {
-        return new NPCTemplate.Talk.Chat();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Name }
+	 * 
+	 */
+	public NPCTemplate.Info.Name createNPCTemplateInfoName() {
+		return new NPCTemplate.Info.Name();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Name }
-     * 
-     */
-    public NPCTemplate.Info.Name createNPCTemplateInfoName() {
-        return new NPCTemplate.Info.Name();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Title }
+	 * 
+	 */
+	public NPCTemplate.Info.Title createNPCTemplateInfoTitle() {
+		return new NPCTemplate.Info.Title();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Title }
-     * 
-     */
-    public NPCTemplate.Info.Title createNPCTemplateInfoTitle() {
-        return new NPCTemplate.Info.Title();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Item }
+	 * 
+	 */
+	public NPCTemplate.Info.Item createNPCTemplateInfoItem() {
+		return new NPCTemplate.Info.Item();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Item }
-     * 
-     */
-    public NPCTemplate.Info.Item createNPCTemplateInfoItem() {
-        return new NPCTemplate.Info.Item();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Collision }
+	 * 
+	 */
+	public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() {
+		return new NPCTemplate.Info.Collision();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Collision }
-     * 
-     */
-    public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() {
-        return new NPCTemplate.Info.Collision();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Hp }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() {
+		return new NPCTemplate.Info.Stats.Hp();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Hp }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() {
-        return new NPCTemplate.Info.Stats.Hp();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Mp }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() {
+		return new NPCTemplate.Info.Stats.Mp();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Mp }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() {
-        return new NPCTemplate.Info.Stats.Mp();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Move }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() {
+		return new NPCTemplate.Info.Stats.Move();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Move }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() {
-        return new NPCTemplate.Info.Stats.Move();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Base }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() {
+		return new NPCTemplate.Info.Stats.Base();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Base }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() {
-        return new NPCTemplate.Info.Stats.Base();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() {
+		return new NPCTemplate.Info.Stats.Defense.Physical();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() {
-        return new NPCTemplate.Info.Stats.Defense.Physical();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() {
+		return new NPCTemplate.Info.Stats.Defense.Magical();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() {
-        return new NPCTemplate.Info.Stats.Defense.Magical();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() {
+		return new NPCTemplate.Info.Stats.Attack.Physical();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() {
-        return new NPCTemplate.Info.Stats.Attack.Physical();
-    }
+	/**
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical }
+	 * 
+	 */
+	public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() {
+		return new NPCTemplate.Info.Stats.Attack.Magical();
+	}
 
-    /**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical }
-     * 
-     */
-    public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() {
-        return new NPCTemplate.Info.Stats.Attack.Magical();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Controller }
+	 * 
+	 */
+	public ItemTemplate.Controller createItemTemplateController() {
+		return new ItemTemplate.Controller();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Controller }
-     * 
-     */
-    public ItemTemplate.Controller createItemTemplateController() {
-        return new ItemTemplate.Controller();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Effect }
+	 * 
+	 */
+	public ItemTemplate.Effect createItemTemplateEffect() {
+		return new ItemTemplate.Effect();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Effect }
-     * 
-     */
-    public ItemTemplate.Effect createItemTemplateEffect() {
-        return new ItemTemplate.Effect();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.EtcItem }
+	 * 
+	 */
+	public ItemTemplate.EtcItem createItemTemplateEtcItem() {
+		return new ItemTemplate.EtcItem();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.EtcItem }
-     * 
-     */
-    public ItemTemplate.EtcItem createItemTemplateEtcItem() {
-        return new ItemTemplate.EtcItem();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Weapon }
+	 * 
+	 */
+	public ItemTemplate.Weapon createItemTemplateWeapon() {
+		return new ItemTemplate.Weapon();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Weapon }
-     * 
-     */
-    public ItemTemplate.Weapon createItemTemplateWeapon() {
-        return new ItemTemplate.Weapon();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Armor.Cost }
+	 * 
+	 */
+	public ItemTemplate.Armor.Cost createItemTemplateArmorCost() {
+		return new ItemTemplate.Armor.Cost();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Armor.Cost }
-     * 
-     */
-    public ItemTemplate.Armor.Cost createItemTemplateArmorCost() {
-        return new ItemTemplate.Armor.Cost();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Armor.Equipment }
+	 * 
+	 */
+	public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() {
+		return new ItemTemplate.Armor.Equipment();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Armor.Equipment }
-     * 
-     */
-    public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() {
-        return new ItemTemplate.Armor.Equipment();
-    }
+	/**
+	 * Create an instance of {@link ItemTemplate.Attributes.Cost }
+	 * 
+	 */
+	public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() {
+		return new ItemTemplate.Attributes.Cost();
+	}
 
-    /**
-     * Create an instance of {@link ItemTemplate.Attributes.Cost }
-     * 
-     */
-    public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() {
-        return new ItemTemplate.Attributes.Cost();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Collision.Male }
+	 * 
+	 */
+	public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() {
+		return new CharacterTemplate.Collision.Male();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Collision.Male }
-     * 
-     */
-    public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() {
-        return new CharacterTemplate.Collision.Male();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Collision.Female }
+	 * 
+	 */
+	public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() {
+		return new CharacterTemplate.Collision.Female();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Collision.Female }
-     * 
-     */
-    public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() {
-        return new CharacterTemplate.Collision.Female();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Hp }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() {
+		return new CharacterTemplate.Stats.Hp();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Hp }
-     * 
-     */
-    public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() {
-        return new CharacterTemplate.Stats.Hp();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Mp }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() {
+		return new CharacterTemplate.Stats.Mp();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Mp }
-     * 
-     */
-    public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() {
-        return new CharacterTemplate.Stats.Mp();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Cp }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() {
+		return new CharacterTemplate.Stats.Cp();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Cp }
-     * 
-     */
-    public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() {
-        return new CharacterTemplate.Stats.Cp();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Move }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() {
+		return new CharacterTemplate.Stats.Move();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Move }
-     * 
-     */
-    public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() {
-        return new CharacterTemplate.Stats.Move();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Base }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() {
+		return new CharacterTemplate.Stats.Base();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Base }
-     * 
-     */
-    public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() {
-        return new CharacterTemplate.Stats.Base();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() {
+		return new CharacterTemplate.Stats.Defense.Physical();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical }
-     * 
-     */
-    public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() {
-        return new CharacterTemplate.Stats.Defense.Physical();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() {
+		return new CharacterTemplate.Stats.Defense.Magical();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical }
-     * 
-     */
-    public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() {
-        return new CharacterTemplate.Stats.Defense.Magical();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() {
+		return new CharacterTemplate.Stats.Attack.Physical();
+	}
 
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical }
-     * 
-     */
-    public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() {
-        return new CharacterTemplate.Stats.Attack.Physical();
-    }
-
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical }
-     * 
-     */
-    public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() {
-        return new CharacterTemplate.Stats.Attack.Magical();
-    }
+	/**
+	 * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical }
+	 * 
+	 */
+	public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() {
+		return new CharacterTemplate.Stats.Attack.Magical();
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java
index 849430619..ed6bba3ac 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java
@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,14 +13,17 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.l2jserver.model.id.template.SkillTemplateID;
 import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
 
-
 /**
- * 
Java class for skill element declaration.
+ * 

+ * Java class for skill element declaration.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <element name="skill">
@@ -44,119 +46,109 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "maximumLevel"
-})
+@XmlType(name = "", propOrder = { "maximumLevel" })
 @XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
-public class SkillTemplate
-    extends AbstractTemplate
-{
+public class SkillTemplate extends AbstractTemplate {
 
-    protected int maximumLevel;
-    @XmlAttribute(name = "id", required = true)
-    @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
-    protected SkillTemplateID id;
-    @XmlAttribute(name = "name", required = true)
-    protected String name;
-    @XmlAttribute(name = "delay", required = true)
-    protected int delay;
-    @XmlAttribute(name = "cooldown", required = true)
-    protected int cooldown;
+	protected int maximumLevel;
+	@XmlAttribute(name = "id", required = true)
+	@XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
+	protected SkillTemplateID id;
+	@XmlAttribute(name = "name", required = true)
+	protected String name;
+	@XmlAttribute(name = "delay", required = true)
+	protected int delay;
+	@XmlAttribute(name = "cooldown", required = true)
+	protected int cooldown;
 
-    /**
-     * Gets the value of the maximumLevel property.
-     * 
-     */
-    public int getMaximumLevel() {
-        return maximumLevel;
-    }
+	/**
+	 * Gets the value of the maximumLevel property.
+	 * 
+	 */
+	public int getMaximumLevel() {
+		return maximumLevel;
+	}
 
-    /**
-     * Sets the value of the maximumLevel property.
-     * 
-     */
-    public void setMaximumLevel(int value) {
-        this.maximumLevel = value;
-    }
+	/**
+	 * Sets the value of the maximumLevel property.
+	 * 
+	 */
+	public void setMaximumLevel(int value) {
+		this.maximumLevel = value;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public SkillTemplateID getID() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public SkillTemplateID getID() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setID(SkillTemplateID value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setID(SkillTemplateID value) {
+		this.id = value;
+	}
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
-    /**
-     * Gets the value of the delay property.
-     * 
-     */
-    public int getDelay() {
-        return delay;
-    }
+	/**
+	 * Gets the value of the delay property.
+	 * 
+	 */
+	public int getDelay() {
+		return delay;
+	}
 
-    /**
-     * Sets the value of the delay property.
-     * 
-     */
-    public void setDelay(int value) {
-        this.delay = value;
-    }
+	/**
+	 * Sets the value of the delay property.
+	 * 
+	 */
+	public void setDelay(int value) {
+		this.delay = value;
+	}
 
-    /**
-     * Gets the value of the cooldown property.
-     * 
-     */
-    public int getCooldown() {
-        return cooldown;
-    }
+	/**
+	 * Gets the value of the cooldown property.
+	 * 
+	 */
+	public int getCooldown() {
+		return cooldown;
+	}
 
-    /**
-     * Sets the value of the cooldown property.
-     * 
-     */
-    public void setCooldown(int value) {
-        this.cooldown = value;
-    }
+	/**
+	 * Sets the value of the cooldown property.
+	 * 
+	 */
+	public void setCooldown(int value) {
+		this.cooldown = value;
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java
index a5614ae5c..4315993b4 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java
@@ -5,11 +5,11 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -17,14 +17,17 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.l2jserver.model.id.template.TeleportationTemplateID;
 import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
 
-
 /**
- * 
Java class for anonymous complex type.
+ * 

+ * Java class for anonymous complex type.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <complexType>
@@ -72,308 +75,290 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "teleport"
-})
+@XmlType(name = "", propOrder = { "teleport" })
 @XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
 public class Teleports {
 
-    @XmlElement(required = true)
-    protected List teleport;
+	@XmlElement(required = true)
+	protected List teleport;
 
-    /**
-     * Gets the value of the teleport property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the teleport property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getTeleport().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Teleports.Teleport }
-     * 
-     * 
-     */
-    public List getTeleport() {
-        if (teleport == null) {
-            teleport = new ArrayList();
-        }
-        return this.teleport;
-    }
+	/**
+	 * Gets the value of the teleport property.
+	 * 
+	 * 

+	 * This accessor method returns a reference to the live list, not a
+	 * snapshot. Therefore any modification you make to the returned list will
+	 * be present inside the JAXB object. This is why there is not a
+	 * set method for the teleport property.
+	 * 
+	 * 

+	 * For example, to add a new item, do as follows:
+	 * 
+	 * 
+	 * getTeleport().add(newItem);
+	 * 

+	 * 
+	 * 
+	 * 

+	 * Objects of the following type(s) are allowed in the list
+	 * {@link Teleports.Teleport }
+	 * 
+	 * 
+	 */
+	public List getTeleport() {
+		if (teleport == null) {
+			teleport = new ArrayList();
+		}
+		return this.teleport;
+	}
 
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <extension base="{}AbstractTemplate">
+	 *       <sequence>
+	 *         <element name="point" type="{}Coordinate" minOccurs="0"/>
+	 *         <element name="restrictions" minOccurs="0">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                   <element name="restriction" maxOccurs="unbounded">
+	 *                     <simpleType>
+	 *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+	 *                         <enumeration value="NOBLE"/>
+	 *                       </restriction>
+	 *                     </simpleType>
+	 *                   </element>
+	 *                 </sequence>
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+	 *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+	 *       <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *       <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *     </extension>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "point", "restrictions" })
+	public static class Teleport extends AbstractTemplate {
 
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{}AbstractTemplate">
-     *       <sequence>
-     *         <element name="point" type="{}Coordinate" minOccurs="0"/>
-     *         <element name="restrictions" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="restriction" maxOccurs="unbounded">
-     *                     <simpleType>
-     *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         <enumeration value="NOBLE"/>
-     *                       </restriction>
-     *                     </simpleType>
-     *                   </element>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
-     *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "point",
-        "restrictions"
-    })
-    public static class Teleport
-        extends AbstractTemplate
-    {
+		protected Coordinate point;
+		protected Teleports.Teleport.Restrictions restrictions;
+		@XmlAttribute(name = "id", required = true)
+		@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
+		protected TeleportationTemplateID id;
+		@XmlAttribute(name = "name")
+		protected String name;
+		@XmlAttribute(name = "item")
+		protected Integer item;
+		@XmlAttribute(name = "price", required = true)
+		protected int price;
 
-        protected Coordinate point;
-        protected Teleports.Teleport.Restrictions restrictions;
-        @XmlAttribute(name = "id", required = true)
-        @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
-        protected TeleportationTemplateID id;
-        @XmlAttribute(name = "name")
-        protected String name;
-        @XmlAttribute(name = "item")
-        protected Integer item;
-        @XmlAttribute(name = "price", required = true)
-        protected int price;
+		/**
+		 * Gets the value of the point property.
+		 * 
+		 * @return possible object is {@link Coordinate }
+		 * 
+		 */
+		public Coordinate getPoint() {
+			return point;
+		}
 
-        /**
-         * Gets the value of the point property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Coordinate }
-         *     
-         */
-        public Coordinate getPoint() {
-            return point;
-        }
+		/**
+		 * Sets the value of the point property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Coordinate }
+		 * 
+		 */
+		public void setPoint(Coordinate value) {
+			this.point = value;
+		}
 
-        /**
-         * Sets the value of the point property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Coordinate }
-         *     
-         */
-        public void setPoint(Coordinate value) {
-            this.point = value;
-        }
+		/**
+		 * Gets the value of the restrictions property.
+		 * 
+		 * @return possible object is {@link Teleports.Teleport.Restrictions }
+		 * 
+		 */
+		public Teleports.Teleport.Restrictions getRestrictions() {
+			return restrictions;
+		}
 
-        /**
-         * Gets the value of the restrictions property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Teleports.Teleport.Restrictions }
-         *     
-         */
-        public Teleports.Teleport.Restrictions getRestrictions() {
-            return restrictions;
-        }
+		/**
+		 * Sets the value of the restrictions property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Teleports.Teleport.Restrictions }
+		 * 
+		 */
+		public void setRestrictions(Teleports.Teleport.Restrictions value) {
+			this.restrictions = value;
+		}
 
-        /**
-         * Sets the value of the restrictions property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Teleports.Teleport.Restrictions }
-         *     
-         */
-        public void setRestrictions(Teleports.Teleport.Restrictions value) {
-            this.restrictions = value;
-        }
+		/**
+		 * Gets the value of the id property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public TeleportationTemplateID getID() {
+			return id;
+		}
 
-        /**
-         * Gets the value of the id property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public TeleportationTemplateID getID() {
-            return id;
-        }
+		/**
+		 * Sets the value of the id property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setID(TeleportationTemplateID value) {
+			this.id = value;
+		}
 
-        /**
-         * Sets the value of the id property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setID(TeleportationTemplateID value) {
-            this.id = value;
-        }
+		/**
+		 * Gets the value of the name property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getName() {
+			return name;
+		}
 
-        /**
-         * Gets the value of the name property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getName() {
-            return name;
-        }
+		/**
+		 * Sets the value of the name property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setName(String value) {
+			this.name = value;
+		}
 
-        /**
-         * Sets the value of the name property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setName(String value) {
-            this.name = value;
-        }
+		/**
+		 * Gets the value of the item property.
+		 * 
+		 * @return possible object is {@link Integer }
+		 * 
+		 */
+		public Integer getItem() {
+			return item;
+		}
 
-        /**
-         * Gets the value of the item property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getItem() {
-            return item;
-        }
+		/**
+		 * Sets the value of the item property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Integer }
+		 * 
+		 */
+		public void setItem(Integer value) {
+			this.item = value;
+		}
 
-        /**
-         * Sets the value of the item property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setItem(Integer value) {
-            this.item = value;
-        }
+		/**
+		 * Gets the value of the price property.
+		 * 
+		 */
+		public int getPrice() {
+			return price;
+		}
 
-        /**
-         * Gets the value of the price property.
-         * 
-         */
-        public int getPrice() {
-            return price;
-        }
+		/**
+		 * Sets the value of the price property.
+		 * 
+		 */
+		public void setPrice(int value) {
+			this.price = value;
+		}
 
-        /**
-         * Sets the value of the price property.
-         * 
-         */
-        public void setPrice(int value) {
-            this.price = value;
-        }
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *         <element name="restriction" maxOccurs="unbounded">
+		 *           <simpleType>
+		 *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+		 *               <enumeration value="NOBLE"/>
+		 *             </restriction>
+		 *           </simpleType>
+		 *         </element>
+		 *       </sequence>
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "restriction" })
+		public static class Restrictions {
 
+			@XmlElement(required = true)
+			protected List restriction;
 
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="restriction" maxOccurs="unbounded">
-         *           <simpleType>
-         *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-         *               <enumeration value="NOBLE"/>
-         *             </restriction>
-         *           </simpleType>
-         *         </element>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "restriction"
-        })
-        public static class Restrictions {
+			/**
+			 * Gets the value of the restriction property.
+			 * 
+			 * 

+			 * This accessor method returns a reference to the live list, not a
+			 * snapshot. Therefore any modification you make to the returned
+			 * list will be present inside the JAXB object. This is why there is
+			 * not a set method for the restriction property.
+			 * 
+			 * 

+			 * For example, to add a new item, do as follows:
+			 * 
+			 * 
+			 * getRestriction().add(newItem);
+			 * 

+			 * 
+			 * 
+			 * 

+			 * Objects of the following type(s) are allowed in the list
+			 * {@link String }
+			 * 
+			 * 
+			 */
+			public List getRestriction() {
+				if (restriction == null) {
+					restriction = new ArrayList();
+				}
+				return this.restriction;
+			}
 
-            @XmlElement(required = true)
-            protected List restriction;
+		}
 
-            /**
-             * Gets the value of the restriction property.
-             * 
-             * 

-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a set method for the restriction property.
-             * 
-             * 

-             * For example, to add a new item, do as follows:
-             * 
-             *    getRestriction().add(newItem);
-             * 

-             * 
-             * 
-             * 

-             * Objects of the following type(s) are allowed in the list
-             * {@link String }
-             * 
-             * 
-             */
-            public List getRestriction() {
-                if (restriction == null) {
-                    restriction = new ArrayList();
-                }
-                return this.restriction;
-            }
-
-        }
-
-    }
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java
index 6562c0166..68535f987 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java
@@ -5,22 +5,24 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * 
Java class for ZoneType complex type.
+ * 

+ * Java class for ZoneType complex type.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <complexType name="ZoneType">
@@ -49,131 +51,129 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZoneType", namespace = "zones", propOrder = {
-    "point"
-})
+@XmlType(name = "ZoneType", namespace = "zones", propOrder = { "point" })
 public class ZoneType {
 
-    @XmlElement(required = true)
-    protected List point;
-    @XmlAttribute(name = "id", required = true)
-    protected String id;
+	@XmlElement(required = true)
+	protected List point;
+	@XmlAttribute(name = "id", required = true)
+	protected String id;
 
-    /**
-     * Gets the value of the point property.
-     * 
-     * 

-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a set method for the point property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getPoint().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ZoneType.Point }
-     * 
-     * 
-     */
-    public List getPoint() {
-        if (point == null) {
-            point = new ArrayList();
-        }
-        return this.point;
-    }
+	/**
+	 * Gets the value of the point property.
+	 * 
+	 * 

+	 * This accessor method returns a reference to the live list, not a
+	 * snapshot. Therefore any modification you make to the returned list will
+	 * be present inside the JAXB object. This is why there is not a
+	 * set method for the point property.
+	 * 
+	 * 

+	 * For example, to add a new item, do as follows:
+	 * 
+	 * 
+	 * getPoint().add(newItem);
+	 * 

+	 * 
+	 * 
+	 * 

+	 * Objects of the following type(s) are allowed in the list
+	 * {@link ZoneType.Point }
+	 * 
+	 * 
+	 */
+	public List getPoint() {
+		if (point == null) {
+			point = new ArrayList();
+		}
+		return this.point;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *       </sequence>
+	 *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Point {
 
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *       </sequence>
-     *       <attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       <attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Point {
+		@XmlAttribute(name = "x", required = true)
+		protected int x;
+		@XmlAttribute(name = "y", required = true)
+		protected int y;
 
-        @XmlAttribute(name = "x", required = true)
-        protected int x;
-        @XmlAttribute(name = "y", required = true)
-        protected int y;
+		/**
+		 * Gets the value of the x property.
+		 * 
+		 */
+		public int getX() {
+			return x;
+		}
 
-        /**
-         * Gets the value of the x property.
-         * 
-         */
-        public int getX() {
-            return x;
-        }
+		/**
+		 * Sets the value of the x property.
+		 * 
+		 */
+		public void setX(int value) {
+			this.x = value;
+		}
 
-        /**
-         * Sets the value of the x property.
-         * 
-         */
-        public void setX(int value) {
-            this.x = value;
-        }
+		/**
+		 * Gets the value of the y property.
+		 * 
+		 */
+		public int getY() {
+			return y;
+		}
 
-        /**
-         * Gets the value of the y property.
-         * 
-         */
-        public int getY() {
-            return y;
-        }
+		/**
+		 * Sets the value of the y property.
+		 * 
+		 */
+		public void setY(int value) {
+			this.y = value;
+		}
 
-        /**
-         * Sets the value of the y property.
-         * 
-         */
-        public void setY(int value) {
-            this.y = value;
-        }
-
-    }
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java
index 404eb82a1..b6b65d91a 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java
@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,13 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * 
Java class for anonymous complex type.
+ * 

+ * Java class for anonymous complex type.
  * 
- * 
The following schema fragment specifies the expected content contained within this class.
+ * 

+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * 
  * <complexType>
@@ -55,157 +56,146 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "castle"
-})
+@XmlType(name = "", propOrder = { "castle" })
 @XmlRootElement(name = "zones", namespace = "zones")
 public class Zones {
 
-    @XmlElement(required = true)
-    protected Zones.Castle castle;
+	@XmlElement(required = true)
+	protected Zones.Castle castle;
 
-    /**
-     * Gets the value of the castle property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Zones.Castle }
-     *     
-     */
-    public Zones.Castle getCastle() {
-        return castle;
-    }
+	/**
+	 * Gets the value of the castle property.
+	 * 
+	 * @return possible object is {@link Zones.Castle }
+	 * 
+	 */
+	public Zones.Castle getCastle() {
+		return castle;
+	}
 
-    /**
-     * Sets the value of the castle property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Zones.Castle }
-     *     
-     */
-    public void setCastle(Zones.Castle value) {
-        this.castle = value;
-    }
+	/**
+	 * Sets the value of the castle property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Zones.Castle }
+	 * 
+	 */
+	public void setCastle(Zones.Castle value) {
+		this.castle = value;
+	}
 
+	/**
+	 * 

+	 * Java class for anonymous complex type.
+	 * 
+	 * 

+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * 
+	 * <complexType>
+	 *   <complexContent>
+	 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       <sequence>
+	 *         <element name="siege">
+	 *           <complexType>
+	 *             <complexContent>
+	 *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 <sequence>
+	 *                   <element name="zone" type="{zones}ZoneType"/>
+	 *                 </sequence>
+	 *               </restriction>
+	 *             </complexContent>
+	 *           </complexType>
+	 *         </element>
+	 *       </sequence>
+	 *     </restriction>
+	 *   </complexContent>
+	 * </complexType>
+	 * 

+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "siege" })
+	public static class Castle {
 
-    /**
-     * 
Java class for anonymous complex type.
-     * 
-     * 
The following schema fragment specifies the expected content contained within this class.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="siege">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="zone" type="{zones}ZoneType"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "siege"
-    })
-    public static class Castle {
+		@XmlElement(required = true)
+		protected Zones.Castle.Siege siege;
 
-        @XmlElement(required = true)
-        protected Zones.Castle.Siege siege;
+		/**
+		 * Gets the value of the siege property.
+		 * 
+		 * @return possible object is {@link Zones.Castle.Siege }
+		 * 
+		 */
+		public Zones.Castle.Siege getSiege() {
+			return siege;
+		}
 
-        /**
-         * Gets the value of the siege property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Zones.Castle.Siege }
-         *     
-         */
-        public Zones.Castle.Siege getSiege() {
-            return siege;
-        }
+		/**
+		 * Sets the value of the siege property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Zones.Castle.Siege }
+		 * 
+		 */
+		public void setSiege(Zones.Castle.Siege value) {
+			this.siege = value;
+		}
 
-        /**
-         * Sets the value of the siege property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Zones.Castle.Siege }
-         *     
-         */
-        public void setSiege(Zones.Castle.Siege value) {
-            this.siege = value;
-        }
+		/**
+		 * 

+		 * Java class for anonymous complex type.
+		 * 
+		 * 

+		 * The following schema fragment specifies the expected content
+		 * contained within this class.
+		 * 
+		 * 
+		 * <complexType>
+		 *   <complexContent>
+		 *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       <sequence>
+		 *         <element name="zone" type="{zones}ZoneType"/>
+		 *       </sequence>
+		 *     </restriction>
+		 *   </complexContent>
+		 * </complexType>
+		 * 

+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "zone" })
+		public static class Siege {
 
+			@XmlElement(required = true)
+			protected ZoneType zone;
 
-        /**
-         * 
Java class for anonymous complex type.
-         * 
-         * 
The following schema fragment specifies the expected content contained within this class.
-         * 
-         * 
-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="zone" type="{zones}ZoneType"/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         * 

-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "zone"
-        })
-        public static class Siege {
+			/**
+			 * Gets the value of the zone property.
+			 * 
+			 * @return possible object is {@link ZoneType }
+			 * 
+			 */
+			public ZoneType getZone() {
+				return zone;
+			}
 
-            @XmlElement(required = true)
-            protected ZoneType zone;
+			/**
+			 * Sets the value of the zone property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link ZoneType }
+			 * 
+			 */
+			public void setZone(ZoneType value) {
+				this.zone = value;
+			}
 
-            /**
-             * Gets the value of the zone property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link ZoneType }
-             *     
-             */
-            public ZoneType getZone() {
-                return zone;
-            }
+		}
 
-            /**
-             * Sets the value of the zone property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link ZoneType }
-             *     
-             */
-            public void setZone(ZoneType value) {
-                this.zone = value;
-            }
-
-        }
-
-    }
+	}
 
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java
index bef3a527b..f204b7bc9 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java
@@ -18,7 +18,6 @@ package com.l2jserver;
 
 import com.l2jserver.service.network.model.ProtocolVersion;
 
-
 /**
  * Constant values for this L2J compilation
  * 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JGameServerMain.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JGameServerMain.java
index 0a1071eb3..86ae69e8d 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JGameServerMain.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JGameServerMain.java
@@ -79,7 +79,7 @@ public class L2JGameServerMain {
 	@SuppressWarnings("unchecked")
 	public static void main(String[] args) {
 		BasicConfigurator.configure();
-		
+
 		final ServiceManager serviceManager = new ServiceManager();
 		try {
 			serviceManager.load(Paths.get("services.xml"));
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java
index 726aab5e0..126f69a30 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java
@@ -36,16 +36,18 @@ public class CharacterShortcutID extends
 	 * The {@link CharacterShortcutDAO} instance
 	 */
 	private final CharacterShortcutDAO shortcutDao;
-	
+
 	/**
 	 * Creates a new instance
 	 * 
 	 * @param id
 	 *            the id
-	 * @param shortcutDao the shortcut DAO
+	 * @param shortcutDao
+	 *            the shortcut DAO
 	 */
 	@Inject
-	public CharacterShortcutID(@Assisted int id, CharacterShortcutDAO shortcutDao) {
+	public CharacterShortcutID(@Assisted int id,
+			CharacterShortcutDAO shortcutDao) {
 		super(id);
 		this.shortcutDao = shortcutDao;
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java
index 43dfe3bae..4d09fecfd 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java
@@ -16,7 +16,6 @@
  */
 package com.l2jserver.model.template;
 
-
 /**
  * Template for an Aumentation
  * 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java
index 0047997e5..a1616cd88 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java
@@ -95,10 +95,11 @@ public abstract class Actor extends PositionableObject {
 		DEAD;
 	}
 
-//	/**
-//	 * The currently effects active on the actor
-//	 */
-//	protected final ActorEffectContainer effects = new ActorEffectContainer(this);
+	// /**
+	// * The currently effects active on the actor
+	// */
+	// protected final ActorEffectContainer effects = new
+	// ActorEffectContainer(this);
 	/**
 	 * The skills learned by this actor
 	 */
@@ -270,12 +271,12 @@ public abstract class Actor extends PositionableObject {
 		return state == ActorState.ATTACKING;
 	}
 
-//	/**
-//	 * @return the active effects on this actor
-//	 */
-//	public ActorEffectContainer getEffects() {
-//		return effects;
-//	}
+	// /**
+	// * @return the active effects on this actor
+	// */
+	// public ActorEffectContainer getEffects() {
+	// return effects;
+	// }
 
 	/**
 	 * @return the actor skills
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java
index 277ccf51d..22783c0c5 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java
@@ -52,6 +52,5 @@ public abstract class ActorCalculatorFunction extends
 	 *            the original value
 	 * @return the calculated value
 	 */
-	protected abstract double calculate(Actor a, ActorTemplate t,
-			double value);
+	protected abstract double calculate(Actor a, ActorTemplate t, double value);
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java
index 99781b635..65eb3e35a 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java
@@ -43,10 +43,10 @@ public class MaximumHPAddCalculator extends CharacterFormula {
 
 	@Override
 	public double calculate(L2Character c, CharacterTemplate t, double value) {
-		int lvl = c.getLevel() -  t.getStats().getLevel();
+		int lvl = c.getLevel() - t.getStats().getLevel();
 		double mod = t.getStats().getHp().getModifier() * lvl;
 		double max = (t.getStats().getHp().getAdd() + mod) * lvl;
-		double min = ( t.getStats().getHp().getAdd() * lvl) + mod;
+		double min = (t.getStats().getHp().getAdd() * lvl) + mod;
 
 		return value + (max + min) / 2;
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java
index 3abe46311..a1fc8a4bb 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java
@@ -43,6 +43,6 @@ public class CharacterBasePhysicalCriticalRateCalculator extends
 
 	@Override
 	protected double calculate(L2Character c, CharacterTemplate t, double value) {
-		return  t.getStats().getAttack().getCritical();
+		return t.getStats().getAttack().getCritical();
 	}
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java
index cac9a1628..580865089 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java
@@ -50,7 +50,8 @@ public class ItemPickEvent implements ItemEvent, CharacterEvent {
 	 *            the picking up character
 	 * @param item
 	 *            the picked up item
-	 * @param newItem the new {@link Item}
+	 * @param newItem
+	 *            the new {@link Item}
 	 */
 	public ItemPickEvent(L2Character character, Item item, Item newItem) {
 		this.character = character;
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java
index 41e2181a0..dfeda53af 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java
@@ -152,7 +152,7 @@ public abstract class BaseNPCController implements NPCController {
 				break;
 			}
 		}
-		if(html == null)
+		if (html == null)
 			return null;
 
 		// TODO use an decent template engine
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java
index 27504a5c0..9426e968b 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java
@@ -33,8 +33,8 @@ import com.l2jserver.util.html.markup.MarkupTag;
  */
 public class NotImplementedNPCController extends BaseNPCController {
 	@Override
-	public void interact(NPC npc, L2Character character,
-			final String... args) throws L2Exception {
+	public void interact(NPC npc, L2Character character, final String... args)
+			throws L2Exception {
 		// action not handled
 		final HtmlTemplate template = new HtmlTemplate() {
 			@Override
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java
index 96b2344ec..9082d10d3 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java
@@ -42,8 +42,7 @@ import com.l2jserver.service.database.dao.sql.SQLNPCDAO;
 public class JDBCDAOModule extends AbstractModule {
 	@Override
 	protected void configure() {
-		bind(CharacterDAO.class).to(SQLCharacterDAO.class)
-				.in(Scopes.SINGLETON);
+		bind(CharacterDAO.class).to(SQLCharacterDAO.class).in(Scopes.SINGLETON);
 		bind(CharacterFriendDAO.class).to(SQLCharacterFriendDAO.class).in(
 				Scopes.SINGLETON);
 		bind(CharacterShortcutDAO.class).to(SQLCharacterShortcutDAO.class).in(
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java
index f31a4a1ea..4c19a6803 100644
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java
@@ -140,7 +140,8 @@ public class OrientDBItemDAO extends AbstractOrientDBDAO
 					@Override
 					protected OQueryContextNative query(
 							OQueryContextNative record, Item o) {
-						return record.field(name(entity.itemId)).eq(o.getID().getID());
+						return record.field(name(entity.itemId)).eq(
+								o.getID().getID());
 					}
 				});
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java
index a320d35bd..ea0eab721 100644
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java
@@ -126,8 +126,8 @@ public class SQLCharacterFriendDAO extends
 					protected void query(SQLDeleteClause q, CharacterFriend o) {
 						q.where(entity.characterId.eq(
 								o.getID().getCharacterID().getID()).and(
-								entity.characterIdFriend.eq(o.getID().getFriendID()
-										.getID())));
+								entity.characterIdFriend.eq(o.getID()
+										.getFriendID().getID())));
 					}
 				});
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java
index aa7c6371d..2ace23c0a 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java
@@ -48,7 +48,9 @@ public class QCharacterFriend extends
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QCharacterFriend(String variable) {
 		super(FriendID.class, forVariable(variable), "null", "character_friend");
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java
index d44000112..5c644c6fb 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java
@@ -23,7 +23,7 @@ public class QCharacterShortcut extends
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QCharacterShortcut}
 	 */
@@ -88,7 +88,9 @@ public class QCharacterShortcut extends
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QCharacterShortcut(String variable) {
 		super(Integer.class, forVariable(variable), "null",
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java
index 6a6a077f1..56dd28f3a 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java
@@ -18,7 +18,7 @@ public class QClan extends com.mysema.query.sql.RelationalPathBase {
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QClan}
 	 */
@@ -44,7 +44,9 @@ public class QClan extends com.mysema.query.sql.RelationalPathBase {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QClan(String variable) {
 		super(Integer.class, forVariable(variable), "null", "clan");
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java
index 68d8ef68a..1323fe1cf 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java
@@ -23,7 +23,7 @@ public class QItem extends com.mysema.query.sql.RelationalPathBase {
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QItem}
 	 */
@@ -97,7 +97,9 @@ public class QItem extends com.mysema.query.sql.RelationalPathBase {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QItem(String variable) {
 		super(Integer.class, forVariable(variable), "null", "item");
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java
index af6f97993..5162664bc 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java
@@ -26,7 +26,7 @@ public class QLogChat extends com.mysema.query.sql.RelationalPathBase {
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QLogChat}
 	 */
@@ -78,7 +78,9 @@ public class QLogChat extends com.mysema.query.sql.RelationalPathBase {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QLogChat(String variable) {
 		super(Integer.class, forVariable(variable), "null", "log_chat");
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java
index 8c092c65b..2f6223d98 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java
@@ -84,7 +84,9 @@ public class QNPC extends com.mysema.query.sql.RelationalPathBase {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QNPC(String variable) {
 		super(Integer.class, forVariable(variable), "null", "npc");
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java
index 02e6e5236..43ecdfc3f 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java
@@ -64,8 +64,8 @@ public class AttackServiceImpl extends AbstractService implements AttackService
 	private final NPCService npcService;
 
 	/**
-	 * The {@link WorldEventDispatcherService} is used to dispatch attack events to the
-	 * world
+	 * The {@link WorldEventDispatcherService} is used to dispatch attack events
+	 * to the world
 	 */
 	private final WorldEventDispatcherService eventDispatcher;
 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java
index caa2b7b4f..b77cd98f4 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java
@@ -79,8 +79,8 @@ public class AIServiceImpl extends AbstractService implements AIService {
 	 */
 	@Inject
 	public AIServiceImpl(WorldService worldService,
-			WorldEventDispatcherService eventDispatcher, ThreadService threadService,
-			NetworkService networkService) {
+			WorldEventDispatcherService eventDispatcher,
+			ThreadService threadService, NetworkService networkService) {
 		this.worldService = worldService;
 		this.eventDispatcher = eventDispatcher;
 		this.threadService = threadService;
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java
index 6c4415f4c..a70242f86 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java
@@ -22,8 +22,7 @@ package com.l2jserver.service.game.character;
  * 
  * @author Rogiel
  */
-public class TooManyCharactersException extends
-		CharacterServiceException {
+public class TooManyCharactersException extends CharacterServiceException {
 	/**
 	 * The Java Serialization API serial
 	 */
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java
index 11d13b8aa..a73e28e51 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java
@@ -52,8 +52,8 @@ import com.l2jserver.service.Service;
  * {@link ChatBanActiveChatServiceException} will be thrown.
  * 
  * 
Packets

- * Messages are received (from the clients) with CM_CHAR_CHAT and sent (to
- * the clients) with SM_ACTOR_CHAT.
+ * Messages are received (from the clients) with CM_CHAR_CHAT and
+ * sent (to the clients) with SM_ACTOR_CHAT.
  * 
  * @author Rogiel
  */
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java
index 53e50f06d..5ddc71b58 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java
@@ -55,10 +55,10 @@ public class SimpleChatService extends AbstractService implements ChatService {
 	 * The {@link ChatLoggingService} implementation
 	 */
 	private final ChatLoggingService chatLoggingService;
-//	/**
-//	 * The {@link RegionService}
-//	 */
-//	private final RegionService regionService;
+	// /**
+	// * The {@link RegionService}
+	// */
+	// private final RegionService regionService;
 	/**
 	 * The {@link L2Character} DAO
 	 */
@@ -177,13 +177,13 @@ public class SimpleChatService extends AbstractService implements ChatService {
 	@Override
 	public PublicChatChannel getRegionChannel(L2Character character) {
 		Preconditions.checkNotNull(character, "character");
-//		final Region region = regionService.getRegion(character);
-//		RegionChatChannelImpl channel = regionChannels.get(region);
-//		if (channel == null) {
-//			channel = new RegionChatChannelImpl(region);
-//			regionChannels.put(region, channel);
-//		}
-//		return channel;
+		// final Region region = regionService.getRegion(character);
+		// RegionChatChannelImpl channel = regionChannels.get(region);
+		// if (channel == null) {
+		// channel = new RegionChatChannelImpl(region);
+		// regionChannels.put(region, channel);
+		// }
+		// return channel;
 		return null;
 	}
 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java
index 58767e2e7..6b42376a6 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java
@@ -149,7 +149,8 @@ public class ItemServiceImpl extends
 
 	@Override
 	public Item split(Item item, long count)
-			throws NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			throws NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		if (item.getCount() < count)
 			throw new NotEnoughItemsServiceException();
 		if (item.getCount() == count)
@@ -187,7 +188,8 @@ public class ItemServiceImpl extends
 
 	@Override
 	public boolean destroy(Item item, long count)
-			throws NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			throws NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		synchronized (item) {
 			Item destroyItem = split(item, count);
 			itemDao.deleteObjectsAsync(destroyItem);
@@ -266,7 +268,8 @@ public class ItemServiceImpl extends
 	public Item drop(Item item, long count, Point3D point, Actor actor)
 			throws SpawnPointNotFoundServiceException,
 			ItemAlreadyOnGroundServiceException,
-			AlreadySpawnedServiceException, NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			AlreadySpawnedServiceException, NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		synchronized (item) {
 			if (item.getLocation() == ItemLocation.GROUND)
 				throw new AlreadySpawnedServiceException();
@@ -320,7 +323,8 @@ public class ItemServiceImpl extends
 	public void drop(Item item, Point3D point, Actor actor)
 			throws SpawnPointNotFoundServiceException,
 			ItemAlreadyOnGroundServiceException,
-			AlreadySpawnedServiceException, NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			AlreadySpawnedServiceException, NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		drop(item, item.getCount(), point, actor);
 	}
 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java
index 93e2487b2..8c801ee18 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java
@@ -90,7 +90,8 @@ public class MapperPathingService extends AbstractService implements
 	 * 
 	 * @param eventDispatcher
 	 *            the world event dispatcher
-	 * @param vfsService the VFS service implementation
+	 * @param vfsService
+	 *            the VFS service implementation
 	 */
 	@Inject
 	public MapperPathingService(WorldEventDispatcherService eventDispatcher,
@@ -117,7 +118,7 @@ public class MapperPathingService extends AbstractService implements
 						.fromCoordinate(point.getCoordinate());
 				try {
 					channel.write(struct.getByteBuffer());
-					//channel.force(true);
+					// channel.force(true);
 				} catch (IOException e1) {
 					log.warn("Error writing pathing file!", e1);
 				}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java
index 631f8afe2..d7f323baa 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java
@@ -108,7 +108,8 @@ public class EclipseCompilerClassFileManager extends
 	 * @return classLoader of this ClassFileManager
 	 */
 	@Override
-	public synchronized EclipseCompilerScriptClassLoader getClassLoader(Location location) {
+	public synchronized EclipseCompilerScriptClassLoader getClassLoader(
+			Location location) {
 		if (loader == null) {
 			loader = AccessController
 					.doPrivileged(new PrivilegedAction() {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java
index 2daaf4e12..f44dc1f58 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java
@@ -80,7 +80,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
 	 * @param classFileManager
 	 *            classFileManager of this classLoader
 	 */
-	EclipseCompilerScriptClassLoader(EclipseCompilerClassFileManager classFileManager) {
+	EclipseCompilerScriptClassLoader(
+			EclipseCompilerClassFileManager classFileManager) {
 		super(new URL[] {});
 		this.classFileManager = classFileManager;
 	}
@@ -94,7 +95,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
 	 * @param parent
 	 *            parent classLoader
 	 */
-	EclipseCompilerScriptClassLoader(EclipseCompilerClassFileManager classFileManager, ClassLoader parent) {
+	EclipseCompilerScriptClassLoader(
+			EclipseCompilerClassFileManager classFileManager, ClassLoader parent) {
 		super(new URL[] {}, parent);
 		this.classFileManager = classFileManager;
 	}
@@ -176,7 +178,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
 			newName = newName.replace('/', '.');
 			if (classFileManager.getCompiledClasses().containsKey(newName)) {
 				try {
-					return new URL(null,
+					return new URL(
+							null,
 							EclipseCompilerVirtualClassURLStreamHandler.HANDLER_PROTOCOL
 									+ newName, urlStreamHandler);
 				} catch (MalformedURLException e) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java
index 3140c3835..5f0fada51 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java
@@ -48,7 +48,8 @@ public class EclipseCompilerVirtualClassURLConnection extends URLConnection {
 	 * @param cl
 	 *            classloader
 	 */
-	protected EclipseCompilerVirtualClassURLConnection(URL url, EclipseCompilerScriptClassLoader cl) {
+	protected EclipseCompilerVirtualClassURLConnection(URL url,
+			EclipseCompilerScriptClassLoader cl) {
 		super(url);
 		BinaryClass bc = cl.getClassFileManager().getCompiledClasses()
 				.get(url.getHost());
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java
index 2270cd59d..43bc316b8 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java
@@ -27,7 +27,8 @@ import java.net.URLStreamHandler;
  * 
  * @author Rogiel
  */
-public class EclipseCompilerVirtualClassURLStreamHandler extends URLStreamHandler {
+public class EclipseCompilerVirtualClassURLStreamHandler extends
+		URLStreamHandler {
 
 	/**
 	 * Script Handler protocol for classes compiled from source
@@ -45,7 +46,8 @@ public class EclipseCompilerVirtualClassURLStreamHandler extends URLStreamHandle
 	 * @param cl
 	 *            ScriptClassLoaderImpl that was used to load compiled class
 	 */
-	public EclipseCompilerVirtualClassURLStreamHandler(EclipseCompilerScriptClassLoader cl) {
+	public EclipseCompilerVirtualClassURLStreamHandler(
+			EclipseCompilerScriptClassLoader cl) {
 		this.cl = cl;
 	}
 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java
index b73735abd..cbcd8829c 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java
@@ -190,7 +190,8 @@ public class EclipseScriptCompiler implements ScriptCompiler {
 			Iterable compilationUnits) {
 		List options = Arrays.asList("-encoding", "UTF-8", "-g");
 		DiagnosticListener listener = new ErrorListener();
-		EclipseCompilerClassFileManager manager = new EclipseCompilerClassFileManager(javaCompiler, listener);
+		EclipseCompilerClassFileManager manager = new EclipseCompilerClassFileManager(
+				javaCompiler, listener);
 		manager.setParentClassLoader(parentClassLoader);
 
 		if (libraries != null) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java
index d58697add..07601cada 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java
@@ -94,7 +94,8 @@ public class JDKScriptClassLoader extends ScriptClassLoader {
 	 * @param parent
 	 *            parent classLoader
 	 */
-	JDKScriptClassLoader(JDKClassFileManager classFileManager, ClassLoader parent) {
+	JDKScriptClassLoader(JDKClassFileManager classFileManager,
+			ClassLoader parent) {
 		super(new URL[] {}, parent);
 		this.classFileManager = classFileManager;
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java
index fb114aa38..e950bdda0 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java
@@ -189,7 +189,8 @@ public class JDKScriptCompiler implements ScriptCompiler {
 			Iterable compilationUnits) {
 		List options = Arrays.asList("-encoding", "UTF-8", "-g");
 		DiagnosticListener listener = new ErrorListener();
-		JDKClassFileManager manager = new JDKClassFileManager(javaCompiler, listener);
+		JDKClassFileManager manager = new JDKClassFileManager(javaCompiler,
+				listener);
 		manager.setParentClassLoader(parentClassLoader);
 
 		if (libraries != null) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java
index 6d4ee5ecd..78a7ef408 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java
@@ -79,7 +79,8 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
 	 */
 	@Inject
 	public SpawnServiceImpl(WorldService worldService,
-			WorldEventDispatcherService eventDispatcher, ThreadService threadService) {
+			WorldEventDispatcherService eventDispatcher,
+			ThreadService threadService) {
 		this.worldService = worldService;
 		this.eventDispatcher = eventDispatcher;
 		this.threadService = threadService;
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java
index c6d63a775..8ae20e3e7 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java
@@ -96,7 +96,7 @@ public interface WorldEventDispatcherService extends Service {
 	 *            the listener
 	 */
 	void removeListener(ObjectID id, WorldListener listener);
-	
+
 	/**
 	 * Removes all listeners from a given object
 	 * 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
index a656ddbeb..661381789 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java
@@ -56,7 +56,7 @@ public class RangeFilter implements WorldObjectFilter {
 	public boolean accept(PositionableObject other) {
 		if (other == null)
 			return false;
-		if(other.getPoint() == null)
+		if (other.getPoint() == null)
 			return false;
 
 		final double dx = FastMath.abs(object.getPoint().getX()
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java
index 2717dfd45..16a6f2546 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java
@@ -16,7 +16,6 @@
  */
 package com.l2jserver.service.network;
 
-
 import com.l2jserver.model.id.object.CharacterID;
 import com.l2jserver.model.world.L2Character;
 import com.l2jserver.service.Service;
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java
index a4d3bd3d9..869cc41a2 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java
@@ -39,16 +39,16 @@ public interface Lineage2Client {
 	 * @return the character
 	 */
 	boolean hasCharacter();
-	
+
 	/**
 	 * @return the character ID
 	 */
 	CharacterID getCharacterID();
-	
+
 	/**
 	 * @return the character
 	 */
-	L2Character getCharacter() ;
+	L2Character getCharacter();
 
 	/**
 	 * @param characterID
@@ -149,7 +149,7 @@ public interface Lineage2Client {
 	 *         has been written.
 	 */
 	ChannelFuture sendSystemMessage(SystemMessage message);
-	
+
 	/**
 	 * Sends a {@link SystemMessage} to this client
 	 * 
@@ -157,15 +157,14 @@ public interface Lineage2Client {
 	 *            the {@link SystemMessage}
 	 * @param args
 	 *            the arguments of the message, they will be automatically
-	 *            detected and inserted. See SM_SYSTEM_MESSAGE for more
-	 *            about supported formats.
+	 *            detected and inserted. See SM_SYSTEM_MESSAGE for
+	 *            more about supported formats.
 	 * @return the {@link ChannelFuture} that will be notified once the packet
 	 *         has been written.
 	 * @see SystemMessage
 	 */
-	ChannelFuture sendSystemMessage(SystemMessage message,
-			Object... args);
-	
+	ChannelFuture sendSystemMessage(SystemMessage message, Object... args);
+
 	/**
 	 * Sends a SM_ACTION_FAILED to the client.
 	 * 

@@ -178,9 +177,9 @@ public interface Lineage2Client {
 	ChannelFuture sendActionFailed();
 
 	/**
-	 * Sends a SM_HTML packet to the client. In the packet, the NPC will
-	 * be null. If you wish to send the HTML with an NPC, you should send the
-	 * packet directly.
+	 * Sends a SM_HTML packet to the client. In the packet, the NPC
+	 * will be null. If you wish to send the HTML with an NPC, you should send
+	 * the packet directly.
 	 * 

 	 * This is an convenience method for 

 	 * conn.write(new SM_HTML(null, template));

@@ -193,8 +192,9 @@ public interface Lineage2Client {
 	ChannelFuture sendHTML(HtmlTemplate template);
 
 	/**
-	 * Sends a SM_COMMUNITY_HTML packet to the client. HTML code is not
-	 * displayed in the regular chat window, they will appear in a large one.
+	 * Sends a SM_COMMUNITY_HTML packet to the client. HTML code is
+	 * not displayed in the regular chat window, they will appear in a large
+	 * one.
 	 * 

 	 * This is an convenience method for 

 	 * conn.write(new SM_COMMUNITY_HTML(template));

@@ -258,7 +258,7 @@ public interface Lineage2Client {
 	 * @return the {@link ChannelFuture}
 	 */
 	ChannelFuture close();
-	
+
 	@Override
 	String toString();
 }
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java
index d9fbef2f8..c4ef868dc 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java
@@ -16,7 +16,6 @@
  */
 package com.l2jserver.service.network.model;
 
-
 /**
  * @author Rogiel
  * 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java
index 3585dfa50..ab58ba1ff 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java
@@ -18,7 +18,6 @@ package com.l2jserver.util.geometry;
 
 import org.apache.commons.math.geometry.Vector3D;
 
-
 /**
  * Represents an coordinate in the game world.
  * 

diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java
index f5d8652db..14dbcffb9 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java
@@ -34,7 +34,7 @@ public class CharacterTemplateIDAdapter extends
 	 * The character template id provider
 	 */
 	private final CharacterTemplateIDProvider provider;
-	
+
 	/**
 	 * Used for template generator
 	 */
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java
index 95b0ec9e4..58f871d8a 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java
@@ -53,6 +53,7 @@ public class ScriptingServiceImplTest {
 
 	/**
 	 * Tests script loading
+	 * 
 	 * @throws Exception
 	 */
 	@Test
@@ -64,6 +65,7 @@ public class ScriptingServiceImplTest {
 
 	/**
 	 * Tests script instantiation
+	 * 
 	 * @throws Exception
 	 */
 	@Test
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java
index a35e3331f..16a728d91 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java
@@ -69,6 +69,7 @@ public class WorldEventDispatcherImplTest {
 
 	/**
 	 * Prepares the tests
+	 * 
 	 * @throws ServiceStartException
 	 */
 	@Before
@@ -90,6 +91,7 @@ public class WorldEventDispatcherImplTest {
 
 	/**
 	 * Test listenteners - mode 1
+	 * 
 	 * @throws InterruptedException
 	 */
 	@Test
@@ -135,6 +137,7 @@ public class WorldEventDispatcherImplTest {
 
 	/**
 	 * Test listeners - mode 2
+	 * 
 	 * @throws InterruptedException
 	 */
 	@Test
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java
index d188d387c..cbb9cfb7e 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java
@@ -409,6 +409,7 @@ public class FreyaLineage2Client implements Lineage2Client {
 		return (Lineage2PacketWriter) channel.getPipeline().get(
 				Lineage2PacketWriter.HANDLER_NAME);
 	}
+
 	@Override
 	public String toString() {
 		return "Lineage2Client [channel=" + channel + ", characterID="
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java
index c98693b0c..6f64db7ab 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java
@@ -77,9 +77,12 @@ public class CM_CHAR_ACTION extends AbstractClientPacket {
 	private CharacterAction action;
 
 	/**
-	 * @param idResolver the id resolver
-	 * @param npcService the npc service
-	 * @param itemService the item service
+	 * @param idResolver
+	 *            the id resolver
+	 * @param npcService
+	 *            the npc service
+	 * @param itemService
+	 *            the item service
 	 */
 	@Inject
 	public CM_CHAR_ACTION(ObjectIDResolver idResolver, NPCService npcService,
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java
index 57b1a9b3d..a4d58b604 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java
@@ -42,7 +42,8 @@ public class CM_CHAR_APPEARING extends AbstractClientPacket {
 	private final SpawnService spawnService;
 
 	/**
-	 * @param spawnService the spawn service
+	 * @param spawnService
+	 *            the spawn service
 	 */
 	@Inject
 	public CM_CHAR_APPEARING(SpawnService spawnService) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java
index 21ff1ca73..71facb75f 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java
@@ -127,7 +127,8 @@ public class CM_CHAR_ATTACK extends AbstractClientPacket {
 	 *            the object id resolver
 	 */
 	@Inject
-	public CM_CHAR_ATTACK(CharacterService charService, ObjectIDResolver idResolver) {
+	public CM_CHAR_ATTACK(CharacterService charService,
+			ObjectIDResolver idResolver) {
 		this.charService = charService;
 		this.idResolver = idResolver;
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java
index e7a41846f..4475d6dfd 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java
@@ -63,7 +63,8 @@ public class CM_CHAR_CHAT extends AbstractClientPacket {
 	private String target;
 
 	/**
-	 * @param chatService the chat service
+	 * @param chatService
+	 *            the chat service
 	 */
 	@Inject
 	public CM_CHAR_CHAT(ChatService chatService) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java
index 8ffd7de5c..fb7fce66f 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java
@@ -66,6 +66,7 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
 
 	/**
 	 * Defines the movement action type
+	 * 
 	 * @author Rogiel
 	 */
 	public enum MovementType {
@@ -84,14 +85,16 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
 		public final int id;
 
 		/**
-		 * @param id the type id
+		 * @param id
+		 *            the type id
 		 */
 		MovementType(int id) {
 			this.id = id;
 		}
 
 		/**
-		 * @param id the type id
+		 * @param id
+		 *            the type id
 		 * @return the {@link MovementType} represented by id
 		 */
 		public static MovementType fromID(int id) {
@@ -104,7 +107,8 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
 	}
 
 	/**
-	 * @param charService the character service
+	 * @param charService
+	 *            the character service
 	 */
 	@Inject
 	public CM_CHAR_MOVE(CharacterService charService) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java
index 761dcbbce..d5505c995 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java
@@ -51,7 +51,8 @@ public class CM_CHAR_POSITION extends AbstractClientPacket {
 	private int extra; // vehicle id
 
 	/**
-	 * @param charService the character service
+	 * @param charService
+	 *            the character service
 	 */
 	@Inject
 	public CM_CHAR_POSITION(CharacterService charService) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java
index d513fbe15..bf656a35d 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java
@@ -51,7 +51,8 @@ public class CM_CHAR_SELECT extends AbstractClientPacket {
 	private int slot;
 
 	/**
-	 * @param characterDao the character dao
+	 * @param characterDao
+	 *            the character dao
 	 */
 	@Inject
 	public CM_CHAR_SELECT(CharacterDAO characterDao) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
index 67b63a03c..4a01085d9 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
@@ -51,7 +51,8 @@ public class CM_ENTER_WORLD extends AbstractClientPacket {
 	private final CharacterService characterService;
 
 	/**
-	 * @param characterService the character service
+	 * @param characterService
+	 *            the character service
 	 */
 	@Inject
 	public CM_ENTER_WORLD(CharacterService characterService) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java
index 9a1df84bc..4a3b603d0 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java
@@ -53,7 +53,8 @@ public class CM_GG_KEY extends AbstractClientPacket {
 	private byte[] key = new byte[8];
 
 	/**
-	 * @param ggService the gameguard service
+	 * @param ggService
+	 *            the gameguard service
 	 */
 	@Inject
 	public CM_GG_KEY(GameGuardService ggService) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java
index bc3946627..10fe80e4e 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java
@@ -49,7 +49,8 @@ public class CM_GOTO_LOBBY extends AbstractClientPacket {
 	private final CharacterDAO characterDao;
 
 	/**
-	 * @param characterDao the character dao
+	 * @param characterDao
+	 *            the character dao
 	 */
 	@Inject
 	public CM_GOTO_LOBBY(CharacterDAO characterDao) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java
index 8d613df0f..f88d9c796 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java
@@ -97,7 +97,8 @@ public class CM_ITEM_DESTROY extends AbstractClientPacket {
 			} else {
 				conn.updateInventoryItems(item);
 			}
-		} catch (NotEnoughItemsServiceException | NonStackableItemsServiceException e) {
+		} catch (NotEnoughItemsServiceException
+				| NonStackableItemsServiceException e) {
 			conn.sendSystemMessage(SystemMessage.CANNOT_DISCARD_THIS_ITEM);
 		}
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java
index fb474f2e8..4cf7be88f 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java
@@ -119,7 +119,8 @@ public class CM_ITEM_DROP extends AbstractClientPacket {
 		} catch (ItemAlreadyOnGroundServiceException
 				| AlreadySpawnedServiceException
 				| SpawnPointNotFoundServiceException
-				| NotEnoughItemsServiceException | NonStackableItemsServiceException e) {
+				| NotEnoughItemsServiceException
+				| NonStackableItemsServiceException e) {
 			conn.sendActionFailed();
 		}
 	}
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
index 604e4dc35..8a5c2e687 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java
@@ -66,7 +66,8 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket {
 	private ProtocolVersion version;
 
 	/**
-	 * @param keygen the keygen service
+	 * @param keygen
+	 *            the keygen service
 	 */
 	@Inject
 	public CM_PROTOCOL_VERSION(BlowfishKeygenService keygen) {
@@ -84,7 +85,7 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket {
 		// generate a new key
 		final Lineage2CryptographyKey inKey = new Lineage2CryptographyKey(
 				keygen.generate());
-		
+
 		final FreyaLineage2Client client = (FreyaLineage2Client) conn;
 
 		client.getDecrypter().enable(inKey);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java
index 90e41a3c1..c28c307a2 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java
@@ -65,7 +65,8 @@ public class CM_REQUEST_CHAR_TEMPLATE extends AbstractClientPacket {
 	private final CharacterTemplateIDProvider idFactory;
 
 	/**
-	 * @param idFactory the character template id provider
+	 * @param idFactory
+	 *            the character template id provider
 	 */
 	@Inject
 	public CM_REQUEST_CHAR_TEMPLATE(CharacterTemplateIDProvider idFactory) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java
index 0b4a91d78..8d2aab37f 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java
@@ -49,8 +49,10 @@ public class CM_RESTART extends AbstractClientPacket {
 	private final CharacterDAO charDao;
 
 	/**
-	 * @param charService the character service
-	 * @param charDao the character dao
+	 * @param charService
+	 *            the character service
+	 * @param charDao
+	 *            the character dao
 	 */
 	@Inject
 	public CM_RESTART(CharacterService charService, CharacterDAO charDao) {
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java
index 3ed260050..c89149987 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java
@@ -55,11 +55,15 @@ public class SM_ACTOR_CHAT extends AbstractServerPacket {
 	private int messageID = 0;
 
 	/**
-	 * @param character the actor
-	 * @param destination the destination
-	 * @param message the message
+	 * @param character
+	 *            the actor
+	 * @param destination
+	 *            the destination
+	 * @param message
+	 *            the message
 	 */
-	public SM_ACTOR_CHAT(Actor character, ChatMessageType destination, String message) {
+	public SM_ACTOR_CHAT(Actor character, ChatMessageType destination,
+			String message) {
 		super(OPCODE);
 		this.actor = character;
 		this.destination = destination;
@@ -67,9 +71,12 @@ public class SM_ACTOR_CHAT extends AbstractServerPacket {
 	}
 
 	/**
-	 * @param actor the actor
-	 * @param destination the destination
-	 * @param messageID the message id
+	 * @param actor
+	 *            the actor
+	 * @param destination
+	 *            the destination
+	 * @param messageID
+	 *            the message id
 	 */
 	public SM_ACTOR_CHAT(Actor actor, ChatMessageType destination, int messageID) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java
index e679ddde6..18084872d 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java
@@ -46,8 +46,10 @@ public class SM_ACTOR_MOVE extends AbstractServerPacket {
 	private Coordinate target;
 
 	/**
-	 * @param actor the actor
-	 * @param target the target
+	 * @param actor
+	 *            the actor
+	 * @param target
+	 *            the target
 	 */
 	public SM_ACTOR_MOVE(Actor actor, Coordinate target) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java
index 75c948d27..de035bbd1 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java
@@ -40,7 +40,8 @@ public class SM_ACTOR_POSITION extends AbstractServerPacket {
 	private final Actor actor;
 
 	/**
-	 * @param actor the actor
+	 * @param actor
+	 *            the actor
 	 */
 	public SM_ACTOR_POSITION(Actor actor) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java
index b1f30ca92..07f8d7af3 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java
@@ -77,7 +77,8 @@ public class SM_CHAR_INFO extends AbstractServerPacket {
 	private L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_INFO(L2Character character) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java
index 2cb948568..bfd2ec4c0 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java
@@ -39,7 +39,8 @@ public class SM_CHAR_INFO_EXTRA extends AbstractServerPacket {
 	private L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_INFO_EXTRA(L2Character character) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java
index 7bf9efc4a..35a6ed700 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java
@@ -45,7 +45,8 @@ public class SM_CHAR_INVENTORY extends AbstractServerPacket {
 	private boolean showWindow = false;
 
 	/**
-	 * @param inventory the inventory
+	 * @param inventory
+	 *            the inventory
 	 */
 	public SM_CHAR_INVENTORY(CharacterInventory inventory) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java
index bb808c36f..57d98c63f 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java
@@ -39,7 +39,8 @@ public class SM_CHAR_MOVE_TYPE extends AbstractServerPacket {
 	private final L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_MOVE_TYPE(L2Character character) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java
index f668aad2c..e4ef557fa 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java
@@ -38,7 +38,8 @@ public class SM_CHAR_OPEN_MAP extends AbstractServerPacket {
 	private final int mapID;
 
 	/**
-	 * @param mapID the map id
+	 * @param mapID
+	 *            the map id
 	 */
 	public SM_CHAR_OPEN_MAP(int mapID) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java
index 8f4cce1c8..3cd443cd5 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java
@@ -42,7 +42,8 @@ public class SM_CHAR_SELECTED extends AbstractServerPacket {
 	private final L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_SELECTED(L2Character character) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java
index 34cab75b8..c122d8bf4 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java
@@ -39,7 +39,8 @@ public class SM_CHAR_STOP extends AbstractServerPacket {
 	private L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_STOP(L2Character character) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java
index 3f7370b49..91e454332 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java
@@ -40,7 +40,8 @@ public class SM_CHAR_TARGET_UNSELECT extends AbstractServerPacket {
 	private final L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_TARGET_UNSELECT(L2Character character) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java
index 0db79584f..43b2152d1 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java
@@ -45,8 +45,10 @@ public class SM_CHAR_TELEPORT extends AbstractServerPacket {
 	private final Point3D point;
 
 	/**
-	 * @param character the character
-	 * @param point the teleport point
+	 * @param character
+	 *            the character
+	 * @param point
+	 *            the teleport point
 	 */
 	public SM_CHAR_TELEPORT(L2Character character, Point3D point) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java
index 18b679b1d..7e8f81cd2 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java
@@ -42,7 +42,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
 	private final String html;
 
 	/**
-	 * @param html the html
+	 * @param html
+	 *            the html
 	 */
 	public SM_COMMUNITY_HTML(String html) {
 		super(OPCODE);
@@ -50,7 +51,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
 	}
 
 	/**
-	 * @param html the html
+	 * @param html
+	 *            the html
 	 */
 	public SM_COMMUNITY_HTML(Html html) {
 		super(OPCODE);
@@ -58,7 +60,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
 	}
 
 	/**
-	 * @param template the html template
+	 * @param template
+	 *            the html template
 	 */
 	public SM_COMMUNITY_HTML(HtmlTemplate template) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java
index df160af47..ef582527e 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java
@@ -38,7 +38,8 @@ public class SM_ITEM_GROUND extends AbstractServerPacket {
 	private final Item item;
 
 	/**
-	 * @param item the item that is on the ground
+	 * @param item
+	 *            the item that is on the ground
 	 */
 	public SM_ITEM_GROUND(Item item) {
 		super(OPCODE);
@@ -47,7 +48,8 @@ public class SM_ITEM_GROUND extends AbstractServerPacket {
 
 	@Override
 	public void write(Lineage2Client conn, ChannelBuffer buffer) {
-		buffer.writeInt((item.getOwnerID() != null ? item.getOwnerID().getID() : 0)); // char who dropped
+		buffer.writeInt((item.getOwnerID() != null ? item.getOwnerID().getID()
+				: 0)); // char who dropped
 		buffer.writeInt(item.getID().getID()); // item obj id
 		buffer.writeInt(item.getTemplateID().getID()); // item template id
 
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java
index 42cfa6257..7c92e5f91 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java
@@ -39,7 +39,8 @@ public class SM_MANOR_LIST extends AbstractServerPacket {
 	private String[] manors;
 
 	/**
-	 * @param manors the manors
+	 * @param manors
+	 *            the manors
 	 */
 	public SM_MANOR_LIST(String... manors) {
 		super(OPCODE);
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java
index 2e4c5fc5d..3196fc5aa 100755
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java
+++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java
@@ -55,7 +55,8 @@ public class SM_SERVER_OBJECT extends AbstractServerPacket {
 
 		buffer.writeInt(npc.getID().getID()); // obj id
 		buffer.writeInt(npc.getTemplateID().getID() + 1000000); // template id
-		BufferUtils.writeString(buffer, template.getInfo().getName().getValue()); // name
+		BufferUtils
+				.writeString(buffer, template.getInfo().getName().getValue()); // name
 		buffer.writeInt((template.getInfo().isAttackable() ? 0x01 : 0x00)); // attackable
 		buffer.writeInt(npc.getPoint().getX()); // x
 		buffer.writeInt(npc.getPoint().getY()); // y
@@ -65,7 +66,8 @@ public class SM_SERVER_OBJECT extends AbstractServerPacket {
 		buffer.writeDouble(0x01); // attack spd mult
 		buffer.writeDouble(template.getInfo().getCollision().getRadius());
 		buffer.writeDouble(template.getInfo().getCollision().getHeigth());
-		buffer.writeInt((int) (template.getInfo().isAttackable() ? npc.getHP() : 0x00));
+		buffer.writeInt((int) (template.getInfo().isAttackable() ? npc.getHP()
+				: 0x00));
 		buffer.writeInt((int) (template.getInfo().isAttackable() ? template
 				.getInfo().getStats().getHp() : 0x00));
 		buffer.writeInt(0x01); // object type
diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java
deleted file mode 100755
index 736436c3f..000000000
--- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This file is part of l2jserver2 .
- *
- * l2jserver2 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.
- *
- * l2jserver2 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 l2jserver2.  If not, see .
- */
-package com.l2jserver.service.network.gameguard;
-
-import java.util.concurrent.Future;
-
-import com.l2jserver.model.world.L2Character;
-import com.l2jserver.service.Service;
-import com.l2jserver.service.network.model.Lineage2Client;
-
-/**
- * This service is responsible for querying and validating GameGuard packets
- * 
- * @author Rogiel
- */
-public interface GameGuardService extends Service {
-	/**
-	 * Queries the client GameGuard for an response
-	 * 
-	 * @param character
-	 *            the lineage 2 character
-	 * @return an future that will be used to obtain validation status
-	 */
-	Future query(L2Character character);
-
-	/**
-	 * The Game guard key state
-	 * 
-	 * @author Rogiel
-	 */
-	public enum GameGuardResponse {
-		/**
-		 * Key is valid
-		 */
-		VALID,
-		/**
-		 * Key is not valid
-		 */
-		INVALID;
-	}
-
-	/**
-	 * Sets the game guard key for the given connection. Future will be notified
-	 * of the key state (valid or invalid).
-	 * 
-	 * @param conn
-	 *            the connection
-	 * @param key
-	 *            the key
-	 * @return the validation state
-	 */
-	GameGuardResponse key(Lineage2Client conn, byte[] key);
-}
diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java
index a81fc6bdd..5ddfab7f2 100644
--- a/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java
+++ b/l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java
@@ -88,7 +88,7 @@ public class NPCTemplateConverter {
 		Class.forName("com.mysql.jdbc.Driver");
 
 		final File target = new File("generated/template/npc");
-	
+
 		System.out.println("Scaning legacy HTML files...");
 		htmlScannedFiles = FileUtils.listFiles(L2J_HTML_FOLDER, new String[] {
 				"html", "htm" }, true);
@@ -131,15 +131,15 @@ public class NPCTemplateConverter {
 		}
 
 		System.out.println("Generating template XML files...");
-//		c.generateSchema(new SchemaOutputResolver() {
-//			@Override
-//			public Result createOutput(String namespaceUri,
-//					String suggestedFileName) throws IOException {
-//				// System.out.println(new File(target, suggestedFileName));
-//				// return null;
-//				return new StreamResult(new File(target, suggestedFileName));
-//			}
-//		});
+		// c.generateSchema(new SchemaOutputResolver() {
+		// @Override
+		// public Result createOutput(String namespaceUri,
+		// String suggestedFileName) throws IOException {
+		// // System.out.println(new File(target, suggestedFileName));
+		// // return null;
+		// return new StreamResult(new File(target, suggestedFileName));
+		// }
+		// });
 
 		try {
 			final Marshaller m = c.createMarshaller();
@@ -225,7 +225,7 @@ public class NPCTemplateConverter {
 
 		template.getInfo().setName(factory.createNPCTemplateInfoName());
 		template.getInfo().getName().setValue(rs.getString("name"));
-		//template.getInfo().getName().setDisplay(rs.getBoolean("show_name"));
+		// template.getInfo().getName().setDisplay(rs.getBoolean("show_name"));
 		template.getInfo().getName().setSend(rs.getBoolean("serverSideName"));
 
 		template.getInfo().setTitle(factory.createNPCTemplateInfoTitle());
@@ -243,9 +243,9 @@ public class NPCTemplateConverter {
 			template.getInfo().setSex(
 					ActorSex.valueOf(rs.getString("sex").toUpperCase()));
 		// template.info.attackable = rs.getBoolean("attackable");
-		//template.getInfo().setTargetable(rs.getBoolean("targetable"));
+		// template.getInfo().setTargetable(rs.getBoolean("targetable"));
 		template.getInfo().setTargetable(true);
-		//template.getInfo().setAggressive(rs.getBoolean("aggro"));
+		// template.getInfo().setAggressive(rs.getBoolean("aggro"));
 		template.getInfo().setAggressive(true);
 		template.getInfo().setAttackable(true); // FIXME
 
@@ -351,9 +351,9 @@ public class NPCTemplateConverter {
 		final ResultSet rs = st.getResultSet();
 		while (rs.next()) {
 			final Droplist.Item item = factory.createNPCTemplateDroplistItem();
-			item.setId( new ItemTemplateID(rs.getInt("itemId"), null));
+			item.setId(new ItemTemplateID(rs.getInt("itemId"), null));
 			item.setMin(rs.getInt("min"));
-			item.setMax( rs.getInt("max"));
+			item.setMax(rs.getInt("max"));
 			item.setChance(rs.getInt("chance"));
 			item.setCategory(getCategory(rs.getInt("category")));
 			drops.getItem().add(item);
@@ -363,7 +363,8 @@ public class NPCTemplateConverter {
 		return drops;
 	}
 
-	private static Talk fillHtmlChat(final ObjectFactory factory, int npcId) throws IOException {
+	private static Talk fillHtmlChat(final ObjectFactory factory, int npcId)
+			throws IOException {
 		final Talk talk = factory.createNPCTemplateTalk();
 		talk.setDefault("default");
 		for (final File file : htmlScannedFiles) {
@@ -389,8 +390,8 @@ public class NPCTemplateConverter {
 		return talk;
 	}
 
-	private static Skills fillSkillList(final ObjectFactory factory, ResultSet npcRs, int npcId)
-			throws SQLException {
+	private static Skills fillSkillList(final ObjectFactory factory,
+			ResultSet npcRs, int npcId) throws SQLException {
 		final Connection conn = npcRs.getStatement().getConnection();
 		final Skills skills = factory.createNPCTemplateSkills();
 
diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java
index 8f8bdd4b5..94fe7a9ec 100644
--- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java
+++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java
@@ -18,7 +18,6 @@ package com.l2jserver.tool;
 
 import com.l2jserver.model.template.character.CharacterClass;
 
-
 public class CharacterSQLEnumGenerator {
 	public static void main(String[] args) {
 		System.out.println("== 'Character' SQL STATEMENT ==");
diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java
index 61338a0fc..76d2f0bcc 100644
--- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java
+++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java
@@ -18,8 +18,6 @@ package com.l2jserver.tool;
 
 import com.l2jserver.model.template.character.CharacterClass;
 
-
-
 public class PacketSamuraiCharacterClassEnum {
 	public static void main(String[] args) {
 		System.out.println(createClassStatement());
diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java
index 4adfd8e39..278400562 100644
--- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java
+++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java
@@ -25,7 +25,8 @@ import com.l2jserver.service.network.model.SystemMessage;
 public class PacketSamuraiSystemMessageEnumGenerator {
 	public static void main(String[] args) throws IOException {
 		System.out.println(createClassStatement());
-		Files.write(Paths.get("generated", "SystemMessageEnum.txt"), createClassStatement().getBytes());
+		Files.write(Paths.get("generated", "SystemMessageEnum.txt"),
+				createClassStatement().getBytes());
 	}
 
 	private static String createClassStatement() {
diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java
index 7b2ce85ca..46806d698 100644
--- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java
+++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java
@@ -18,7 +18,6 @@ package com.l2jserver.tool.conversor.itemtemplate;
 
 import com.l2jserver.model.template.item.ItemMaterial;
 
-
 /**
  * @author Rogiel
  * 
diff --git a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java
index 41a972dcc..a8dffab7c 100644
--- a/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java
+++ b/l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java
@@ -18,7 +18,6 @@ package com.l2jserver.tool.conversor.itemtemplate;
 
 import com.l2jserver.model.template.item.ItemType;
 
-
 /**
  * @author Rogiel
  *