Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-11 09:42:54 +00:00
Code Releases Activity

Java side template changes

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-06-03 15:57:08 -03:00
parent 4d6289b12c
commit 5990a97dfd
27 changed files with 500 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/l2jserver/model/world/Actor.java
View File

@@ -19,6 +19,7 @@ package com.l2jserver.model.world;
import com.l2jserver.model.id.object.ActorID;
import com.l2jserver.model.id.template.ActorTemplateID;
import com.l2jserver.model.template.ActorTemplate;
import com.l2jserver.model.template.actor.ActorSex;
import com.l2jserver.model.world.actor.ActorEffects;
import com.l2jserver.model.world.actor.ActorSkillContainer;
import com.l2jserver.model.world.actor.stat.ActorStats;
@@ -36,30 +37,6 @@ public abstract class Actor extends PositionableObject {
*/
protected ActorSex sex;
/**
* Represent the sex of an actor.
* <p>
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public enum ActorSex {
MALE(0x00), FEMALE(0x01);
public final int option;
ActorSex(int option) {
this.option = option;
}
public static ActorSex fromOption(int option) {
for (ActorSex sex : values()) {
if (sex.option == option)
return sex;
}
return null;
}
}
/**
* The actor level
*/

37
src/main/java/com/l2jserver/model/world/L2Character.java
View File

@@ -25,8 +25,9 @@ import com.l2jserver.model.id.object.ClanID;
import com.l2jserver.model.id.object.PetID;
import com.l2jserver.model.id.template.CharacterTemplateID;
import com.l2jserver.model.template.CharacterTemplate;
import com.l2jserver.model.template.character.CharacterClass;
import com.l2jserver.model.template.character.CharacterRace;
import com.l2jserver.model.world.character.CharacterAppearance;
import com.l2jserver.model.world.character.CharacterClass;
import com.l2jserver.model.world.character.CharacterFriendList;
import com.l2jserver.model.world.character.CharacterInventory;
import com.l2jserver.model.world.character.CharacterShortcutContainer;
@@ -57,40 +58,6 @@ public class L2Character extends Player {
*/
protected CharacterRace race;
/**
* Represents the character race.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public enum CharacterRace {
HUMAN(0x00), ELF(0x01), DARK_ELF(0x02), ORC(0x03), DWARF(0x04), KAMAEL(
0x05);
/**
* The numeric ID representing this race
*/
public final int id;
CharacterRace(int id) {
this.id = id;
}
/**
* Finds the race based on the <tt>id</tt>
*
* @param id
* the id
* @return the race constant
*/
public static CharacterRace fromOption(int id) {
for (final CharacterRace race : values()) {
if (race.id == id)
return race;
}
return null;
}
}
/**
* This character's inventory
*/

1
src/main/java/com/l2jserver/model/world/NPC.java
View File

@@ -20,6 +20,7 @@ import com.l2jserver.model.id.TemplateID;
import com.l2jserver.model.id.object.NPCID;
import com.l2jserver.model.id.template.NPCTemplateID;
import com.l2jserver.model.template.NPCTemplate;
import com.l2jserver.model.template.actor.ActorSex;
import com.l2jserver.model.world.npc.NPCStats;
import com.l2jserver.service.game.ai.AIScript;

2
src/main/java/com/l2jserver/model/world/actor/ActorSkillContainer.java
View File

@@ -124,7 +124,7 @@ public class ActorSkillContainer implements Iterable<Skill> {
*/
public Skill hasSkill(SkillTemplateID skillTemplate) {
for (final Skill skill : this.skills) {
if (skill.getSkillTemplateID().equals(skillTemplate))
if (skill.getTemplateID().equals(skillTemplate))
return skill;
}
return null;

321
src/main/java/com/l2jserver/model/world/character/CharacterClass.java
View File

@@ -1,321 +0,0 @@
/*
* 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 com.l2jserver.model.world.character;
import com.l2jserver.model.world.L2Character.CharacterRace;
/**
* Defines all the possible classes for an character
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public enum CharacterClass {
/**
* Human fighter
*/
HUMAN_FIGHTER(0x00, ClassType.FIGHTER, CharacterRace.HUMAN), WARRIOR(0x01,
HUMAN_FIGHTER), GLADIATOR(0x02, WARRIOR), WARLORD(0x03, WARRIOR), KNIGHT(
0x04, HUMAN_FIGHTER), PALADIN(0x05, KNIGHT), DARK_AVENGER(0x06,
KNIGHT), ROGUE(0x07, HUMAN_FIGHTER), TREASURE_HUNTER(0x08, ROGUE), HAWKEYE(
0x09, ROGUE), DUELIST(0x58, GLADIATOR), DREADNOUGHT(0x59, WARLORD), PHOENIX_KNIGHT(
0x5a, PALADIN), HELL_KNIGHT(0x5b, DARK_AVENGER), SAGITTARIUS(0x5c,
HAWKEYE), ADVENTURER(0x5d, TREASURE_HUNTER),
/**
* Human mystic
*/
HUMAN_MYSTIC(0x0a, ClassType.MYSTIC, CharacterRace.HUMAN), WIZARD(0x0b,
HUMAN_MYSTIC), SORCEROR(0x0c, WIZARD), NECROMANCER(0x0d, WIZARD), WARLOCK(
0x0e, true, WIZARD), CLERIC(0x0f, ClassType.PRIEST, HUMAN_MYSTIC), BISHOP(
0x10, CLERIC), PROPHET(0x11, CLERIC), ARCHMAGE(0x5e, SORCEROR), SOULTAKER(
0x5f, NECROMANCER), ARCANA_LORD(0x60, WARLOCK), CARDINAL(0x61,
BISHOP), HIEROPHANT(0x62, PROPHET),
/**
* Elven fighter
*/
ELVEN_FIGHTER(0x12, ClassType.FIGHTER, CharacterRace.ELF), ELVEN_KNIGHT(0x13,
ELVEN_FIGHTER), TEMPLE_KNIGHT(0x14, ELVEN_KNIGHT), SWORD_SINGER(
0x15, ELVEN_KNIGHT), ELVEN_SCOUT(0x16, ELVEN_FIGHTER), PLAINS_WALKER(
0x17, ELVEN_SCOUT), SILVER_RANGER(0x18, ELVEN_SCOUT), EVA_TEMPLAR(
0x63, TEMPLE_KNIGHT), SWORD_MUSE(0x64, SWORD_SINGER), WIND_RIDER(
0x65, PLAINS_WALKER), MOONLIGHT_SENTINEL(0x66, SILVER_RANGER),
/**
* Elven mystic
*/
ELVEN_MYSTIC(0x19, ClassType.MYSTIC, CharacterRace.ELF), ELVEN_WIZARD(0x1a,
ELVEN_MYSTIC), SPELLSINGER(0x1b, ELVEN_WIZARD), ELEMENTAL_SUMMONER(
0x1c, true, ELVEN_WIZARD), ORACLE(0x1d, ClassType.PRIEST,
ELVEN_MYSTIC), ELDER(0x1e, ORACLE), MYSTIC_MUSE(0x67, SPELLSINGER), ELEMENTAL_MASTER(
0x68, ELEMENTAL_SUMMONER), EVA_SAINT(0x69, ELDER),
/**
* Dark elf fighter
*/
DARK_FIGHTER(0x1f, ClassType.FIGHTER, CharacterRace.DARK_ELF), PALUS_KNIGHT(
0x20, DARK_FIGHTER), SHILLIEN_KNIGHT(0x21, PALUS_KNIGHT), BLADEDANCER(
0x22, PALUS_KNIGHT), ASSASSIN(0x23, DARK_FIGHTER), ABYSS_WALKER(
0x24, ASSASSIN), PHANTOM_RANGER(0x25, ASSASSIN), SHILLIEN_TEMPLAR(
0x6a, SHILLIEN_KNIGHT), spectralDancer(0x6b, BLADEDANCER), GHOST_HUNTER(
0x6c, ABYSS_WALKER), GHOST_SENTINEL(0x6d, PHANTOM_RANGER),
/**
* Dark elf mystic
*/
DARK_MYSTIC(0x26, ClassType.MYSTIC, CharacterRace.DARK_ELF), DARK_WIZARD(0x27,
DARK_MYSTIC), SPELLHOWLER(0x28, DARK_WIZARD), PHANTOM_SUMMONER(
0x29, true, DARK_WIZARD), SHILLIEN_ORACLE(0x2a, ClassType.PRIEST,
DARK_MYSTIC), SHILLIEN_ELDER(0x2b, SHILLIEN_ORACLE), STORM_SCREAMER(
0x6e, SPELLHOWLER), SPECTRAL_MASTER(0x6f, PHANTOM_SUMMONER), SHILLIEAN_SAINT(
0x70, SHILLIEN_ELDER),
/**
* Orc fighter
*/
ORC_FIGHTER(0x2c, ClassType.FIGHTER, CharacterRace.ORC), ORC_RAIDER(0x2d,
ORC_FIGHTER), DESTROYER(0x2e, ORC_RAIDER), ORC_MONK(0x2f,
ORC_FIGHTER), TYRANT(0x30, ORC_RAIDER), TITAN(0x71, DESTROYER), GRAND_KHAUATARI(
0x72, TYRANT),
/**
* Orc mystic
*/
ORC_MYSTIC(0x31, ClassType.FIGHTER, CharacterRace.ORC), ORC_SHAMAN(0x32,
ClassType.MYSTIC, ORC_MYSTIC), OVERLORD(0x33, ORC_SHAMAN), WARCRYER(
0x34, ORC_SHAMAN), DOMINATOR(0x73, OVERLORD), DOOMCRYER(0x74,
WARCRYER),
/**
* Dwarf fighter
*/
DWARVEN_FIGHTER(0x35, ClassType.FIGHTER, CharacterRace.DWARF), SCAVENGER(0x36,
DWARVEN_FIGHTER), BOUNTY_HUNTER(0x37, SCAVENGER), ARTISAN(0x38,
DWARVEN_FIGHTER), WARSMITH(0x39, ARTISAN), FORTUNE_SEEKER(0x75,
BOUNTY_HUNTER), MAESTRO(0x76, WARSMITH),
/**
* Kamael male soldier
*/
MALE_SOLDIER(0x7b, ClassType.FIGHTER, CharacterRace.KAMAEL), TROOPER(0x7D,
MALE_SOLDIER), BERSEKER(0x7F, TROOPER), MALE_SOULBREAKER(0x80,
TROOPER), DOOMBRINGER(0x83, BERSEKER), MALE_SOULDHOUND(0x84,
MALE_SOULBREAKER),
/**
* Kamael female soldier
*/
FEMALE_SOLDIER(0x7C, ClassType.FIGHTER, CharacterRace.KAMAEL), WARDER(0x7E,
FEMALE_SOLDIER), FEMALE_SOULBREAKER(0x81, WARDER), ARBALESTER(0x82,
WARDER), FEMALE_SOULDHOUND(0x85, FEMALE_SOULBREAKER), TRICKSTER(
0x86, ARBALESTER), INSPECTOR(0x87, WARDER), JUDICATOR(0x88,
INSPECTOR),
// DUMMY ENTRIES, TRASH
DUMMY_ENTRY_1(58, null, false, null, null), DUMMY_ENTRY_2(59, null, false,
null, null), DUMMY_ENTRY_3(60, null, false, null, null), DUMMY_ENTRY_4(
61, null, false, null, null), DUMMY_ENTRY_5(62, null, false, null,
null), DUMMY_ENTRY_6(63, null, false, null, null), DUMMY_ENTRY_7(
64, null, false, null, null), DUMMY_ENTRY_8(65, null, false, null,
null), DUMMY_ENTRY_9(66, null, false, null, null), DUMMY_ENTRY_10(
67, null, false, null, null), DUMMY_ENTRY_11(68, null, false, null,
null), DUMMY_ENTRY_12(69, null, false, null, null), DUMMY_ENTRY_13(
70, null, false, null, null), DUMMY_ENTRY_14(71, null, false, null,
null), DUMMY_ENTRY_15(72, null, false, null, null), DUMMY_ENTRY_16(
73, null, false, null, null), DUMMY_ENTRY_17(74, null, false, null,
null), DUMMY_ENTRY_18(75, null, false, null, null), DUMMY_ENTRY_19(
76, null, false, null, null), DUMMY_ENTRY_20(77, null, false, null,
null), DUMMY_ENTRY_21(78, null, false, null, null), DUMMY_ENTRY_22(
79, null, false, null, null), DUMMY_ENTRY_23(80, null, false, null,
null), DUMMY_ENTRY_24(81, null, false, null, null), DUMMY_ENTRY_25(
82, null, false, null, null), DUMMY_ENTRY_26(83, null, false, null,
null), DUMMY_ENTRY_27(84, null, false, null, null), DUMMY_ENTRY_28(
85, null, false, null, null), DUMMY_ENTRY_29(86, null, false, null,
null), DUMMY_ENTRY_30(87, null, false, null, null), DUMMY_ENTRY_31(
0x77, null, false, null, null), DUMMY_ENTRY_32(0x78, null, false,
null, null), DUMMY_ENTRY_33(0x79, null, false, null, null), DUMMY_ENTRY_34(
0x7a, null, false, null, null);
/**
* The Class ID
*/
public final int id;
/**
* The class type
*/
public final ClassType type;
/**
* Is this class summoner?
*/
public final boolean summoner;
/**
* The class race
*/
public final CharacterRace race;
/**
* The parent class
*/
public final CharacterClass parent;
/**
* Creates a new class
*
* @param id
* the id
* @param type
* the type
* @param summoner
* is summoner
* @param race
* the race
* @param parent
* the parent
*/
private CharacterClass(int id, ClassType type, boolean summoner,
CharacterRace race, CharacterClass parent) {
this.id = id;
this.type = type;
this.summoner = summoner;
this.race = race;
this.parent = parent;
}
/**
* Creates a new instance, will inherit <tt>type</tt>, <tt>summoner</tt> and
* <tt>race</tt> from <tt>parent</tt>
*
* @param id
* the id
* @param parent
* the parent
*/
private CharacterClass(int id, CharacterClass parent) {
this(id, parent.type, parent.summoner, parent.race, parent);
}
/**
* Creates a new instance, will inherit <tt>type</tt> and <tt>race</tt> from
* <tt>parent</tt>
*
* @param id
* the class id
* @param summoner
* is summoner
* @param parent
* the parent
*/
private CharacterClass(int id, boolean summoner, CharacterClass parent) {
this(id, parent.type, summoner, parent.race, parent);
}
/**
* Creates a new instance, will inherit <tt>type</tt> and <tt>summoner</tt>
* from <tt>parent</tt>
*
* @param id
* the class id
* @param race
* the race
* @param parent
* the parent class
*/
private CharacterClass(int id, CharacterRace race, CharacterClass parent) {
this(id, parent.type, parent.summoner, race, parent);
}
/**
* Creates a new instance, will inherit <tt>summoner</tt> will be false and
* <tt>parent</tt> null.
*
* @param id
* the id
* @param type
* the class type
* @param race
* the class race
*/
private CharacterClass(int id, ClassType type, CharacterRace race) {
this(id, type, false, race, null);
}
/**
* Creates a new instance will inherit <tt>race</tt> from <tt/>parent</tt>.
* <tt>summoner</tt> will be false
*
* @param id
* the class id
* @param type
* the class type
* @param parent
* the parent class
*/
private CharacterClass(int id, ClassType type, CharacterClass parent) {
this(id, type, false, parent.race, parent);
}
/**
* Creates a new instance will inherit <tt>race</tt> from <tt/>parent</tt>
*
* @param id
* the class id
* @param type
* the class type
* @param summoner
* is class summoner
* @param parent
* the parent class
*/
private CharacterClass(int id, ClassType type, boolean summoner,
CharacterClass parent) {
this(id, type, summoner, parent.race, parent);
}
/**
* Tries to locate the class based on its ID. If not found, <tt>null</tt> is
* returned.
*
* @param id
* the class id
* @return the {@link CharacterClass} instance found
*/
public static CharacterClass fromID(int id) {
for (final CharacterClass c : values()) {
if (c.id == id)
return c;
}
return null;
}
/**
* Calculates the level of the class. Base class is zero.
*
* @return the class level
*/
public final int level() {
if (parent == null)
return 0;
return 1 + parent.level();
}
/**
* The class type
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public enum ClassType {
FIGHTER, MYSTIC, PRIEST;
}
}