Signed-off-by: Rogiel <rogiel@rogiel.com>

data/script/ai/ai.xml

@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!--
+  ~ This file is part of l2jserver.
+  ~
+  ~ l2jserver 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.
+  ~
+  ~ l2jserver 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 l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<scriptlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../contexts.xsd">
+    <scriptinfo root="./data/script/ai"/>
+</scriptlist>

data/script/ai/script/AIInterest.java

@@ -0,0 +1,63 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver 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.
+ *
+ * l2jserver 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 l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package script;
+
+/**
+ * The {@link AIInterest} defines what the AI is interested in doing.
+ * 
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ */
+public enum AIInterest {
+	/**
+	 * Idle
+	 */
+	INTEREST_IDLE,
+	/**
+	 * Will scan for attackable targets, if mob is aggressive or if it is
+	 * aggrided.
+	 */
+	INTEREST_ACTIVE,
+	/**
+	 * Rest (sit until attacked)
+	 */
+	INTEREST_REST,
+	/**
+	 * Attack target (cast combat magic, go to target, combat), may be ignored,
+	 * if target is locked on another character or a peacefull zone and so on
+	 */
+	INTEREST_ATTACK,
+	/**
+	 * Cast a spell, depending on the spell - may start or stop attacking
+	 */
+	INTEREST_CAST,
+	/**
+	 * Just move to another location
+	 */
+	INTEREST_MOVE_TO,
+	/**
+	 * Like move, but check target's movement and follow it
+	 */
+	INTEREST_FOLLOW,
+	/**
+	 * PickUp and item, (got to item, pickup it, become idle
+	 */
+	INTEREST_PICK_UP,
+	/**
+	 * Move to target, then interact
+	 */
+	INTEREST_INTERACT;
+}

data/script/ai/script/AIScriptFactory.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver 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.
+ *
+ * l2jserver 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 l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package script;
+
+import script.ai.CharacterAI;
+
+import com.google.inject.Inject;
+import com.l2jserver.game.net.Lineage2Connection;
+import com.l2jserver.model.id.object.CharacterID;
+import com.l2jserver.model.world.L2Character;
+import com.l2jserver.model.world.WorldObject;
+import com.l2jserver.service.game.ai.AIScript;
+import com.l2jserver.service.game.world.event.WorldEventDispatcher;
+import com.l2jserver.service.network.NetworkService;
+
+/**
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ */
+public class AIScriptFactory {
+	private final WorldEventDispatcher eventDispatcher;
+	private final NetworkService networkService;
+
+	@Inject
+	public AIScriptFactory(WorldEventDispatcher eventDispatcher,
+			NetworkService networkService) {
+		this.eventDispatcher = eventDispatcher;
+		this.networkService = networkService;
+	}
+
+	public AIScript create(WorldObject object) {
+		if (object instanceof L2Character) {
+			final Lineage2Connection conn = networkService
+					.discover((CharacterID) object.getID());
+			return new CharacterAI((L2Character) object, conn, eventDispatcher);
+		}
+		return null;
+	}
+}

data/script/ai/script/ai/CharacterAI.java

@@ -0,0 +1,128 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver 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.
+ *
+ * l2jserver 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 l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package script.ai;
+
+import script.AIInterest;
+
+import com.l2jserver.game.net.Lineage2Connection;
+import com.l2jserver.game.net.packet.server.ActorMovementPacket;
+import com.l2jserver.model.world.L2Character;
+import com.l2jserver.model.world.capability.Attackable;
+import com.l2jserver.model.world.capability.Positionable;
+import com.l2jserver.model.world.character.event.CharacterMoveEvent;
+import com.l2jserver.service.game.ai.AIScript;
+import com.l2jserver.service.game.ai.script.AttackAIScript;
+import com.l2jserver.service.game.ai.script.WalkingAIScript;
+import com.l2jserver.service.game.world.WorldService;
+import com.l2jserver.service.game.world.event.WorldEventDispatcher;
+import com.l2jserver.util.dimensional.Coordinate;
+
+/**
+ * This {@link AIScript} is for {@link L2Character} object instances
+ * 
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ */
+public class CharacterAI implements AIScript, WalkingAIScript, AttackAIScript {
+	/**
+	 * The {@link L2Character} being controlled by this AI
+	 */
+	private final L2Character character;
+	/**
+	 * The {@link Lineage2Connection} instance for this character
+	 */
+	private final Lineage2Connection conn;
+	/**
+	 * The {@link WorldService} event dispatcher
+	 */
+	private final WorldEventDispatcher eventDispatcher;
+	/**
+	 * The AI interest
+	 */
+	private AIInterest interest;
+
+	// walking
+	/**
+	 * Walking destination coordinate
+	 */
+	private Coordinate coordinate;
+
+	public CharacterAI(L2Character character, Lineage2Connection conn,
+			WorldEventDispatcher eventDispatcher) {
+		this.character = character;
+		this.conn = conn;
+		this.eventDispatcher = eventDispatcher;
+	}
+
+	@Override
+	public void start() {
+		// TODO implement listener
+	}
+
+	@Override
+	public void run(double time) {
+		if (interest == AIInterest.INTEREST_IDLE)
+			return;
+
+		switch (interest) {
+		case INTEREST_MOVE_TO:
+			final Coordinate source = character.getPosition();
+			character.setPosition(coordinate);
+			conn.write(new ActorMovementPacket(character, source));
+			eventDispatcher.dispatch(new CharacterMoveEvent(character,
+					coordinate.toPoint()));
+			// double speed = character.getAttributes().getMoveSpeed();
+			// double move = time * speed;
+			// // Calculate movement angles needed
+			// final double distance = coordinate.getDistance(character
+			// .getPosition());
+			// final int dy = coordinate.getY() - character.getPoint().getY();
+			// final int dx = coordinate.getX() - character.getPoint().getX();
+			//
+			// double sin = dy / distance;
+			// double cos = dx / distance;
+			//
+			// double angleTarget = Math.toDegrees(Math.atan2(sin, cos));
+			// if (angleTarget < 0)
+			// angleTarget = 360 + angleTarget;
+			// final int angle = (int) (angleTarget * 182.044444444);
+			this.interest = AIInterest.INTEREST_IDLE;
+			break;
+		default:
+			break;
+		}
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void walk(Coordinate coordinate) {
+		this.interest = AIInterest.INTEREST_MOVE_TO;
+		this.coordinate = coordinate;
+	}
+
+	@Override
+	public void follow(Positionable positionable) {
+	}
+
+	@Override
+	public void attack(Attackable target) {
+	}
+}

data/script/ai/script/ai/scanner/AIScanner.java

@@ -0,0 +1,25 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver 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.
+ *
+ * l2jserver 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 l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package script.ai.scanner;
+
+/**
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ *
+ */
+public interface AIScanner {
+
+}

data/script/template/script/template/actor/character/AbstractCharacterTemplate.java

@@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point;
 
 public abstract class AbstractCharacterTemplate extends CharacterTemplate {
 	protected AbstractCharacterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, maxWeigth, moveSpeed,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AbstractDarkElfCharacterTemplate.java

@@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point;
 public abstract class AbstractDarkElfCharacterTemplate extends
 		AbstractCharacterTemplate {
 	protected AbstractDarkElfCharacterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				false, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AbstractDwarfCharacterTemplate.java

@@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point;
 public abstract class AbstractDwarfCharacterTemplate extends
 		AbstractCharacterTemplate {
 	protected AbstractDwarfCharacterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				false, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AbstractElfCharacterTemplate.java

@@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point;
 public abstract class AbstractElfCharacterTemplate extends
 		AbstractCharacterTemplate {
 	protected AbstractElfCharacterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				false, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AbstractHumanCharacterTemplate.java

@@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point;
 public abstract class AbstractHumanCharacterTemplate extends
 		AbstractCharacterTemplate {
 	protected AbstractHumanCharacterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				false, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AbstractKamaelCharacterTemplate.java

@@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point;
 public abstract class AbstractKamaelCharacterTemplate extends
 		AbstractCharacterTemplate {
 	protected AbstractKamaelCharacterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				false, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AbstractOrcCharacterTemplate.java

@@ -24,17 +24,8 @@ import com.l2jserver.util.dimensional.Point;
 public abstract class AbstractOrcCharacterTemplate extends
 		AbstractCharacterTemplate {
 	protected AbstractOrcCharacterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				false, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AbyssWalkerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class AbyssWalkerTemplate extends AssassinTemplate {
 	@Inject
 	public AbyssWalkerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ABYSS_WALKER.id),
+		super(factory.createID(CharacterClass.ABYSS_WALKER.id), CharacterClass.ABYSS_WALKER,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.ABYSS_WALKER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected AbyssWalkerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AdventurerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class AdventurerTemplate extends TreasureHunterTemplate {
 	@Inject
 	public AdventurerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ADVENTURER.id),
+		super(factory.createID(CharacterClass.ADVENTURER.id), CharacterClass.ADVENTURER,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.ADVENTURER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected AdventurerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ArbalesterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ArbalesterTemplate extends WarderTemplate {
 	@Inject
 	public ArbalesterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ARBALESTER.id),
+		super(factory.createID(CharacterClass.ARBALESTER.id), CharacterClass.ARBALESTER,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.ARBALESTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 28;
-				28,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 30;
-				30,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected ArbalesterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ArcanaLordTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ArcanaLordTemplate extends WarlockTemplate {
 	@Inject
 	public ArcanaLordTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ARCANA_LORD.id),
+		super(factory.createID(CharacterClass.ARCANA_LORD.id), CharacterClass.ARCANA_LORD,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.ARCANA_LORD,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected ArcanaLordTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ArchmageTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ArchmageTemplate extends SorcerorTemplate {
 	@Inject
 	public ArchmageTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ARCHMAGE.id),
+		super(factory.createID(CharacterClass.ARCHMAGE.id), CharacterClass.ARCHMAGE,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.ARCHMAGE,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected ArchmageTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ArtisanTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ArtisanTemplate extends DwarvenFighterTemplate {
 	@Inject
 	public ArtisanTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ARTISAN.id),
+		super(factory.createID(CharacterClass.ARTISAN.id), CharacterClass.ARTISAN,	Point.fromXYZ(108512, -174026, -400));
-				CharacterClass.ARTISAN,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 20;
-				20,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 45;
-				45,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 29;
-				29,// DEX
+		attributes.witness = 10;
-				10,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 43;
-				43,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 83000;
-				83000,// max inventory weight
+		attributes.craft = true;
-				true,// can craft
-				Point.fromXYZ(108512, -174026, -400)// spawn location
-		);
 	}
 	
 	protected ArtisanTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/AssassinTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class AssassinTemplate extends DarkFighterTemplate {
 	@Inject
 	public AssassinTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ASSASSIN.id),
+		super(factory.createID(CharacterClass.ASSASSIN.id), CharacterClass.ASSASSIN,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.ASSASSIN,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected AssassinTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/BersekerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class BersekerTemplate extends TrooperTemplate {
 	@Inject
 	public BersekerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.BERSEKER.id),
+		super(factory.createID(CharacterClass.BERSEKER.id), CharacterClass.BERSEKER,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.BERSEKER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 29;
-				29,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 33;
-				33,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected BersekerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/BishopTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class BishopTemplate extends ClericTemplate {
 	@Inject
 	public BishopTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.BISHOP.id),
+		super(factory.createID(CharacterClass.BISHOP.id), CharacterClass.BISHOP,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.BISHOP,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected BishopTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/BladedancerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class BladedancerTemplate extends PalusKnightTemplate {
 	@Inject
 	public BladedancerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.BLADEDANCER.id),
+		super(factory.createID(CharacterClass.BLADEDANCER.id), CharacterClass.BLADEDANCER,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.BLADEDANCER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected BladedancerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/BountyHunterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class BountyHunterTemplate extends ScavengerTemplate {
 	@Inject
 	public BountyHunterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.BOUNTY_HUNTER.id),
+		super(factory.createID(CharacterClass.BOUNTY_HUNTER.id), CharacterClass.BOUNTY_HUNTER,	Point.fromXYZ(108512, -174026, -400));
-				CharacterClass.BOUNTY_HUNTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 20;
-				20,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 45;
-				45,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 29;
-				29,// DEX
+		attributes.witness = 10;
-				10,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 43;
-				43,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 83000;
-				83000,// max inventory weight
+		attributes.craft = true;
-				true,// can craft
-				Point.fromXYZ(108512, -174026, -400)// spawn location
-		);
 	}
 	
 	protected BountyHunterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/CardinalTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class CardinalTemplate extends BishopTemplate {
 	@Inject
 	public CardinalTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.CARDINAL.id),
+		super(factory.createID(CharacterClass.CARDINAL.id), CharacterClass.CARDINAL,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.CARDINAL,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected CardinalTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ClericTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ClericTemplate extends HumanMysticTemplate {
 	@Inject
 	public ClericTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.CLERIC.id),
+		super(factory.createID(CharacterClass.CLERIC.id), CharacterClass.CLERIC,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.CLERIC,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected ClericTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DarkAvengerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DarkAvengerTemplate extends KnightTemplate {
 	@Inject
 	public DarkAvengerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DARK_AVENGER.id),
+		super(factory.createID(CharacterClass.DARK_AVENGER.id), CharacterClass.DARK_AVENGER,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.DARK_AVENGER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected DarkAvengerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DarkFighterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DarkFighterTemplate extends AbstractDarkElfCharacterTemplate {
 	@Inject
 	public DarkFighterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DARK_FIGHTER.id),
+		super(factory.createID(CharacterClass.DARK_FIGHTER.id), CharacterClass.DARK_FIGHTER,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.DARK_FIGHTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected DarkFighterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DarkMysticTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DarkMysticTemplate extends AbstractDarkElfCharacterTemplate {
 	@Inject
 	public DarkMysticTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DARK_MYSTIC.id),
+		super(factory.createID(CharacterClass.DARK_MYSTIC.id), CharacterClass.DARK_MYSTIC,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.DARK_MYSTIC,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected DarkMysticTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DarkWizardTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DarkWizardTemplate extends DarkMysticTemplate {
 	@Inject
 	public DarkWizardTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DARK_WIZARD.id),
+		super(factory.createID(CharacterClass.DARK_WIZARD.id), CharacterClass.DARK_WIZARD,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.DARK_WIZARD,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected DarkWizardTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DestroyerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DestroyerTemplate extends OrcRaiderTemplate {
 	@Inject
 	public DestroyerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DESTROYER.id),
+		super(factory.createID(CharacterClass.DESTROYER.id), CharacterClass.DESTROYER,	Point.fromXYZ(-56693, -113610, -690));
-				CharacterClass.DESTROYER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 18;
-				18,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 47;
-				47,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 26;
-				26,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 31;
-				31,// accuracy
+		attributes.criticalChance = 42;
-				42,// critical
+		attributes.evasionChance = 31;
-				31,// evasion
+		attributes.moveSpeed = 117;
-				117,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56693, -113610, -690)// spawn location
-		);
 	}
 	
 	protected DestroyerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DominatorTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DominatorTemplate extends OverlordTemplate {
 	@Inject
 	public DominatorTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DOMINATOR.id),
+		super(factory.createID(CharacterClass.DOMINATOR.id), CharacterClass.DOMINATOR,	Point.fromXYZ(-56682, -113730, -690));
-				CharacterClass.DOMINATOR,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 31;
-				31,// INT
+		attributes.strength = 27;
-				27,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 42;
-				42,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 15;
-				15,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 121;
-				121,// move speed
+		attributes.maxWeigth = 68000;
-				68000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56682, -113730, -690)// spawn location
-		);
 	}
 	
 	protected DominatorTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DoombringerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DoombringerTemplate extends BersekerTemplate {
 	@Inject
 	public DoombringerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DOOMBRINGER.id),
+		super(factory.createID(CharacterClass.DOOMBRINGER.id), CharacterClass.DOOMBRINGER,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.DOOMBRINGER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 29;
-				29,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 33;
-				33,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected DoombringerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DoomcryerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DoomcryerTemplate extends WarcryerTemplate {
 	@Inject
 	public DoomcryerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DOOMCRYER.id),
+		super(factory.createID(CharacterClass.DOOMCRYER.id), CharacterClass.DOOMCRYER,	Point.fromXYZ(-56682, -113730, -690));
-				CharacterClass.DOOMCRYER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 31;
-				31,// INT
+		attributes.strength = 27;
-				27,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 42;
-				42,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 15;
-				15,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 121;
-				121,// move speed
+		attributes.maxWeigth = 68000;
-				68000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56682, -113730, -690)// spawn location
-		);
 	}
 	
 	protected DoomcryerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DreadnoughtTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DreadnoughtTemplate extends WarlordTemplate {
 	@Inject
 	public DreadnoughtTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DREADNOUGHT.id),
+		super(factory.createID(CharacterClass.DREADNOUGHT.id), CharacterClass.DREADNOUGHT,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.DREADNOUGHT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected DreadnoughtTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DuelistTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DuelistTemplate extends GladiatorTemplate {
 	@Inject
 	public DuelistTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DUELIST.id),
+		super(factory.createID(CharacterClass.DUELIST.id), CharacterClass.DUELIST,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.DUELIST,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected DuelistTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/DwarvenFighterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class DwarvenFighterTemplate extends AbstractDwarfCharacterTemplate {
 	@Inject
 	public DwarvenFighterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.DWARVEN_FIGHTER.id),
+		super(factory.createID(CharacterClass.DWARVEN_FIGHTER.id), CharacterClass.DWARVEN_FIGHTER,	Point.fromXYZ(108512, -174026, -400));
-				CharacterClass.DWARVEN_FIGHTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 20;
-				20,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 45;
-				45,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 29;
-				29,// DEX
+		attributes.witness = 10;
-				10,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 43;
-				43,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 83000;
-				83000,// max inventory weight
+		attributes.craft = true;
-				true,// can craft
-				Point.fromXYZ(108512, -174026, -400)// spawn location
-		);
 	}
 	
 	protected DwarvenFighterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElderTemplate.java

@@ -26,42 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElderTemplate extends OracleTemplate {
 	@Inject
 	public ElderTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELDER.id), CharacterClass.ELDER,
+		super(factory.createID(CharacterClass.ELDER.id), CharacterClass.ELDER,	Point.fromXYZ(46182, 41198, -3440));
 		// ATTRIBUTES
-				37,// INT
+		attributes.intelligence = 37;
-				21,// STR
+		attributes.strength = 21;
-				25,// CON
+		attributes.concentration = 25;
-				40,// MEN
+		attributes.mentality = 40;
-				24,// DEX
+		attributes.dexterity = 24;
-				23,// WIT
+		attributes.witness = 23;
-				3,// physical attack
+		attributes.physicalAttack = 3;
-				6,// magical attack
+		attributes.magicalAttack = 6;
-				54,// physical def
+		attributes.physicalDefense = 54;
-				41,// magical def
+		attributes.magicalDefense = 41;
-				300,// attack speed
+		attributes.attackSpeed = 300;
-				333,// cast speed
+		attributes.castSpeed = 333;
-				30,// accuracy
+		attributes.accuracy = 30;
-				41,// critical
+		attributes.criticalChance = 41;
-				30,// evasion
+		attributes.evasionChance = 30;
-				122,// move speed
+		attributes.moveSpeed = 122;
-				62400,// max inventory weight
+		attributes.maxWeigth = 62400;
-				false,// can craft
+		attributes.craft = false;
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected ElderTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElementalMasterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElementalMasterTemplate extends ElementalSummonerTemplate {
 	@Inject
 	public ElementalMasterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELEMENTAL_MASTER.id),
+		super(factory.createID(CharacterClass.ELEMENTAL_MASTER.id), CharacterClass.ELEMENTAL_MASTER,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.ELEMENTAL_MASTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected ElementalMasterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElementalSummonerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElementalSummonerTemplate extends ElvenWizardTemplate {
 	@Inject
 	public ElementalSummonerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELEMENTAL_SUMMONER.id),
+		super(factory.createID(CharacterClass.ELEMENTAL_SUMMONER.id), CharacterClass.ELEMENTAL_SUMMONER,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.ELEMENTAL_SUMMONER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected ElementalSummonerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElvenFighterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElvenFighterTemplate extends AbstractElfCharacterTemplate {
 	@Inject
 	public ElvenFighterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELVEN_FIGHTER.id),
+		super(factory.createID(CharacterClass.ELVEN_FIGHTER.id), CharacterClass.ELVEN_FIGHTER,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.ELVEN_FIGHTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected ElvenFighterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElvenKnightTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElvenKnightTemplate extends ElvenFighterTemplate {
 	@Inject
 	public ElvenKnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELVEN_KNIGHT.id),
+		super(factory.createID(CharacterClass.ELVEN_KNIGHT.id), CharacterClass.ELVEN_KNIGHT,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.ELVEN_KNIGHT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected ElvenKnightTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElvenMysticTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElvenMysticTemplate extends AbstractElfCharacterTemplate {
 	@Inject
 	public ElvenMysticTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELVEN_MYSTIC.id),
+		super(factory.createID(CharacterClass.ELVEN_MYSTIC.id), CharacterClass.ELVEN_MYSTIC,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.ELVEN_MYSTIC,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected ElvenMysticTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElvenScoutTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElvenScoutTemplate extends ElvenFighterTemplate {
 	@Inject
 	public ElvenScoutTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELVEN_SCOUT.id),
+		super(factory.createID(CharacterClass.ELVEN_SCOUT.id), CharacterClass.ELVEN_SCOUT,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.ELVEN_SCOUT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected ElvenScoutTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ElvenWizardTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ElvenWizardTemplate extends ElvenMysticTemplate {
 	@Inject
 	public ElvenWizardTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ELVEN_WIZARD.id),
+		super(factory.createID(CharacterClass.ELVEN_WIZARD.id), CharacterClass.ELVEN_WIZARD,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.ELVEN_WIZARD,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected ElvenWizardTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/EvaSaintTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class EvaSaintTemplate extends ElderTemplate {
 	@Inject
 	public EvaSaintTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.EVA_SAINT.id),
+		super(factory.createID(CharacterClass.EVA_SAINT.id), CharacterClass.EVA_SAINT,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.EVA_SAINT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected EvaSaintTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/EvaTemplarTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class EvaTemplarTemplate extends TempleKnightTemplate {
 	@Inject
 	public EvaTemplarTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.EVA_TEMPLAR.id),
+		super(factory.createID(CharacterClass.EVA_TEMPLAR.id), CharacterClass.EVA_TEMPLAR,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.EVA_TEMPLAR,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected EvaTemplarTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/FemaleSoldierTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class FemaleSoldierTemplate extends AbstractKamaelCharacterTemplate {
 	@Inject
 	public FemaleSoldierTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.FEMALE_SOLDIER.id),
+		super(factory.createID(CharacterClass.FEMALE_SOLDIER.id), CharacterClass.FEMALE_SOLDIER,	Point.fromXYZ(-125517, 38267, 1176));
-				CharacterClass.FEMALE_SOLDIER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 28;
-				28,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 30;
-				30,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125517, 38267, 1176)// spawn location
-		);
 	}
 	
 	protected FemaleSoldierTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/FemaleSoulbreakerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class FemaleSoulbreakerTemplate extends WarderTemplate {
 	@Inject
 	public FemaleSoulbreakerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.FEMALE_SOULBREAKER.id),
+		super(factory.createID(CharacterClass.FEMALE_SOULBREAKER.id), CharacterClass.FEMALE_SOULBREAKER,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.FEMALE_SOULBREAKER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 28;
-				28,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 30;
-				30,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected FemaleSoulbreakerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/FemaleSouldhoundTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class FemaleSouldhoundTemplate extends FemaleSoulbreakerTemplate {
 	@Inject
 	public FemaleSouldhoundTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.FEMALE_SOULDHOUND.id),
+		super(factory.createID(CharacterClass.FEMALE_SOULDHOUND.id), CharacterClass.FEMALE_SOULDHOUND,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.FEMALE_SOULDHOUND,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 28;
-				28,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 30;
-				30,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected FemaleSouldhoundTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/FortuneSeekerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class FortuneSeekerTemplate extends BountyHunterTemplate {
 	@Inject
 	public FortuneSeekerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.FORTUNE_SEEKER.id),
+		super(factory.createID(CharacterClass.FORTUNE_SEEKER.id), CharacterClass.FORTUNE_SEEKER,	Point.fromXYZ(108512, -174026, -400));
-				CharacterClass.FORTUNE_SEEKER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 20;
-				20,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 45;
-				45,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 29;
-				29,// DEX
+		attributes.witness = 10;
-				10,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 43;
-				43,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 83000;
-				83000,// max inventory weight
+		attributes.craft = true;
-				true,// can craft
-				Point.fromXYZ(108512, -174026, -400)// spawn location
-		);
 	}
 	
 	protected FortuneSeekerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/GhostHunterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class GhostHunterTemplate extends AbyssWalkerTemplate {
 	@Inject
 	public GhostHunterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.GHOST_HUNTER.id),
+		super(factory.createID(CharacterClass.GHOST_HUNTER.id), CharacterClass.GHOST_HUNTER,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.GHOST_HUNTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected GhostHunterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/GhostSentinelTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class GhostSentinelTemplate extends PhantomRangerTemplate {
 	@Inject
 	public GhostSentinelTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.GHOST_SENTINEL.id),
+		super(factory.createID(CharacterClass.GHOST_SENTINEL.id), CharacterClass.GHOST_SENTINEL,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.GHOST_SENTINEL,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected GhostSentinelTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/GladiatorTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class GladiatorTemplate extends WarriorTemplate {
 	@Inject
 	public GladiatorTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.GLADIATOR.id),
+		super(factory.createID(CharacterClass.GLADIATOR.id), CharacterClass.GLADIATOR,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.GLADIATOR,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected GladiatorTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/GrandKhauatariTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class GrandKhauatariTemplate extends TyrantTemplate {
 	@Inject
 	public GrandKhauatariTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.GRAND_KHAUATARI.id),
+		super(factory.createID(CharacterClass.GRAND_KHAUATARI.id), CharacterClass.GRAND_KHAUATARI,	Point.fromXYZ(-56693, -113610, -690));
-				CharacterClass.GRAND_KHAUATARI,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 18;
-				18,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 47;
-				47,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 26;
-				26,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 31;
-				31,// accuracy
+		attributes.criticalChance = 42;
-				42,// critical
+		attributes.evasionChance = 31;
-				31,// evasion
+		attributes.moveSpeed = 117;
-				117,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56693, -113610, -690)// spawn location
-		);
 	}
 	
 	protected GrandKhauatariTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/HawkeyeTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class HawkeyeTemplate extends RogueTemplate {
 	@Inject
 	public HawkeyeTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.HAWKEYE.id),
+		super(factory.createID(CharacterClass.HAWKEYE.id), CharacterClass.HAWKEYE,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.HAWKEYE,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected HawkeyeTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/HellKnightTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class HellKnightTemplate extends DarkAvengerTemplate {
 	@Inject
 	public HellKnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.HELL_KNIGHT.id),
+		super(factory.createID(CharacterClass.HELL_KNIGHT.id), CharacterClass.HELL_KNIGHT,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.HELL_KNIGHT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected HellKnightTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/HierophantTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class HierophantTemplate extends ProphetTemplate {
 	@Inject
 	public HierophantTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.HIEROPHANT.id),
+		super(factory.createID(CharacterClass.HIEROPHANT.id), CharacterClass.HIEROPHANT,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.HIEROPHANT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected HierophantTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/HumanFighterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class HumanFighterTemplate extends AbstractHumanCharacterTemplate {
 	@Inject
 	public HumanFighterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.HUMAN_FIGHTER.id),
+		super(factory.createID(CharacterClass.HUMAN_FIGHTER.id), CharacterClass.HUMAN_FIGHTER,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.HUMAN_FIGHTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected HumanFighterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/HumanMysticTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class HumanMysticTemplate extends AbstractHumanCharacterTemplate {
 	@Inject
 	public HumanMysticTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.HUMAN_MYSTIC.id),
+		super(factory.createID(CharacterClass.HUMAN_MYSTIC.id), CharacterClass.HUMAN_MYSTIC,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.HUMAN_MYSTIC,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected HumanMysticTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/InspectorTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class InspectorTemplate extends WarderTemplate {
 	@Inject
 	public InspectorTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.INSPECTOR.id),
+		super(factory.createID(CharacterClass.INSPECTOR.id), CharacterClass.INSPECTOR,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.INSPECTOR,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 28;
-				28,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 30;
-				30,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected InspectorTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/JudicatorTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class JudicatorTemplate extends InspectorTemplate {
 	@Inject
 	public JudicatorTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.JUDICATOR.id),
+		super(factory.createID(CharacterClass.JUDICATOR.id), CharacterClass.JUDICATOR,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.JUDICATOR,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 28;
-				28,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 30;
-				30,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected JudicatorTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/KnightTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class KnightTemplate extends HumanFighterTemplate {
 	@Inject
 	public KnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.KNIGHT.id),
+		super(factory.createID(CharacterClass.KNIGHT.id), CharacterClass.KNIGHT,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.KNIGHT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected KnightTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/MaestroTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class MaestroTemplate extends WarsmithTemplate {
 	@Inject
 	public MaestroTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.MAESTRO.id),
+		super(factory.createID(CharacterClass.MAESTRO.id), CharacterClass.MAESTRO,	Point.fromXYZ(108512, -174026, -400));
-				CharacterClass.MAESTRO,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 20;
-				20,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 45;
-				45,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 29;
-				29,// DEX
+		attributes.witness = 10;
-				10,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 43;
-				43,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 83000;
-				83000,// max inventory weight
+		attributes.craft = true;
-				true,// can craft
-				Point.fromXYZ(108512, -174026, -400)// spawn location
-		);
 	}
 	
 	protected MaestroTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/MaleSoldierTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class MaleSoldierTemplate extends AbstractKamaelCharacterTemplate {
 	@Inject
 	public MaleSoldierTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.MALE_SOLDIER.id),
+		super(factory.createID(CharacterClass.MALE_SOLDIER.id), CharacterClass.MALE_SOLDIER,	Point.fromXYZ(-125464, 37776, 1176));
-				CharacterClass.MALE_SOLDIER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 29;
-				29,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 33;
-				33,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125464, 37776, 1176)// spawn location
-		);
 	}
 	
 	protected MaleSoldierTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/MaleSoulbreakerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class MaleSoulbreakerTemplate extends TrooperTemplate {
 	@Inject
 	public MaleSoulbreakerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.MALE_SOULBREAKER.id),
+		super(factory.createID(CharacterClass.MALE_SOULBREAKER.id), CharacterClass.MALE_SOULBREAKER,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.MALE_SOULBREAKER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 29;
-				29,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 33;
-				33,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected MaleSoulbreakerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/MaleSouldhoundTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class MaleSouldhoundTemplate extends MaleSoulbreakerTemplate {
 	@Inject
 	public MaleSouldhoundTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.MALE_SOULDHOUND.id),
+		super(factory.createID(CharacterClass.MALE_SOULDHOUND.id), CharacterClass.MALE_SOULDHOUND,	Point.fromXYZ(-125533, 38114, 1142));
-				CharacterClass.MALE_SOULDHOUND,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 29;
-				29,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 33;
-				33,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-125533, 38114, 1142)// spawn location
-		);
 	}
 	
 	protected MaleSouldhoundTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/MoonlightSentinelTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class MoonlightSentinelTemplate extends SilverRangerTemplate {
 	@Inject
 	public MoonlightSentinelTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.MOONLIGHT_SENTINEL.id),
+		super(factory.createID(CharacterClass.MOONLIGHT_SENTINEL.id), CharacterClass.MOONLIGHT_SENTINEL,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.MOONLIGHT_SENTINEL,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected MoonlightSentinelTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/MysticMuseTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class MysticMuseTemplate extends SpellsingerTemplate {
 	@Inject
 	public MysticMuseTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.MYSTIC_MUSE.id),
+		super(factory.createID(CharacterClass.MYSTIC_MUSE.id), CharacterClass.MYSTIC_MUSE,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.MYSTIC_MUSE,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected MysticMuseTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/NecromancerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class NecromancerTemplate extends WizardTemplate {
 	@Inject
 	public NecromancerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.NECROMANCER.id),
+		super(factory.createID(CharacterClass.NECROMANCER.id), CharacterClass.NECROMANCER,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.NECROMANCER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected NecromancerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/OracleTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class OracleTemplate extends ElvenMysticTemplate {
 	@Inject
 	public OracleTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ORACLE.id),
+		super(factory.createID(CharacterClass.ORACLE.id), CharacterClass.ORACLE,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.ORACLE,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected OracleTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/OrcFighterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class OrcFighterTemplate extends AbstractOrcCharacterTemplate {
 	@Inject
 	public OrcFighterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ORC_FIGHTER.id),
+		super(factory.createID(CharacterClass.ORC_FIGHTER.id), CharacterClass.ORC_FIGHTER,	Point.fromXYZ(-56693, -113610, -690));
-				CharacterClass.ORC_FIGHTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 18;
-				18,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 47;
-				47,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 26;
-				26,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 31;
-				31,// accuracy
+		attributes.criticalChance = 42;
-				42,// critical
+		attributes.evasionChance = 31;
-				31,// evasion
+		attributes.moveSpeed = 117;
-				117,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56693, -113610, -690)// spawn location
-		);
 	}
 	
 	protected OrcFighterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/OrcMonkTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class OrcMonkTemplate extends OrcFighterTemplate {
 	@Inject
 	public OrcMonkTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ORC_MONK.id),
+		super(factory.createID(CharacterClass.ORC_MONK.id), CharacterClass.ORC_MONK,	Point.fromXYZ(-56682, -113610, -690));
-				CharacterClass.ORC_MONK,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 18;
-				18,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 47;
-				47,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 26;
-				26,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 31;
-				31,// accuracy
+		attributes.criticalChance = 42;
-				42,// critical
+		attributes.evasionChance = 31;
-				31,// evasion
+		attributes.moveSpeed = 117;
-				117,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56682, -113610, -690)// spawn location
-		);
 	}
 	
 	protected OrcMonkTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/OrcMysticTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class OrcMysticTemplate extends AbstractOrcCharacterTemplate {
 	@Inject
 	public OrcMysticTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ORC_MYSTIC.id),
+		super(factory.createID(CharacterClass.ORC_MYSTIC.id), CharacterClass.ORC_MYSTIC,	Point.fromXYZ(-56682, -113730, -690));
-				CharacterClass.ORC_MYSTIC,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 31;
-				31,// INT
+		attributes.strength = 27;
-				27,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 42;
-				42,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 15;
-				15,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 121;
-				121,// move speed
+		attributes.maxWeigth = 68000;
-				68000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56682, -113730, -690)// spawn location
-		);
 	}
 	
 	protected OrcMysticTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/OrcRaiderTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class OrcRaiderTemplate extends OrcFighterTemplate {
 	@Inject
 	public OrcRaiderTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ORC_RAIDER.id),
+		super(factory.createID(CharacterClass.ORC_RAIDER.id), CharacterClass.ORC_RAIDER,	Point.fromXYZ(-56693, -113610, -690));
-				CharacterClass.ORC_RAIDER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 18;
-				18,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 47;
-				47,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 26;
-				26,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 31;
-				31,// accuracy
+		attributes.criticalChance = 42;
-				42,// critical
+		attributes.evasionChance = 31;
-				31,// evasion
+		attributes.moveSpeed = 117;
-				117,// move speed
+		attributes.maxWeigth = 87000;
-				87000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56693, -113610, -690)// spawn location
-		);
 	}
 	
 	protected OrcRaiderTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/OrcShamanTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class OrcShamanTemplate extends OrcMysticTemplate {
 	@Inject
 	public OrcShamanTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ORC_SHAMAN.id),
+		super(factory.createID(CharacterClass.ORC_SHAMAN.id), CharacterClass.ORC_SHAMAN,	Point.fromXYZ(-56682, -113730, -690));
-				CharacterClass.ORC_SHAMAN,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 31;
-				31,// INT
+		attributes.strength = 27;
-				27,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 42;
-				42,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 15;
-				15,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 121;
-				121,// move speed
+		attributes.maxWeigth = 68000;
-				68000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56682, -113730, -690)// spawn location
-		);
 	}
 	
 	protected OrcShamanTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/OverlordTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class OverlordTemplate extends OrcShamanTemplate {
 	@Inject
 	public OverlordTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.OVERLORD.id),
+		super(factory.createID(CharacterClass.OVERLORD.id), CharacterClass.OVERLORD,	Point.fromXYZ(-56682, -113730, -690));
-				CharacterClass.OVERLORD,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 31;
-				31,// INT
+		attributes.strength = 27;
-				27,// STR
+		attributes.concentration = 31;
-				31,// CON
+		attributes.mentality = 42;
-				42,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 15;
-				15,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 121;
-				121,// move speed
+		attributes.maxWeigth = 68000;
-				68000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-56682, -113730, -690)// spawn location
-		);
 	}
 	
 	protected OverlordTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/PaladinTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class PaladinTemplate extends KnightTemplate {
 	@Inject
 	public PaladinTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.PALADIN.id),
+		super(factory.createID(CharacterClass.PALADIN.id), CharacterClass.PALADIN,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.PALADIN,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected PaladinTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/PalusKnightTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class PalusKnightTemplate extends DarkFighterTemplate {
 	@Inject
 	public PalusKnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.PALUS_KNIGHT.id),
+		super(factory.createID(CharacterClass.PALUS_KNIGHT.id), CharacterClass.PALUS_KNIGHT,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.PALUS_KNIGHT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected PalusKnightTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/PhantomRangerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class PhantomRangerTemplate extends AssassinTemplate {
 	@Inject
 	public PhantomRangerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.PHANTOM_RANGER.id),
+		super(factory.createID(CharacterClass.PHANTOM_RANGER.id), CharacterClass.PHANTOM_RANGER,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.PHANTOM_RANGER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected PhantomRangerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/PhantomSummonerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class PhantomSummonerTemplate extends DarkWizardTemplate {
 	@Inject
 	public PhantomSummonerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.PHANTOM_SUMMONER.id),
+		super(factory.createID(CharacterClass.PHANTOM_SUMMONER.id), CharacterClass.PHANTOM_SUMMONER,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.PHANTOM_SUMMONER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected PhantomSummonerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/PhoenixKnightTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class PhoenixKnightTemplate extends PaladinTemplate {
 	@Inject
 	public PhoenixKnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.PHOENIX_KNIGHT.id),
+		super(factory.createID(CharacterClass.PHOENIX_KNIGHT.id), CharacterClass.PHOENIX_KNIGHT,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.PHOENIX_KNIGHT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected PhoenixKnightTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/PlainsWalkerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class PlainsWalkerTemplate extends ElvenScoutTemplate {
 	@Inject
 	public PlainsWalkerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.PLAINS_WALKER.id),
+		super(factory.createID(CharacterClass.PLAINS_WALKER.id), CharacterClass.PLAINS_WALKER,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.PLAINS_WALKER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected PlainsWalkerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ProphetTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ProphetTemplate extends ClericTemplate {
 	@Inject
 	public ProphetTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.PROPHET.id),
+		super(factory.createID(CharacterClass.PROPHET.id), CharacterClass.PROPHET,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.PROPHET,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected ProphetTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/RogueTemplate.java

@@ -26,42 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class RogueTemplate extends HumanFighterTemplate {
 	@Inject
 	public RogueTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.ROGUE.id), CharacterClass.ROGUE,
+		super(factory.createID(CharacterClass.ROGUE.id), CharacterClass.ROGUE,	Point.fromXYZ(-71338, 258271, -3104));
 		// ATTRIBUTES
-				21,// INT
+		attributes.intelligence = 21;
-				40,// STR
+		attributes.strength = 40;
-				43,// CON
+		attributes.concentration = 43;
-				25,// MEN
+		attributes.mentality = 25;
-				30,// DEX
+		attributes.dexterity = 30;
-				11,// WIT
+		attributes.witness = 11;
-				4,// physical attack
+		attributes.physicalAttack = 4;
-				6,// magical attack
+		attributes.magicalAttack = 6;
-				80,// physical def
+		attributes.physicalDefense = 80;
-				41,// magical def
+		attributes.magicalDefense = 41;
-				300,// attack speed
+		attributes.attackSpeed = 300;
-				333,// cast speed
+		attributes.castSpeed = 333;
-				33,// accuracy
+		attributes.accuracy = 33;
-				44,// critical
+		attributes.criticalChance = 44;
-				33,// evasion
+		attributes.evasionChance = 33;
-				115,// move speed
+		attributes.moveSpeed = 115;
-				81900,// max inventory weight
+		attributes.maxWeigth = 81900;
-				false,// can craft
+		attributes.craft = false;
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected RogueTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SagittariusTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SagittariusTemplate extends HawkeyeTemplate {
 	@Inject
 	public SagittariusTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SAGITTARIUS.id),
+		super(factory.createID(CharacterClass.SAGITTARIUS.id), CharacterClass.SAGITTARIUS,	Point.fromXYZ(-71338, 258271, -3104));
-				CharacterClass.SAGITTARIUS,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 21;
-				21,// INT
+		attributes.strength = 40;
-				40,// STR
+		attributes.concentration = 43;
-				43,// CON
+		attributes.mentality = 25;
-				25,// MEN
+		attributes.dexterity = 30;
-				30,// DEX
+		attributes.witness = 11;
-				11,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 44;
-				44,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 81900;
-				81900,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-71338, 258271, -3104)// spawn location
-		);
 	}
 	
 	protected SagittariusTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ScavengerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ScavengerTemplate extends DwarvenFighterTemplate {
 	@Inject
 	public ScavengerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SCAVENGER.id),
+		super(factory.createID(CharacterClass.SCAVENGER.id), CharacterClass.SCAVENGER,	Point.fromXYZ(108512, -174026, -400));
-				CharacterClass.SCAVENGER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 20;
-				20,// INT
+		attributes.strength = 39;
-				39,// STR
+		attributes.concentration = 45;
-				45,// CON
+		attributes.mentality = 27;
-				27,// MEN
+		attributes.dexterity = 29;
-				29,// DEX
+		attributes.witness = 10;
-				10,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 33;
-				33,// accuracy
+		attributes.criticalChance = 43;
-				43,// critical
+		attributes.evasionChance = 33;
-				33,// evasion
+		attributes.moveSpeed = 115;
-				115,// move speed
+		attributes.maxWeigth = 83000;
-				83000,// max inventory weight
+		attributes.craft = true;
-				true,// can craft
-				Point.fromXYZ(108512, -174026, -400)// spawn location
-		);
 	}
 	
 	protected ScavengerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ShillieanSaintTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ShillieanSaintTemplate extends ShillienElderTemplate {
 	@Inject
 	public ShillieanSaintTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SHILLIEAN_SAINT.id),
+		super(factory.createID(CharacterClass.SHILLIEAN_SAINT.id), CharacterClass.SHILLIEAN_SAINT,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.SHILLIEAN_SAINT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected ShillieanSaintTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ShillienElderTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ShillienElderTemplate extends ShillienOracleTemplate {
 	@Inject
 	public ShillienElderTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SHILLIEN_ELDER.id),
+		super(factory.createID(CharacterClass.SHILLIEN_ELDER.id), CharacterClass.SHILLIEN_ELDER,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.SHILLIEN_ELDER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected ShillienElderTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ShillienKnightTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ShillienKnightTemplate extends PalusKnightTemplate {
 	@Inject
 	public ShillienKnightTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SHILLIEN_KNIGHT.id),
+		super(factory.createID(CharacterClass.SHILLIEN_KNIGHT.id), CharacterClass.SHILLIEN_KNIGHT,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.SHILLIEN_KNIGHT,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected ShillienKnightTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ShillienOracleTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ShillienOracleTemplate extends DarkMysticTemplate {
 	@Inject
 	public ShillienOracleTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SHILLIEN_ORACLE.id),
+		super(factory.createID(CharacterClass.SHILLIEN_ORACLE.id), CharacterClass.SHILLIEN_ORACLE,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.SHILLIEN_ORACLE,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected ShillienOracleTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/ShillienTemplarTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class ShillienTemplarTemplate extends ShillienKnightTemplate {
 	@Inject
 	public ShillienTemplarTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SHILLIEN_TEMPLAR.id),
+		super(factory.createID(CharacterClass.SHILLIEN_TEMPLAR.id), CharacterClass.SHILLIEN_TEMPLAR,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.SHILLIEN_TEMPLAR,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected ShillienTemplarTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SilverRangerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SilverRangerTemplate extends ElvenScoutTemplate {
 	@Inject
 	public SilverRangerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SILVER_RANGER.id),
+		super(factory.createID(CharacterClass.SILVER_RANGER.id), CharacterClass.SILVER_RANGER,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.SILVER_RANGER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected SilverRangerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SorcerorTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SorcerorTemplate extends WizardTemplate {
 	@Inject
 	public SorcerorTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SORCEROR.id),
+		super(factory.createID(CharacterClass.SORCEROR.id), CharacterClass.SORCEROR,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.SORCEROR,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected SorcerorTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SoultakerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SoultakerTemplate extends NecromancerTemplate {
 	@Inject
 	public SoultakerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SOULTAKER.id),
+		super(factory.createID(CharacterClass.SOULTAKER.id), CharacterClass.SOULTAKER,	Point.fromXYZ(-90890, 248027, -3570));
-				CharacterClass.SOULTAKER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 41;
-				41,// INT
+		attributes.strength = 22;
-				22,// STR
+		attributes.concentration = 27;
-				27,// CON
+		attributes.mentality = 39;
-				39,// MEN
+		attributes.dexterity = 21;
-				21,// DEX
+		attributes.witness = 20;
-				20,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 28;
-				28,// accuracy
+		attributes.criticalChance = 40;
-				40,// critical
+		attributes.evasionChance = 28;
-				28,// evasion
+		attributes.moveSpeed = 120;
-				120,// move speed
+		attributes.maxWeigth = 62500;
-				62500,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(-90890, 248027, -3570)// spawn location
-		);
 	}
 	
 	protected SoultakerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SpectralMasterTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SpectralMasterTemplate extends PhantomSummonerTemplate {
 	@Inject
 	public SpectralMasterTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SPECTRAL_MASTER.id),
+		super(factory.createID(CharacterClass.SPECTRAL_MASTER.id), CharacterClass.SPECTRAL_MASTER,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.SPECTRAL_MASTER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected SpectralMasterTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SpectraldancerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SpectraldancerTemplate extends BladedancerTemplate {
 	@Inject
 	public SpectraldancerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.spectralDancer.id),
+		super(factory.createID(CharacterClass.spectralDancer.id), CharacterClass.spectralDancer,	Point.fromXYZ(28377, 10916, -4224));
-				CharacterClass.spectralDancer,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 25;
-				25,// INT
+		attributes.strength = 41;
-				41,// STR
+		attributes.concentration = 32;
-				32,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 34;
-				34,// DEX
+		attributes.witness = 12;
-				12,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 35;
-				35,// accuracy
+		attributes.criticalChance = 45;
-				45,// critical
+		attributes.evasionChance = 35;
-				35,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 69000;
-				69000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28377, 10916, -4224)// spawn location
-		);
 	}
 	
 	protected SpectraldancerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SpellhowlerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SpellhowlerTemplate extends DarkWizardTemplate {
 	@Inject
 	public SpellhowlerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SPELLHOWLER.id),
+		super(factory.createID(CharacterClass.SPELLHOWLER.id), CharacterClass.SPELLHOWLER,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.SPELLHOWLER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected SpellhowlerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SpellsingerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SpellsingerTemplate extends ElvenWizardTemplate {
 	@Inject
 	public SpellsingerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SPELLSINGER.id),
+		super(factory.createID(CharacterClass.SPELLSINGER.id), CharacterClass.SPELLSINGER,	Point.fromXYZ(46182, 41198, -3440));
-				CharacterClass.SPELLSINGER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 37;
-				37,// INT
+		attributes.strength = 21;
-				21,// STR
+		attributes.concentration = 25;
-				25,// CON
+		attributes.mentality = 40;
-				40,// MEN
+		attributes.dexterity = 24;
-				24,// DEX
+		attributes.witness = 23;
-				23,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 30;
-				30,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 30;
-				30,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 62400;
-				62400,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(46182, 41198, -3440)// spawn location
-		);
 	}
 	
 	protected SpellsingerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/StormScreamerTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class StormScreamerTemplate extends SpellhowlerTemplate {
 	@Inject
 	public StormScreamerTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.STORM_SCREAMER.id),
+		super(factory.createID(CharacterClass.STORM_SCREAMER.id), CharacterClass.STORM_SCREAMER,	Point.fromXYZ(28295, 11063, -4224));
-				CharacterClass.STORM_SCREAMER,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 44;
-				44,// INT
+		attributes.strength = 23;
-				23,// STR
+		attributes.concentration = 24;
-				24,// CON
+		attributes.mentality = 37;
-				37,// MEN
+		attributes.dexterity = 23;
-				23,// DEX
+		attributes.witness = 19;
-				19,// WIT
+		attributes.physicalAttack = 3;
-				3,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 54;
-				54,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 29;
-				29,// accuracy
+		attributes.criticalChance = 41;
-				41,// critical
+		attributes.evasionChance = 29;
-				29,// evasion
+		attributes.moveSpeed = 122;
-				122,// move speed
+		attributes.maxWeigth = 61000;
-				61000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(28295, 11063, -4224)// spawn location
-		);
 	}
 	
 	protected StormScreamerTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override

data/script/template/script/template/actor/character/SwordMuseTemplate.java

@@ -26,43 +26,31 @@ import com.l2jserver.util.dimensional.Point;
 public class SwordMuseTemplate extends SwordSingerTemplate {
 	@Inject
 	public SwordMuseTemplate(CharacterTemplateIDFactory factory) {
-		super(factory.createID(CharacterClass.SWORD_MUSE.id),
+		super(factory.createID(CharacterClass.SWORD_MUSE.id), CharacterClass.SWORD_MUSE,	Point.fromXYZ(45978, 41196, -3440));
-				CharacterClass.SWORD_MUSE,
+		// ATTRIBUTES
-				// ATTRIBUTES
+		attributes.intelligence = 23;
-				23,// INT
+		attributes.strength = 36;
-				36,// STR
+		attributes.concentration = 36;
-				36,// CON
+		attributes.mentality = 26;
-				26,// MEN
+		attributes.dexterity = 35;
-				35,// DEX
+		attributes.witness = 14;
-				14,// WIT
+		attributes.physicalAttack = 4;
-				4,// physical attack
+		attributes.magicalAttack = 6;
-				6,// magical attack
+		attributes.physicalDefense = 80;
-				80,// physical def
+		attributes.magicalDefense = 41;
-				41,// magical def
+		attributes.attackSpeed = 300;
-				300,// attack speed
+		attributes.castSpeed = 333;
-				333,// cast speed
+		attributes.accuracy = 36;
-				36,// accuracy
+		attributes.criticalChance = 46;
-				46,// critical
+		attributes.evasionChance = 36;
-				36,// evasion
+		attributes.moveSpeed = 125;
-				125,// move speed
+		attributes.maxWeigth = 73000;
-				73000,// max inventory weight
+		attributes.craft = false;
-				false,// can craft
-				Point.fromXYZ(45978, 41196, -3440)// spawn location
-		);
 	}
 	
 	protected SwordMuseTemplate(CharacterTemplateID id,
-			CharacterClass characterClass, int intelligence, int strength,
+			CharacterClass characterClass, Point spawnLocation) {
-			int concentration, int mentality, int dexterity, int witness,
+		super(id, characterClass, spawnLocation);
-			int physicalAttack, int magicalAttack, int physicalDefense,
-			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
-			int criticalChance, int evasionChance, int moveSpeed,
-			int maxWeigth, boolean craft, Point spawnLocation) {
-		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dexterity, witness, physicalAttack, magicalAttack,
-				physicalDefense, magicalDefense, attackSpeed, castSpeed,
-				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
-				craft, spawnLocation);
 	}
 
 	@Override